diff --git a/Modals/Clipboard/ClipboardContent.qml b/Modals/Clipboard/ClipboardContent.qml index 8c5d196b..bc299c33 100644 --- a/Modals/Clipboard/ClipboardContent.qml +++ b/Modals/Clipboard/ClipboardContent.qml @@ -77,15 +77,12 @@ Item { width: parent.width height: parent.height - ClipboardConstants.headerHeight - 70 radius: Theme.cornerRadius - color: Theme.surfaceLight - border.color: Theme.outlineLight - border.width: 1 + color: "transparent" clip: true DankListView { id: clipboardListView anchors.fill: parent - anchors.margins: Theme.spacingS model: filteredModel currentIndex: clipboardContent.modal ? clipboardContent.modal.selectedIndex : 0 diff --git a/Modals/Clipboard/ClipboardEntry.qml b/Modals/Clipboard/ClipboardEntry.qml index 0ce5c806..5dafcd06 100644 --- a/Modals/Clipboard/ClipboardEntry.qml +++ b/Modals/Clipboard/ClipboardEntry.qml @@ -24,17 +24,10 @@ Rectangle { radius: Theme.cornerRadius color: { if (isSelected) { - return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.2) + return Theme.primaryPressed } - return mouseArea.containsMouse ? Theme.primaryHover : Theme.primaryBackground + return mouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceContainerHigh } - border.color: { - if (isSelected) { - return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.5) - } - return Theme.outlineStrong - } - border.width: isSelected ? 1.5 : 1 Row { anchors.fill: parent diff --git a/Modals/Spotlight/SpotlightContent.qml b/Modals/Spotlight/SpotlightContent.qml index 71afa418..0792b112 100644 --- a/Modals/Spotlight/SpotlightContent.qml +++ b/Modals/Spotlight/SpotlightContent.qml @@ -59,23 +59,21 @@ Item { Column { anchors.fill: parent - anchors.margins: Theme.spacingL - spacing: Theme.spacingL + anchors.margins: Theme.spacingM + spacing: Theme.spacingM Rectangle { width: parent.width - height: categorySelector.height + Theme.spacingM * 2 + height: categorySelector.height + Theme.spacingS * 2 radius: Theme.cornerRadius - color: Theme.surfaceVariantAlpha - border.color: Theme.outlineMedium - border.width: 1 + color: "transparent" visible: appLauncher.categories.length > 1 || appLauncher.model.count > 0 CategorySelector { id: categorySelector anchors.centerIn: parent - width: parent.width - Theme.spacingM * 2 + width: parent.width - Theme.spacingS * 2 categories: appLauncher.categories selectedCategory: appLauncher.selectedCategory compact: false @@ -88,11 +86,12 @@ Item { Row { width: parent.width spacing: Theme.spacingM + leftPadding: Theme.spacingS DankTextField { id: searchField - width: parent.width - 80 - Theme.spacingM + width: parent.width - 80 - Theme.spacingL height: 56 cornerRadius: Theme.cornerRadius backgroundColor: Theme.surfaceContainerHigh @@ -141,8 +140,6 @@ Item { height: 36 radius: Theme.cornerRadius color: appLauncher.viewMode === "list" ? Theme.primaryHover : listViewArea.containsMouse ? Theme.surfaceHover : "transparent" - border.color: appLauncher.viewMode === "list" ? Theme.primarySelected : "transparent" - border.width: 1 DankIcon { anchors.centerIn: parent @@ -168,8 +165,6 @@ Item { height: 36 radius: Theme.cornerRadius color: appLauncher.viewMode === "grid" ? Theme.primaryHover : gridViewArea.containsMouse ? Theme.surfaceHover : "transparent" - border.color: appLauncher.viewMode === "grid" ? Theme.primarySelected : "transparent" - border.width: 1 DankIcon { anchors.centerIn: parent diff --git a/Modals/Spotlight/SpotlightResults.qml b/Modals/Spotlight/SpotlightResults.qml index ddfffcdc..9e82f70d 100644 --- a/Modals/Spotlight/SpotlightResults.qml +++ b/Modals/Spotlight/SpotlightResults.qml @@ -13,9 +13,7 @@ Rectangle { width: parent.width height: parent.height - y radius: Theme.cornerRadius - color: Theme.surfaceContainerHigh - border.color: Theme.outlineLight - border.width: 1 + color: "transparent" DankListView { id: resultsList @@ -75,9 +73,7 @@ Rectangle { width: ListView.view.width height: resultsList.itemHeight radius: Theme.cornerRadius - color: ListView.isCurrentItem ? Theme.primaryPressed : listMouseArea.containsMouse ? Theme.primaryHoverLight : "transparent" - border.color: ListView.isCurrentItem ? Theme.primarySelected : Theme.outlineMedium - border.width: ListView.isCurrentItem ? 2 : 1 + color: ListView.isCurrentItem ? Theme.primaryPressed : listMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceContainerHigh Row { anchors.fill: parent @@ -238,9 +234,7 @@ Rectangle { width: resultsGrid.cellWidth - resultsGrid.cellPadding height: resultsGrid.cellHeight - resultsGrid.cellPadding radius: Theme.cornerRadius - color: resultsGrid.currentIndex === index ? Theme.primaryPressed : gridMouseArea.containsMouse ? Theme.primaryHoverLight : "transparent" - border.color: resultsGrid.currentIndex === index ? Theme.primarySelected : Theme.outlineMedium - border.width: resultsGrid.currentIndex === index ? 2 : 1 + color: resultsGrid.currentIndex === index ? Theme.primaryPressed : gridMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceContainerHigh Column { anchors.centerIn: parent diff --git a/Modules/AppDrawer/AppDrawerPopout.qml b/Modules/AppDrawer/AppDrawerPopout.qml index 4502104d..4095dd27 100644 --- a/Modules/AppDrawer/AppDrawerPopout.qml +++ b/Modules/AppDrawer/AppDrawerPopout.qml @@ -136,15 +136,16 @@ DankPopout { } Column { - width: parent.width - Theme.spacingL * 2 - height: parent.height - Theme.spacingL * 2 - x: Theme.spacingL - y: Theme.spacingL - spacing: Theme.spacingL + width: parent.width - Theme.spacingS * 2 + height: parent.height - Theme.spacingS * 2 + x: Theme.spacingS + y: Theme.spacingS + spacing: Theme.spacingS Row { width: parent.width height: 40 + leftPadding: Theme.spacingS StyledText { anchors.verticalCenter: parent.verticalCenter @@ -170,7 +171,8 @@ DankPopout { DankTextField { id: searchField - width: parent.width + width: parent.width - Theme.spacingS * 2 + anchors.horizontalCenter: parent.horizontalCenter height: 52 cornerRadius: Theme.cornerRadius backgroundColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.getContentBackgroundAlpha() * 0.7) @@ -231,6 +233,8 @@ DankPopout { height: 40 spacing: Theme.spacingM visible: searchField.text.length === 0 + leftPadding: Theme.spacingS + topPadding: Theme.spacingXS Item { width: 200 @@ -238,6 +242,9 @@ DankPopout { DankDropdown { anchors.fill: parent + anchors.leftMargin: Theme.spacingS + anchors.rightMargin: Theme.spacingS + anchors.bottomMargin: Theme.spacingS text: "" currentValue: appLauncher.selectedCategory options: appLauncher.categories @@ -249,7 +256,7 @@ DankPopout { } Item { - width: parent.width - 300 + width: parent.width - 310 height: 1 } @@ -286,15 +293,13 @@ DankPopout { Rectangle { width: parent.width height: { - let usedHeight = 40 + Theme.spacingL - usedHeight += 52 + Theme.spacingL - usedHeight += (searchField.text.length === 0 ? 40 + Theme.spacingL : 0) + let usedHeight = 40 + Theme.spacingS + usedHeight += 52 + Theme.spacingS + usedHeight += (searchField.text.length === 0 ? 40 : 0) return parent.height - usedHeight } radius: Theme.cornerRadius - color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.1) - border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.05) - border.width: 0 + color: "transparent" DankListView { id: appList @@ -323,7 +328,9 @@ DankPopout { } anchors.fill: parent - anchors.margins: Theme.spacingS + anchors.leftMargin: Theme.spacingS + anchors.rightMargin: Theme.spacingS + anchors.bottomMargin: Theme.spacingS visible: appLauncher.viewMode === "list" model: appLauncher.model currentIndex: appLauncher.selectedIndex @@ -353,9 +360,7 @@ DankPopout { width: ListView.view.width height: appList.itemHeight radius: Theme.cornerRadius - color: ListView.isCurrentItem ? Theme.primaryPressed : listMouseArea.containsMouse ? Theme.primaryHoverLight : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.03) - border.color: ListView.isCurrentItem ? Theme.primarySelected : Theme.outlineMedium - border.width: ListView.isCurrentItem ? 2 : 1 + color: ListView.isCurrentItem ? Theme.primaryPressed : listMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceContainerHigh Row { anchors.fill: parent @@ -371,6 +376,7 @@ DankPopout { id: listIconImg anchors.fill: parent + anchors.margins: Theme.spacingXS source: Quickshell.iconPath(model.icon, true) smooth: true asynchronous: true @@ -379,6 +385,9 @@ DankPopout { Rectangle { anchors.fill: parent + anchors.leftMargin: Theme.spacingS + anchors.rightMargin: Theme.spacingS + anchors.bottomMargin: Theme.spacingM visible: !listIconImg.visible color: Theme.surfaceLight radius: Theme.cornerRadius @@ -425,6 +434,9 @@ DankPopout { id: listMouseArea anchors.fill: parent + anchors.leftMargin: Theme.spacingS + anchors.rightMargin: Theme.spacingS + anchors.bottomMargin: Theme.spacingM hoverEnabled: true cursorShape: Qt.PointingHandCursor acceptedButtons: Qt.LeftButton | Qt.RightButton @@ -484,7 +496,9 @@ DankPopout { } anchors.fill: parent - anchors.margins: Theme.spacingS + anchors.leftMargin: Theme.spacingS + anchors.rightMargin: Theme.spacingS + anchors.bottomMargin: Theme.spacingS visible: appLauncher.viewMode === "grid" model: appLauncher.model clip: true @@ -516,9 +530,7 @@ DankPopout { width: appGrid.cellWidth - appGrid.cellPadding height: appGrid.cellHeight - appGrid.cellPadding radius: Theme.cornerRadius - color: appGrid.currentIndex === index ? Theme.primaryPressed : gridMouseArea.containsMouse ? Theme.primaryHoverLight : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.03) - border.color: appGrid.currentIndex === index ? Theme.primarySelected : Theme.outlineMedium - border.width: appGrid.currentIndex === index ? 2 : 1 + color: appGrid.currentIndex === index ? Theme.primaryPressed : gridMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceContainerHigh Column { anchors.centerIn: parent @@ -535,6 +547,9 @@ DankPopout { id: gridIconImg anchors.fill: parent + anchors.leftMargin: Theme.spacingS + anchors.rightMargin: Theme.spacingS + anchors.bottomMargin: Theme.spacingS source: Quickshell.iconPath(model.icon, true) smooth: true asynchronous: true @@ -543,6 +558,9 @@ DankPopout { Rectangle { anchors.fill: parent + anchors.leftMargin: Theme.spacingS + anchors.rightMargin: Theme.spacingS + anchors.bottomMargin: Theme.spacingS visible: !gridIconImg.visible color: Theme.surfaceLight radius: Theme.cornerRadius @@ -577,6 +595,9 @@ DankPopout { id: gridMouseArea anchors.fill: parent + anchors.leftMargin: Theme.spacingS + anchors.rightMargin: Theme.spacingS + anchors.bottomMargin: Theme.spacingS hoverEnabled: true cursorShape: Qt.PointingHandCursor acceptedButtons: Qt.LeftButton | Qt.RightButton diff --git a/Modules/AppDrawer/CategorySelector.qml b/Modules/AppDrawer/CategorySelector.qml index 910c7f76..9ef54b91 100644 --- a/Modules/AppDrawer/CategorySelector.qml +++ b/Modules/AppDrawer/CategorySelector.qml @@ -15,7 +15,7 @@ Item { readonly property int maxCompactItems: 8 readonly property int itemHeight: 36 readonly property color selectedBorderColor: "transparent" - readonly property color unselectedBorderColor: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.3) + readonly property color unselectedBorderColor: "transparent" function handleCategoryClick(category) { selectedCategory = category @@ -42,8 +42,7 @@ Item { height: root.itemHeight width: root.getButtonWidth(itemCount, parent.width) radius: Theme.cornerRadius - color: selectedCategory === modelData ? Theme.primary : "transparent" - border.color: selectedCategory === modelData ? selectedBorderColor : unselectedBorderColor + color: selectedCategory === modelData ? Theme.primary : Theme.surfaceContainerHigh StyledText { anchors.centerIn: parent @@ -82,7 +81,7 @@ Item { height: root.itemHeight width: root.getButtonWidth(itemCount, parent.width) radius: Theme.cornerRadius - color: selectedCategory === modelData ? Theme.primary : "transparent" + color: selectedCategory === modelData ? Theme.primary : Theme.surfaceContainerHigh border.color: selectedCategory === modelData ? selectedBorderColor : unselectedBorderColor StyledText { @@ -118,7 +117,7 @@ Item { height: root.itemHeight width: root.getButtonWidth(itemCount, parent.width) radius: Theme.cornerRadius - color: selectedCategory === modelData ? Theme.primary : "transparent" + color: selectedCategory === modelData ? Theme.primary : Theme.surfaceContainerHigh border.color: selectedCategory === modelData ? selectedBorderColor : unselectedBorderColor StyledText { diff --git a/Modules/Notifications/Center/NotificationCard.qml b/Modules/Notifications/Center/NotificationCard.qml index 2c8b5107..0c67ac41 100644 --- a/Modules/Notifications/Center/NotificationCard.qml +++ b/Modules/Notifications/Center/NotificationCard.qml @@ -34,12 +34,6 @@ Rectangle { } radius: Theme.cornerRadius - Behavior on color { - ColorAnimation { - duration: Theme.shortDuration - easing.type: Theme.standardEasing - } - } Behavior on border.color { ColorAnimation { @@ -50,12 +44,12 @@ Rectangle { color: { if (isGroupSelected && keyboardNavigationActive) { - return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.2) + return Theme.primaryPressed } if (keyboardNavigationActive && expanded && selectedNotificationIndex >= 0) { - return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.12) + return Theme.primaryHoverLight } - return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.1) + return Theme.surfaceContainerHigh } border.color: { if (isGroupSelected && keyboardNavigationActive) { @@ -350,16 +344,10 @@ Rectangle { return baseHeight } radius: Theme.cornerRadius - color: isSelected ? Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.25) : "transparent" + color: isSelected ? Theme.primaryPressed : Theme.surfaceContainerHigh border.color: isSelected ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.4) : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.05) border.width: isSelected ? 1 : 1 - Behavior on color { - ColorAnimation { - duration: Theme.shortDuration - easing.type: Theme.standardEasing - } - } Behavior on border.color { ColorAnimation { diff --git a/Modules/Notifications/Center/NotificationHeader.qml b/Modules/Notifications/Center/NotificationHeader.qml index b93051a8..a2c9f432 100644 --- a/Modules/Notifications/Center/NotificationHeader.qml +++ b/Modules/Notifications/Center/NotificationHeader.qml @@ -106,9 +106,7 @@ Item { height: 28 radius: Theme.cornerRadius visible: NotificationService.notifications.length > 0 - color: clearArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) - border.color: clearArea.containsMouse ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08) - border.width: 1 + color: clearArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceContainerHigh Row { anchors.centerIn: parent @@ -139,19 +137,6 @@ Item { onClicked: NotificationService.clearAllNotifications() } - Behavior on color { - ColorAnimation { - duration: Theme.shortDuration - easing.type: Theme.standardEasing - } - } - - Behavior on border.color { - ColorAnimation { - duration: Theme.shortDuration - easing.type: Theme.standardEasing - } - } } } }