make style smarter
This commit is contained in:
parent
ffa3068128
commit
aebb29a028
6 changed files with 24 additions and 32 deletions
34
Colors.qml
34
Colors.qml
|
|
@ -8,7 +8,7 @@ import qs.settings
|
||||||
Singleton {
|
Singleton {
|
||||||
id: root
|
id: root
|
||||||
property alias c: colors
|
property alias c: colors
|
||||||
property string accent: colors[Config.cfg.appearance.accent]
|
property color accent: colors[Config.cfg.appearance.accent]
|
||||||
property string font: colors.base05
|
property string font: colors.base05
|
||||||
|
|
||||||
FileView {
|
FileView {
|
||||||
|
|
@ -20,22 +20,22 @@ Singleton {
|
||||||
watchChanges: true
|
watchChanges: true
|
||||||
adapter: JsonAdapter {
|
adapter: JsonAdapter {
|
||||||
id: colors
|
id: colors
|
||||||
property string base00
|
property color base00
|
||||||
property string base01
|
property color base01
|
||||||
property string base02
|
property color base02
|
||||||
property string base03
|
property color base03
|
||||||
property string base04
|
property color base04
|
||||||
property string base05
|
property color base05
|
||||||
property string base06
|
property color base06
|
||||||
property string base07
|
property color base07
|
||||||
property string base08
|
property color base08
|
||||||
property string base09
|
property color base09
|
||||||
property string base0A
|
property color base0A
|
||||||
property string base0B
|
property color base0B
|
||||||
property string base0C
|
property color base0C
|
||||||
property string base0D
|
property color base0D
|
||||||
property string base0E
|
property color base0E
|
||||||
property string base0F
|
property color base0F
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,6 @@ Rectangle {
|
||||||
implicitHeight: 600
|
implicitHeight: 600
|
||||||
color: Colors.c.base00
|
color: Colors.c.base00
|
||||||
radius: Config.cfg.appearance.rounding
|
radius: Config.cfg.appearance.rounding
|
||||||
border.width: 1
|
|
||||||
border.color: Colors.c.base03
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
acceptedButtons: Qt.AllButtons
|
acceptedButtons: Qt.AllButtons
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
@ -55,8 +53,7 @@ Rectangle {
|
||||||
implicitWidth: 300
|
implicitWidth: 300
|
||||||
implicitHeight: 30
|
implicitHeight: 30
|
||||||
radius: Config.cfg.appearance.rounding
|
radius: Config.cfg.appearance.rounding
|
||||||
border.width: 1
|
|
||||||
border.color: Colors.c.base03
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -69,8 +66,6 @@ Rectangle {
|
||||||
delegate: Rectangle {
|
delegate: Rectangle {
|
||||||
id: container
|
id: container
|
||||||
required property var modelData
|
required property var modelData
|
||||||
border.width: 1
|
|
||||||
border.color: Colors.c.base03
|
|
||||||
color: Colors.c.base02
|
color: Colors.c.base02
|
||||||
height: 30
|
height: 30
|
||||||
radius: Config.cfg.appearance.rounding
|
radius: Config.cfg.appearance.rounding
|
||||||
|
|
|
||||||
|
|
@ -30,11 +30,10 @@ Rectangle {
|
||||||
id: audioRep
|
id: audioRep
|
||||||
model: Audio.sinks
|
model: Audio.sinks
|
||||||
|
|
||||||
delegate: Rectangle {
|
delegate: BarComponent {
|
||||||
Layout.margins: 5
|
Layout.margins: 5
|
||||||
id: audioDelContainer
|
id: audioDelContainer
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
color: Colors.c.base02
|
|
||||||
radius: Config.cfg.appearance.rounding - 4
|
radius: Config.cfg.appearance.rounding - 4
|
||||||
required property var modelData
|
required property var modelData
|
||||||
implicitHeight: audioRow.implicitHeight + 8
|
implicitHeight: audioRow.implicitHeight + 8
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ Variants {
|
||||||
margins.left: Config.cfg.bar.floating ? 10 : 0
|
margins.left: Config.cfg.bar.floating ? 10 : 0
|
||||||
margins.right: Config.cfg.bar.floating ? 10 : 0
|
margins.right: Config.cfg.bar.floating ? 10 : 0
|
||||||
Rectangle {
|
Rectangle {
|
||||||
color: Colors.c.base01
|
color: Colors.c.base00
|
||||||
radius: Config.cfg.bar.floating ? Config.cfg.appearance.rounding : 0
|
radius: Config.cfg.bar.floating ? Config.cfg.appearance.rounding : 0
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
implicitHeight: parent.height
|
implicitHeight: parent.height
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"appearance": {
|
"appearance": {
|
||||||
"accent": "base0D",
|
"accent": "base0D",
|
||||||
"currentTheme": "base16-gruvbox-dark.json",
|
"currentTheme": "base16-tokyodark.json",
|
||||||
"font": "Inter",
|
"font": "Inter",
|
||||||
"fontSize": 14,
|
"fontSize": 14,
|
||||||
"iconSize": 16,
|
"iconSize": 16,
|
||||||
|
|
@ -14,6 +14,6 @@
|
||||||
},
|
},
|
||||||
"wallpaper": {
|
"wallpaper": {
|
||||||
"wallDir": "/home/lucy/.walls/",
|
"wallDir": "/home/lucy/.walls/",
|
||||||
"wallpaper": "/home/lucy/.walls/lain_room.png"
|
"wallpaper": "/home/lucy/.walls/faris.png"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,11 +4,9 @@ import qs
|
||||||
import qs.settings
|
import qs.settings
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
property color accent: Colors.c.base02
|
property color base: Qt.rgba(Colors.accent.r, Colors.accent.g, Colors.accent.b, active ? 0.5 : 0.19)
|
||||||
property bool active: false
|
property bool active: false
|
||||||
color: active ? Colors.c.base03 : Colors.c.base02
|
color: base
|
||||||
implicitHeight: Config.cfg.bar.height - 8
|
implicitHeight: Config.cfg.bar.height - 8
|
||||||
radius: Config.cfg.appearance.rounding - 4
|
radius: Config.cfg.appearance.rounding - 4
|
||||||
border.width: 1
|
|
||||||
border.color: Colors.c.base03
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue