From dfc7f7339228e5a960ebed86d73c9bd961035f21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= Date: Fri, 18 Dec 2020 18:46:04 +0100 Subject: [PATCH] GTK3: use the same shadows for the switch, check, radio, switch and entry widgets --- share/themes/Kali-Dark/gtk-3.0/gtk.css | 4 ++-- share/themes/Kali-Light/gtk-3.0/gtk-dark.css | 4 ++-- share/themes/Kali-Light/gtk-3.0/gtk.css | 4 ++-- src/themes/Kali/sass/gtk-sass/_common-tweaks.scss | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css index 5dbaeb43..8b967bb0 100644 --- a/share/themes/Kali-Dark/gtk-3.0/gtk.css +++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css @@ -5138,7 +5138,7 @@ scale slider:active, switch:hover slider { * Switch * **********/ switch { - box-shadow: inset 0 1px 2px -1px rgba(0, 0, 0, 0.6); } + box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05); } switch:checked { border-color: rgba(0, 0, 0, 0.2); border-right-width: 0; @@ -5174,7 +5174,7 @@ check, menu menuitem check, menu menuitem:hover check, radio, menu menuitem radio, menu menuitem:hover radio { background-image: linear-gradient(to bottom, #1e2128 20%, #1a1c23 90%); border-color: black; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.27); } + box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05); } check:disabled, check:disabled:checked, check:disabled:indeterminate, check:disabled:backdrop, check:disabled:backdrop:checked, check:disabled:backdrop:indeterminate, menu menuitem check:disabled, menu menuitem check:disabled:checked, menu menuitem check:disabled:indeterminate, menu menuitem check:disabled:backdrop, menu menuitem check:disabled:backdrop:checked, menu menuitem check:disabled:backdrop:indeterminate, menu menuitem:hover check:disabled, menu menuitem:hover check:disabled:checked, menu menuitem:hover check:disabled:indeterminate, menu menuitem:hover check:disabled:backdrop, menu menuitem:hover check:disabled:backdrop:checked, menu menuitem:hover check:disabled:backdrop:indeterminate, radio:disabled, radio:disabled:checked, 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 5dbaeb43..8b967bb0 100644 --- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css +++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css @@ -5138,7 +5138,7 @@ scale slider:active, switch:hover slider { * Switch * **********/ switch { - box-shadow: inset 0 1px 2px -1px rgba(0, 0, 0, 0.6); } + box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05); } switch:checked { border-color: rgba(0, 0, 0, 0.2); border-right-width: 0; @@ -5174,7 +5174,7 @@ check, menu menuitem check, menu menuitem:hover check, radio, menu menuitem radio, menu menuitem:hover radio { background-image: linear-gradient(to bottom, #1e2128 20%, #1a1c23 90%); border-color: black; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.27); } + box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05); } check:disabled, check:disabled:checked, check:disabled:indeterminate, check:disabled:backdrop, check:disabled:backdrop:checked, check:disabled:backdrop:indeterminate, menu menuitem check:disabled, menu menuitem check:disabled:checked, menu menuitem check:disabled:indeterminate, menu menuitem check:disabled:backdrop, menu menuitem check:disabled:backdrop:checked, menu menuitem check:disabled:backdrop:indeterminate, menu menuitem:hover check:disabled, menu menuitem:hover check:disabled:checked, menu menuitem:hover check:disabled:indeterminate, menu menuitem:hover check:disabled:backdrop, menu menuitem:hover check:disabled:backdrop:checked, menu menuitem:hover check:disabled:backdrop:indeterminate, radio:disabled, radio:disabled:checked, diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css index a45a4477..28aaf00f 100644 --- a/share/themes/Kali-Light/gtk-3.0/gtk.css +++ b/share/themes/Kali-Light/gtk-3.0/gtk.css @@ -5159,7 +5159,7 @@ scale slider:active, switch:hover slider { * Switch * **********/ switch { - box-shadow: inset 0 1px 2px -1px rgba(0, 0, 0, 0.2); } + box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.1), 0 1px rgba(255, 255, 255, 0.05); } switch:checked { border-color: rgba(0, 0, 0, 0.2); border-right-width: 0; @@ -5195,7 +5195,7 @@ check, menu menuitem check, menu menuitem:hover check, radio, menu menuitem radio, menu menuitem:hover radio { background-image: linear-gradient(to bottom, #ffffff 20%, #fafafa 90%); border-color: #c2c2c2; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.07); } + box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.1), 0 1px rgba(255, 255, 255, 0.05); } check:disabled, check:disabled:checked, check:disabled:indeterminate, check:disabled:backdrop, check:disabled:backdrop:checked, check:disabled:backdrop:indeterminate, menu menuitem check:disabled, menu menuitem check:disabled:checked, menu menuitem check:disabled:indeterminate, menu menuitem check:disabled:backdrop, menu menuitem check:disabled:backdrop:checked, menu menuitem check:disabled:backdrop:indeterminate, menu menuitem:hover check:disabled, menu menuitem:hover check:disabled:checked, menu menuitem:hover check:disabled:indeterminate, menu menuitem:hover check:disabled:backdrop, menu menuitem:hover check:disabled:backdrop:checked, menu menuitem:hover check:disabled:backdrop:indeterminate, radio:disabled, radio:disabled:checked, diff --git a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss index 759fd7f2..a262c4c5 100644 --- a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss +++ b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss @@ -67,7 +67,7 @@ headerbar entry { switch { $_slider_border_color: darken($alt_borders_color, 3%); - box-shadow: inset 0 1px 2px -1px transparentize(black, if($variant=='light', .8, .4)); + box-shadow: $_widget_inset_shadow; &:checked { border-color: transparentize(black, .8); @@ -117,7 +117,7 @@ radio { &, menu menuitem &, menu menuitem:hover & { background-image: linear-gradient(to bottom, $_c 20%, darken($_c, 2%) 90%); border-color: $alt_borders_color; - box-shadow: $_shadow; + box-shadow: $_widget_inset_shadow; &:disabled, &:disabled:backdrop { &, &:checked, &:indeterminate {