diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b57c86c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +Colors.qml diff --git a/Colors.qml b/Colors.qml index c1ba3b8..aba1af7 100644 --- a/Colors.qml +++ b/Colors.qml @@ -5,25 +5,25 @@ import Quickshell Singleton { id: customColors // Core Backgrounds - readonly property color background: "#161616" - readonly property color foreground: "#FFFFFF" - readonly property color cursor: "#6F6F6F" + readonly property color background: "#1E1E2E" + readonly property color foreground: "#CDD6F4" + readonly property color cursor: "#CDD6F4" // The 16 Colors of the Apocalypse - readonly property color color0: "#262626" - readonly property color color1: "#EE5396" - readonly property color color2: "#42BE65" - readonly property color color3: "#FFE97B" - readonly property color color4: "#33B1FF" - readonly property color color5: "#FF7EB6" - readonly property color color6: "#3DDBD9" - readonly property color color7: "#DDE1E6" - readonly property color color8: "#393939" - readonly property color color9: "#EE5396" - readonly property color color10: "#42BE65" - readonly property color color11: "#FFE97B" - readonly property color color12: "#33B1FF" - readonly property color color13: "#FF7EB6" - readonly property color color14: "#3DDBD9" - readonly property color color15: "#FFFFFF" + readonly property color color0: "#45475A" + readonly property color color1: "#F38BA8" + readonly property color color2: "#A6E3A1" + readonly property color color3: "#F9E2AF" + readonly property color color4: "#89B4FA" + readonly property color color5: "#F5C2E7" + readonly property color color6: "#94E2D5" + readonly property color color7: "#BAC2DE" + readonly property color color8: "#585B70" + readonly property color color9: "#F38BA8" + readonly property color color10: "#A6E3A1" + readonly property color color11: "#F9E2AF" + readonly property color color12: "#89B4FA" + readonly property color color13: "#F5C2E7" + readonly property color color14: "#94E2D5" + readonly property color color15: "#A6ADC8" } diff --git a/modules/Bar/Bar.qml b/modules/Bar/Bar.qml index d5fef64..9ee1c80 100644 --- a/modules/Bar/Bar.qml +++ b/modules/Bar/Bar.qml @@ -2,7 +2,6 @@ import Quickshell import QtQuick import "../../settings/" import "../../" -import "../../reusables/" import QtQuick.Layouts Variants { @@ -18,12 +17,10 @@ Variants { left: true right: true } - margins { - left: 10 - right: 10 - } + implicitHeight: Settings.config.barHeight - RowLayout { + Row { + leftPadding: 10 id: leftStuff spacing: 20 anchors.left: parent.left @@ -40,9 +37,10 @@ Variants { Clock {} } - RowLayout { + Row { + rightPadding: 10 id: rightStuff - spacing: 20 + spacing: 10 anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter Volume {} diff --git a/modules/Bar/Volume.qml b/modules/Bar/Volume.qml index 759ecc6..c903eac 100644 --- a/modules/Bar/Volume.qml +++ b/modules/Bar/Volume.qml @@ -35,7 +35,7 @@ Item { Row { id: textRow anchors.verticalCenter: parent.verticalCenter - spacing: 5 + spacing: 0 CustomText { id: volumeText PwObjectTracker {