mirror of
https://github.com/zoriya/noctalia-shell.git
synced 2026-08-15 18:43:59 +00:00
Default Settings and colors
- Replaced Dinslaken by Tokyo - Renamed Colors.highlight to Colors.hover
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
"error": "#eb6f92",
|
||||
"warning": "#f6c177",
|
||||
|
||||
"highlight": "#c4a7e7",
|
||||
"hover": "#c4a7e7",
|
||||
"onAccent": "#191724",
|
||||
"outline": "#44415a",
|
||||
|
||||
|
||||
@@ -112,7 +112,7 @@ PopupWindow {
|
||||
Rectangle {
|
||||
id: bg
|
||||
anchors.fill: parent
|
||||
color: mouseArea.containsMouse ? Colors.highlight : "transparent"
|
||||
color: mouseArea.containsMouse ? Colors.hover : "transparent"
|
||||
radius: Style.radiusSmall * scaling
|
||||
visible: !(modelData?.isSeparator ?? false)
|
||||
|
||||
@@ -347,7 +347,7 @@ PopupWindow {
|
||||
Rectangle {
|
||||
id: bg
|
||||
anchors.fill: parent
|
||||
color: mouseArea.containsMouse ? Colors.highlight : "transparent"
|
||||
color: mouseArea.containsMouse ? Colors.hover : "transparent"
|
||||
radius: Style.radiusSmall * scaling
|
||||
visible: !(modelData?.isSeparator ?? false)
|
||||
property color hoverTextColor: mouseArea.containsMouse ? Colors.onAccent : Colors.textPrimary
|
||||
|
||||
@@ -114,7 +114,7 @@ NLoader {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: Style.baseWidgetSize * 1.5 * scaling
|
||||
radius: Style.radiusMedium * scaling
|
||||
color: modelData.connected ? Colors.accentPrimary : (networkMouseArea.containsMouse ? Colors.highlight : "transparent")
|
||||
color: modelData.connected ? Colors.accentPrimary : (networkMouseArea.containsMouse ? Colors.hover : "transparent")
|
||||
|
||||
RowLayout {
|
||||
anchors.fill: parent
|
||||
|
||||
@@ -108,7 +108,7 @@ NLoader {
|
||||
width: parent.width
|
||||
height: 32 * scaling // Back to original height
|
||||
radius: Style.radiusSmall * scaling
|
||||
color: selected ? Colors.accentPrimary : (tabItem.hovering ? Colors.highlight : "transparent")
|
||||
color: selected ? Colors.accentPrimary : (tabItem.hovering ? Colors.hover : "transparent")
|
||||
border.color: "transparent"
|
||||
border.width: 0
|
||||
|
||||
|
||||
+4
-4
@@ -31,8 +31,8 @@ Singleton {
|
||||
property color error: themeData.error
|
||||
property color warning: themeData.warning
|
||||
|
||||
// Highlights
|
||||
property color highlight: themeData.highlight
|
||||
// Hover
|
||||
property color hover: themeData.hover
|
||||
|
||||
// Additional Theme Properties
|
||||
property color onAccent: themeData.onAccent
|
||||
@@ -85,8 +85,8 @@ Singleton {
|
||||
property string error: "#eb6f92"
|
||||
property string warning: "#f6c177"
|
||||
|
||||
// Highlights
|
||||
property string highlight: "#c4a7e7"
|
||||
// Hover
|
||||
property string hover: "#c4a7e7"
|
||||
|
||||
// Additional Theme Properties
|
||||
property string onAccent: "#191724"
|
||||
|
||||
@@ -85,7 +85,7 @@ Singleton {
|
||||
property JsonObject location
|
||||
|
||||
location: JsonObject {
|
||||
property string name: "Dinslaken"
|
||||
property string name: "Tokyo"
|
||||
property bool useFahrenheit: false
|
||||
property bool reverseDayMonth: false
|
||||
property bool use12HourClock: false
|
||||
|
||||
@@ -28,7 +28,7 @@ ComboBox {
|
||||
implicitWidth: 120 * scaling
|
||||
implicitHeight: Style.baseWidgetSize * scaling
|
||||
color: Colors.surfaceVariant
|
||||
border.color: root.activeFocus ? Colors.highlight : Colors.outline
|
||||
border.color: root.activeFocus ? Colors.hover : Colors.outline
|
||||
border.width: Math.max(1, Style.borderThin * scaling)
|
||||
radius: Style.radiusMedium * scaling
|
||||
}
|
||||
@@ -93,7 +93,7 @@ ComboBox {
|
||||
|
||||
background: Rectangle {
|
||||
width: root.width - Style.spacingMedium * scaling * 3
|
||||
color: highlighted ? Colors.highlight : "transparent"
|
||||
color: highlighted ? Colors.hover : "transparent"
|
||||
radius: Style.radiusSmall * scaling
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user