diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..eefded0 Binary files /dev/null and b/.DS_Store differ diff --git a/AppGhostButton.qml b/AppGhostButton.qml index 8c5474b..3e90660 100644 --- a/AppGhostButton.qml +++ b/AppGhostButton.qml @@ -13,7 +13,7 @@ Button { implicitWidth: 100 implicitHeight: 40 visible: !control.flat || control.down || control.checked || control.highlighted - color: control.down ? Theme.card : "transparent" + color: control.down ? Theme.highlight : "transparent" border.width: 0 // custom radius: Theme.radius diff --git a/AppIconButton.qml b/AppIconButton.qml index be48d5b..de8f877 100644 --- a/AppIconButton.qml +++ b/AppIconButton.qml @@ -24,7 +24,7 @@ Button { implicitWidth: 100 implicitHeight: 40 visible: !control.flat || control.down || control.checked || control.highlighted - color: control.down ? Theme.card : "transparent" + color: control.down ? Theme.highlight : "transparent" border.width: 0 // custom radius: Theme.radius diff --git a/AppSecondaryButton.qml b/AppSecondaryButton.qml index 9958114..4c744ac 100644 --- a/AppSecondaryButton.qml +++ b/AppSecondaryButton.qml @@ -24,7 +24,7 @@ Button { implicitWidth: 100 implicitHeight: 40 visible: !control.flat || control.down || control.checked || control.highlighted - color: control.down ? Theme.card : "transparent" + color: control.down ? Theme.highlight : "transparent" border.color: Theme.softBorder border.width: 1 // custom diff --git a/AppWindow.qml b/AppWindow.qml index 4887dbe..a2bf57f 100644 --- a/AppWindow.qml +++ b/AppWindow.qml @@ -17,7 +17,7 @@ ApplicationWindow { button: Theme.accent midlight: Theme.card light: Theme.secondaryText - highlight: Theme.muted + highlight: Theme.highlight highlightedText: Theme.secondaryBackground placeholderText: Theme.muted } diff --git a/Theme.qml b/Theme.qml index ddb6867..eb733fb 100644 --- a/Theme.qml +++ b/Theme.qml @@ -6,9 +6,9 @@ import QtQuick // based on https://colorhunt.co/palette/181c143c3d37697565ecdfcc Item { id: item - property color background: darkTheme ? "#1C1C1E" : "#f2f2f2" - property color card: darkTheme ? "#2C2C2E" : "#fafafa" - property color secondaryBackground: darkTheme ? "#4A4B4C" : "#D7DCDD" + property color background: darkTheme ? "#1C1C1E" : "#D7DCDD" + property color card: darkTheme ? "#2C2C2E" : "#e4e9eb" + property color secondaryBackground: darkTheme ? "#4A4B4C" : "#e4e9eb" property color accent: "#697565" property color muted: darkTheme ? "#EBEBF5" : "#3C3C43" property color foreground: darkTheme ? "#FFFFFF" : "#000000" @@ -17,6 +17,7 @@ Item { property color secondaryText: darkTheme ? "#EBEBF5" : "#3C3C43" property color caption: darkTheme ? "#EBEBF5" : "#3C3C43" property color separator: darkTheme ? "#38383A" : "#C6C6C8" + property color highlight: darkTheme ? "#374151" : "#c6cbcc" property int radius: 5