From 58cfa4b066fb97fc0e336f79d49addfd437f366f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= Date: Wed, 2 Mar 2022 13:45:05 +0100 Subject: [PATCH] Gnome-Shell: update keyboard theme tweaks --- .../Kali-Dark/gnome-shell/gnome-shell.css | 36 +++++++++---------- .../Kali-Light/gnome-shell/gnome-shell.css | 36 +++++++++---------- .../gnome-shell-sass/widgets/_keyboard.scss | 6 ++-- .../widgets/_keyboard.scss.patch | 12 +++++++ 4 files changed, 51 insertions(+), 39 deletions(-) create mode 100644 src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_keyboard.scss.patch diff --git a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css index 99228ad6..4bfbfa2c 100644 --- a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css +++ b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css @@ -1984,7 +1984,7 @@ StScrollBar { /* On-screen Keyboard */ #keyboard { - background-color: #303340; + background-color: rgba(26, 28, 35, 0.96); box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.1); } #keyboard .page-indicator { padding: 6px; } @@ -2006,7 +2006,7 @@ StScrollBar { border-radius: 12px; box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.3); color: white; - background-color: #545454; } + background-color: #363a48; } .keyboard-key:focus { color: white; background-color: #35415b; @@ -2019,30 +2019,30 @@ StScrollBar { box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.7); } .keyboard-key:hover { color: white; - background-color: #5e5e5e; } + background-color: #3f4454; } .keyboard-key:active { color: white; - background-color: #666666; } + background-color: #464b5d; } .keyboard-key:checked { color: white; - background-color: #737373; } + background-color: #51576b; } .keyboard-key:grayed { background-color: #1c1e25; color: white; border-color: black; } .keyboard-key.default-key { color: white; - background-color: #3b3b3b; + background-color: #4c5266; border-radius: 12px; } .keyboard-key.default-key:hover { color: white; - background-color: #454545; } + background-color: #555b71; } .keyboard-key.default-key:active { color: white; - background-color: #4d4d4d; } + background-color: #5b627a; } .keyboard-key.default-key:checked { color: white; - background-color: #595959; } + background-color: #666e89; } .keyboard-key.enter-key { color: #ffffff; background-color: #3681ff; @@ -2058,10 +2058,10 @@ StScrollBar { color: #ffffff; background-color: #74a7ff; } .keyboard-key.shift-key-uppercase { - background-color: gray; + background-color: #5b627a; color: #303340; } .keyboard-key.shift-key-uppercase:hover { - background-color: #8c8c8c; + background-color: #666e89; color: #3b3f4e; } .keyboard-key StIcon { icon-size: 24px; } @@ -2077,7 +2077,7 @@ StScrollBar { padding: 6px; } .keyboard-subkeys .keyboard-key { color: white; - background-color: #545454; + background-color: #363a48; border-radius: 12px; } .keyboard-subkeys .keyboard-key:focus { color: white; @@ -2091,13 +2091,13 @@ StScrollBar { box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.7); } .keyboard-subkeys .keyboard-key:hover { color: white; - background-color: #5e5e5e; } + background-color: #3f4454; } .keyboard-subkeys .keyboard-key:active { color: white; - background-color: #666666; } + background-color: #464b5d; } .keyboard-subkeys .keyboard-key:checked { color: white; - background-color: #737373; } + background-color: #51576b; } .emoji-page .keyboard-key { background-color: transparent; @@ -2133,13 +2133,13 @@ StScrollBar { box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.7); } .word-suggestions StButton:hover { color: white; - background-color: #5e5e5e; } + background-color: #3f4454; } .word-suggestions StButton:active { color: white; - background-color: #666666; } + background-color: #464b5d; } .word-suggestions StButton:checked { color: white; - background-color: #737373; } + background-color: #51576b; } /* Looking Glass */ #LookingGlassDialog { diff --git a/share/themes/Kali-Light/gnome-shell/gnome-shell.css b/share/themes/Kali-Light/gnome-shell/gnome-shell.css index 3eeeaee2..d0390f3e 100644 --- a/share/themes/Kali-Light/gnome-shell/gnome-shell.css +++ b/share/themes/Kali-Light/gnome-shell/gnome-shell.css @@ -1984,7 +1984,7 @@ StScrollBar { /* On-screen Keyboard */ #keyboard { - background-color: #303340; + background-color: rgba(26, 28, 35, 0.96); box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.1); } #keyboard .page-indicator { padding: 6px; } @@ -2006,7 +2006,7 @@ StScrollBar { border-radius: 12px; box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.1); color: white; - background-color: #545454; } + background-color: #363a48; } .keyboard-key:focus { color: white; background-color: #35415b; @@ -2019,30 +2019,30 @@ StScrollBar { box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.7); } .keyboard-key:hover { color: white; - background-color: #5e5e5e; } + background-color: #3f4454; } .keyboard-key:active { color: white; - background-color: #666666; } + background-color: #464b5d; } .keyboard-key:checked { color: white; - background-color: #737373; } + background-color: #51576b; } .keyboard-key:grayed { background-color: #f7f7f7; color: white; border-color: black; } .keyboard-key.default-key { color: white; - background-color: #383838; + background-color: #4c5266; border-radius: 12px; } .keyboard-key.default-key:hover { color: white; - background-color: #424242; } + background-color: #555b71; } .keyboard-key.default-key:active { color: white; - background-color: #4a4a4a; } + background-color: #5b627a; } .keyboard-key.default-key:checked { color: white; - background-color: #575757; } + background-color: #666e89; } .keyboard-key.enter-key { color: #ffffff; background-color: #3681ff; @@ -2058,10 +2058,10 @@ StScrollBar { color: #ffffff; background-color: #74a7ff; } .keyboard-key.shift-key-uppercase { - background-color: gray; + background-color: #5b627a; color: #303340; } .keyboard-key.shift-key-uppercase:hover { - background-color: #8c8c8c; + background-color: #666e89; color: #3b3f4e; } .keyboard-key StIcon { icon-size: 24px; } @@ -2077,7 +2077,7 @@ StScrollBar { padding: 6px; } .keyboard-subkeys .keyboard-key { color: white; - background-color: #545454; + background-color: #363a48; border-radius: 12px; } .keyboard-subkeys .keyboard-key:focus { color: white; @@ -2091,13 +2091,13 @@ StScrollBar { box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.7); } .keyboard-subkeys .keyboard-key:hover { color: white; - background-color: #5e5e5e; } + background-color: #3f4454; } .keyboard-subkeys .keyboard-key:active { color: white; - background-color: #666666; } + background-color: #464b5d; } .keyboard-subkeys .keyboard-key:checked { color: white; - background-color: #737373; } + background-color: #51576b; } .emoji-page .keyboard-key { background-color: transparent; @@ -2133,13 +2133,13 @@ StScrollBar { box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.7); } .word-suggestions StButton:hover { color: white; - background-color: #5e5e5e; } + background-color: #3f4454; } .word-suggestions StButton:active { color: white; - background-color: #666666; } + background-color: #464b5d; } .word-suggestions StButton:checked { color: white; - background-color: #737373; } + background-color: #51576b; } /* Looking Glass */ #LookingGlassDialog { diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_keyboard.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_keyboard.scss index 91d9a3d5..ca049c68 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_keyboard.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_keyboard.scss @@ -2,15 +2,15 @@ $key_size: 1.2em; $key_border_radius: $base_border_radius + 4px; // 12px -$key_bg_color: darken($osd_fg_color, 70%); +$key_bg_color: $osd_bg_color; // $default_key_bg_color: darken($key_bg_color, 4%); -$default_key_bg_color: if($variant=='light', darken($key_bg_color, 11%), darken($key_bg_color, 10%)); +$default_key_bg_color: lighten($osd_bg_color, 10%); // draw keys using button function #keyboard { // background-color: transparentize(if($variant=='light', darken($bg_color, 5%), darken($bg_color, 8%)), 0.1); - background-color: $osd_bg_color; + background-color: transparentize(darken($osd_bg_color, 10%), 0.04); box-shadow: inset 0 1px 0 0 $osd_outer_borders_color; .page-indicator { diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_keyboard.scss.patch b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_keyboard.scss.patch new file mode 100644 index 00000000..6a21d8a7 --- /dev/null +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_keyboard.scss.patch @@ -0,0 +1,12 @@ +5c5 +< $key_bg_color: darken($osd_fg_color, 70%); +--- +> $key_bg_color: $osd_bg_color; +7c7 +< $default_key_bg_color: if($variant=='light', darken($key_bg_color, 11%), darken($key_bg_color, 10%)); +--- +> $default_key_bg_color: lighten($osd_bg_color, 10%); +13c13 +< background-color: $osd_bg_color; +--- +> background-color: transparentize(darken($osd_bg_color, 10%), 0.04);