From 203071f58db3fe8384a5d2c65e6ff6f38d433d52 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 29 Nov 2023 20:07:08 +0900 Subject: [PATCH] Rework on waybar styles. Added keyhints wiki page --- config/hypr/scripts/KeyHints.sh | 4 +- config/waybar/configs/Camellia [Bottom] | 4 +- config/waybar/configs/Camellia [TOP] | 4 +- config/waybar/configs/Chrysanthemum [Bottom] | 2 +- config/waybar/configs/Chrysanthemum [TOP] | 2 +- config/waybar/configs/Default [Bottom] | 2 +- config/waybar/configs/Peony [Bottom] | 4 +- config/waybar/configs/Peony [TOP] | 4 +- config/waybar/style/Black & White.css | 2 +- .../waybar/style/{Dark.css => Black Bar.css} | 8 ++-- config/waybar/style/Catppuccin-Latte.css | 2 +- config/waybar/style/Catppuccin-Mocha.css | 2 +- config/waybar/style/Chroma Tally.css | 2 +- config/waybar/style/Colored (Bordered).css | 2 +- config/waybar/style/Crimson.css | 6 +-- config/waybar/style/Golden Noir.css | 2 +- config/waybar/style/Purpl.css | 7 ++-- config/waybar/style/Rainbow Spectrum.css | 2 +- config/waybar/style/Rose-Pine.css | 35 ++++++++++++----- config/waybar/style/Simple Pink.css | 2 +- config/waybar/style/Translucent Chromatic.css | 2 +- config/waybar/style/Transparent.css | 2 +- .../waybar/style/{Light.css => White Bar.css} | 38 ++----------------- 23 files changed, 62 insertions(+), 78 deletions(-) rename config/waybar/style/{Dark.css => Black Bar.css} (96%) rename config/waybar/style/{Light.css => White Bar.css} (84%) diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh index d868b5d..bf4a1bf 100755 --- a/config/hypr/scripts/KeyHints.sh +++ b/config/hypr/scripts/KeyHints.sh @@ -35,6 +35,8 @@ yad --width=1000 --height=1000 \ " H" "Launch this app" "" \ " E" "View or EDIT Keybinds, Settings, Monitor" "" \ "" "" "" \ -"" "This window will auto-close in 60 secs" ""\ +"" "More tips on Hyprland-Dots github wiki page" ""\ +"" "" "" \ +"" "" "This window will auto-close in 60 secs" ""\ diff --git a/config/waybar/configs/Camellia [Bottom] b/config/waybar/configs/Camellia [Bottom] index 4865c4a..02118d3 100644 --- a/config/waybar/configs/Camellia [Bottom] +++ b/config/waybar/configs/Camellia [Bottom] @@ -12,8 +12,8 @@ "exclusive": true, "passthrough": false, "position": "bottom", -"spacing": 0, -"fixed-center": false, +"spacing": 4, +"fixed-center": true, "ipc": true, //"margin-top": 0, //"margin-bottom": 0, diff --git a/config/waybar/configs/Camellia [TOP] b/config/waybar/configs/Camellia [TOP] index 4081716..cb265b7 100644 --- a/config/waybar/configs/Camellia [TOP] +++ b/config/waybar/configs/Camellia [TOP] @@ -12,8 +12,8 @@ "exclusive": true, "passthrough": false, "position": "top", -"spacing": 0, -"fixed-center": false, +"spacing": 3, +"fixed-center": true, "ipc": true, //"margin-top": 0, //"margin-bottom": 0, diff --git a/config/waybar/configs/Chrysanthemum [Bottom] b/config/waybar/configs/Chrysanthemum [Bottom] index 326bed0..d87fd24 100644 --- a/config/waybar/configs/Chrysanthemum [Bottom] +++ b/config/waybar/configs/Chrysanthemum [Bottom] @@ -12,7 +12,7 @@ "passthrough": false, "position": "bottom", "spacing": 5, -"fixed-center": false, +"fixed-center": true, "ipc": true, "margin-left": 5, "margin-right": 5, diff --git a/config/waybar/configs/Chrysanthemum [TOP] b/config/waybar/configs/Chrysanthemum [TOP] index a948ce1..9761e87 100644 --- a/config/waybar/configs/Chrysanthemum [TOP] +++ b/config/waybar/configs/Chrysanthemum [TOP] @@ -12,7 +12,7 @@ "passthrough": false, "position": "top", "spacing": 5, -"fixed-center": false, +"fixed-center": true, "ipc": true, "margin-left": 5, "margin-right": 5, diff --git a/config/waybar/configs/Default [Bottom] b/config/waybar/configs/Default [Bottom] index 78032fb..8bf8ecd 100644 --- a/config/waybar/configs/Default [Bottom] +++ b/config/waybar/configs/Default [Bottom] @@ -11,7 +11,7 @@ "spacing": 3, "fixed-center": true, "ipc": true, -"margin-bottom": 2, +//"margin-top": 6, "margin-left": 8, "margin-right": 8, diff --git a/config/waybar/configs/Peony [Bottom] b/config/waybar/configs/Peony [Bottom] index 1ec4fb6..0caa4ea 100644 --- a/config/waybar/configs/Peony [Bottom] +++ b/config/waybar/configs/Peony [Bottom] @@ -12,8 +12,8 @@ "exclusive": true, "passthrough": false, "position": "bottom", -"spacing": 0, -"fixed-center": false, +"spacing": 4, +"fixed-center": true, "ipc": true, //"margin-top": 5, "margin-bottom": 5, diff --git a/config/waybar/configs/Peony [TOP] b/config/waybar/configs/Peony [TOP] index d124667..ade9f2c 100644 --- a/config/waybar/configs/Peony [TOP] +++ b/config/waybar/configs/Peony [TOP] @@ -12,8 +12,8 @@ "exclusive": true, "passthrough": false, "position": "top", -"spacing": 0, -"fixed-center": false, +"spacing": 4, +"fixed-center": true, "ipc": true, "margin-top": 5, //"margin-bottom": 5, diff --git a/config/waybar/style/Black & White.css b/config/waybar/style/Black & White.css index 5e166c4..8f36e35 100644 --- a/config/waybar/style/Black & White.css +++ b/config/waybar/style/Black & White.css @@ -6,7 +6,7 @@ font-family: "JetBrainsMono Nerd Font"; font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ -font-size: 98%; +font-size: 97%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; padding: 1px; } diff --git a/config/waybar/style/Dark.css b/config/waybar/style/Black Bar.css similarity index 96% rename from config/waybar/style/Dark.css rename to config/waybar/style/Black Bar.css index e153d89..c15093c 100644 --- a/config/waybar/style/Dark.css +++ b/config/waybar/style/Black Bar.css @@ -8,13 +8,14 @@ font-family: "JetBrainsMono Nerd Font"; font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ -font-size: 98%; +font-size: 97%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; padding: 1px; } window#waybar { - background: rgba(0, 0, 0, 0); + background: black; + border-radius: 12px; } window#waybar.hidden { @@ -46,7 +47,6 @@ tooltip label { /*-----module groups----*/ .modules-right { - background-color: rgba(0, 0, 0, 0.8); border: 0px solid #b4befe; border-radius: 10px; padding-top: 2px; @@ -56,7 +56,6 @@ tooltip label { } .modules-center { - background-color: rgba(0, 0, 0, 0.8); border: 0px solid #b4befe; border-radius: 10px; padding-top: 2px; @@ -66,7 +65,6 @@ tooltip label { } .modules-left { - background-color: rgba(0, 0, 0, 0.8); border: 0px solid #b4befe; border-radius: 10px; padding-top: 2px; diff --git a/config/waybar/style/Catppuccin-Latte.css b/config/waybar/style/Catppuccin-Latte.css index 8f0ef62..619b24a 100644 --- a/config/waybar/style/Catppuccin-Latte.css +++ b/config/waybar/style/Catppuccin-Latte.css @@ -6,7 +6,7 @@ font-family: "JetBrainsMono Nerd Font"; font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ -font-size: 98%; +font-size: 97%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; padding: 1px; } diff --git a/config/waybar/style/Catppuccin-Mocha.css b/config/waybar/style/Catppuccin-Mocha.css index 914dc8d..eceb569 100644 --- a/config/waybar/style/Catppuccin-Mocha.css +++ b/config/waybar/style/Catppuccin-Mocha.css @@ -6,7 +6,7 @@ font-family: "JetBrainsMono Nerd Font"; font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ -font-size: 98%; +font-size: 97%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; padding: 1px; } diff --git a/config/waybar/style/Chroma Tally.css b/config/waybar/style/Chroma Tally.css index 96f416a..136c177 100644 --- a/config/waybar/style/Chroma Tally.css +++ b/config/waybar/style/Chroma Tally.css @@ -8,7 +8,7 @@ font-family: "JetBrainsMono Nerd Font"; font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ -font-size: 98%; +font-size: 97%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; padding: 1px; } diff --git a/config/waybar/style/Colored (Bordered).css b/config/waybar/style/Colored (Bordered).css index 07146cb..77a1194 100644 --- a/config/waybar/style/Colored (Bordered).css +++ b/config/waybar/style/Colored (Bordered).css @@ -8,7 +8,7 @@ font-family: "JetBrainsMono Nerd Font"; font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ -font-size: 98%; +font-size: 97%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; padding: 1px; } diff --git a/config/waybar/style/Crimson.css b/config/waybar/style/Crimson.css index dc36fb3..44c20e0 100644 --- a/config/waybar/style/Crimson.css +++ b/config/waybar/style/Crimson.css @@ -9,7 +9,7 @@ font-family: "JetBrainsMono Nerd Font"; font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ -font-size: 98%; +font-size: 97%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; } @@ -154,8 +154,8 @@ tooltip { #custom-weather.snowyIcyNight, #custom-weather.sunnyDay { color: wheat; - padding-top: 2px; - padding-bottom: 2px; + padding-top: 3px; + padding-bottom: 3px; padding-right: 4px; padding-left: 4px; } diff --git a/config/waybar/style/Golden Noir.css b/config/waybar/style/Golden Noir.css index 14a55d6..2540188 100644 --- a/config/waybar/style/Golden Noir.css +++ b/config/waybar/style/Golden Noir.css @@ -10,7 +10,7 @@ font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ - font-size: 98%; + font-size: 97%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; padding: 1px; } diff --git a/config/waybar/style/Purpl.css b/config/waybar/style/Purpl.css index 226a540..3a6c690 100644 --- a/config/waybar/style/Purpl.css +++ b/config/waybar/style/Purpl.css @@ -9,14 +9,13 @@ font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ - font-size: 98%; + font-size: 97%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; padding: 1px; } window#waybar { background: #100214; - border-radius: 10px; color: #cba6f7; } @@ -48,7 +47,7 @@ tooltip { /*-----module groups----*/ .modules-right { - border: 5px solid #20052a; + border: 3px solid #20052a; border-radius: 100px 0px 0px 0px; background-color: #3d174b; padding-top: 2px; @@ -68,7 +67,7 @@ tooltip { .modules-left { /*background-color: #1e1e2e;*/ - border: 5px solid #20052a; + border: 3px solid #20052a; border-radius: 0px 0px 100px 0px; background-color: #441a53; padding-top: 2px; diff --git a/config/waybar/style/Rainbow Spectrum.css b/config/waybar/style/Rainbow Spectrum.css index 67c6f2a..9f0c704 100644 --- a/config/waybar/style/Rainbow Spectrum.css +++ b/config/waybar/style/Rainbow Spectrum.css @@ -6,7 +6,7 @@ font-family: "JetBrainsMono Nerd Font"; font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ -font-size: 98%; +font-size: 97%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; padding: 1px; } diff --git a/config/waybar/style/Rose-Pine.css b/config/waybar/style/Rose-Pine.css index 84c514a..55d2876 100644 --- a/config/waybar/style/Rose-Pine.css +++ b/config/waybar/style/Rose-Pine.css @@ -15,19 +15,34 @@ font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ - font-size: 98%; + font-size: 97%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; border-radius: 12px; } window#waybar { - background: @bar-bg; + background: #2B5D34; + border-bottom: 2px; + border-top: 1px; + border-color: #D4A2CB; + border-style: solid; + border-radius: 10px; + } +.modules-left, .modules-center, .modules-right { + padding-top: 2px; + padding-bottom: 2px; + padding-right: 4px; + padding-left: 4px; + border-radius: 10px; + +} + tooltip { - background: @main-bg; - color: @main-fg; - border-radius: 8px; + background: #2B5D34; + color: #D4A2CB; + border-radius: 10px; border-width: 0px; } @@ -38,7 +53,7 @@ tooltip { border-radius: 9px; padding-left: 4px; padding-right: 4px; - color: @main-fg; + color: #D4A2CB; animation: gradient_f 20s ease-in infinite; transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); } @@ -137,11 +152,11 @@ tooltip { #custom-weather.showyIcyDay, #custom-weather.snowyIcyNight, #custom-weather.sunnyDay { - color: @main-fg; - background: @main-bg; + color: #D4A2CB; + background: #2B5D34; opacity: 1; - padding-top: 2px; - padding-bottom: 2px; + padding-top: 3px; + padding-bottom: 3px; padding-right: 4px; padding-left: 4px; } diff --git a/config/waybar/style/Simple Pink.css b/config/waybar/style/Simple Pink.css index bc966f0..b21c4ac 100644 --- a/config/waybar/style/Simple Pink.css +++ b/config/waybar/style/Simple Pink.css @@ -9,7 +9,7 @@ font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ - font-size: 98%; + font-size: 97%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; } diff --git a/config/waybar/style/Translucent Chromatic.css b/config/waybar/style/Translucent Chromatic.css index ce65f33..b6f3c41 100644 --- a/config/waybar/style/Translucent Chromatic.css +++ b/config/waybar/style/Translucent Chromatic.css @@ -20,7 +20,7 @@ font-family: "JetBrainsMono Nerd Font"; font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ -font-size: 98%; +font-size: 97%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; padding: 1px; } diff --git a/config/waybar/style/Transparent.css b/config/waybar/style/Transparent.css index f69280d..f3c9e17 100644 --- a/config/waybar/style/Transparent.css +++ b/config/waybar/style/Transparent.css @@ -9,7 +9,7 @@ font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ - font-size: 98%; + font-size: 97%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; padding: 1px; } diff --git a/config/waybar/style/Light.css b/config/waybar/style/White Bar.css similarity index 84% rename from config/waybar/style/Light.css rename to config/waybar/style/White Bar.css index 60fca0c..1bfc7ba 100644 --- a/config/waybar/style/Light.css +++ b/config/waybar/style/White Bar.css @@ -6,13 +6,14 @@ font-family: "JetBrainsMono Nerd Font"; font-weight: bold; min-height: 0; /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ -font-size: 98%; +font-size: 97%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; padding: 1px; } window#waybar { - background: rgba(0, 0, 0, 0) + background: white; + border-radius: 12px; } window#waybar.hidden { @@ -31,7 +32,7 @@ window#waybar.empty #window { } tooltip { - background: rgba(236, 236, 236, 0.8); + background: white; border-radius: 10px; } @@ -41,37 +42,6 @@ tooltip label { padding-left: 2px; } -/*-----module groups----*/ -.modules-right { - background-color: rgba(232, 236, 241, 0.8); - border: 0px solid #b4befe; - border-radius: 10px; - padding-top: 2px; - padding-bottom: 2px; - padding-left: 4px; - padding-right: 4px; -} - -.modules-center { - background-color: rgba(232, 236, 241, 0.8); - border: 0px solid #b4befe; - border-radius: 10px; - padding-top: 2px; - padding-bottom: 2px; - padding-left: 4px; - padding-right: 4px; -} - -.modules-left { - background-color: rgba(232, 236, 241, 0.8); - border: 0px solid #b4befe; - border-radius: 10px; - padding-top: 2px; - padding-bottom: 2px; - padding-left: 4px; - padding-right: 4px; -} - #workspaces button { color: #585b70; box-shadow: none;