diff --git a/Colors.qml b/Colors.qml index c2c3ae2..8e643ec 100644 --- a/Colors.qml +++ b/Colors.qml @@ -3,24 +3,24 @@ import QtQuick QtObject { // --- The Backgrounds (Darkest to Lightest) --- - readonly property color base00: "#1e1e2e" // Default Background - readonly property color base01: "#181825" // Lighter Background (Status bars, panels) - readonly property color base02: "#313244" // Selection Background - readonly property color base03: "#45475a" // Comments, Invisibles, line highlighting + readonly property color base00: "#272e33" // Default Background + readonly property color base01: "#2e383c" // Lighter Background (Status bars, panels) + readonly property color base02: "#414b50" // Selection Background + readonly property color base03: "#859289" // Comments, Invisibles, line highlighting // --- The Foregrounds (Darkest to Lightest) --- - readonly property color base04: "#585b70" // Dark Foreground (Used for status bars) - readonly property color base05: "#cdd6f4" // Default Foreground, Caret - readonly property color base06: "#f5e0dc" // Light Foreground (Rarely used) - readonly property color base07: "#b4befe" // Lightest Foreground + readonly property color base04: "#9da9a0" // Dark Foreground (Used for status bars) + readonly property color base05: "#d3c6aa" // Default Foreground, Caret + readonly property color base06: "#edeada" // Light Foreground (Rarely used) + readonly property color base07: "#fffbef" // Lightest Foreground // --- The Accent Colors --- - readonly property color base08: "#f38ba8" // Red (Variables, errors) - readonly property color base09: "#fab387" // Orange (Integers, booleans, constants) - readonly property color base0A: "#f9e2af" // Yellow (Classes, search text bg, warnings) - readonly property color base0B: "#a6e3a1" // Green (Strings, success states) - readonly property color base0C: "#94e2d5" // Cyan (Support, regex, escape chars) - readonly property color base0D: "#89b4fa" // Blue (Functions, methods, headings) - readonly property color base0E: "#cba6f7" // Purple/Mauve (Keywords, storage, selectors) - readonly property color base0F: "#f2cdcd" // Brown/Flamingo (Deprecated, embedded tags) + readonly property color base08: "#e67e80" // Red (Variables, errors) + readonly property color base09: "#e69875" // Orange (Integers, booleans, constants) + readonly property color base0A: "#dbbc7f" // Yellow (Classes, search text bg, warnings) + readonly property color base0B: "#a7c080" // Green (Strings, success states) + readonly property color base0C: "#83c092" // Cyan (Support, regex, escape chars) + readonly property color base0D: "#7fbbb3" // Blue (Functions, methods, headings) + readonly property color base0E: "#d699b6" // Purple/Mauve (Keywords, storage, selectors) + readonly property color base0F: "#9da9a0" // Brown/Flamingo (Deprecated, embedded tags) } diff --git a/modules/bar/Ws.qml b/modules/bar/Ws.qml index e8892a9..5fd6c23 100644 --- a/modules/bar/Ws.qml +++ b/modules/bar/Ws.qml @@ -41,8 +41,8 @@ Rectangle { StyledText { anchors.centerIn: parent text: wsWrapper.modelData.id > 10 ? wsWrapper.modelData.id > 20 ? wsWrapper.modelData.id - 20 : wsWrapper.modelData.id - 10 : wsWrapper.modelData.id - color: wsWrapper.active ? Colors.base0D : Colors.base04 - opacity: wsWrapper.vacant ? wsWrapper.active ? 1.0 : 0.4 : 1.0 + color: wsWrapper.active ? Colors.base0D : Colors.base02 + opacity: wsWrapper.vacant ? wsWrapper.active ? 1.0 : 0.5 : 1.0 font.bold: wsWrapper.active } MouseArea {