diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 937a144f1f..d9065b6786 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2604,12 +2604,26 @@ GtkScrolledWindow { padding: 2px; } -.list-row.button { +.list-row.button, +.list-row.button:backdrop, +.list-row.button:backdrop:active, +.list-row.button:backdrop:checked, +.list-row.button:backdrop:insensitive, +.list-row.button:backdrop:insensitive:active, +.list-row.button:backdrop:insensitive:checked, +.list-row.button:insensitive:active, +.list-row.button:insensitive:checked { + // reset button inherited stuff @extend %undecorated_button; background-color: transparentize($base_color,1); // for the transition border-style: none; // I need no borders here border-radius: 0; // and no rounded corners box-shadow: none; // and no box-shadow + +} + +.list-row.button { + // let's take care of background colors &:hover { background-color: mix($fg_color, $base_color, 5%); } @@ -2623,9 +2637,7 @@ GtkScrolledWindow { } &:backdrop { background-color: $selected_bg_color; } } - &:backdrop:hover { - @extend %undecorated_button; - } + &:backdrop:hover { background-color: transparent; } } .list-row:selected { diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 40345b4177..0b80156db3 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -1272,7 +1272,15 @@ GtkComboBox.combobox-entry .titlebar .button.titlebutton, .titlebar .menu.button.titlebutton, .notebook tab .button, .notebook tab .header-bar .button.titlebutton, .header-bar .notebook tab .button.titlebutton, .notebook tab .titlebar .button.titlebutton, .titlebar .notebook tab .button.titlebutton, .list-row.button, .header-bar .list-row.button.titlebutton, -.titlebar .list-row.button.titlebutton, .list-row.button:backdrop:hover, .app-notification .button.flat, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button, +.titlebar .list-row.button.titlebutton, +.list-row.button:backdrop, +.list-row.button:backdrop:active, +.list-row.button:backdrop:checked, +.list-row.button:backdrop:insensitive, +.list-row.button:backdrop:insensitive:active, +.list-row.button:backdrop:insensitive:checked, +.list-row.button:insensitive:active, +.list-row.button:insensitive:checked, .app-notification .button.flat, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button, .app-notification .titlebar .titlebutton.button, .titlebar .app-notification .titlebutton.button, .app-notification.frame .button.flat, .app-notification .button.flat:backdrop, .app-notification .button.flat:insensitive, .app-notification .button.flat:backdrop:insensitive, .app-notification .header-bar .titlebutton.button:backdrop:insensitive, .header-bar .app-notification .titlebutton.button:backdrop:insensitive, @@ -3546,21 +3554,32 @@ GtkPlacesSidebar.sidebar .view .separator:backdrop { padding: 2px; } .list-row.button, .header-bar .list-row.button.titlebutton, -.titlebar .list-row.button.titlebutton { +.titlebar .list-row.button.titlebutton, +.list-row.button:backdrop, +.list-row.button:backdrop:active, +.list-row.button:backdrop:checked, +.list-row.button:backdrop:insensitive, +.list-row.button:backdrop:insensitive:active, +.list-row.button:backdrop:insensitive:checked, +.list-row.button:insensitive:active, +.list-row.button:insensitive:checked { background-color: rgba(41, 41, 41, 0); border-style: none; border-radius: 0; box-shadow: none; } - .list-row.button:hover { - background-color: #323232; } - .list-row.button:active { - box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); } - .list-row.button:selected:active { - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); } - .list-row.button:selected:hover { - background-color: #356ba4; } - .list-row.button:selected:backdrop { - background-color: #215d9c; } + +.list-row.button:hover { + background-color: #323232; } +.list-row.button:active { + box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); } +.list-row.button:selected:active { + box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); } +.list-row.button:selected:hover { + background-color: #356ba4; } +.list-row.button:selected:backdrop { + background-color: #215d9c; } +.list-row.button:backdrop:hover { + background-color: transparent; } .list-row:selected .button { color: #eeeeec; diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index c9619b628d..b599ac1282 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1272,7 +1272,15 @@ GtkComboBox.combobox-entry .titlebar .button.titlebutton, .titlebar .menu.button.titlebutton, .notebook tab .button, .notebook tab .header-bar .button.titlebutton, .header-bar .notebook tab .button.titlebutton, .notebook tab .titlebar .button.titlebutton, .titlebar .notebook tab .button.titlebutton, .list-row.button, .header-bar .list-row.button.titlebutton, -.titlebar .list-row.button.titlebutton, .list-row.button:backdrop:hover, .app-notification .button.flat, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button, +.titlebar .list-row.button.titlebutton, +.list-row.button:backdrop, +.list-row.button:backdrop:active, +.list-row.button:backdrop:checked, +.list-row.button:backdrop:insensitive, +.list-row.button:backdrop:insensitive:active, +.list-row.button:backdrop:insensitive:checked, +.list-row.button:insensitive:active, +.list-row.button:insensitive:checked, .app-notification .button.flat, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button, .app-notification .titlebar .titlebutton.button, .titlebar .app-notification .titlebutton.button, .app-notification.frame .button.flat, .app-notification .button.flat:backdrop, .app-notification .button.flat:insensitive, .app-notification .button.flat:backdrop:insensitive, .app-notification .header-bar .titlebutton.button:backdrop:insensitive, .header-bar .app-notification .titlebutton.button:backdrop:insensitive, @@ -3708,21 +3716,32 @@ GtkPlacesSidebar.sidebar .view .separator:backdrop { padding: 2px; } .list-row.button, .header-bar .list-row.button.titlebutton, -.titlebar .list-row.button.titlebutton { +.titlebar .list-row.button.titlebutton, +.list-row.button:backdrop, +.list-row.button:backdrop:active, +.list-row.button:backdrop:checked, +.list-row.button:backdrop:insensitive, +.list-row.button:backdrop:insensitive:active, +.list-row.button:backdrop:insensitive:checked, +.list-row.button:insensitive:active, +.list-row.button:insensitive:checked { background-color: rgba(255, 255, 255, 0); border-style: none; border-radius: 0; box-shadow: none; } - .list-row.button:hover { - background-color: #f4f4f4; } - .list-row.button:active { - box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); } - .list-row.button:selected:active { - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); } - .list-row.button:selected:hover { - background-color: #4786c8; } - .list-row.button:selected:backdrop { - background-color: #4a90d9; } + +.list-row.button:hover { + background-color: #f4f4f4; } +.list-row.button:active { + box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); } +.list-row.button:selected:active { + box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); } +.list-row.button:selected:hover { + background-color: #4786c8; } +.list-row.button:selected:backdrop { + background-color: #4a90d9; } +.list-row.button:backdrop:hover { + background-color: transparent; } .list-row:selected .button { color: #2e3436;