nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: use M3 spacing tokens

Browse source
This commit is contained in:
2 * r + 2 * t 2026-04-20 19:57:20 +10:00
parent 0d0dcaf115
commit 52272c062d
111 changed files with 381 additions and 360 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/ConnectionHeader.qml
View file

@ -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 {

6
components/ConnectionInfoSection.qml
View file

@ -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")
}

2
components/PropertyRow.qml
View file

@ -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
}

2
components/SectionContainer.qml
View file

@ -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

2
components/SectionHeader.qml
View file

@ -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

4
components/controls/CollapsibleSection.qml
View file

@ -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

2
components/controls/SpinBoxRow.qml
View file

@ -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

2
components/controls/SplitButtonRow.qml
View file

@ -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

2
components/controls/StyledRadioButton.qml
View file

@ -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
}
}

2
components/controls/SwitchRow.qml
View file

@ -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

2
components/controls/ToggleButton.qml
View file

@ -52,7 +52,7 @@ StyledRect {
id: toggleBtnInner
anchors.centerIn: parent
spacing: Tokens.spacing.normal
spacing: Tokens.spacing.medium
MaterialIcon {
id: toggleBtnIcon

2
components/controls/ToggleRow.qml
View file

@ -12,7 +12,7 @@ RowLayout {
property alias toggle: toggle
Layout.fillWidth: true
spacing: Tokens.spacing.normal
spacing: Tokens.spacing.medium
StyledText {
Layout.fillWidth: true

2
components/filedialog/DialogButtons.qml
View file

@ -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

4
components/filedialog/Sidebar.qml
View file

@ -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: {

6
modules/background/DesktopClock.qml
View file

@ -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

2
modules/background/Wallpaper.qml
View file

@ -43,7 +43,7 @@ Item {
Row {
anchors.centerIn: parent
spacing: Tokens.spacing.large
spacing: Tokens.spacing.largeIncreased
MaterialIcon {
text: "sentiment_stressed"

2
modules/bar/Bar.qml
View file

@ -102,7 +102,7 @@ ColumnLayout {
}
}
spacing: Tokens.spacing.normal
spacing: Tokens.spacing.medium
Repeater {
id: repeater

4
modules/bar/components/StatusIcons.qml
View file

@ -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 {

2
modules/bar/components/workspaces/SpecialWorkspaces.qml
View file

@ -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)

4
modules/bar/popouts/ActiveWindow.qml
View file

@ -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

8
modules/bar/popouts/Audio.qml
View file

@ -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

4
modules/bar/popouts/Battery.qml
View file

@ -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

4
modules/bar/popouts/Bluetooth.qml
View file

@ -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

2
modules/bar/popouts/Network.qml
View file

@ -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

4
modules/bar/popouts/TrayMenu.qml
View file

@ -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 {

10
modules/bar/popouts/WirelessPassword.qml
View file

@ -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

10
modules/controlcenter/NavRail.qml
View file

@ -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

4
modules/controlcenter/appearance/AppearancePane.qml
View file

@ -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")

2
modules/controlcenter/appearance/sections/AnimationsSection.qml
View file

@ -19,7 +19,7 @@ CollapsibleSection {
showBackground: true
SectionContainer {
contentSpacing: Tokens.spacing.normal
contentSpacing: Tokens.spacing.medium
SliderInput {
Layout.fillWidth: true

14
modules/controlcenter/appearance/sections/BackgroundSection.qml
View file

@ -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

4
modules/controlcenter/appearance/sections/BorderSection.qml
View file

@ -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

2
modules/controlcenter/appearance/sections/ColorSchemeSection.qml
View file

@ -67,7 +67,7 @@ CollapsibleSection {
anchors.fill: parent
anchors.margins: Tokens.padding.medium
spacing: Tokens.spacing.normal
spacing: Tokens.spacing.medium
StyledRect {
id: preview

2
modules/controlcenter/appearance/sections/ColorVariantSection.qml
View file

@ -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

8
modules/controlcenter/appearance/sections/FontsSection.qml
View file

@ -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

6
modules/controlcenter/appearance/sections/ScalesSection.qml
View file

@ -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

4
modules/controlcenter/appearance/sections/TransparencySection.qml
View file

@ -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

24
modules/controlcenter/audio/AudioPane.qml
View file

@ -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"

28
modules/controlcenter/bluetooth/Details.qml
View file

@ -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

4
modules/controlcenter/bluetooth/DeviceList.qml
View file

@ -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

26
modules/controlcenter/bluetooth/Settings.qml
View file

@ -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

2
modules/controlcenter/components/ConnectedButtonGroup.qml
View file

@ -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 !== ""

2
modules/controlcenter/components/DeviceDetails.qml
View file

@ -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

2
modules/controlcenter/components/ReadonlySlider.qml
View file

@ -21,7 +21,7 @@ ColumnLayout {
RowLayout {
Layout.fillWidth: true
spacing: Tokens.spacing.normal
spacing: Tokens.spacing.medium
StyledText {
visible: root.label !== ""

2
modules/controlcenter/components/SettingsHeader.qml
View file

@ -18,7 +18,7 @@ Item {
id: column
anchors.centerIn: parent
spacing: Tokens.spacing.normal
spacing: Tokens.spacing.medium
MaterialIcon {
Layout.alignment: Qt.AlignHCenter

2
modules/controlcenter/components/SliderInput.qml
View file

@ -71,7 +71,7 @@ ColumnLayout {
RowLayout {
Layout.fillWidth: true
spacing: Tokens.spacing.normal
spacing: Tokens.spacing.medium
StyledText {
visible: root.label !== ""

10
modules/controlcenter/components/WallpaperGrid.qml
View file

@ -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

4
modules/controlcenter/dashboard/DashboardPane.qml
View file

@ -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")

2
modules/controlcenter/dashboard/GeneralSection.qml
View file

@ -40,7 +40,7 @@ SectionContainer {
RowLayout {
Layout.fillWidth: true
spacing: Tokens.spacing.normal
spacing: Tokens.spacing.medium
SwitchRow {
Layout.fillWidth: true

22
modules/controlcenter/launcher/LauncherPane.qml
View file

@ -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

14
modules/controlcenter/launcher/Settings.qml
View file

@ -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")
}

6
modules/controlcenter/network/EthernetDetails.qml
View file

@ -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")

6
modules/controlcenter/network/EthernetList.qml
View file

@ -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

6
modules/controlcenter/network/EthernetSettings.qml
View file

@ -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")
}

12
modules/controlcenter/network/NetworkSettings.qml
View file

@ -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")
}

4
modules/controlcenter/network/NetworkingPane.qml
View file

@ -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")

26
modules/controlcenter/network/VpnDetails.qml
View file

@ -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

28
modules/controlcenter/network/VpnList.qml
View file

@ -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

18
modules/controlcenter/network/VpnSettings.qml
View file

@ -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

8
modules/controlcenter/network/WirelessDetails.qml
View file

@ -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")

6
modules/controlcenter/network/WirelessList.qml
View file

@ -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

8
modules/controlcenter/network/WirelessPasswordDialog.qml
View file

@ -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

6
modules/controlcenter/network/WirelessSettings.qml
View file

@ -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")
}

10
modules/controlcenter/notifications/NotificationsPane.qml
View file

@ -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

26
modules/controlcenter/taskbar/TaskbarPane.qml
View file

@ -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

4
modules/dashboard/Dash.qml
View file

@ -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

4
modules/dashboard/LyricMenu.qml
View file

@ -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 {

2
modules/dashboard/LyricsView.qml
View file

@ -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

8
modules/dashboard/Media.qml
View file

@ -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

26
modules/dashboard/Performance.qml
View file

@ -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"

14
modules/dashboard/WeatherTab.qml
View file

@ -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

4
modules/dashboard/dash/Media.qml
View file

@ -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

2
modules/dashboard/dash/Resources.qml
View file

@ -11,7 +11,7 @@ Row {
anchors.bottom: parent.bottom
padding: Tokens.padding.large
spacing: Tokens.spacing.normal
spacing: Tokens.spacing.medium
Ref {
service: SystemUsage

2
modules/dashboard/dash/SmallWeather.qml
View file

@ -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

4
modules/dashboard/dash/User.qml
View file

@ -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

2
modules/launcher/ContentList.qml
View file

@ -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

2
modules/launcher/Wrapper.qml
View file

@ -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;

2
modules/launcher/items/ActionItem.qml
View file

@ -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

2
modules/launcher/items/AppItem.qml
View file

@ -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

2
modules/launcher/items/CalcItem.qml
View file

@ -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"

4
modules/launcher/items/SchemeItem.qml
View file

@ -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 {

4
modules/launcher/items/VariantItem.qml
View file

@ -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 {

8
modules/lock/Center.qml
View file

@ -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)

6
modules/lock/Content.qml
View file

@ -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

8
modules/lock/Fetch.qml
View file

@ -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

6
modules/lock/Media.qml
View file

@ -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"

4
modules/lock/NotifDock.qml
View file

@ -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

4
modules/lock/NotifGroup.qml
View file

@ -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

4
modules/lock/Resources.qml
View file

@ -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

6
modules/lock/WeatherInfo.qml
View file

@ -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: {

14
modules/notifications/Content.qml
View file

@ -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

6
modules/notifications/Notification.qml
View file

@ -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

2
modules/osd/Content.qml
View file

@ -27,7 +27,7 @@ Item {
id: layout
anchors.centerIn: parent
spacing: Tokens.spacing.normal
spacing: Tokens.spacing.medium
// Speaker volume
CustomMouseArea {

2
modules/session/Content.qml
View file

@ -13,7 +13,7 @@ Column {
required property DrawerVisibilities visibilities
padding: Tokens.padding.large
spacing: Tokens.spacing.large
spacing: Tokens.spacing.largeIncreased
SessionButton {
id: logout

2
modules/sidebar/Content.qml
View file

@ -14,7 +14,7 @@ Item {
id: layout
anchors.fill: parent
spacing: Tokens.spacing.normal
spacing: Tokens.spacing.medium
StyledRect {
Layout.fillWidth: true

2
modules/sidebar/Notif.qml
View file

@ -131,7 +131,7 @@ StyledRect {
component ExpandedBody: ColumnLayout {
readonly property alias body: bodyText
spacing: Tokens.spacing.smaller
spacing: Tokens.spacing.medium
StyledText {
id: bodyText

4
modules/sidebar/NotifDock.qml
View file

@ -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

4
modules/sidebar/NotifGroup.qml
View file

@ -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

2
modules/utilities/Content.qml
View file

@ -20,7 +20,7 @@ Item {
id: layout
anchors.fill: parent
spacing: Tokens.spacing.normal
spacing: Tokens.spacing.medium
IdleInhibit {}

6
modules/utilities/RecordingDeleteModal.qml
View file

@ -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")

4
modules/utilities/cards/IdleInhibit.qml
View file

@ -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

Some files were not shown because too many files have changed in this diff Show more