From 1837aa927401134520c17e597cfbac1c5311c30f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= Date: Mon, 28 Sep 2020 15:21:52 +0200 Subject: [PATCH] GTK3: Replaced hardcoded white color for selected items with $selected_fg_color --- 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 | 6 +++--- src/themes/Kali/sass/gtk-sass/_applications.scss | 2 +- src/themes/Kali/sass/gtk-sass/_common-tweaks.scss | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css index aa8a4d82..a14ce912 100644 --- a/share/themes/Kali-Dark/gtk-3.0/gtk.css +++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css @@ -5172,7 +5172,7 @@ radio:indeterminate, menu menuitem radio:checked, menu menuitem radio:indetermin background-image: linear-gradient(to bottom, #2777ff 20%, #1d71ff 90%); border-color: #00348d; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.27); - color: white; } + color: #ffffff; } check:checked:active, check:indeterminate:active, menu menuitem check:checked:active, menu menuitem check:indeterminate:active, radio:checked:active, radio:indeterminate:active, menu menuitem radio:checked:active, menu menuitem radio:indeterminate:active { @@ -5527,7 +5527,7 @@ filechooser placessidebar.sidebar, filechooser placessidebar.sidebar row.sidebar-row:selected revealer .sidebar-icon, filechooser placessidebar.sidebar row.sidebar-row:selected revealer .sidebar-label, .nautilus-window placessidebar.sidebar row.sidebar-row:selected revealer .sidebar-icon, .nautilus-window placessidebar.sidebar row.sidebar-row:selected revealer .sidebar-label { - color: white; } + color: #ffffff; } filechooser placessidebar.sidebar row.sidebar-row .sidebar-icon, .nautilus-window placessidebar.sidebar row.sidebar-row .sidebar-icon { padding-right: 20px; } 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 aa8a4d82..a14ce912 100644 --- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css +++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css @@ -5172,7 +5172,7 @@ radio:indeterminate, menu menuitem radio:checked, menu menuitem radio:indetermin background-image: linear-gradient(to bottom, #2777ff 20%, #1d71ff 90%); border-color: #00348d; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.27); - color: white; } + color: #ffffff; } check:checked:active, check:indeterminate:active, menu menuitem check:checked:active, menu menuitem check:indeterminate:active, radio:checked:active, radio:indeterminate:active, menu menuitem radio:checked:active, menu menuitem radio:indeterminate:active { @@ -5527,7 +5527,7 @@ filechooser placessidebar.sidebar, filechooser placessidebar.sidebar row.sidebar-row:selected revealer .sidebar-icon, filechooser placessidebar.sidebar row.sidebar-row:selected revealer .sidebar-label, .nautilus-window placessidebar.sidebar row.sidebar-row:selected revealer .sidebar-icon, .nautilus-window placessidebar.sidebar row.sidebar-row:selected revealer .sidebar-label { - color: white; } + color: #ffffff; } filechooser placessidebar.sidebar row.sidebar-row .sidebar-icon, .nautilus-window placessidebar.sidebar row.sidebar-row .sidebar-icon { padding-right: 20px; } diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css index 56f565b8..ceedc784 100644 --- a/share/themes/Kali-Light/gtk-3.0/gtk.css +++ b/share/themes/Kali-Light/gtk-3.0/gtk.css @@ -5173,7 +5173,7 @@ switch { *************************/ check, menu menuitem check, menu menuitem:hover check, radio, menu menuitem radio, menu menuitem:hover radio { - background-image: linear-gradient(to bottom, white 20%, #fafafa 90%); + background-image: linear-gradient(to bottom, #ffffff 20%, #fafafa 90%); border-color: #c2c2c2; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.07); } 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, @@ -5193,7 +5193,7 @@ radio:indeterminate, menu menuitem radio:checked, menu menuitem radio:indetermin background-image: linear-gradient(to bottom, #2777ff 20%, #1d71ff 90%); border-color: #0051da; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07); - color: white; } + color: #ffffff; } check:checked:active, check:indeterminate:active, menu menuitem check:checked:active, menu menuitem check:indeterminate:active, radio:checked:active, radio:indeterminate:active, menu menuitem radio:checked:active, menu menuitem radio:indeterminate:active { @@ -5548,7 +5548,7 @@ filechooser placessidebar.sidebar, filechooser placessidebar.sidebar row.sidebar-row:selected revealer .sidebar-icon, filechooser placessidebar.sidebar row.sidebar-row:selected revealer .sidebar-label, .nautilus-window placessidebar.sidebar row.sidebar-row:selected revealer .sidebar-icon, .nautilus-window placessidebar.sidebar row.sidebar-row:selected revealer .sidebar-label { - color: white; } + color: #ffffff; } filechooser placessidebar.sidebar row.sidebar-row .sidebar-icon, .nautilus-window placessidebar.sidebar row.sidebar-row .sidebar-icon { padding-right: 20px; } diff --git a/src/themes/Kali/sass/gtk-sass/_applications.scss b/src/themes/Kali/sass/gtk-sass/_applications.scss index bb3509ac..4b3684f7 100644 --- a/src/themes/Kali/sass/gtk-sass/_applications.scss +++ b/src/themes/Kali/sass/gtk-sass/_applications.scss @@ -46,7 +46,7 @@ filechooser, padding-left: 8px; padding-right: 8px; - .sidebar-icon, .sidebar-label { color: white; } + .sidebar-icon, .sidebar-label { color: $selected_fg_color; } } } diff --git a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss index b882dbc9..23cd0d4f 100644 --- a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss +++ b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss @@ -99,7 +99,7 @@ switch { *************************/ check, radio { - $_c: if($variant=='light', white, darken($bg_color, 2%)); + $_c: if($variant=='light', $bg_color, darken($bg_color, 2%)); $_shadow: 0 1px 2px transparentize($shadow_color, 0.03); &, menu menuitem &, menu menuitem:hover & { @@ -121,7 +121,7 @@ radio { background-image: linear-gradient(to bottom, $selected_bg_color 20%, darken($selected_bg_color, 2%) 90%); border-color: $selected_borders_color; box-shadow: inset 0 1px transparentize(white, .9), $_shadow; - color: white; + color: $selected_fg_color; &:active { box-shadow: none; } &:backdrop { background-image: image($checkradio_bg_color); }