diff --git a/components/controls/StyledSwitch.qml b/components/controls/StyledSwitch.qml index 941a8a19..24f1dce6 100644 --- a/components/controls/StyledSwitch.qml +++ b/components/controls/StyledSwitch.qml @@ -18,7 +18,7 @@ Switch { color: root.checked ? Colours.palette.m3primary : Colours.layer(Colours.palette.m3surfaceContainerHighest, root.cLayer) implicitWidth: implicitHeight * 1.7 - implicitHeight: Tokens.font.body.medium.pointSize + Tokens.padding.smaller * 2 + implicitHeight: Tokens.font.body.medium.pointSize + Tokens.padding.small * 2 StyledRect { readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.3 : implicitHeight diff --git a/modules/bar/popouts/WirelessPassword.qml b/modules/bar/popouts/WirelessPassword.qml index d99c293c..a30414ce 100644 --- a/modules/bar/popouts/WirelessPassword.qml +++ b/modules/bar/popouts/WirelessPassword.qml @@ -468,7 +468,7 @@ ColumnLayout { id: cancelButton Layout.fillWidth: true - Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.normal * 2 + Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.medium * 2 inactiveColour: Colours.palette.m3secondaryContainer inactiveOnColour: Colours.palette.m3onSecondaryContainer text: qsTr("Cancel") @@ -483,7 +483,7 @@ ColumnLayout { property bool hasError: false Layout.fillWidth: true - Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.normal * 2 + Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.medium * 2 inactiveColour: Colours.palette.m3primary inactiveOnColour: Colours.palette.m3onPrimary text: qsTr("Connect") diff --git a/modules/controlcenter/bluetooth/DeviceList.qml b/modules/controlcenter/bluetooth/DeviceList.qml index a00bcb3b..e391fae5 100644 --- a/modules/controlcenter/bluetooth/DeviceList.qml +++ b/modules/controlcenter/bluetooth/DeviceList.qml @@ -48,8 +48,8 @@ DeviceList { icon: "power" accent: "Tertiary" iconSize: Tokens.font.body.medium.pointSize - horizontalPadding: Tokens.padding.normal - verticalPadding: Tokens.padding.smaller + horizontalPadding: Tokens.padding.medium + verticalPadding: Tokens.padding.small tooltip: qsTr("Toggle Bluetooth") onClicked: { @@ -64,8 +64,8 @@ DeviceList { icon: root.smallDiscoverable ? "group_search" : "" label: root.smallDiscoverable ? "" : qsTr("Discoverable") iconSize: Tokens.font.body.medium.pointSize - horizontalPadding: Tokens.padding.normal - verticalPadding: Tokens.padding.smaller + horizontalPadding: Tokens.padding.medium + verticalPadding: Tokens.padding.small tooltip: qsTr("Make discoverable") onClicked: { @@ -80,8 +80,8 @@ DeviceList { icon: "missing_controller" label: root.smallPairable ? "" : qsTr("Pairable") iconSize: Tokens.font.body.medium.pointSize - horizontalPadding: Tokens.padding.normal - verticalPadding: Tokens.padding.smaller + horizontalPadding: Tokens.padding.medium + verticalPadding: Tokens.padding.small tooltip: qsTr("Make pairable") onClicked: { @@ -96,8 +96,8 @@ DeviceList { icon: "bluetooth_searching" accent: "Secondary" iconSize: Tokens.font.body.medium.pointSize - horizontalPadding: Tokens.padding.normal - verticalPadding: Tokens.padding.smaller + horizontalPadding: Tokens.padding.medium + verticalPadding: Tokens.padding.small tooltip: qsTr("Scan for devices") onClicked: { @@ -112,8 +112,8 @@ DeviceList { icon: "settings" accent: "Primary" iconSize: Tokens.font.body.medium.pointSize - horizontalPadding: Tokens.padding.normal - verticalPadding: Tokens.padding.smaller + horizontalPadding: Tokens.padding.medium + verticalPadding: Tokens.padding.small tooltip: qsTr("Bluetooth settings") onClicked: { diff --git a/modules/controlcenter/launcher/LauncherPane.qml b/modules/controlcenter/launcher/LauncherPane.qml index 23d88874..587d0402 100644 --- a/modules/controlcenter/launcher/LauncherPane.qml +++ b/modules/controlcenter/launcher/LauncherPane.qml @@ -168,8 +168,8 @@ Item { icon: "settings" accent: "Primary" iconSize: Tokens.font.body.medium.pointSize - horizontalPadding: Tokens.padding.normal - verticalPadding: Tokens.padding.smaller + horizontalPadding: Tokens.padding.medium + verticalPadding: Tokens.padding.small tooltip: qsTr("Launcher settings") onClicked: { diff --git a/modules/controlcenter/network/EthernetList.qml b/modules/controlcenter/network/EthernetList.qml index 09b5968c..84021e86 100644 --- a/modules/controlcenter/network/EthernetList.qml +++ b/modules/controlcenter/network/EthernetList.qml @@ -39,8 +39,8 @@ DeviceList { icon: "settings" accent: "Primary" iconSize: Tokens.font.body.medium.pointSize - horizontalPadding: Tokens.padding.normal - verticalPadding: Tokens.padding.smaller + horizontalPadding: Tokens.padding.medium + verticalPadding: Tokens.padding.small onClicked: { if (root.session.ethernet.active) diff --git a/modules/controlcenter/network/NetworkSettings.qml b/modules/controlcenter/network/NetworkSettings.qml index 2bb7493a..c0677d97 100644 --- a/modules/controlcenter/network/NetworkSettings.qml +++ b/modules/controlcenter/network/NetworkSettings.qml @@ -87,8 +87,8 @@ ColumnLayout { TextButton { Layout.fillWidth: true - Layout.topMargin: Tokens.spacing.normal - Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.normal * 2 + Layout.topMargin: Tokens.spacing.medium + Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.medium * 2 text: qsTr("⚙ Manage VPN Providers") inactiveColour: Colours.palette.m3secondaryContainer inactiveOnColour: Colours.palette.m3onSecondaryContainer diff --git a/modules/controlcenter/network/NetworkingPane.qml b/modules/controlcenter/network/NetworkingPane.qml index 1315c322..80b0d5fc 100644 --- a/modules/controlcenter/network/NetworkingPane.qml +++ b/modules/controlcenter/network/NetworkingPane.qml @@ -63,8 +63,8 @@ Item { icon: "wifi" accent: "Tertiary" iconSize: Tokens.font.body.medium.pointSize - horizontalPadding: Tokens.padding.normal - verticalPadding: Tokens.padding.smaller + horizontalPadding: Tokens.padding.medium + verticalPadding: Tokens.padding.small tooltip: qsTr("Toggle WiFi") onClicked: { @@ -77,8 +77,8 @@ Item { icon: "wifi_find" accent: "Secondary" iconSize: Tokens.font.body.medium.pointSize - horizontalPadding: Tokens.padding.normal - verticalPadding: Tokens.padding.smaller + horizontalPadding: Tokens.padding.medium + verticalPadding: Tokens.padding.small tooltip: qsTr("Scan for networks") onClicked: { @@ -91,8 +91,8 @@ Item { icon: "settings" accent: "Primary" iconSize: Tokens.font.body.medium.pointSize - horizontalPadding: Tokens.padding.normal - verticalPadding: Tokens.padding.smaller + horizontalPadding: Tokens.padding.medium + verticalPadding: Tokens.padding.small tooltip: qsTr("Network settings") onClicked: { diff --git a/modules/controlcenter/network/VpnDetails.qml b/modules/controlcenter/network/VpnDetails.qml index 2b9028cd..b174e0ba 100644 --- a/modules/controlcenter/network/VpnDetails.qml +++ b/modules/controlcenter/network/VpnDetails.qml @@ -96,7 +96,7 @@ DeviceDetails { TextButton { Layout.fillWidth: true - Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.normal * 2 + Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.medium * 2 visible: root.providerEnabled enabled: !VPN.connecting inactiveColour: Colours.palette.m3primaryContainer diff --git a/modules/controlcenter/network/WirelessDetails.qml b/modules/controlcenter/network/WirelessDetails.qml index 800631c6..51123a29 100644 --- a/modules/controlcenter/network/WirelessDetails.qml +++ b/modules/controlcenter/network/WirelessDetails.qml @@ -86,8 +86,8 @@ DeviceDetails { TextButton { Layout.fillWidth: true - Layout.topMargin: Tokens.spacing.normal - Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.normal * 2 + Layout.topMargin: Tokens.spacing.medium + Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.medium * 2 visible: { if (!root.network || !root.network.ssid) { return false; diff --git a/modules/controlcenter/network/WirelessList.qml b/modules/controlcenter/network/WirelessList.qml index 7771ce7d..4d25fc1b 100644 --- a/modules/controlcenter/network/WirelessList.qml +++ b/modules/controlcenter/network/WirelessList.qml @@ -64,8 +64,8 @@ DeviceList { icon: "wifi" accent: "Tertiary" iconSize: Tokens.font.body.medium.pointSize - horizontalPadding: Tokens.padding.normal - verticalPadding: Tokens.padding.smaller + horizontalPadding: Tokens.padding.medium + verticalPadding: Tokens.padding.small onClicked: { Nmcli.toggleWifi(null); @@ -77,8 +77,8 @@ DeviceList { icon: "wifi_find" accent: "Secondary" iconSize: Tokens.font.body.medium.pointSize - horizontalPadding: Tokens.padding.normal - verticalPadding: Tokens.padding.smaller + horizontalPadding: Tokens.padding.medium + verticalPadding: Tokens.padding.small onClicked: { Nmcli.rescanWifi(); @@ -90,8 +90,8 @@ DeviceList { icon: "settings" accent: "Primary" iconSize: Tokens.font.body.medium.pointSize - horizontalPadding: Tokens.padding.normal - verticalPadding: Tokens.padding.smaller + horizontalPadding: Tokens.padding.medium + verticalPadding: Tokens.padding.small onClicked: { if (root.session.network.active) diff --git a/modules/controlcenter/network/WirelessPasswordDialog.qml b/modules/controlcenter/network/WirelessPasswordDialog.qml index a5ac5f23..2ab80d07 100644 --- a/modules/controlcenter/network/WirelessPasswordDialog.qml +++ b/modules/controlcenter/network/WirelessPasswordDialog.qml @@ -395,7 +395,7 @@ Item { id: cancelButton Layout.fillWidth: true - Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.normal * 2 + Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.medium * 2 inactiveColour: Colours.palette.m3secondaryContainer inactiveOnColour: Colours.palette.m3onSecondaryContainer text: qsTr("Cancel") @@ -410,7 +410,7 @@ Item { property bool hasError: false Layout.fillWidth: true - Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.normal * 2 + Layout.minimumHeight: Tokens.font.body.medium.pointSize + Tokens.padding.medium * 2 inactiveColour: Colours.palette.m3primary inactiveOnColour: Colours.palette.m3onPrimary text: qsTr("Connect") diff --git a/modules/lock/Resources.qml b/modules/lock/Resources.qml index 929a9b05..2d6be753 100644 --- a/modules/lock/Resources.qml +++ b/modules/lock/Resources.qml @@ -80,8 +80,7 @@ GridLayout { anchors.centerIn: parent text: res.icon color: res.colour - font.pointSize: (circ.arcRadius * 0.7) || 1 - font.weight: 600 + font: Tokens.font.icon.builders.medium.size((circ.arcRadius * 0.7) || 1).weight(600).build() } Behavior on value { diff --git a/modules/sidebar/NotifDock.qml b/modules/sidebar/NotifDock.qml index a5855985..6008953a 100644 --- a/modules/sidebar/NotifDock.qml +++ b/modules/sidebar/NotifDock.qml @@ -182,7 +182,7 @@ Item { icon: "clear_all" radius: Tokens.rounding.normal - padding: Tokens.padding.normal + padding: Tokens.padding.medium font: Tokens.font.icon.builders.large.size(Math.round(Tokens.font.icon.large.pointSize * 1.2)).build() onClicked: clearTimer.start()