From 640c6af9320dbc979d98605751a8a972f96e4657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= Date: Wed, 10 Jun 2020 12:17:49 +0200 Subject: [PATCH] GTK3: improve entry visibility --- share/themes/Kali-Dark/gtk-3.0/gtk.css | 14 +++++++++++++ share/themes/Kali-Light/gtk-3.0/gtk-dark.css | 14 +++++++++++++ share/themes/Kali-Light/gtk-3.0/gtk.css | 13 ++++++++++++ .../Kali/sass/gtk-sass/_common-tweaks.scss | 20 ++++++++++++++++++- 4 files changed, 60 insertions(+), 1 deletion(-) diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css index 60f48048..b121f4bd 100644 --- a/share/themes/Kali-Dark/gtk-3.0/gtk.css +++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css @@ -4770,6 +4770,9 @@ popover.emoji-completion .emoji:hover { * button, * button:hover, * button:active, * button:checked, * button:focus { outline-color: alpha(currentColor,0.07); } +/********** + * Button * + **********/ .titlebar stackswitcher button:checked:checked, .titlebar button.toggle:active, .titlebar button.toggle:checked, @@ -4782,6 +4785,17 @@ button:checked { background: #1b1d24; box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.3); } +/********** + * Entry * + **********/ +spinbutton:not(.vertical), +entry { + box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.3); + background-color: #1b1d24; } + +/********** + * Slider * + **********/ scale slider:active, switch:hover slider { background-image: image(#0f1014); } diff --git a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css index 60f48048..b121f4bd 100644 --- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css +++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css @@ -4770,6 +4770,9 @@ popover.emoji-completion .emoji:hover { * button, * button:hover, * button:active, * button:checked, * button:focus { outline-color: alpha(currentColor,0.07); } +/********** + * Button * + **********/ .titlebar stackswitcher button:checked:checked, .titlebar button.toggle:active, .titlebar button.toggle:checked, @@ -4782,6 +4785,17 @@ button:checked { background: #1b1d24; box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.3); } +/********** + * Entry * + **********/ +spinbutton:not(.vertical), +entry { + box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.3); + background-color: #1b1d24; } + +/********** + * Slider * + **********/ scale slider:active, switch:hover slider { background-image: image(#0f1014); } diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css index e82c3df0..9bf59fac 100644 --- a/share/themes/Kali-Light/gtk-3.0/gtk.css +++ b/share/themes/Kali-Light/gtk-3.0/gtk.css @@ -4792,6 +4792,9 @@ popover.emoji-completion .emoji:hover { * button, * button:hover, * button:active, * button:checked, * button:focus { outline-color: alpha(currentColor,0.15); } +/********** + * Button * + **********/ .titlebar stackswitcher button:checked:checked, .titlebar button.toggle:active, .titlebar button.toggle:checked, @@ -4804,6 +4807,16 @@ button:checked { background: #f2f2f2; box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.1); } +/********** + * Entry * + **********/ +spinbutton:not(.vertical), +entry { + box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.1); } + +/********** + * Slider * + **********/ scale slider:active, switch:hover slider { background-image: image(white); } diff --git a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss index 786c4069..b4d701ca 100644 --- a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss +++ b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss @@ -1,4 +1,5 @@ $_menu_shadow: 0 1px 6px transparentize(black, if($variant == 'light', .85, .5)); +$_widget_inset_shadow: inset 0 3px 5px -4px $shadow_color; $_wm_border: if($variant=='light', transparentize(black, 0.9), transparentize($borders_color, 0.25)); * { @@ -15,13 +16,30 @@ $_wm_border: if($variant=='light', transparentize(black, 0.9), transparentize($b } } +/********** + * Button * + **********/ %button_active, button:active, button:checked, { background: $dark_fill; - box-shadow: inset 0 3px 5px -4px $shadow_color; + box-shadow: $_widget_inset_shadow; } +/********** + * Entry * + **********/ +%entry, +entry { + box-shadow: $_widget_inset_shadow; + @if ($variant == 'dark') { + background-color: $dark_fill; + } +} + +/********** + * Slider * + **********/ %slider_active { background-image: if($variant == 'light', image(lighten($bg_color, 14%)), image(darken($bg_color, 9%))); }