diff --git a/resources/qml/Account/AccountWidget.qml b/resources/qml/Account/AccountWidget.qml index 22c876b857..48c05f8a11 100644 --- a/resources/qml/Account/AccountWidget.qml +++ b/resources/qml/Account/AccountWidget.qml @@ -131,7 +131,7 @@ Item opacity: opened ? 1 : 0 Behavior on opacity { NumberAnimation { duration: 100 } } - padding: UM.Theme.getSize("wide_margin").height + padding: 0 contentItem: AccountDetails {} diff --git a/resources/qml/Account/GeneralOperations.qml b/resources/qml/Account/GeneralOperations.qml index bea90c1d67..9562f940a4 100644 --- a/resources/qml/Account/GeneralOperations.qml +++ b/resources/qml/Account/GeneralOperations.qml @@ -10,7 +10,7 @@ import Cura 1.1 as Cura Column { spacing: UM.Theme.getSize("default_margin").width - + padding: UM.Theme.getSize("default_margin").width Image { id: machinesImage diff --git a/resources/qml/Account/SyncState.qml b/resources/qml/Account/SyncState.qml index a362c93e21..aa81688e45 100644 --- a/resources/qml/Account/SyncState.qml +++ b/resources/qml/Account/SyncState.qml @@ -11,7 +11,6 @@ Row // Sync state icon + message id: syncRow width: childrenRect.width height: childrenRect.height - anchors.horizontalCenter: parent.horizontalCenter spacing: UM.Theme.getSize("narrow_margin").height states: [ @@ -49,7 +48,6 @@ Row // Sync state icon + message id: palette } - UM.RecolorImage { id: icon @@ -91,6 +89,7 @@ Row // Sync state icon + message color: UM.Theme.getColor("text") font: UM.Theme.getFont("medium") renderType: Text.NativeRendering + width: contentWidth + UM.Theme.getSize("default_margin").height height: contentHeight verticalAlignment: Text.AlignVCenter visible: !Cura.API.account.manualSyncEnabled @@ -105,6 +104,7 @@ Row // Sync state icon + message renderType: Text.NativeRendering verticalAlignment: Text.AlignVCenter height: contentHeight + width: contentWidth + UM.Theme.getSize("default_margin").height visible: Cura.API.account.manualSyncEnabled MouseArea diff --git a/resources/qml/Account/UserOperations.qml b/resources/qml/Account/UserOperations.qml index e660286257..e897e97d2e 100644 --- a/resources/qml/Account/UserOperations.qml +++ b/resources/qml/Account/UserOperations.qml @@ -10,11 +10,17 @@ import Cura 1.1 as Cura Column { spacing: UM.Theme.getSize("narrow_margin").height + topPadding: UM.Theme.getSize("default_margin").height + bottomPadding: UM.Theme.getSize("default_margin").height + width: childrenRect.width Item { + id: accountInfo width: childrenRect.width height: childrenRect.height + anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("default_margin").width AvatarImage { id: avatar @@ -30,6 +36,8 @@ Column anchors.left: avatar.right anchors.leftMargin: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("narrow_margin").height + width: childrenRect.width + height: childrenRect.height Label { id: username