fix: fixup left margin in settings to be 64px

as intended in Figma; also fix the icon size to be 24px
This commit is contained in:
Lukáš Tinkl 2023-09-22 11:58:02 +02:00 committed by Lukáš Tinkl
parent 8969b410f4
commit b4958689bd
9 changed files with 17 additions and 26 deletions

View File

@ -12,8 +12,10 @@ StatusListItem {
implicitWidth: 286
implicitHeight: 48
asset.bgWidth: 20
asset.bgHeight: 20
asset.bgWidth: 24
asset.bgHeight: 24
asset.width: 24
asset.height: 24
asset.bgColor: "transparent"
statusListItemIcon.anchors.topMargin: 14

View File

@ -1,9 +1,8 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.13
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import StatusQ.Core 0.1
import StatusQ.Core.Theme 0.1
import StatusQ.Controls 0.1
ToolBar {
@ -21,23 +20,20 @@ ToolBar {
objectName: "statusToolBar"
implicitWidth: visible ? 518 : 0
implicitHeight: visible ? 56 : 0
padding: 4
leftPadding: 24
rightPadding: 10
topPadding: 8
bottomPadding: 4
background: null
RowLayout {
anchors.fill: parent
anchors.rightMargin: 4
spacing: 0
StatusFlatButton {
objectName: "toolBarBackButton"
icon.name: "arrow-left"
icon.width: 20
icon.height: 20
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
Layout.leftMargin: 18
visible: !!root.backButtonName
text: root.backButtonName
size: StatusBaseButton.Size.Large
onClicked: { root.backButtonClicked(); }
}

View File

@ -106,10 +106,10 @@ StatusSectionLayout {
Layout.fillWidth: true
Layout.fillHeight: true
Layout.leftMargin: Style.current.padding
Layout.leftMargin: Style.current.halfPadding
Layout.rightMargin: Style.current.padding
model: stackLayout.children
spacing: 8
spacing: Style.current.halfPadding
enabled: !root.communitySettingsDisabled
delegate: StatusNavigationListItem {
@ -117,8 +117,6 @@ StatusSectionLayout {
width: ListView.view.width
title: model.sectionName
asset.name: model.sectionIcon
asset.height: 24
asset.width: 24
selected: d.currentIndex === index && !root.communitySettingsDisabled
onClicked: d.currentIndex = index
visible: model.sectionEnabled

View File

@ -40,7 +40,6 @@ SettingsContentBase {
Item {
id: appearanceContainer
anchors.left: !!parent ? parent.left : undefined
anchors.leftMargin: Style.current.padding
width: appearanceView.contentWidth - 2 * Style.current.padding
height: childrenRect.height

View File

@ -48,8 +48,6 @@ SettingsContentBase {
RowLayout {
Layout.fillWidth: true
Layout.leftMargin: Style.current.padding
Layout.rightMargin: Style.current.padding
z: root.z + 2
StatusBaseText {
@ -87,8 +85,6 @@ SettingsContentBase {
RowLayout {
Layout.fillWidth: true
Layout.leftMargin: Style.current.padding
Layout.rightMargin: Style.current.padding
z: root.z + 1
StatusBaseText {
@ -162,8 +158,6 @@ SettingsContentBase {
// Time format options:
Column {
Layout.fillWidth: true
Layout.leftMargin: Style.current.padding
Layout.rightMargin: Style.current.padding
Layout.topMargin: Style.current.padding
spacing: Style.current.padding
StatusBaseText {

View File

@ -32,6 +32,7 @@ Item {
contentHeight: profileMenu.height + Style.current.bigPadding
anchors.right: parent.right
anchors.left: parent.left
leftPadding: Style.current.halfPadding
anchors.top: title.bottom
anchors.topMargin: Style.current.halfPadding
anchors.bottom: parent.bottom

View File

@ -49,6 +49,7 @@ SettingsContentBase {
bottomHeaderComponents: StatusTabBar {
id: editPreviwTabBar
StatusTabButton {
leftPadding: 0
width: implicitWidth
text: qsTr("Edit")
}

View File

@ -62,9 +62,8 @@ Item {
RowLayout {
id: titleLayout
Layout.preferredWidth: (parent.width - Style.current.padding)
Layout.fillWidth: true
Layout.preferredHeight: visible ? d.titleRowHeight : 0
Layout.leftMargin: Style.current.padding
visible: (root.sectionTitle !== "")
Loader {

View File

@ -19,6 +19,7 @@ ColumnLayout {
StatusTabBar {
id: editPreviwTabBar
StatusTabButton {
leftPadding: 0
text: qsTr("Live Network")
width: implicitWidth
}