diff --git a/components/ConnectionHeader.qml b/components/ConnectionHeader.qml index 691fd3c5..886043ad 100644 --- a/components/ConnectionHeader.qml +++ b/components/ConnectionHeader.qml @@ -9,7 +9,7 @@ ColumnLayout { required property string icon required property string title - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium Layout.alignment: Qt.AlignHCenter MaterialIcon { diff --git a/components/ConnectionInfoSection.qml b/components/ConnectionInfoSection.qml index d94c3a6e..ed8ef887 100644 --- a/components/ConnectionInfoSection.qml +++ b/components/ConnectionInfoSection.qml @@ -22,7 +22,7 @@ ColumnLayout { } StyledText { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium text: qsTr("Subnet Mask") } @@ -33,7 +33,7 @@ ColumnLayout { } StyledText { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium text: qsTr("Gateway") } @@ -44,7 +44,7 @@ ColumnLayout { } StyledText { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium text: qsTr("DNS Servers") } diff --git a/components/PropertyRow.qml b/components/PropertyRow.qml index 4d302509..b00881ba 100644 --- a/components/PropertyRow.qml +++ b/components/PropertyRow.qml @@ -14,7 +14,7 @@ ColumnLayout { spacing: Tokens.spacing.small / 2 StyledText { - Layout.topMargin: root.showTopMargin ? Tokens.spacing.normal : 0 + Layout.topMargin: root.showTopMargin ? Tokens.spacing.medium : 0 text: root.label } diff --git a/components/SectionContainer.qml b/components/SectionContainer.qml index 8bd256d3..f539fa77 100644 --- a/components/SectionContainer.qml +++ b/components/SectionContainer.qml @@ -8,7 +8,7 @@ StyledRect { id: root default property alias content: contentColumn.data - property real contentSpacing: Tokens.spacing.larger + property real contentSpacing: Tokens.spacing.large property bool alignTop: false Layout.fillWidth: true diff --git a/components/SectionHeader.qml b/components/SectionHeader.qml index 09364143..d9403897 100644 --- a/components/SectionHeader.qml +++ b/components/SectionHeader.qml @@ -13,7 +13,7 @@ ColumnLayout { spacing: 0 StyledText { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased text: root.title font.pointSize: Tokens.font.size.larger font.weight: 500 diff --git a/components/controls/CollapsibleSection.qml b/components/controls/CollapsibleSection.qml index de1400a7..4136aa87 100644 --- a/components/controls/CollapsibleSection.qml +++ b/components/controls/CollapsibleSection.qml @@ -34,7 +34,7 @@ ColumnLayout { anchors.verticalCenter: parent.verticalCenter anchors.leftMargin: Tokens.padding.medium anchors.rightMargin: Tokens.padding.medium - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { text: root.title @@ -117,7 +117,7 @@ ColumnLayout { id: descriptionText Layout.fillWidth: true - Layout.topMargin: root.description !== "" ? Tokens.spacing.smaller : 0 + Layout.topMargin: root.description !== "" ? Tokens.spacing.medium : 0 Layout.bottomMargin: root.description !== "" ? Tokens.spacing.small : 0 visible: root.description !== "" text: root.description diff --git a/components/controls/SpinBoxRow.qml b/components/controls/SpinBoxRow.qml index 497bb75c..edce6639 100644 --- a/components/controls/SpinBoxRow.qml +++ b/components/controls/SpinBoxRow.qml @@ -30,7 +30,7 @@ StyledRect { anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true diff --git a/components/controls/SplitButtonRow.qml b/components/controls/SplitButtonRow.qml index 7ba1654c..a907ed2b 100644 --- a/components/controls/SplitButtonRow.qml +++ b/components/controls/SplitButtonRow.qml @@ -33,7 +33,7 @@ StyledRect { anchors.fill: parent anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true diff --git a/components/controls/StyledRadioButton.qml b/components/controls/StyledRadioButton.qml index d215ca9f..33bd69b3 100644 --- a/components/controls/StyledRadioButton.qml +++ b/components/controls/StyledRadioButton.qml @@ -49,6 +49,6 @@ RadioButton { font.pointSize: root.font.pointSize anchors.verticalCenter: parent.verticalCenter anchors.left: outerCircle.right - anchors.leftMargin: Tokens.spacing.smaller + anchors.leftMargin: Tokens.spacing.medium } } diff --git a/components/controls/SwitchRow.qml b/components/controls/SwitchRow.qml index d502253d..d4d83183 100644 --- a/components/controls/SwitchRow.qml +++ b/components/controls/SwitchRow.qml @@ -28,7 +28,7 @@ StyledRect { anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true diff --git a/components/controls/ToggleButton.qml b/components/controls/ToggleButton.qml index 54208557..33975573 100644 --- a/components/controls/ToggleButton.qml +++ b/components/controls/ToggleButton.qml @@ -52,7 +52,7 @@ StyledRect { id: toggleBtnInner anchors.centerIn: parent - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium MaterialIcon { id: toggleBtnIcon diff --git a/components/controls/ToggleRow.qml b/components/controls/ToggleRow.qml index beb6a15c..133c3ff4 100644 --- a/components/controls/ToggleRow.qml +++ b/components/controls/ToggleRow.qml @@ -12,7 +12,7 @@ RowLayout { property alias toggle: toggle Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true diff --git a/components/filedialog/DialogButtons.qml b/components/filedialog/DialogButtons.qml index f548d91f..fe686e4a 100644 --- a/components/filedialog/DialogButtons.qml +++ b/components/filedialog/DialogButtons.qml @@ -28,7 +28,7 @@ StyledRect { StyledRect { Layout.fillWidth: true Layout.fillHeight: true - Layout.rightMargin: Tokens.spacing.normal + Layout.rightMargin: Tokens.spacing.medium color: Colours.tPalette.m3surfaceContainerHigh radius: Tokens.rounding.medium diff --git a/components/filedialog/Sidebar.qml b/components/filedialog/Sidebar.qml index c491beeb..f6a0e374 100644 --- a/components/filedialog/Sidebar.qml +++ b/components/filedialog/Sidebar.qml @@ -29,7 +29,7 @@ StyledRect { StyledText { Layout.alignment: Qt.AlignHCenter Layout.topMargin: Tokens.padding.extraSmall / 2 - Layout.bottomMargin: Tokens.spacing.normal + Layout.bottomMargin: Tokens.spacing.medium text: qsTr("Files") color: Colours.palette.m3onSurface font.pointSize: Tokens.font.size.larger @@ -69,7 +69,7 @@ StyledRect { anchors.leftMargin: Tokens.padding.large anchors.rightMargin: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium MaterialIcon { text: { diff --git a/modules/background/DesktopClock.qml b/modules/background/DesktopClock.qml index 76bd2d5d..463e32b5 100644 --- a/modules/background/DesktopClock.qml +++ b/modules/background/DesktopClock.qml @@ -74,7 +74,7 @@ Item { id: layout anchors.centerIn: parent - spacing: Tokens.spacing.larger * root.clockScale + spacing: Tokens.spacing.large * root.clockScale RowLayout { spacing: Tokens.spacing.small @@ -120,8 +120,8 @@ Item { StyledRect { Layout.fillHeight: true Layout.preferredWidth: 4 * root.clockScale - Layout.topMargin: Tokens.spacing.larger * root.clockScale - Layout.bottomMargin: Tokens.spacing.larger * root.clockScale + Layout.topMargin: Tokens.spacing.large * root.clockScale + Layout.bottomMargin: Tokens.spacing.large * root.clockScale radius: Tokens.rounding.full color: root.safePrimary opacity: 0.8 diff --git a/modules/background/Wallpaper.qml b/modules/background/Wallpaper.qml index 411c573d..f1421797 100644 --- a/modules/background/Wallpaper.qml +++ b/modules/background/Wallpaper.qml @@ -43,7 +43,7 @@ Item { Row { anchors.centerIn: parent - spacing: Tokens.spacing.large + spacing: Tokens.spacing.largeIncreased MaterialIcon { text: "sentiment_stressed" diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml index a2ed060e..db648a9c 100644 --- a/modules/bar/Bar.qml +++ b/modules/bar/Bar.qml @@ -102,7 +102,7 @@ ColumnLayout { } } - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium Repeater { id: repeater diff --git a/modules/bar/components/StatusIcons.qml b/modules/bar/components/StatusIcons.qml index 9318a743..46fd3af4 100644 --- a/modules/bar/components/StatusIcons.qml +++ b/modules/bar/components/StatusIcons.qml @@ -31,7 +31,7 @@ StyledRect { anchors.bottom: parent.bottom anchors.bottomMargin: Tokens.padding.medium - spacing: Tokens.spacing.smaller / 2 + spacing: Tokens.spacing.medium / 2 // Lock keys status WrappedLoader { @@ -172,7 +172,7 @@ StyledRect { active: Config.bar.status.showBluetooth sourceComponent: ColumnLayout { - spacing: Tokens.spacing.smaller / 2 + spacing: Tokens.spacing.medium / 2 // Bluetooth icon MaterialIcon { diff --git a/modules/bar/components/workspaces/SpecialWorkspaces.qml b/modules/bar/components/workspaces/SpecialWorkspaces.qml index ed224b61..25861964 100644 --- a/modules/bar/components/workspaces/SpecialWorkspaces.qml +++ b/modules/bar/components/workspaces/SpecialWorkspaces.qml @@ -88,7 +88,7 @@ Item { id: view anchors.fill: parent - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium interactive: false currentIndex: model.values.findIndex(w => w.name === root.activeSpecial) diff --git a/modules/bar/popouts/ActiveWindow.qml b/modules/bar/popouts/ActiveWindow.qml index d5864b76..08991196 100644 --- a/modules/bar/popouts/ActiveWindow.qml +++ b/modules/bar/popouts/ActiveWindow.qml @@ -19,14 +19,14 @@ Item { id: child anchors.centerIn: parent - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium RowLayout { id: detailsRow anchors.left: parent.left anchors.right: parent.right - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium IconImage { id: icon diff --git a/modules/bar/popouts/Audio.qml b/modules/bar/popouts/Audio.qml index fcc935da..7b24fb0e 100644 --- a/modules/bar/popouts/Audio.qml +++ b/modules/bar/popouts/Audio.qml @@ -30,7 +30,7 @@ Item { anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { text: qsTr("Output device") @@ -53,7 +53,7 @@ Item { } StyledText { - Layout.topMargin: Tokens.spacing.smaller + Layout.topMargin: Tokens.spacing.medium text: qsTr("Input device") font.weight: 500 } @@ -72,7 +72,7 @@ Item { } StyledText { - Layout.topMargin: Tokens.spacing.smaller + Layout.topMargin: Tokens.spacing.medium Layout.bottomMargin: -Tokens.spacing.small / 2 text: qsTr("Volume (%1)").arg(Audio.muted ? qsTr("Muted") : `${Math.round(Audio.volume * 100)}%`) font.weight: 500 @@ -105,7 +105,7 @@ Item { IconTextButton { Layout.fillWidth: true - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium inactiveColour: Colours.palette.m3primaryContainer inactiveOnColour: Colours.palette.m3onPrimaryContainer verticalPadding: Tokens.padding.extraSmall diff --git a/modules/bar/popouts/Battery.qml b/modules/bar/popouts/Battery.qml index d15f6fa5..f90f2ec3 100644 --- a/modules/bar/popouts/Battery.qml +++ b/modules/bar/popouts/Battery.qml @@ -9,7 +9,7 @@ import qs.services Column { id: root - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium width: Tokens.sizes.bar.batteryWidth StyledText { @@ -109,7 +109,7 @@ Column { anchors.horizontalCenter: parent.horizontalCenter - implicitWidth: saver.implicitHeight + balance.implicitHeight + perf.implicitHeight + Tokens.padding.medium * 2 + Tokens.spacing.large * 2 + implicitWidth: saver.implicitHeight + balance.implicitHeight + perf.implicitHeight + Tokens.padding.medium * 2 + Tokens.spacing.largeIncreased * 2 implicitHeight: Math.max(saver.implicitHeight, balance.implicitHeight, perf.implicitHeight) + Tokens.padding.small color: Colours.tPalette.m3surfaceContainer diff --git a/modules/bar/popouts/Bluetooth.qml b/modules/bar/popouts/Bluetooth.qml index f8cb12dd..4012ea27 100644 --- a/modules/bar/popouts/Bluetooth.qml +++ b/modules/bar/popouts/Bluetooth.qml @@ -169,7 +169,7 @@ ColumnLayout { IconTextButton { Layout.fillWidth: true - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium inactiveColour: Colours.palette.m3primaryContainer inactiveOnColour: Colours.palette.m3onPrimaryContainer verticalPadding: Tokens.padding.extraSmall @@ -186,7 +186,7 @@ ColumnLayout { Layout.fillWidth: true Layout.rightMargin: Tokens.padding.extraSmall - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true diff --git a/modules/bar/popouts/Network.qml b/modules/bar/popouts/Network.qml index 0805e6bd..93614ea0 100644 --- a/modules/bar/popouts/Network.qml +++ b/modules/bar/popouts/Network.qml @@ -372,7 +372,7 @@ ColumnLayout { Layout.fillWidth: true Layout.rightMargin: Tokens.padding.extraSmall - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true diff --git a/modules/bar/popouts/TrayMenu.qml b/modules/bar/popouts/TrayMenu.qml index 7dc81b42..fd9eba9e 100644 --- a/modules/bar/popouts/TrayMenu.qml +++ b/modules/bar/popouts/TrayMenu.qml @@ -138,7 +138,7 @@ StackView { id: label anchors.left: icon.right - anchors.leftMargin: icon.active ? Tokens.spacing.smaller : 0 + anchors.leftMargin: icon.active ? Tokens.spacing.medium : 0 text: labelMetrics.elidedText color: item.modelData.enabled ? Colours.palette.m3onSurface : Colours.palette.m3outline @@ -152,7 +152,7 @@ StackView { font.family: label.font.family elide: Text.ElideRight - elideWidth: root.Tokens.sizes.bar.trayMenuWidth - (icon.active ? icon.implicitWidth + label.anchors.leftMargin : 0) - (expand.active ? expand.implicitWidth + root.Tokens.spacing.normal : 0) + elideWidth: root.Tokens.sizes.bar.trayMenuWidth - (icon.active ? icon.implicitWidth + label.anchors.leftMargin : 0) - (expand.active ? expand.implicitWidth + root.Tokens.spacing.medium : 0) } Loader { diff --git a/modules/bar/popouts/WirelessPassword.qml b/modules/bar/popouts/WirelessPassword.qml index de1dd54b..daa38ae3 100644 --- a/modules/bar/popouts/WirelessPassword.qml +++ b/modules/bar/popouts/WirelessPassword.qml @@ -69,7 +69,7 @@ ColumnLayout { } } - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium implicitWidth: 400 implicitHeight: content.implicitHeight + Tokens.padding.extraLargeIncreased visible: shouldBeVisible || isClosing @@ -172,7 +172,7 @@ ColumnLayout { anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium MaterialIcon { Layout.alignment: Qt.AlignHCenter @@ -261,7 +261,7 @@ ColumnLayout { property string passwordBuffer: "" objectName: "passwordContainer" - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased Layout.fillWidth: true implicitHeight: Math.max(48, charList.implicitHeight + Tokens.padding.medium * 2) focus: true @@ -463,9 +463,9 @@ ColumnLayout { } RowLayout { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium TextButton { id: cancelButton diff --git a/modules/controlcenter/NavRail.qml b/modules/controlcenter/NavRail.qml index e1e79286..9e26cdd0 100644 --- a/modules/controlcenter/NavRail.qml +++ b/modules/controlcenter/NavRail.qml @@ -24,7 +24,7 @@ Item { anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter anchors.leftMargin: Tokens.padding.medium * 2 - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium states: State { name: "expanded" @@ -42,7 +42,7 @@ Item { } Loader { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased asynchronous: true active: !root.session.floating visible: active @@ -88,7 +88,7 @@ Item { anchors.left: normalWinIcon.right anchors.verticalCenter: parent.verticalCenter - anchors.leftMargin: Tokens.spacing.normal + anchors.leftMargin: Tokens.spacing.medium text: qsTr("Float window") color: Colours.palette.m3onPrimaryContainer @@ -121,7 +121,7 @@ Item { NavItem { required property int index - Layout.topMargin: index === 0 ? Tokens.spacing.large * 2 : 0 + Layout.topMargin: index === 0 ? Tokens.spacing.largeIncreased * 2 : 0 icon: PaneRegistry.getByIndex(index).icon label: PaneRegistry.getByIndex(index).label } @@ -206,7 +206,7 @@ Item { anchors.left: icon.right anchors.verticalCenter: parent.verticalCenter - anchors.leftMargin: Tokens.spacing.normal + anchors.leftMargin: Tokens.spacing.medium opacity: 0 text: item.label diff --git a/modules/controlcenter/appearance/AppearancePane.qml b/modules/controlcenter/appearance/AppearancePane.qml index 058d48d2..b2cfbbca 100644 --- a/modules/controlcenter/appearance/AppearancePane.qml +++ b/modules/controlcenter/appearance/AppearancePane.qml @@ -109,7 +109,7 @@ Item { StyledText { Layout.alignment: Qt.AlignHCenter - Layout.bottomMargin: Tokens.spacing.normal + Layout.bottomMargin: Tokens.spacing.medium text: qsTr("Wallpaper") font.pointSize: Tokens.font.size.extraLarge font.weight: 600 @@ -173,7 +173,7 @@ Item { spacing: Tokens.spacing.small RowLayout { - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium StyledText { text: qsTr("Appearance") diff --git a/modules/controlcenter/appearance/sections/AnimationsSection.qml b/modules/controlcenter/appearance/sections/AnimationsSection.qml index 412441ab..921d3abe 100644 --- a/modules/controlcenter/appearance/sections/AnimationsSection.qml +++ b/modules/controlcenter/appearance/sections/AnimationsSection.qml @@ -19,7 +19,7 @@ CollapsibleSection { showBackground: true SectionContainer { - contentSpacing: Tokens.spacing.normal + contentSpacing: Tokens.spacing.medium SliderInput { Layout.fillWidth: true diff --git a/modules/controlcenter/appearance/sections/BackgroundSection.qml b/modules/controlcenter/appearance/sections/BackgroundSection.qml index 3f31f10b..90879129 100644 --- a/modules/controlcenter/appearance/sections/BackgroundSection.qml +++ b/modules/controlcenter/appearance/sections/BackgroundSection.qml @@ -37,7 +37,7 @@ CollapsibleSection { } StyledText { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium text: qsTr("Desktop Clock") font.pointSize: Tokens.font.size.larger font.weight: 500 @@ -174,7 +174,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Tokens.spacing.normal + contentSpacing: Tokens.spacing.medium SliderInput { Layout.fillWidth: true @@ -199,7 +199,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Tokens.spacing.normal + contentSpacing: Tokens.spacing.medium SliderInput { Layout.fillWidth: true @@ -252,7 +252,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Tokens.spacing.normal + contentSpacing: Tokens.spacing.medium SliderInput { Layout.fillWidth: true @@ -278,7 +278,7 @@ CollapsibleSection { } StyledText { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium text: qsTr("Visualiser") font.pointSize: Tokens.font.size.larger font.weight: 500 @@ -303,7 +303,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Tokens.spacing.normal + contentSpacing: Tokens.spacing.medium SliderInput { Layout.fillWidth: true @@ -328,7 +328,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Tokens.spacing.normal + contentSpacing: Tokens.spacing.medium SliderInput { Layout.fillWidth: true diff --git a/modules/controlcenter/appearance/sections/BorderSection.qml b/modules/controlcenter/appearance/sections/BorderSection.qml index 7dbd2dbe..71bb6faf 100644 --- a/modules/controlcenter/appearance/sections/BorderSection.qml +++ b/modules/controlcenter/appearance/sections/BorderSection.qml @@ -19,7 +19,7 @@ CollapsibleSection { showBackground: true SectionContainer { - contentSpacing: Tokens.spacing.normal + contentSpacing: Tokens.spacing.medium SliderInput { Layout.fillWidth: true @@ -43,7 +43,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Tokens.spacing.normal + contentSpacing: Tokens.spacing.medium SliderInput { Layout.fillWidth: true diff --git a/modules/controlcenter/appearance/sections/ColorSchemeSection.qml b/modules/controlcenter/appearance/sections/ColorSchemeSection.qml index 16a77b5e..414777b1 100644 --- a/modules/controlcenter/appearance/sections/ColorSchemeSection.qml +++ b/modules/controlcenter/appearance/sections/ColorSchemeSection.qml @@ -67,7 +67,7 @@ CollapsibleSection { anchors.fill: parent anchors.margins: Tokens.padding.medium - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledRect { id: preview diff --git a/modules/controlcenter/appearance/sections/ColorVariantSection.qml b/modules/controlcenter/appearance/sections/ColorVariantSection.qml index e7f7fb55..54fa62e1 100644 --- a/modules/controlcenter/appearance/sections/ColorVariantSection.qml +++ b/modules/controlcenter/appearance/sections/ColorVariantSection.qml @@ -64,7 +64,7 @@ CollapsibleSection { anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.medium - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium MaterialIcon { text: modelData.icon diff --git a/modules/controlcenter/appearance/sections/FontsSection.qml b/modules/controlcenter/appearance/sections/FontsSection.qml index 47b518ac..9dfadb65 100644 --- a/modules/controlcenter/appearance/sections/FontsSection.qml +++ b/modules/controlcenter/appearance/sections/FontsSection.qml @@ -72,7 +72,7 @@ CollapsibleSection { anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.medium - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { text: modelData @@ -153,7 +153,7 @@ CollapsibleSection { anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.medium - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { text: modelData @@ -236,7 +236,7 @@ CollapsibleSection { anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.medium - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { text: modelData @@ -264,7 +264,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Tokens.spacing.normal + contentSpacing: Tokens.spacing.medium SliderInput { Layout.fillWidth: true diff --git a/modules/controlcenter/appearance/sections/ScalesSection.qml b/modules/controlcenter/appearance/sections/ScalesSection.qml index dac6226e..60e7e493 100644 --- a/modules/controlcenter/appearance/sections/ScalesSection.qml +++ b/modules/controlcenter/appearance/sections/ScalesSection.qml @@ -19,7 +19,7 @@ CollapsibleSection { showBackground: true SectionContainer { - contentSpacing: Tokens.spacing.normal + contentSpacing: Tokens.spacing.medium SliderInput { Layout.fillWidth: true @@ -43,7 +43,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Tokens.spacing.normal + contentSpacing: Tokens.spacing.medium SliderInput { Layout.fillWidth: true @@ -67,7 +67,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Tokens.spacing.normal + contentSpacing: Tokens.spacing.medium SliderInput { Layout.fillWidth: true diff --git a/modules/controlcenter/appearance/sections/TransparencySection.qml b/modules/controlcenter/appearance/sections/TransparencySection.qml index f2f15ba1..eaa8dfd6 100644 --- a/modules/controlcenter/appearance/sections/TransparencySection.qml +++ b/modules/controlcenter/appearance/sections/TransparencySection.qml @@ -28,7 +28,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Tokens.spacing.normal + contentSpacing: Tokens.spacing.medium SliderInput { Layout.fillWidth: true @@ -53,7 +53,7 @@ CollapsibleSection { } SectionContainer { - contentSpacing: Tokens.spacing.normal + contentSpacing: Tokens.spacing.medium SliderInput { Layout.fillWidth: true diff --git a/modules/controlcenter/audio/AudioPane.qml b/modules/controlcenter/audio/AudioPane.qml index 5a53a6e6..b677d69d 100644 --- a/modules/controlcenter/audio/AudioPane.qml +++ b/modules/controlcenter/audio/AudioPane.qml @@ -38,11 +38,11 @@ Item { anchors.left: parent.left anchors.right: parent.right - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium StyledText { text: qsTr("Audio") @@ -110,7 +110,7 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.medium - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium MaterialIcon { text: Audio.sink?.id === modelData.id ? "speaker" : "speaker_group" @@ -187,7 +187,7 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.medium - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium MaterialIcon { text: "mic" @@ -229,7 +229,7 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SettingsHeader { icon: "volume_up" @@ -242,7 +242,7 @@ Item { } SectionContainer { - contentSpacing: Tokens.spacing.normal + contentSpacing: Tokens.spacing.medium ColumnLayout { Layout.fillWidth: true @@ -250,7 +250,7 @@ Item { RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { text: qsTr("Volume") @@ -360,7 +360,7 @@ Item { } SectionContainer { - contentSpacing: Tokens.spacing.normal + contentSpacing: Tokens.spacing.medium ColumnLayout { Layout.fillWidth: true @@ -368,7 +368,7 @@ Item { RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { text: qsTr("Volume") @@ -478,7 +478,7 @@ Item { } SectionContainer { - contentSpacing: Tokens.spacing.normal + contentSpacing: Tokens.spacing.medium ColumnLayout { Layout.fillWidth: true @@ -493,11 +493,11 @@ Item { required property int index Layout.fillWidth: true - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium MaterialIcon { text: "apps" diff --git a/modules/controlcenter/bluetooth/Details.qml b/modules/controlcenter/bluetooth/Details.qml index 2f94d195..bed5c19a 100644 --- a/modules/controlcenter/bluetooth/Details.qml +++ b/modules/controlcenter/bluetooth/Details.qml @@ -54,10 +54,10 @@ StyledFlickable { sections: [ Component { ColumnLayout { - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased text: qsTr("Connection status") font.pointSize: Tokens.font.size.larger font.weight: 500 @@ -83,7 +83,7 @@ StyledFlickable { anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.larger + spacing: Tokens.spacing.large Toggle { label: qsTr("Connected") @@ -113,10 +113,10 @@ StyledFlickable { }, Component { ColumnLayout { - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased text: qsTr("Device properties") font.pointSize: Tokens.font.size.larger font.weight: 500 @@ -142,7 +142,7 @@ StyledFlickable { anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.larger + spacing: Tokens.spacing.large RowLayout { Layout.fillWidth: true @@ -319,10 +319,10 @@ StyledFlickable { }, Component { ColumnLayout { - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased text: qsTr("Device information") font.pointSize: Tokens.font.size.larger font.weight: 500 @@ -382,7 +382,7 @@ StyledFlickable { } StyledText { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium text: qsTr("Dbus path") } @@ -393,7 +393,7 @@ StyledFlickable { } StyledText { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium text: qsTr("MAC address") } @@ -404,7 +404,7 @@ StyledFlickable { } StyledText { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium text: qsTr("Bonded") } @@ -415,7 +415,7 @@ StyledFlickable { } StyledText { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium text: qsTr("System name") } @@ -544,7 +544,7 @@ StyledFlickable { id: fabMenuItemInner anchors.centerIn: parent - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium opacity: 0 MaterialIcon { @@ -650,7 +650,7 @@ StyledFlickable { property alias toggle: toggle Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true diff --git a/modules/controlcenter/bluetooth/DeviceList.qml b/modules/controlcenter/bluetooth/DeviceList.qml index 96e8f323..6bb03cd7 100644 --- a/modules/controlcenter/bluetooth/DeviceList.qml +++ b/modules/controlcenter/bluetooth/DeviceList.qml @@ -32,7 +32,7 @@ DeviceList { headerComponent: Component { RowLayout { - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium StyledText { text: qsTr("Bluetooth") @@ -157,7 +157,7 @@ DeviceList { anchors.fill: parent anchors.margins: Tokens.padding.medium - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledRect { implicitWidth: implicitHeight diff --git a/modules/controlcenter/bluetooth/Settings.qml b/modules/controlcenter/bluetooth/Settings.qml index 4c0d2c43..fff80162 100644 --- a/modules/controlcenter/bluetooth/Settings.qml +++ b/modules/controlcenter/bluetooth/Settings.qml @@ -16,7 +16,7 @@ ColumnLayout { required property Session session - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SettingsHeader { icon: "bluetooth" @@ -24,7 +24,7 @@ ColumnLayout { } StyledText { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased text: qsTr("Adapter status") font.pointSize: Tokens.font.size.larger font.weight: 500 @@ -50,7 +50,7 @@ ColumnLayout { anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.larger + spacing: Tokens.spacing.large Toggle { label: qsTr("Powered") @@ -85,7 +85,7 @@ ColumnLayout { } StyledText { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased text: qsTr("Adapter properties") font.pointSize: Tokens.font.size.larger font.weight: 500 @@ -111,11 +111,11 @@ ColumnLayout { anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.larger + spacing: Tokens.spacing.large RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true @@ -145,7 +145,7 @@ ColumnLayout { anchors.margins: Tokens.padding.medium anchors.topMargin: Tokens.padding.small anchors.bottomMargin: Tokens.padding.small - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { Layout.leftMargin: Tokens.padding.extraSmall @@ -224,7 +224,7 @@ ColumnLayout { anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.medium - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true @@ -264,7 +264,7 @@ ColumnLayout { RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true @@ -442,7 +442,7 @@ ColumnLayout { } StyledText { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased text: qsTr("Adapter information") font.pointSize: Tokens.font.size.larger font.weight: 500 @@ -481,7 +481,7 @@ ColumnLayout { } StyledText { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium text: qsTr("Dbus path") } @@ -492,7 +492,7 @@ ColumnLayout { } StyledText { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium text: qsTr("Adapter id") } @@ -510,7 +510,7 @@ ColumnLayout { property alias toggle: toggle Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true diff --git a/modules/controlcenter/components/ConnectedButtonGroup.qml b/modules/controlcenter/components/ConnectedButtonGroup.qml index 1bcc072d..fa2e20e8 100644 --- a/modules/controlcenter/components/ConnectedButtonGroup.qml +++ b/modules/controlcenter/components/ConnectedButtonGroup.qml @@ -30,7 +30,7 @@ StyledRect { anchors.fill: parent anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { visible: root.title !== "" diff --git a/modules/controlcenter/components/DeviceDetails.qml b/modules/controlcenter/components/DeviceDetails.qml index 075024f6..1dfa327f 100644 --- a/modules/controlcenter/components/DeviceDetails.qml +++ b/modules/controlcenter/components/DeviceDetails.qml @@ -30,7 +30,7 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium Loader { id: headerLoader diff --git a/modules/controlcenter/components/ReadonlySlider.qml b/modules/controlcenter/components/ReadonlySlider.qml index b71cde80..9874d27a 100644 --- a/modules/controlcenter/components/ReadonlySlider.qml +++ b/modules/controlcenter/components/ReadonlySlider.qml @@ -21,7 +21,7 @@ ColumnLayout { RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { visible: root.label !== "" diff --git a/modules/controlcenter/components/SettingsHeader.qml b/modules/controlcenter/components/SettingsHeader.qml index c6ccbb67..dccea377 100644 --- a/modules/controlcenter/components/SettingsHeader.qml +++ b/modules/controlcenter/components/SettingsHeader.qml @@ -18,7 +18,7 @@ Item { id: column anchors.centerIn: parent - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium MaterialIcon { Layout.alignment: Qt.AlignHCenter diff --git a/modules/controlcenter/components/SliderInput.qml b/modules/controlcenter/components/SliderInput.qml index 4921b1f6..ef30c3ba 100644 --- a/modules/controlcenter/components/SliderInput.qml +++ b/modules/controlcenter/components/SliderInput.qml @@ -71,7 +71,7 @@ ColumnLayout { RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { visible: root.label !== "" diff --git a/modules/controlcenter/components/WallpaperGrid.qml b/modules/controlcenter/components/WallpaperGrid.qml index a8353ec4..5b219698 100644 --- a/modules/controlcenter/components/WallpaperGrid.qml +++ b/modules/controlcenter/components/WallpaperGrid.qml @@ -15,11 +15,11 @@ GridView { required property Session session - readonly property int minCellWidth: 200 + Tokens.spacing.normal + readonly property int minCellWidth: 200 + Tokens.spacing.medium readonly property int columnsCount: Math.max(1, Math.floor(width / minCellWidth)) cellWidth: width / columnsCount - cellHeight: 140 + Tokens.spacing.normal + cellHeight: 140 + Tokens.spacing.medium model: Wallpapers.list @@ -33,7 +33,7 @@ GridView { required property var modelData required property int index readonly property bool isCurrent: modelData && modelData.path === Wallpapers.actualCurrent - readonly property real itemMargin: Tokens.spacing.normal / 2 + readonly property real itemMargin: Tokens.spacing.medium / 2 readonly property real itemRadius: Tokens.rounding.large width: root.cellWidth @@ -205,8 +205,8 @@ GridView { anchors.left: parent.left anchors.right: parent.right anchors.bottom: parent.bottom - anchors.leftMargin: Tokens.padding.medium + Tokens.spacing.normal / 2 - anchors.rightMargin: Tokens.padding.medium + Tokens.spacing.normal / 2 + anchors.leftMargin: Tokens.padding.medium + Tokens.spacing.medium / 2 + anchors.rightMargin: Tokens.padding.medium + Tokens.spacing.medium / 2 anchors.bottomMargin: Tokens.padding.medium text: modelData.name diff --git a/modules/controlcenter/dashboard/DashboardPane.qml b/modules/controlcenter/dashboard/DashboardPane.qml index 49e0771f..92b08e8b 100644 --- a/modules/controlcenter/dashboard/DashboardPane.qml +++ b/modules/controlcenter/dashboard/DashboardPane.qml @@ -112,10 +112,10 @@ Item { anchors.right: parent.right anchors.top: parent.top - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium RowLayout { - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium StyledText { text: qsTr("Dashboard") diff --git a/modules/controlcenter/dashboard/GeneralSection.qml b/modules/controlcenter/dashboard/GeneralSection.qml index be67eab2..edaeb7ef 100644 --- a/modules/controlcenter/dashboard/GeneralSection.qml +++ b/modules/controlcenter/dashboard/GeneralSection.qml @@ -40,7 +40,7 @@ SectionContainer { RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SwitchRow { Layout.fillWidth: true diff --git a/modules/controlcenter/launcher/LauncherPane.qml b/modules/controlcenter/launcher/LauncherPane.qml index 6a43684e..fa74da94 100644 --- a/modules/controlcenter/launcher/LauncherPane.qml +++ b/modules/controlcenter/launcher/LauncherPane.qml @@ -152,7 +152,7 @@ Item { spacing: Tokens.spacing.small RowLayout { - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium StyledText { text: qsTr("Launcher") @@ -186,7 +186,7 @@ Item { } StyledText { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased text: qsTr("Applications (%1)").arg(root.searchText ? root.filteredApps.length : allAppsDb.apps.length) font.pointSize: Tokens.font.size.normal font.weight: 500 @@ -199,7 +199,7 @@ Item { StyledRect { Layout.fillWidth: true - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium Layout.bottomMargin: Tokens.spacing.small color: Colours.layer(Colours.palette.m3surfaceContainer, 2) @@ -339,7 +339,7 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.medium - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium IconImage { asynchronous: true @@ -517,7 +517,7 @@ Item { readonly property var displayedApp: parent && parent.displayedApp !== undefined ? parent.displayedApp : null anchors.fill: parent - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SettingsHeader { Layout.leftMargin: Tokens.padding.extraLargeIncreased @@ -535,11 +535,11 @@ Item { Layout.topMargin: Tokens.padding.extraLargeIncreased visible: displayedApp !== null implicitWidth: Math.max(appIconImage.implicitWidth, appTitleText.implicitWidth) - implicitHeight: appIconImage.implicitHeight + Tokens.spacing.normal + appTitleText.implicitHeight + implicitHeight: appIconImage.implicitHeight + Tokens.spacing.medium + appTitleText.implicitHeight ColumnLayout { anchors.centerIn: parent - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium IconImage { id: appIconImage @@ -573,7 +573,7 @@ Item { Item { Layout.fillWidth: true Layout.fillHeight: true - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased Layout.leftMargin: Tokens.padding.extraLargeIncreased Layout.rightMargin: Tokens.padding.extraLargeIncreased @@ -594,10 +594,10 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SwitchRow { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium visible: appDetailsLayout.displayedApp !== null label: qsTr("Mark as favourite") checked: root.favouriteChecked @@ -629,7 +629,7 @@ Item { } } SwitchRow { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium visible: appDetailsLayout.displayedApp !== null label: qsTr("Hide from launcher") checked: root.hideFromLauncherChecked diff --git a/modules/controlcenter/launcher/Settings.qml b/modules/controlcenter/launcher/Settings.qml index f0181230..258c8dcf 100644 --- a/modules/controlcenter/launcher/Settings.qml +++ b/modules/controlcenter/launcher/Settings.qml @@ -15,7 +15,7 @@ ColumnLayout { required property Session session - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SettingsHeader { icon: "apps" @@ -23,7 +23,7 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased title: qsTr("General") description: qsTr("General launcher settings") } @@ -63,7 +63,7 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased title: qsTr("Display") description: qsTr("Display and appearance settings") } @@ -90,7 +90,7 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased title: qsTr("Prefixes") description: qsTr("Command prefix settings") } @@ -111,7 +111,7 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased title: qsTr("Fuzzy search") description: qsTr("Fuzzy search settings") } @@ -159,7 +159,7 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased title: qsTr("Sizes") description: qsTr("Size settings for launcher items") } @@ -192,7 +192,7 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased title: qsTr("Hidden apps") description: qsTr("Applications hidden from launcher") } diff --git a/modules/controlcenter/network/EthernetDetails.qml b/modules/controlcenter/network/EthernetDetails.qml index 1daeb4a2..8d63c698 100644 --- a/modules/controlcenter/network/EthernetDetails.qml +++ b/modules/controlcenter/network/EthernetDetails.qml @@ -43,7 +43,7 @@ DeviceDetails { sections: [ Component { ColumnLayout { - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SectionHeader { title: qsTr("Connection status") @@ -69,7 +69,7 @@ DeviceDetails { }, Component { ColumnLayout { - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SectionHeader { title: qsTr("Device properties") @@ -100,7 +100,7 @@ DeviceDetails { }, Component { ColumnLayout { - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SectionHeader { title: qsTr("Connection information") diff --git a/modules/controlcenter/network/EthernetList.qml b/modules/controlcenter/network/EthernetList.qml index dba39ecc..99ff42a9 100644 --- a/modules/controlcenter/network/EthernetList.qml +++ b/modules/controlcenter/network/EthernetList.qml @@ -23,7 +23,7 @@ DeviceList { headerComponent: Component { RowLayout { - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium StyledText { text: qsTr("Settings") @@ -81,7 +81,7 @@ DeviceList { anchors.fill: parent anchors.margins: Tokens.padding.medium - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledRect { implicitWidth: implicitHeight @@ -124,7 +124,7 @@ DeviceList { RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true diff --git a/modules/controlcenter/network/EthernetSettings.qml b/modules/controlcenter/network/EthernetSettings.qml index aa7e3774..46aa26cb 100644 --- a/modules/controlcenter/network/EthernetSettings.qml +++ b/modules/controlcenter/network/EthernetSettings.qml @@ -15,7 +15,7 @@ ColumnLayout { required property Session session - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SettingsHeader { icon: "cable" @@ -23,7 +23,7 @@ ColumnLayout { } StyledText { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased text: qsTr("Ethernet devices") font.pointSize: Tokens.font.size.larger font.weight: 500 @@ -62,7 +62,7 @@ ColumnLayout { } StyledText { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium text: qsTr("Connected devices") } diff --git a/modules/controlcenter/network/NetworkSettings.qml b/modules/controlcenter/network/NetworkSettings.qml index 82839122..b0e0e24a 100644 --- a/modules/controlcenter/network/NetworkSettings.qml +++ b/modules/controlcenter/network/NetworkSettings.qml @@ -17,7 +17,7 @@ ColumnLayout { required property Session session - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SettingsHeader { icon: "router" @@ -25,7 +25,7 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased title: qsTr("Ethernet") description: qsTr("Ethernet device information") } @@ -46,7 +46,7 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased title: qsTr("Wireless") description: qsTr("WiFi network settings") } @@ -62,7 +62,7 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased title: qsTr("VPN") description: qsTr("VPN provider settings") visible: GlobalConfig.utilities.vpn.enabled || GlobalConfig.utilities.vpn.provider.length > 0 @@ -87,7 +87,7 @@ ColumnLayout { TextButton { Layout.fillWidth: true - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.medium * 2 text: qsTr("⚙ Manage VPN Providers") inactiveColour: Colours.palette.m3secondaryContainer @@ -100,7 +100,7 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased title: qsTr("Current connection") description: qsTr("Active network connection information") } diff --git a/modules/controlcenter/network/NetworkingPane.qml b/modules/controlcenter/network/NetworkingPane.qml index 3a7493e9..e714b1a2 100644 --- a/modules/controlcenter/network/NetworkingPane.qml +++ b/modules/controlcenter/network/NetworkingPane.qml @@ -43,11 +43,11 @@ Item { anchors.left: parent.left anchors.right: parent.right - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium StyledText { text: qsTr("Network") diff --git a/modules/controlcenter/network/VpnDetails.qml b/modules/controlcenter/network/VpnDetails.qml index 01843097..0987b28c 100644 --- a/modules/controlcenter/network/VpnDetails.qml +++ b/modules/controlcenter/network/VpnDetails.qml @@ -37,7 +37,7 @@ DeviceDetails { sections: [ Component { ColumnLayout { - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SectionHeader { title: qsTr("Connection status") @@ -91,8 +91,8 @@ DeviceDetails { RowLayout { Layout.fillWidth: true - Layout.topMargin: Tokens.spacing.normal - spacing: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium + spacing: Tokens.spacing.medium TextButton { Layout.fillWidth: true @@ -147,7 +147,7 @@ DeviceDetails { TextButton { Layout.fillWidth: true - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium visible: root.providerEnabled && VPN.status.state === "needs-auth" && VPN.status.authUrl !== "" text: qsTr("Open Login Page") inactiveColour: Colours.palette.m3tertiaryContainer @@ -160,7 +160,7 @@ DeviceDetails { StyledText { Layout.fillWidth: true - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium visible: root.providerEnabled && VPN.status.state === "needs-auth" && VPN.status.authUrl === "" text: qsTr("Click 'Connect' to generate authentication URL") font.pointSize: Tokens.font.size.small @@ -173,7 +173,7 @@ DeviceDetails { }, Component { ColumnLayout { - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SectionHeader { title: qsTr("Provider details") @@ -316,7 +316,7 @@ DeviceDetails { } contentItem: ColumnLayout { - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { text: qsTr("Edit VPN Provider") @@ -326,7 +326,7 @@ DeviceDetails { ColumnLayout { Layout.fillWidth: true - spacing: Tokens.spacing.smaller / 2 + spacing: Tokens.spacing.medium / 2 StyledText { text: qsTr("Display Name") @@ -363,7 +363,7 @@ DeviceDetails { ColumnLayout { Layout.fillWidth: true - spacing: Tokens.spacing.smaller / 2 + spacing: Tokens.spacing.medium / 2 StyledText { text: qsTr("Interface (e.g., wg0, torguard)") @@ -400,7 +400,7 @@ DeviceDetails { ColumnLayout { Layout.fillWidth: true - spacing: Tokens.spacing.smaller / 2 + spacing: Tokens.spacing.medium / 2 visible: editVpnDialog.connectCmd.length > 0 StyledText { @@ -438,7 +438,7 @@ DeviceDetails { ColumnLayout { Layout.fillWidth: true - spacing: Tokens.spacing.smaller / 2 + spacing: Tokens.spacing.medium / 2 visible: editVpnDialog.disconnectCmd.length > 0 StyledText { @@ -475,9 +475,9 @@ DeviceDetails { } RowLayout { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium TextButton { Layout.fillWidth: true diff --git a/modules/controlcenter/network/VpnList.qml b/modules/controlcenter/network/VpnList.qml index 12f56480..c792fad2 100644 --- a/modules/controlcenter/network/VpnList.qml +++ b/modules/controlcenter/network/VpnList.qml @@ -18,7 +18,7 @@ ColumnLayout { property bool showHeader: true property int pendingSwitchIndex: -1 - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium Connections { function onConnectedChanged() { @@ -76,7 +76,7 @@ ColumnLayout { Layout.preferredHeight: contentHeight interactive: false - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium model: ScriptModel { values: GlobalConfig.utilities.vpn.provider.map((provider, index) => { @@ -124,7 +124,7 @@ ColumnLayout { anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.medium - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledRect { implicitWidth: implicitHeight @@ -159,7 +159,7 @@ ColumnLayout { RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true @@ -445,7 +445,7 @@ ColumnLayout { id: selectionContent anchors.fill: parent - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium visible: vpnDialog.currentState === "selection" opacity: vpnDialog.currentState === "selection" ? 1 : 0 @@ -470,7 +470,7 @@ ColumnLayout { } TextButton { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium Layout.fillWidth: true text: qsTr("NetBird") inactiveColour: Colours.tPalette.m3surfaceContainerHigh @@ -551,7 +551,7 @@ ColumnLayout { } TextButton { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium Layout.fillWidth: true text: qsTr("Cancel") inactiveColour: Colours.palette.m3secondaryContainer @@ -564,7 +564,7 @@ ColumnLayout { id: formContent anchors.fill: parent - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium visible: vpnDialog.currentState === "form" opacity: vpnDialog.currentState === "form" ? 1 : 0 @@ -582,7 +582,7 @@ ColumnLayout { ColumnLayout { Layout.fillWidth: true - spacing: Tokens.spacing.smaller / 2 + spacing: Tokens.spacing.medium / 2 StyledText { text: qsTr("Display Name") @@ -619,7 +619,7 @@ ColumnLayout { ColumnLayout { Layout.fillWidth: true - spacing: Tokens.spacing.smaller / 2 + spacing: Tokens.spacing.medium / 2 StyledText { text: qsTr("Interface (e.g., wg0, torguard)") @@ -656,7 +656,7 @@ ColumnLayout { ColumnLayout { Layout.fillWidth: true - spacing: Tokens.spacing.smaller / 2 + spacing: Tokens.spacing.medium / 2 visible: vpnDialog.editIndex >= 0 ? (vpnDialog.connectCmd.length > 0) : (vpnDialog.providerName === "custom") StyledText { @@ -694,7 +694,7 @@ ColumnLayout { ColumnLayout { Layout.fillWidth: true - spacing: Tokens.spacing.smaller / 2 + spacing: Tokens.spacing.medium / 2 visible: vpnDialog.editIndex >= 0 ? (vpnDialog.connectCmd.length > 0) : (vpnDialog.providerName === "custom") StyledText { @@ -731,9 +731,9 @@ ColumnLayout { } RowLayout { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium TextButton { Layout.fillWidth: true diff --git a/modules/controlcenter/network/VpnSettings.qml b/modules/controlcenter/network/VpnSettings.qml index d85bfb09..f8181e3e 100644 --- a/modules/controlcenter/network/VpnSettings.qml +++ b/modules/controlcenter/network/VpnSettings.qml @@ -18,7 +18,7 @@ ColumnLayout { required property Session session - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SettingsHeader { icon: "vpn_key" @@ -26,7 +26,7 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased title: qsTr("General") description: qsTr("VPN configuration") } @@ -42,20 +42,20 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased title: qsTr("Providers") description: qsTr("Manage VPN providers") } SectionContainer { - contentSpacing: Tokens.spacing.normal + contentSpacing: Tokens.spacing.medium ListView { Layout.fillWidth: true Layout.preferredHeight: contentHeight interactive: false - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium model: ScriptModel { values: GlobalConfig.utilities.vpn.provider.map((provider, index) => { @@ -90,7 +90,7 @@ ColumnLayout { anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.medium - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium MaterialIcon { text: modelData.isActive ? "vpn_key" : "vpn_key_off" @@ -183,7 +183,7 @@ ColumnLayout { TextButton { Layout.fillWidth: true - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium text: qsTr("+ Add Provider") inactiveColour: Colours.palette.m3primaryContainer inactiveOnColour: Colours.palette.m3onPrimaryContainer @@ -195,13 +195,13 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased title: qsTr("Quick Add") description: qsTr("Add common VPN providers") } SectionContainer { - contentSpacing: Tokens.spacing.smaller + contentSpacing: Tokens.spacing.medium TextButton { Layout.fillWidth: true diff --git a/modules/controlcenter/network/WirelessDetails.qml b/modules/controlcenter/network/WirelessDetails.qml index 4fad14cf..cc686a3e 100644 --- a/modules/controlcenter/network/WirelessDetails.qml +++ b/modules/controlcenter/network/WirelessDetails.qml @@ -64,7 +64,7 @@ DeviceDetails { sections: [ Component { ColumnLayout { - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SectionHeader { title: qsTr("Connection status") @@ -86,7 +86,7 @@ DeviceDetails { TextButton { Layout.fillWidth: true - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium Layout.minimumHeight: Tokens.font.size.normal + Tokens.padding.medium * 2 visible: { if (!root.network || !root.network.ssid) { @@ -112,7 +112,7 @@ DeviceDetails { }, Component { ColumnLayout { - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SectionHeader { title: qsTr("Network properties") @@ -155,7 +155,7 @@ DeviceDetails { }, Component { ColumnLayout { - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SectionHeader { title: qsTr("Connection information") diff --git a/modules/controlcenter/network/WirelessList.qml b/modules/controlcenter/network/WirelessList.qml index 8dcb7930..70ee757b 100644 --- a/modules/controlcenter/network/WirelessList.qml +++ b/modules/controlcenter/network/WirelessList.qml @@ -48,7 +48,7 @@ DeviceList { headerComponent: Component { RowLayout { - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium StyledText { text: qsTr("Settings") @@ -132,7 +132,7 @@ DeviceList { anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.medium - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledRect { implicitWidth: implicitHeight @@ -167,7 +167,7 @@ DeviceList { RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true diff --git a/modules/controlcenter/network/WirelessPasswordDialog.qml b/modules/controlcenter/network/WirelessPasswordDialog.qml index 1d323dda..8992d586 100644 --- a/modules/controlcenter/network/WirelessPasswordDialog.qml +++ b/modules/controlcenter/network/WirelessPasswordDialog.qml @@ -144,7 +144,7 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium MaterialIcon { Layout.alignment: Qt.AlignHCenter @@ -193,7 +193,7 @@ Item { property string passwordBuffer: "" - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased Layout.fillWidth: true implicitHeight: Math.max(48, charList.implicitHeight + Tokens.padding.medium * 2) focus: true @@ -390,9 +390,9 @@ Item { } RowLayout { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium TextButton { id: cancelButton diff --git a/modules/controlcenter/network/WirelessSettings.qml b/modules/controlcenter/network/WirelessSettings.qml index f3f1fd4b..d5e5cc45 100644 --- a/modules/controlcenter/network/WirelessSettings.qml +++ b/modules/controlcenter/network/WirelessSettings.qml @@ -15,7 +15,7 @@ ColumnLayout { required property Session session - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SettingsHeader { icon: "wifi" @@ -23,7 +23,7 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased title: qsTr("WiFi status") description: qsTr("General WiFi settings") } @@ -39,7 +39,7 @@ ColumnLayout { } SectionHeader { - Layout.topMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.largeIncreased title: qsTr("Network information") description: qsTr("Current network connection") } diff --git a/modules/controlcenter/notifications/NotificationsPane.qml b/modules/controlcenter/notifications/NotificationsPane.qml index f4a3a7cf..128ecbbe 100644 --- a/modules/controlcenter/notifications/NotificationsPane.qml +++ b/modules/controlcenter/notifications/NotificationsPane.qml @@ -109,13 +109,13 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium ColumnLayout { Layout.fillWidth: true Layout.maximumWidth: 500 Layout.alignment: Qt.AlignTop - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SectionContainer { Layout.fillWidth: true @@ -218,7 +218,7 @@ Item { ColumnLayout { Layout.fillWidth: true Layout.alignment: Qt.AlignTop - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SectionContainer { Layout.fillWidth: true @@ -314,8 +314,8 @@ Item { GridLayout { Layout.fillWidth: true columns: 2 - columnSpacing: Tokens.spacing.normal - rowSpacing: Tokens.spacing.normal + columnSpacing: Tokens.spacing.medium + rowSpacing: Tokens.spacing.medium SwitchRow { Layout.fillWidth: true diff --git a/modules/controlcenter/taskbar/TaskbarPane.qml b/modules/controlcenter/taskbar/TaskbarPane.qml index 687fdf66..48ccaaa1 100644 --- a/modules/controlcenter/taskbar/TaskbarPane.qml +++ b/modules/controlcenter/taskbar/TaskbarPane.qml @@ -172,10 +172,10 @@ Item { anchors.right: parent.right anchors.top: parent.top - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium RowLayout { - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium StyledText { text: qsTr("Taskbar") @@ -269,14 +269,14 @@ Item { id: mainRowLayout Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium ColumnLayout { id: leftColumnLayout Layout.fillWidth: true Layout.alignment: Qt.AlignTop - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SectionContainer { Layout.fillWidth: true @@ -304,7 +304,7 @@ Item { anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true @@ -340,7 +340,7 @@ Item { anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true @@ -374,7 +374,7 @@ Item { anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true @@ -408,7 +408,7 @@ Item { anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true @@ -442,7 +442,7 @@ Item { anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true @@ -478,7 +478,7 @@ Item { anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true @@ -543,7 +543,7 @@ Item { Layout.fillWidth: true Layout.alignment: Qt.AlignTop - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SectionContainer { Layout.fillWidth: true @@ -610,7 +610,7 @@ Item { } SectionContainer { - contentSpacing: Tokens.spacing.normal + contentSpacing: Tokens.spacing.medium SliderInput { Layout.fillWidth: true @@ -669,7 +669,7 @@ Item { Layout.fillWidth: true Layout.alignment: Qt.AlignTop - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium SectionContainer { Layout.fillWidth: true diff --git a/modules/dashboard/Dash.qml b/modules/dashboard/Dash.qml index f46d3d08..219abf09 100644 --- a/modules/dashboard/Dash.qml +++ b/modules/dashboard/Dash.qml @@ -12,8 +12,8 @@ GridLayout { required property DashboardState dashState required property FileDialog facePicker - rowSpacing: Tokens.spacing.normal - columnSpacing: Tokens.spacing.normal + rowSpacing: Tokens.spacing.medium + columnSpacing: Tokens.spacing.medium Rect { Layout.column: 2 diff --git a/modules/dashboard/LyricMenu.qml b/modules/dashboard/LyricMenu.qml index 429c2a1b..3de65031 100644 --- a/modules/dashboard/LyricMenu.qml +++ b/modules/dashboard/LyricMenu.qml @@ -30,7 +30,7 @@ StyledRect { sourceComponent: ColumnLayout { anchors.fill: parent anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium // Header: icon, backend selector, refresh, toggle RowLayout { @@ -41,7 +41,7 @@ StyledRect { text: "lyrics" fill: 1 color: Colours.palette.m3primary - font.pointSize: Tokens.spacing.large + font.pointSize: Tokens.spacing.largeIncreased } Rectangle { diff --git a/modules/dashboard/LyricsView.qml b/modules/dashboard/LyricsView.qml index c0188304..ba39ab8c 100644 --- a/modules/dashboard/LyricsView.qml +++ b/modules/dashboard/LyricsView.qml @@ -46,7 +46,7 @@ StyledListView { property bool isCurrent: ListView.isCurrentItem width: ListView.view.width - height: hasContent ? (lyricText.contentHeight + Tokens.spacing.large) : 0 + height: hasContent ? (lyricText.contentHeight + Tokens.spacing.largeIncreased) : 0 MultiEffect { id: effect diff --git a/modules/dashboard/Media.qml b/modules/dashboard/Media.qml index 64bca2f9..7e76d5f0 100644 --- a/modules/dashboard/Media.qml +++ b/modules/dashboard/Media.qml @@ -201,7 +201,7 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.left: visualiser.right - anchors.leftMargin: Tokens.spacing.normal + anchors.leftMargin: Tokens.spacing.medium spacing: Tokens.spacing.small @@ -260,7 +260,7 @@ Item { Layout.alignment: Qt.AlignHCenter Layout.topMargin: Tokens.spacing.small - Layout.bottomMargin: Tokens.spacing.smaller + Layout.bottomMargin: Tokens.spacing.medium spacing: Tokens.spacing.small @@ -377,7 +377,7 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.verticalCenterOffset: playerChanger.parent == leftSection ? -playerChanger.height : 0 anchors.left: details.right - anchors.leftMargin: Tokens.spacing.normal + anchors.leftMargin: Tokens.spacing.medium visible: lyricMenu.height === 0 || opacity > 0 opacity: lyricMenu.height === 0 ? 1 : 0 @@ -416,7 +416,7 @@ Item { anchors.top: parent.top anchors.left: details.right anchors.right: parent.right - anchors.leftMargin: Tokens.spacing.normal + anchors.leftMargin: Tokens.spacing.medium contentHeight: !root.lyricsShowingDebounced ? root.detailsHeightWithoutLyrics + Tokens.padding.large * 5 : root.detailsHeightWithoutLyrics + lyricsViewInDetails.implicitHeight diff --git a/modules/dashboard/Performance.qml b/modules/dashboard/Performance.qml index dc7c1bc8..14fd8973 100644 --- a/modules/dashboard/Performance.qml +++ b/modules/dashboard/Performance.qml @@ -11,7 +11,7 @@ import qs.services Item { id: root - readonly property int minWidth: 400 + 400 + Tokens.spacing.normal + 120 + Tokens.padding.extraLargeIncreased + readonly property int minWidth: 400 + 400 + Tokens.spacing.medium + 120 + Tokens.padding.extraLargeIncreased function displayTemp(temp: real): string { return `${Math.ceil(GlobalConfig.services.useFahrenheitPerformance ? temp * 1.8 + 32 : temp)}°${GlobalConfig.services.useFahrenheitPerformance ? "F" : "C"}`; @@ -32,7 +32,7 @@ Item { ColumnLayout { anchors.centerIn: parent - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium MaterialIcon { Layout.alignment: Qt.AlignHCenter @@ -62,7 +62,7 @@ Item { anchors.left: parent.left anchors.right: parent.right - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium visible: !placeholder.visible Ref { @@ -73,11 +73,11 @@ Item { id: mainColumn Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium visible: Config.dashboard.performance.showCpu || (Config.dashboard.performance.showGpu && SystemUsage.gpuType !== "NONE") HeroCard { @@ -115,7 +115,7 @@ Item { RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium visible: Config.dashboard.performance.showMemory || Config.dashboard.performance.showStorage || Config.dashboard.performance.showNetwork GaugeCard { @@ -288,7 +288,7 @@ Item { text: parent.icon fill: 1 color: parent.accentColor - font.pointSize: Tokens.spacing.large + font.pointSize: Tokens.spacing.largeIncreased } StyledText { @@ -368,7 +368,7 @@ Item { anchors.leftMargin: Tokens.padding.large anchors.topMargin: Math.round(Tokens.padding.large * 1.2) - width: parent.width - anchors.leftMargin - usageColumn.anchors.rightMargin - usageLabel.width - Tokens.spacing.normal + width: parent.width - anchors.leftMargin - usageColumn.anchors.rightMargin - usageLabel.width - Tokens.spacing.medium icon: heroCard.icon title: heroCard.title accentColor: heroCard.accentColor @@ -470,7 +470,7 @@ Item { ColumnLayout { anchors.fill: parent anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium CardHeader { icon: gaugeCard.icon @@ -568,7 +568,7 @@ Item { ColumnLayout { anchors.fill: parent anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium CardHeader { icon: "hard_disk" @@ -729,7 +729,7 @@ Item { // Download row RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium MaterialIcon { text: "download" @@ -761,7 +761,7 @@ Item { // Upload row RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium MaterialIcon { text: "upload" @@ -793,7 +793,7 @@ Item { // Session totals RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium MaterialIcon { text: "history" diff --git a/modules/dashboard/WeatherTab.qml b/modules/dashboard/WeatherTab.qml index 3744cbe1..ab9fc47a 100644 --- a/modules/dashboard/WeatherTab.qml +++ b/modules/dashboard/WeatherTab.qml @@ -17,7 +17,7 @@ Item { id: layout anchors.fill: parent - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium RowLayout { Layout.leftMargin: Tokens.padding.large @@ -46,7 +46,7 @@ Item { } Row { - spacing: Tokens.spacing.large + spacing: Tokens.spacing.largeIncreased WeatherStat { icon: "wb_twilight" @@ -75,7 +75,7 @@ Item { id: bigInfoRow anchors.centerIn: parent - spacing: Tokens.spacing.large + spacing: Tokens.spacing.largeIncreased MaterialIcon { Layout.alignment: Qt.AlignVCenter @@ -108,7 +108,7 @@ Item { RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium DetailCard { icon: "water_drop" @@ -131,7 +131,7 @@ Item { } StyledText { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium Layout.leftMargin: Tokens.padding.medium visible: forecastRepeater.count > 0 text: qsTr("7-Day Forecast") @@ -142,7 +142,7 @@ Item { RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium Repeater { id: forecastRepeater @@ -218,7 +218,7 @@ Item { Row { anchors.centerIn: parent - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium MaterialIcon { text: detailRoot.icon diff --git a/modules/dashboard/dash/Media.qml b/modules/dashboard/dash/Media.qml index ad485e10..70b4121b 100644 --- a/modules/dashboard/dash/Media.qml +++ b/modules/dashboard/dash/Media.qml @@ -119,7 +119,7 @@ Item { anchors.top: cover.bottom anchors.horizontalCenter: parent.horizontalCenter - anchors.topMargin: Tokens.spacing.normal + anchors.topMargin: Tokens.spacing.medium animate: true horizontalAlignment: Text.AlignHCenter @@ -169,7 +169,7 @@ Item { anchors.top: artist.bottom anchors.horizontalCenter: parent.horizontalCenter - anchors.topMargin: Tokens.spacing.smaller + anchors.topMargin: Tokens.spacing.medium spacing: Tokens.spacing.small diff --git a/modules/dashboard/dash/Resources.qml b/modules/dashboard/dash/Resources.qml index 2e0f085b..43cd8c41 100644 --- a/modules/dashboard/dash/Resources.qml +++ b/modules/dashboard/dash/Resources.qml @@ -11,7 +11,7 @@ Row { anchors.bottom: parent.bottom padding: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium Ref { service: SystemUsage diff --git a/modules/dashboard/dash/SmallWeather.qml b/modules/dashboard/dash/SmallWeather.qml index cb160b7a..b08a863c 100644 --- a/modules/dashboard/dash/SmallWeather.qml +++ b/modules/dashboard/dash/SmallWeather.qml @@ -29,7 +29,7 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.left: icon.right - anchors.leftMargin: Tokens.spacing.large + anchors.leftMargin: Tokens.spacing.largeIncreased spacing: Tokens.spacing.small diff --git a/modules/dashboard/dash/User.qml b/modules/dashboard/dash/User.qml index 21c8ee73..1217ae54 100644 --- a/modules/dashboard/dash/User.qml +++ b/modules/dashboard/dash/User.qml @@ -14,7 +14,7 @@ Row { required property FileDialog facePicker padding: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledClippingRect { implicitWidth: info.implicitHeight @@ -106,7 +106,7 @@ Row { id: info anchors.verticalCenter: parent.verticalCenter - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium Item { id: line diff --git a/modules/launcher/ContentList.qml b/modules/launcher/ContentList.qml index db7abdf9..8975c4b3 100644 --- a/modules/launcher/ContentList.qml +++ b/modules/launcher/ContentList.qml @@ -110,7 +110,7 @@ Item { opacity: root.currentList?.count === 0 ? 1 : 0 scale: root.currentList?.count === 0 ? 1 : 0.5 - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium padding: Tokens.padding.large anchors.horizontalCenter: parent.horizontalCenter diff --git a/modules/launcher/Wrapper.qml b/modules/launcher/Wrapper.qml index d5630b23..c6f221d3 100644 --- a/modules/launcher/Wrapper.qml +++ b/modules/launcher/Wrapper.qml @@ -16,7 +16,7 @@ Item { readonly property bool shouldBeActive: visibilities.launcher && Config.launcher.enabled readonly property real maxHeight: { - let max = screen.height - Config.border.thickness * 2 - Tokens.spacing.large; + let max = screen.height - Config.border.thickness * 2 - Tokens.spacing.largeIncreased; if (visibilities.dashboard) max -= panels.dashboard.nonAnimHeight; return max; diff --git a/modules/launcher/items/ActionItem.qml b/modules/launcher/items/ActionItem.qml index 2eae1a59..465040df 100644 --- a/modules/launcher/items/ActionItem.qml +++ b/modules/launcher/items/ActionItem.qml @@ -36,7 +36,7 @@ Item { Item { anchors.left: icon.right - anchors.leftMargin: Tokens.spacing.normal + anchors.leftMargin: Tokens.spacing.medium anchors.verticalCenter: icon.verticalCenter implicitWidth: parent.width - icon.width diff --git a/modules/launcher/items/AppItem.qml b/modules/launcher/items/AppItem.qml index db0f1d73..86dfc2d5 100644 --- a/modules/launcher/items/AppItem.qml +++ b/modules/launcher/items/AppItem.qml @@ -44,7 +44,7 @@ Item { Item { anchors.left: icon.right - anchors.leftMargin: Tokens.spacing.normal + anchors.leftMargin: Tokens.spacing.medium anchors.verticalCenter: icon.verticalCenter implicitWidth: parent.width - icon.width - favouriteIcon.width diff --git a/modules/launcher/items/CalcItem.qml b/modules/launcher/items/CalcItem.qml index adc91b17..f6e0d533 100644 --- a/modules/launcher/items/CalcItem.qml +++ b/modules/launcher/items/CalcItem.qml @@ -38,7 +38,7 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.margins: Tokens.padding.medium - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium MaterialIcon { text: "function" diff --git a/modules/launcher/items/SchemeItem.qml b/modules/launcher/items/SchemeItem.qml index f4096c9d..f3ac5eef 100644 --- a/modules/launcher/items/SchemeItem.qml +++ b/modules/launcher/items/SchemeItem.qml @@ -61,10 +61,10 @@ Item { Column { anchors.left: preview.right - anchors.leftMargin: Tokens.spacing.normal + anchors.leftMargin: Tokens.spacing.medium anchors.verticalCenter: parent.verticalCenter - width: parent.width - preview.width - anchors.leftMargin - (current.active ? current.width + Tokens.spacing.normal : 0) + width: parent.width - preview.width - anchors.leftMargin - (current.active ? current.width + Tokens.spacing.medium : 0) spacing: 0 StyledText { diff --git a/modules/launcher/items/VariantItem.qml b/modules/launcher/items/VariantItem.qml index fe038cee..87443f76 100644 --- a/modules/launcher/items/VariantItem.qml +++ b/modules/launcher/items/VariantItem.qml @@ -37,10 +37,10 @@ Item { Column { anchors.left: icon.right - anchors.leftMargin: Tokens.spacing.larger + anchors.leftMargin: Tokens.spacing.large anchors.verticalCenter: icon.verticalCenter - width: parent.width - icon.width - anchors.leftMargin - (current.active ? current.width + Tokens.spacing.normal : 0) + width: parent.width - icon.width - anchors.leftMargin - (current.active ? current.width + Tokens.spacing.medium : 0) spacing: 0 StyledText { diff --git a/modules/lock/Center.qml b/modules/lock/Center.qml index 9ee52b6b..f0bab877 100644 --- a/modules/lock/Center.qml +++ b/modules/lock/Center.qml @@ -20,7 +20,7 @@ ColumnLayout { Layout.fillWidth: false Layout.fillHeight: true - spacing: Tokens.spacing.large * 2 + spacing: Tokens.spacing.largeIncreased * 2 RowLayout { Layout.alignment: Qt.AlignHCenter @@ -83,7 +83,7 @@ ColumnLayout { } StyledClippingRect { - Layout.topMargin: Tokens.spacing.large * 2 + Layout.topMargin: Tokens.spacing.largeIncreased * 2 Layout.alignment: Qt.AlignHCenter implicitWidth: root.centerWidth / 2 @@ -148,7 +148,7 @@ ColumnLayout { anchors.fill: parent anchors.margins: Tokens.padding.extraSmall - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium Item { implicitWidth: implicitHeight @@ -212,7 +212,7 @@ ColumnLayout { Item { Layout.fillWidth: true - Layout.topMargin: -Tokens.spacing.large + Layout.topMargin: -Tokens.spacing.largeIncreased implicitHeight: Math.max(message.implicitHeight, stateMessage.implicitHeight) diff --git a/modules/lock/Content.qml b/modules/lock/Content.qml index 594adaf9..378d4bc7 100644 --- a/modules/lock/Content.qml +++ b/modules/lock/Content.qml @@ -9,11 +9,11 @@ RowLayout { required property var lock - spacing: Tokens.spacing.large * 2 + spacing: Tokens.spacing.largeIncreased * 2 ColumnLayout { Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledRect { Layout.fillWidth: true @@ -62,7 +62,7 @@ RowLayout { ColumnLayout { Layout.fillWidth: true - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledRect { Layout.fillWidth: true diff --git a/modules/lock/Fetch.qml b/modules/lock/Fetch.qml index 8a070f21..13202380 100644 --- a/modules/lock/Fetch.qml +++ b/modules/lock/Fetch.qml @@ -21,7 +21,7 @@ ColumnLayout { RowLayout { Layout.fillWidth: true Layout.fillHeight: false - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledRect { implicitWidth: prompt.implicitWidth + Tokens.padding.medium * 2 @@ -74,7 +74,7 @@ ColumnLayout { Layout.topMargin: Tokens.padding.medium Layout.bottomMargin: Tokens.padding.medium Layout.leftMargin: iconLoader.active ? 0 : width * 0.1 - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium WrappedLoader { Layout.fillWidth: true @@ -125,10 +125,10 @@ ColumnLayout { active: root.height > 180 sourceComponent: RowLayout { - spacing: Tokens.spacing.large + spacing: Tokens.spacing.largeIncreased Repeater { - model: Math.max(0, Math.min(8, root.width / (Tokens.font.size.larger * 2 + Tokens.spacing.large))) + model: Math.max(0, Math.min(8, root.width / (Tokens.font.size.larger * 2 + Tokens.spacing.largeIncreased))) StyledRect { required property int index diff --git a/modules/lock/Media.qml b/modules/lock/Media.qml index 162579f3..1972545b 100644 --- a/modules/lock/Media.qml +++ b/modules/lock/Media.qml @@ -73,7 +73,7 @@ Item { StyledText { Layout.topMargin: Tokens.padding.large - Layout.bottomMargin: Tokens.spacing.larger + Layout.bottomMargin: Tokens.spacing.large text: qsTr("Now playing") color: Colours.palette.m3onSurfaceVariant font.family: Tokens.font.family.mono @@ -104,10 +104,10 @@ Item { RowLayout { Layout.alignment: Qt.AlignHCenter - Layout.topMargin: Tokens.spacing.large * 1.2 + Layout.topMargin: Tokens.spacing.largeIncreased * 1.2 Layout.bottomMargin: Tokens.padding.large - spacing: Tokens.spacing.large + spacing: Tokens.spacing.largeIncreased PlayerControl { icon: "skip_previous" diff --git a/modules/lock/NotifDock.qml b/modules/lock/NotifDock.qml index 73b74c59..f8601c3b 100644 --- a/modules/lock/NotifDock.qml +++ b/modules/lock/NotifDock.qml @@ -19,7 +19,7 @@ ColumnLayout { anchors.fill: parent anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true @@ -46,7 +46,7 @@ ColumnLayout { opacity: Notifs.list.length > 0 && !Config.lock.hideNotifs ? 0 : 1 sourceComponent: ColumnLayout { - spacing: Tokens.spacing.large + spacing: Tokens.spacing.largeIncreased Image { asynchronous: true diff --git a/modules/lock/NotifGroup.qml b/modules/lock/NotifGroup.qml index ced224a1..8d10fbc9 100644 --- a/modules/lock/NotifGroup.qml +++ b/modules/lock/NotifGroup.qml @@ -60,7 +60,7 @@ StyledRect { anchors.top: parent.top anchors.margins: Tokens.padding.medium - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium Item { Layout.alignment: Qt.AlignLeft | Qt.AlignTop @@ -148,7 +148,7 @@ StyledRect { RowLayout { Layout.bottomMargin: -parent.spacing Layout.fillWidth: true - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true diff --git a/modules/lock/Resources.qml b/modules/lock/Resources.qml index cca2a814..929a9b05 100644 --- a/modules/lock/Resources.qml +++ b/modules/lock/Resources.qml @@ -13,8 +13,8 @@ GridLayout { anchors.right: parent.right anchors.margins: Tokens.padding.large - rowSpacing: Tokens.spacing.large - columnSpacing: Tokens.spacing.large + rowSpacing: Tokens.spacing.largeIncreased + columnSpacing: Tokens.spacing.largeIncreased rows: 2 columns: 2 diff --git a/modules/lock/WeatherInfo.qml b/modules/lock/WeatherInfo.qml index 5883829b..fada8e13 100644 --- a/modules/lock/WeatherInfo.qml +++ b/modules/lock/WeatherInfo.qml @@ -36,7 +36,7 @@ ColumnLayout { RowLayout { Layout.fillWidth: true - spacing: Tokens.spacing.large + spacing: Tokens.spacing.largeIncreased MaterialIcon { animate: true @@ -109,7 +109,7 @@ ColumnLayout { id: forecastLoader asynchronous: true - Layout.topMargin: Tokens.spacing.smaller + Layout.topMargin: Tokens.spacing.medium Layout.bottomMargin: Tokens.padding.extraLargeIncreased Layout.fillWidth: true @@ -117,7 +117,7 @@ ColumnLayout { visible: active sourceComponent: RowLayout { - spacing: Tokens.spacing.large + spacing: Tokens.spacing.largeIncreased Repeater { model: { diff --git a/modules/notifications/Content.qml b/modules/notifications/Content.qml index 1795d671..06a1f671 100644 --- a/modules/notifications/Content.qml +++ b/modules/notifications/Content.qml @@ -25,7 +25,7 @@ Item { if (count === 0) return 0; - let height = (count - 1) * Tokens.spacing.smaller; + let height = (count - 1) * Tokens.spacing.medium; for (let i = 0; i < count; i++) height += (list.itemAtIndex(i) as NotifWrapper)?.nonAnimHeight ?? 0; @@ -89,9 +89,9 @@ Item { let height = 0; for (let i = 0; i < count; i++) { - height += ((list.itemAtIndex(i) as NotifWrapper)?.nonAnimHeight ?? 0) + Tokens.spacing.smaller; + height += ((list.itemAtIndex(i) as NotifWrapper)?.nonAnimHeight ?? 0) + Tokens.spacing.medium; - if (height - Tokens.spacing.smaller >= scrollY) + if (height - Tokens.spacing.medium >= scrollY) return i; } @@ -110,9 +110,9 @@ Item { let height = 0; for (let i = count - 1; i >= 0; i--) { - height += ((list.itemAtIndex(i) as NotifWrapper)?.nonAnimHeight ?? 0) + Tokens.spacing.smaller; + height += ((list.itemAtIndex(i) as NotifWrapper)?.nonAnimHeight ?? 0) + Tokens.spacing.medium; - if (height - Tokens.spacing.smaller >= scrollY) + if (height - Tokens.spacing.medium >= scrollY) return count - i - 1; } @@ -140,7 +140,7 @@ Item { } implicitWidth: notif.implicitWidth - implicitHeight: notif.implicitHeight + (idx === 0 ? 0 : Tokens.spacing.smaller) + implicitHeight: notif.implicitHeight + (idx === 0 ? 0 : Tokens.spacing.medium) ListView.onRemove: removeAnim.start() @@ -183,7 +183,7 @@ Item { ClippingRectangle { anchors.top: parent.top - anchors.topMargin: wrapper.idx === 0 ? 0 : Tokens.spacing.smaller + anchors.topMargin: wrapper.idx === 0 ? 0 : Tokens.spacing.medium color: "transparent" radius: notif.radius diff --git a/modules/notifications/Notification.qml b/modules/notifications/Notification.qml index 6b906d90..95c1a59e 100644 --- a/modules/notifications/Notification.qml +++ b/modules/notifications/Notification.qml @@ -228,7 +228,7 @@ StyledRect { anchors.top: parent.top anchors.left: image.right - anchors.leftMargin: Tokens.spacing.smaller + anchors.leftMargin: Tokens.spacing.medium animate: true text: appNameMetrics.elidedText @@ -258,7 +258,7 @@ StyledRect { anchors.top: parent.top anchors.left: image.right - anchors.leftMargin: Tokens.spacing.smaller + anchors.leftMargin: Tokens.spacing.medium animate: true text: summaryMetrics.elidedText @@ -441,7 +441,7 @@ StyledRect { anchors.top: body.bottom anchors.topMargin: Tokens.spacing.small - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium opacity: root.expanded ? 1 : 0 diff --git a/modules/osd/Content.qml b/modules/osd/Content.qml index ff02dcc6..640f6c92 100644 --- a/modules/osd/Content.qml +++ b/modules/osd/Content.qml @@ -27,7 +27,7 @@ Item { id: layout anchors.centerIn: parent - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium // Speaker volume CustomMouseArea { diff --git a/modules/session/Content.qml b/modules/session/Content.qml index 7a3ec063..fb6a27f6 100644 --- a/modules/session/Content.qml +++ b/modules/session/Content.qml @@ -13,7 +13,7 @@ Column { required property DrawerVisibilities visibilities padding: Tokens.padding.large - spacing: Tokens.spacing.large + spacing: Tokens.spacing.largeIncreased SessionButton { id: logout diff --git a/modules/sidebar/Content.qml b/modules/sidebar/Content.qml index 60396080..f5cde346 100644 --- a/modules/sidebar/Content.qml +++ b/modules/sidebar/Content.qml @@ -14,7 +14,7 @@ Item { id: layout anchors.fill: parent - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledRect { Layout.fillWidth: true diff --git a/modules/sidebar/Notif.qml b/modules/sidebar/Notif.qml index 2124f75f..05f61c35 100644 --- a/modules/sidebar/Notif.qml +++ b/modules/sidebar/Notif.qml @@ -131,7 +131,7 @@ StyledRect { component ExpandedBody: ColumnLayout { readonly property alias body: bodyText - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium StyledText { id: bodyText diff --git a/modules/sidebar/NotifDock.qml b/modules/sidebar/NotifDock.qml index 1533221a..854fc91d 100644 --- a/modules/sidebar/NotifDock.qml +++ b/modules/sidebar/NotifDock.qml @@ -80,7 +80,7 @@ Item { anchors.right: parent.right anchors.top: title.bottom anchors.bottom: parent.bottom - anchors.topMargin: Tokens.spacing.smaller + anchors.topMargin: Tokens.spacing.medium radius: Tokens.rounding.medium color: "transparent" @@ -92,7 +92,7 @@ Item { opacity: root.notifCount > 0 ? 0 : 1 sourceComponent: ColumnLayout { - spacing: Tokens.spacing.large + spacing: Tokens.spacing.largeIncreased Image { asynchronous: true diff --git a/modules/sidebar/NotifGroup.qml b/modules/sidebar/NotifGroup.qml index d821dbea..38cb4093 100644 --- a/modules/sidebar/NotifGroup.qml +++ b/modules/sidebar/NotifGroup.qml @@ -74,7 +74,7 @@ StyledRect { anchors.top: parent.top anchors.margins: Tokens.padding.medium - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium Item { Layout.alignment: Qt.AlignLeft | Qt.AlignTop @@ -168,7 +168,7 @@ StyledRect { anchors.left: parent.left anchors.right: parent.right - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true diff --git a/modules/utilities/Content.qml b/modules/utilities/Content.qml index e03c546f..5488e0a9 100644 --- a/modules/utilities/Content.qml +++ b/modules/utilities/Content.qml @@ -20,7 +20,7 @@ Item { id: layout anchors.fill: parent - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium IdleInhibit {} diff --git a/modules/utilities/RecordingDeleteModal.qml b/modules/utilities/RecordingDeleteModal.qml index a5ab91f1..5118d7e8 100644 --- a/modules/utilities/RecordingDeleteModal.qml +++ b/modules/utilities/RecordingDeleteModal.qml @@ -164,7 +164,7 @@ Loader { anchors.fill: parent anchors.margins: Tokens.padding.large * 1.5 - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { text: qsTr("Delete recording?") @@ -180,9 +180,9 @@ Loader { } RowLayout { - Layout.topMargin: Tokens.spacing.normal + Layout.topMargin: Tokens.spacing.medium Layout.alignment: Qt.AlignRight - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium TextButton { text: qsTr("Cancel") diff --git a/modules/utilities/cards/IdleInhibit.qml b/modules/utilities/cards/IdleInhibit.qml index b6253441..21cc3864 100644 --- a/modules/utilities/cards/IdleInhibit.qml +++ b/modules/utilities/cards/IdleInhibit.qml @@ -22,7 +22,7 @@ StyledRect { anchors.left: parent.left anchors.right: parent.right anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledRect { implicitWidth: implicitHeight @@ -73,7 +73,7 @@ StyledRect { asynchronous: true anchors.bottom: parent.bottom anchors.left: parent.left - anchors.topMargin: Tokens.spacing.larger + anchors.topMargin: Tokens.spacing.large anchors.bottomMargin: IdleInhibitor.enabled ? Tokens.padding.large : -implicitHeight anchors.leftMargin: Tokens.padding.large diff --git a/modules/utilities/cards/Record.qml b/modules/utilities/cards/Record.qml index c3da04c7..b9e29e5a 100644 --- a/modules/utilities/cards/Record.qml +++ b/modules/utilities/cards/Record.qml @@ -24,10 +24,10 @@ StyledRect { anchors.fill: parent anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium RowLayout { - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium z: 1 StyledRect { @@ -187,7 +187,7 @@ StyledRect { id: recordingControls RowLayout { - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledRect { radius: Tokens.rounding.full diff --git a/modules/utilities/cards/RecordingList.qml b/modules/utilities/cards/RecordingList.qml index bd57e4fa..b96fb3f2 100644 --- a/modules/utilities/cards/RecordingList.qml +++ b/modules/utilities/cards/RecordingList.qml @@ -27,7 +27,7 @@ ColumnLayout { onClicked: root.props.recordingListExpanded = !root.props.recordingListExpanded RowLayout { - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium MaterialIcon { Layout.alignment: Qt.AlignVCenter @@ -195,7 +195,7 @@ ColumnLayout { } RowLayout { - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium MaterialIcon { Layout.alignment: Qt.AlignHCenter diff --git a/modules/utilities/cards/Toggles.qml b/modules/utilities/cards/Toggles.qml index 0544369f..0957edc0 100644 --- a/modules/utilities/cards/Toggles.qml +++ b/modules/utilities/cards/Toggles.qml @@ -48,7 +48,7 @@ StyledRect { anchors.fill: parent anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { text: qsTr("Quick Toggles") diff --git a/modules/utilities/toasts/ToastItem.qml b/modules/utilities/toasts/ToastItem.qml index 6e773ba2..c3175494 100644 --- a/modules/utilities/toasts/ToastItem.qml +++ b/modules/utilities/toasts/ToastItem.qml @@ -53,7 +53,7 @@ StyledRect { anchors.margins: Tokens.padding.small anchors.leftMargin: Tokens.padding.medium anchors.rightMargin: Tokens.padding.medium - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledRect { radius: Tokens.rounding.large diff --git a/modules/windowinfo/Buttons.qml b/modules/windowinfo/Buttons.qml index 741481d2..14a3b2db 100644 --- a/modules/windowinfo/Buttons.qml +++ b/modules/windowinfo/Buttons.qml @@ -21,7 +21,7 @@ ColumnLayout { Layout.leftMargin: Tokens.padding.large Layout.rightMargin: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium StyledText { Layout.fillWidth: true @@ -62,14 +62,14 @@ ColumnLayout { Layout.preferredHeight: root.moveToWsExpanded ? implicitHeight : 0 clip: true - topMargin: Tokens.spacing.normal - bottomMargin: Tokens.spacing.normal + topMargin: Tokens.spacing.medium + bottomMargin: Tokens.spacing.medium GridLayout { id: wsGrid - rowSpacing: Tokens.spacing.smaller - columnSpacing: Tokens.spacing.normal + rowSpacing: Tokens.spacing.medium + columnSpacing: Tokens.spacing.medium columns: 5 Repeater { @@ -103,7 +103,7 @@ ColumnLayout { Layout.rightMargin: Tokens.padding.large Layout.bottomMargin: Tokens.padding.large - spacing: root.client?.lastIpcObject.floating ? Tokens.spacing.normal : Tokens.spacing.small + spacing: root.client?.lastIpcObject.floating ? Tokens.spacing.medium : Tokens.spacing.small Button { color: Colours.palette.m3secondaryContainer diff --git a/modules/windowinfo/Details.qml b/modules/windowinfo/Details.qml index 1c35420f..e39e8ff7 100644 --- a/modules/windowinfo/Details.qml +++ b/modules/windowinfo/Details.qml @@ -35,8 +35,8 @@ ColumnLayout { Layout.preferredHeight: 1 Layout.leftMargin: Tokens.padding.extraLargeIncreased Layout.rightMargin: Tokens.padding.extraLargeIncreased - Layout.topMargin: Tokens.spacing.normal - Layout.bottomMargin: Tokens.spacing.large + Layout.topMargin: Tokens.spacing.medium + Layout.bottomMargin: Tokens.spacing.largeIncreased color: Colours.palette.m3secondary } @@ -134,7 +134,7 @@ ColumnLayout { Layout.rightMargin: Tokens.padding.large Layout.fillWidth: true - spacing: Tokens.spacing.smaller + spacing: Tokens.spacing.medium MaterialIcon { id: icon diff --git a/modules/windowinfo/Preview.qml b/modules/windowinfo/Preview.qml index d7847afc..a31e1154 100644 --- a/modules/windowinfo/Preview.qml +++ b/modules/windowinfo/Preview.qml @@ -25,7 +25,7 @@ Item { anchors.top: parent.top anchors.bottom: label.top anchors.topMargin: Tokens.padding.large - anchors.bottomMargin: Tokens.spacing.normal + anchors.bottomMargin: Tokens.spacing.medium implicitWidth: view.implicitWidth diff --git a/modules/windowinfo/WindowInfo.qml b/modules/windowinfo/WindowInfo.qml index ba9c839f..212cb717 100644 --- a/modules/windowinfo/WindowInfo.qml +++ b/modules/windowinfo/WindowInfo.qml @@ -21,7 +21,7 @@ Item { anchors.fill: parent anchors.margins: Tokens.padding.large - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium Preview { screen: root.screen @@ -29,7 +29,7 @@ Item { } ColumnLayout { - spacing: Tokens.spacing.normal + spacing: Tokens.spacing.medium Layout.preferredWidth: Tokens.sizes.winfo.detailsWidth Layout.fillHeight: true diff --git a/plugin/src/Caelestia/Config/appearanceconfig.cpp b/plugin/src/Caelestia/Config/appearanceconfig.cpp index 2da41ccf..eaf98b8e 100644 --- a/plugin/src/Caelestia/Config/appearanceconfig.cpp +++ b/plugin/src/Caelestia/Config/appearanceconfig.cpp @@ -71,26 +71,38 @@ void AppearanceSpacing::bindTokens(SpacingTokens* tokens) { connectTokenSignals(tokens, this); } +int AppearanceSpacing::extraSmall() const { + return m_tokens ? static_cast(m_tokens->extraSmall() * m_scale) : 0; +} + int AppearanceSpacing::small() const { return m_tokens ? static_cast(m_tokens->small() * m_scale) : 0; } -int AppearanceSpacing::smaller() const { - return m_tokens ? static_cast(m_tokens->smaller() * m_scale) : 0; -} - -int AppearanceSpacing::normal() const { - return m_tokens ? static_cast(m_tokens->normal() * m_scale) : 0; -} - -int AppearanceSpacing::larger() const { - return m_tokens ? static_cast(m_tokens->larger() * m_scale) : 0; +int AppearanceSpacing::medium() const { + return m_tokens ? static_cast(m_tokens->medium() * m_scale) : 0; } int AppearanceSpacing::large() const { return m_tokens ? static_cast(m_tokens->large() * m_scale) : 0; } +int AppearanceSpacing::largeIncreased() const { + return m_tokens ? static_cast(m_tokens->largeIncreased() * m_scale) : 0; +} + +int AppearanceSpacing::extraLarge() const { + return m_tokens ? static_cast(m_tokens->extraLarge() * m_scale) : 0; +} + +int AppearanceSpacing::extraLargeIncreased() const { + return m_tokens ? static_cast(m_tokens->extraLargeIncreased() * m_scale) : 0; +} + +int AppearanceSpacing::extraExtraLarge() const { + return m_tokens ? static_cast(m_tokens->extraExtraLarge() * m_scale) : 0; +} + // AppearancePadding void AppearancePadding::bindTokens(PaddingTokens* tokens) { diff --git a/plugin/src/Caelestia/Config/appearanceconfig.hpp b/plugin/src/Caelestia/Config/appearanceconfig.hpp index 6a2a80f1..23008f15 100644 --- a/plugin/src/Caelestia/Config/appearanceconfig.hpp +++ b/plugin/src/Caelestia/Config/appearanceconfig.hpp @@ -58,11 +58,14 @@ class AppearanceSpacing : public ConfigObject { CONFIG_PROPERTY(qreal, scale, 1) + Q_PROPERTY(int extraSmall READ extraSmall NOTIFY valuesChanged) Q_PROPERTY(int small READ small NOTIFY valuesChanged) - Q_PROPERTY(int smaller READ smaller NOTIFY valuesChanged) - Q_PROPERTY(int normal READ normal NOTIFY valuesChanged) - Q_PROPERTY(int larger READ larger NOTIFY valuesChanged) + Q_PROPERTY(int medium READ medium NOTIFY valuesChanged) Q_PROPERTY(int large READ large NOTIFY valuesChanged) + Q_PROPERTY(int largeIncreased READ largeIncreased NOTIFY valuesChanged) + Q_PROPERTY(int extraLarge READ extraLarge NOTIFY valuesChanged) + Q_PROPERTY(int extraLargeIncreased READ extraLargeIncreased NOTIFY valuesChanged) + Q_PROPERTY(int extraExtraLarge READ extraExtraLarge NOTIFY valuesChanged) public: explicit AppearanceSpacing(QObject* parent = nullptr) @@ -70,11 +73,14 @@ public: void bindTokens(SpacingTokens* tokens); + [[nodiscard]] int extraSmall() const; [[nodiscard]] int small() const; - [[nodiscard]] int smaller() const; - [[nodiscard]] int normal() const; - [[nodiscard]] int larger() const; + [[nodiscard]] int medium() const; [[nodiscard]] int large() const; + [[nodiscard]] int largeIncreased() const; + [[nodiscard]] int extraLarge() const; + [[nodiscard]] int extraLargeIncreased() const; + [[nodiscard]] int extraExtraLarge() const; signals: void valuesChanged(); diff --git a/plugin/src/Caelestia/Config/tokens.hpp b/plugin/src/Caelestia/Config/tokens.hpp index 0fd06451..21c1116c 100644 --- a/plugin/src/Caelestia/Config/tokens.hpp +++ b/plugin/src/Caelestia/Config/tokens.hpp @@ -65,11 +65,14 @@ class SpacingTokens : public ConfigObject { Q_OBJECT QML_ANONYMOUS - CONFIG_PROPERTY(int, small, 7) - CONFIG_PROPERTY(int, smaller, 10) - CONFIG_PROPERTY(int, normal, 12) - CONFIG_PROPERTY(int, larger, 15) - CONFIG_PROPERTY(int, large, 20) + CONFIG_PROPERTY(int, extraSmall, 4) + CONFIG_PROPERTY(int, small, 8) + CONFIG_PROPERTY(int, medium, 12) + CONFIG_PROPERTY(int, large, 16) + CONFIG_PROPERTY(int, largeIncreased, 20) + CONFIG_PROPERTY(int, extraLarge, 28) + CONFIG_PROPERTY(int, extraLargeIncreased, 32) + CONFIG_PROPERTY(int, extraExtraLarge, 48) public: explicit SpacingTokens(QObject* parent = nullptr)