Colors: slight rework of the default colorscheme and overall colors usage
This commit is contained in:
parent
ef5fff12d1
commit
63fb5bd290
13 changed files with 48 additions and 29 deletions
|
|
@ -3,8 +3,8 @@
|
||||||
"backgroundSecondary": "#1f1d2e",
|
"backgroundSecondary": "#1f1d2e",
|
||||||
"backgroundTertiary": "#26233a",
|
"backgroundTertiary": "#26233a",
|
||||||
|
|
||||||
"surface": "#1f1d2e",
|
"surface": "#1b1927",
|
||||||
"surfaceVariant": "#37354c",
|
"surfaceVariant": "#262337",
|
||||||
|
|
||||||
"textPrimary": "#e0def4",
|
"textPrimary": "#e0def4",
|
||||||
"textSecondary": "#908caa",
|
"textSecondary": "#908caa",
|
||||||
|
|
@ -23,4 +23,4 @@
|
||||||
|
|
||||||
"shadow": "#191724",
|
"shadow": "#191724",
|
||||||
"overlay": "#191724"
|
"overlay": "#191724"
|
||||||
}
|
}
|
||||||
|
|
@ -68,11 +68,11 @@ PanelWindow {
|
||||||
gradient: Gradient {
|
gradient: Gradient {
|
||||||
GradientStop {
|
GradientStop {
|
||||||
position: 0.0
|
position: 0.0
|
||||||
color: Colors.backgroundTertiary
|
color: Colors.backgroundSecondary
|
||||||
}
|
}
|
||||||
GradientStop {
|
GradientStop {
|
||||||
position: 1.0
|
position: 1.0
|
||||||
color: Colors.backgroundSecondary
|
color: Colors.backgroundTertiary
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -281,7 +281,7 @@ NLoader {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
radius: Style.radiusMedium * scaling
|
radius: Style.radiusMedium * scaling
|
||||||
color: Colors.surface
|
color: Colors.surfaceVariant
|
||||||
border.color: Colors.outline
|
border.color: Colors.outline
|
||||||
border.width: Math.max(1, Style.borderThin * scaling)
|
border.width: Math.max(1, Style.borderThin * scaling)
|
||||||
clip: true
|
clip: true
|
||||||
|
|
|
||||||
|
|
@ -168,10 +168,10 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
|
|
||||||
NText {
|
NText {
|
||||||
text: `Contributors: ${root.contributors.length}`
|
text: `Shout-out to our ${root.contributors.length} awesome contributors!`
|
||||||
font.pointSize: Style.fontSizeLarge * scaling
|
font.pointSize: Style.fontSizeLarge * scaling
|
||||||
font.weight: Style.fontWeightBold
|
font.weight: Style.fontWeightBold
|
||||||
color: Colors.textPrimary
|
color: Colors.textSecondary
|
||||||
Layout.alignment: Qt.AlignCenter
|
Layout.alignment: Qt.AlignCenter
|
||||||
Layout.topMargin: Style.marginLarge * 2
|
Layout.topMargin: Style.marginLarge * 2
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -21,19 +21,23 @@ NBox {
|
||||||
// }
|
// }
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
Layout.fillHeight: true
|
||||||
anchors.margins: Style.marginLarge * scaling
|
anchors.margins: Style.marginLarge * scaling
|
||||||
|
|
||||||
// Fallback
|
// Fallback
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: fallback
|
id: fallback
|
||||||
|
|
||||||
visible: !main.visible
|
visible: !main.visible
|
||||||
spacing: Style.marginMedium * scaling
|
spacing: Style.marginSmall * scaling
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
Layout.fillHeight: true
|
||||||
}
|
}
|
||||||
|
|
||||||
NText {
|
NText {
|
||||||
text: "music_note"
|
text: "album"
|
||||||
font.family: "Material Symbols Outlined"
|
font.family: "Material Symbols Outlined"
|
||||||
font.pointSize: 28 * scaling
|
font.pointSize: 28 * scaling
|
||||||
color: Colors.textSecondary
|
color: Colors.textSecondary
|
||||||
|
|
@ -44,6 +48,7 @@ NBox {
|
||||||
color: Colors.textDisabled
|
color: Colors.textDisabled
|
||||||
Layout.alignment: Qt.AlignHCenter
|
Layout.alignment: Qt.AlignHCenter
|
||||||
}
|
}
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
}
|
}
|
||||||
|
|
@ -117,11 +122,11 @@ NBox {
|
||||||
gradient: Gradient {
|
gradient: Gradient {
|
||||||
GradientStop {
|
GradientStop {
|
||||||
position: 0.0
|
position: 0.0
|
||||||
color: Colors.backgroundTertiary
|
color: Colors.backgroundSecondary
|
||||||
}
|
}
|
||||||
GradientStop {
|
GradientStop {
|
||||||
position: 1.0
|
position: 1.0
|
||||||
color: Colors.backgroundSecondary
|
color: Colors.backgroundTertiary
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
border.color: Colors.outline
|
border.color: Colors.outline
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ NBox {
|
||||||
text: weatherReady ? Location.weatherSymbolFromCode(Location.data.weather.current_weather.weathercode) : ""
|
text: weatherReady ? Location.weatherSymbolFromCode(Location.data.weather.current_weather.weathercode) : ""
|
||||||
font.family: "Material Symbols Outlined"
|
font.family: "Material Symbols Outlined"
|
||||||
font.pointSize: Style.fontSizeXXL * 1.5 * scaling
|
font.pointSize: Style.fontSizeXXL * 1.5 * scaling
|
||||||
color: Colors.accentSecondary
|
color: Colors.accentPrimary
|
||||||
}
|
}
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
|
|
@ -41,8 +41,8 @@ NBox {
|
||||||
const chunks = Settings.data.location.name.split(",")
|
const chunks = Settings.data.location.name.split(",")
|
||||||
return chunks[0]
|
return chunks[0]
|
||||||
}
|
}
|
||||||
|
font.pointSize: Style.fontSizeLarger * scaling
|
||||||
font.weight: Style.fontWeightBold
|
font.weight: Style.fontWeightBold
|
||||||
font.pointSize: Style.fontSizeXL * scaling
|
|
||||||
}
|
}
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
|
|
@ -53,11 +53,13 @@ NBox {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
var temp = Location.data.weather.current_weather.temperature
|
var temp = Location.data.weather.current_weather.temperature
|
||||||
|
var suffix = "C"
|
||||||
if (Settings.data.location.useFahrenheit) {
|
if (Settings.data.location.useFahrenheit) {
|
||||||
temp = Location.celsiusToFahrenheit(temp)
|
temp = Location.celsiusToFahrenheit(temp)
|
||||||
|
var suffix = "F"
|
||||||
}
|
}
|
||||||
temp = Math.round(temp)
|
temp = Math.round(temp)
|
||||||
return `${temp}°`
|
return `${temp}°${suffix}`
|
||||||
}
|
}
|
||||||
font.pointSize: Style.fontSizeXL * scaling
|
font.pointSize: Style.fontSizeXL * scaling
|
||||||
font.weight: Style.fontWeightBold
|
font.weight: Style.fontWeightBold
|
||||||
|
|
@ -95,7 +97,7 @@ NBox {
|
||||||
text: Location.weatherSymbolFromCode(Location.data.weather.daily.weathercode[index])
|
text: Location.weatherSymbolFromCode(Location.data.weather.daily.weathercode[index])
|
||||||
font.family: "Material Symbols Outlined"
|
font.family: "Material Symbols Outlined"
|
||||||
font.pointSize: Style.fontSizeXL * scaling
|
font.pointSize: Style.fontSizeXL * scaling
|
||||||
color: Colors.textSecondary
|
color: Colors.accentPrimary
|
||||||
}
|
}
|
||||||
NText {
|
NText {
|
||||||
text: {
|
text: {
|
||||||
|
|
|
||||||
|
|
@ -30,11 +30,11 @@ NPanel {
|
||||||
gradient: Gradient {
|
gradient: Gradient {
|
||||||
GradientStop {
|
GradientStop {
|
||||||
position: 0.0
|
position: 0.0
|
||||||
color: Colors.backgroundTertiary
|
color: Colors.backgroundSecondary
|
||||||
}
|
}
|
||||||
GradientStop {
|
GradientStop {
|
||||||
position: 1.0
|
position: 1.0
|
||||||
color: Colors.backgroundSecondary
|
color: Colors.backgroundTertiary
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -81,7 +81,18 @@ NLoader {
|
||||||
// Inline helpers moved to dedicated widgets: NCard and NCircleStat
|
// Inline helpers moved to dedicated widgets: NCard and NCircleStat
|
||||||
Rectangle {
|
Rectangle {
|
||||||
id: panelBackground
|
id: panelBackground
|
||||||
color: Colors.backgroundPrimary
|
color: "transparent"
|
||||||
|
gradient: Gradient {
|
||||||
|
GradientStop {
|
||||||
|
position: 0.0
|
||||||
|
color: Colors.backgroundSecondary
|
||||||
|
}
|
||||||
|
GradientStop {
|
||||||
|
position: 1.0
|
||||||
|
color: Colors.backgroundTertiary
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
radius: Style.radiusLarge * scaling
|
radius: Style.radiusLarge * scaling
|
||||||
border.color: Colors.backgroundTertiary
|
border.color: Colors.backgroundTertiary
|
||||||
border.width: Math.max(1, Style.borderMedium * scaling)
|
border.width: Math.max(1, Style.borderMedium * scaling)
|
||||||
|
|
|
||||||
|
|
@ -58,8 +58,8 @@ Singleton {
|
||||||
property color backgroundSecondary: "#1f1d2e"
|
property color backgroundSecondary: "#1f1d2e"
|
||||||
property color backgroundTertiary: "#26233a"
|
property color backgroundTertiary: "#26233a"
|
||||||
|
|
||||||
property color surface: "#1f1d2e"
|
property color surface: "#1b1927"
|
||||||
property color surfaceVariant: "#37354c"
|
property color surfaceVariant: "#262337"
|
||||||
|
|
||||||
property color textPrimary: "#e0def4"
|
property color textPrimary: "#e0def4"
|
||||||
property color textSecondary: "#908caa"
|
property color textSecondary: "#908caa"
|
||||||
|
|
@ -134,8 +134,8 @@ Singleton {
|
||||||
property string backgroundTertiary: "#26233a"
|
property string backgroundTertiary: "#26233a"
|
||||||
|
|
||||||
// Surfaces & Elevation
|
// Surfaces & Elevation
|
||||||
property string surface: "#1f1d2e"
|
property string surface: "#1b1927"
|
||||||
property string surfaceVariant: "#37354c"
|
property string surfaceVariant: "#262337"
|
||||||
|
|
||||||
// Text Colors
|
// Text Colors
|
||||||
property string textPrimary: "#e0def4"
|
property string textPrimary: "#e0def4"
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@ Singleton {
|
||||||
property real fontSizeMedium: 11
|
property real fontSizeMedium: 11
|
||||||
property real fontSizeInter: 12
|
property real fontSizeInter: 12
|
||||||
property real fontSizeLarge: 13
|
property real fontSizeLarge: 13
|
||||||
|
property real fontSizeLarger: 16
|
||||||
property real fontSizeXL: 18
|
property real fontSizeXL: 18
|
||||||
property real fontSizeXXL: 24
|
property real fontSizeXXL: 24
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ Rectangle {
|
||||||
implicitWidth: childrenRect.width
|
implicitWidth: childrenRect.width
|
||||||
implicitHeight: childrenRect.height
|
implicitHeight: childrenRect.height
|
||||||
|
|
||||||
color: Colors.surfaceVariant
|
color: Colors.surface
|
||||||
radius: Style.radiusMedium * scaling
|
radius: Style.radiusMedium * scaling
|
||||||
border.color: Colors.backgroundTertiary
|
border.color: Colors.backgroundTertiary
|
||||||
border.width: Math.max(1, Style.borderThin * scaling)
|
border.width: Math.max(1, Style.borderThin * scaling)
|
||||||
|
|
|
||||||
|
|
@ -57,8 +57,8 @@ Rectangle {
|
||||||
const endBg = Math.PI * 5 / 3
|
const endBg = Math.PI * 5 / 3
|
||||||
ctx.reset()
|
ctx.reset()
|
||||||
ctx.lineWidth = 6 * root.scaling * contentScale
|
ctx.lineWidth = 6 * root.scaling * contentScale
|
||||||
// Track uses backgroundPrimary for stronger contrast
|
// Track uses surfaceVariant for stronger contrast
|
||||||
ctx.strokeStyle = Colors.backgroundPrimary
|
ctx.strokeStyle = Colors.surfaceVariant
|
||||||
ctx.beginPath()
|
ctx.beginPath()
|
||||||
ctx.arc(cx, cy, r, start, endBg)
|
ctx.arc(cx, cy, r, start, endBg)
|
||||||
ctx.stroke()
|
ctx.stroke()
|
||||||
|
|
@ -89,7 +89,7 @@ Rectangle {
|
||||||
width: 28 * scaling * contentScale
|
width: 28 * scaling * contentScale
|
||||||
height: width
|
height: width
|
||||||
radius: width / 2
|
radius: width / 2
|
||||||
color: Colors.backgroundSecondary
|
color: Colors.surfaceVariant
|
||||||
// border.color: Colors.accentPrimary
|
// border.color: Colors.accentPrimary
|
||||||
// border.width: Math.max(1, Style.borderThin * scaling)
|
// border.width: Math.max(1, Style.borderThin * scaling)
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
|
|
||||||
|
|
@ -138,11 +138,11 @@ Window {
|
||||||
gradient: Gradient {
|
gradient: Gradient {
|
||||||
GradientStop {
|
GradientStop {
|
||||||
position: 0.0
|
position: 0.0
|
||||||
color: Colors.backgroundTertiary
|
color: Colors.backgroundSecondary
|
||||||
}
|
}
|
||||||
GradientStop {
|
GradientStop {
|
||||||
position: 1.0
|
position: 1.0
|
||||||
color: Colors.backgroundSecondary
|
color: Colors.backgroundTertiary
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
border.color: Colors.outline
|
border.color: Colors.outline
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue