From 5c06f612003afb60987528124e500d31262ec9ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= Date: Mon, 28 Dec 2020 12:04:03 +0100 Subject: [PATCH] GTK3: fix the background of hovered buttons inside infobars --- share/themes/Kali-Dark/gtk-3.0/gtk.css | 7 +++++-- share/themes/Kali-Light/gtk-3.0/gtk-dark.css | 7 +++++-- share/themes/Kali-Light/gtk-3.0/gtk.css | 7 +++++-- src/themes/Kali/sass/gtk-sass/_common-tweaks.scss | 10 +++++++--- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css index 3fe41328..875540bb 100644 --- a/share/themes/Kali-Dark/gtk-3.0/gtk.css +++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css @@ -5064,15 +5064,18 @@ window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top): headerbar stackswitcher button:checked:active, headerbar stackswitcher button:checked:checked, headerbar button.toggle:active, -headerbar button.toggle:checked, button.flat:hover:not(:backdrop):not(:link):not(:visited), button:active, button:checked { +headerbar button.toggle:checked, button.flat:hover:not(:backdrop), button:active, button:checked { background: #1b1d24; box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05); } button.flat { border-color: transparent; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } - button.flat:hover:not(:backdrop):not(:link):not(:visited) { + button.flat:hover:not(:backdrop) { transition: none; } + button.flat:hover:not(:backdrop):link { + background: transparent; + box-shadow: none; } /********** * Entry * 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 3fe41328..875540bb 100644 --- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css +++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css @@ -5064,15 +5064,18 @@ window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top): headerbar stackswitcher button:checked:active, headerbar stackswitcher button:checked:checked, headerbar button.toggle:active, -headerbar button.toggle:checked, button.flat:hover:not(:backdrop):not(:link):not(:visited), button:active, button:checked { +headerbar button.toggle:checked, button.flat:hover:not(:backdrop), button:active, button:checked { background: #1b1d24; box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05); } button.flat { border-color: transparent; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } - button.flat:hover:not(:backdrop):not(:link):not(:visited) { + button.flat:hover:not(:backdrop) { transition: none; } + button.flat:hover:not(:backdrop):link { + background: transparent; + box-shadow: none; } /********** * Entry * diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css index 2be40341..0516f49c 100644 --- a/share/themes/Kali-Light/gtk-3.0/gtk.css +++ b/share/themes/Kali-Light/gtk-3.0/gtk.css @@ -5086,15 +5086,18 @@ window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top): headerbar stackswitcher button:checked:active, headerbar stackswitcher button:checked:checked, headerbar button.toggle:active, -headerbar button.toggle:checked, button.flat:hover:not(:backdrop):not(:link):not(:visited), button:active, button:checked { +headerbar button.toggle:checked, button.flat:hover:not(:backdrop), button:active, button:checked { background: #f2f2f2; box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.1), 0 1px rgba(255, 255, 255, 0.05); } button.flat { border-color: transparent; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } - button.flat:hover:not(:backdrop):not(:link):not(:visited) { + button.flat:hover:not(:backdrop) { transition: none; } + button.flat:hover:not(:backdrop):link { + background: transparent; + box-shadow: none; } /********** * Entry * diff --git a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss index 5d533e3f..18a95a4e 100644 --- a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss +++ b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss @@ -31,9 +31,14 @@ button { border-color: transparent; transition: $button_transition; - &:hover:not(:backdrop):not(:link):not(:visited) { + &:hover:not(:backdrop) { @extend %button_active; transition: none; + + &:link { + background: transparent; + box-shadow: none; + } } } } @@ -311,7 +316,6 @@ infobar { @mixin _infobar_button($bg) { button, button.flat { - // FIXME: extend selection mode buttons @include button(normal, $bg, $selected_fg_color, none); &:hover { @include button(hover, $bg, $selected_fg_color, none); } @@ -319,7 +323,7 @@ infobar { &:active, &:checked { @include button(active, $bg, $selected_fg_color, none); } - &:disabled { @include button(insensitive,$bg,$selected_fg_color,none); } + &:disabled { @include button(insensitive, $bg, $selected_fg_color, none); } &:backdrop { @include button(backdrop, $bg, $selected_fg_color, none);