From f34e7ebc63e60394ef2f3863d6e0deb41919b42b Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Tue, 15 Jul 2014 09:11:56 +0200 Subject: [PATCH] Adwaita: darker hover state again for spinbuttons button in the dark variant. And for hovered list rows, since it works better and it's less distracting. --- gtk/resources/theme/Adwaita/_common.scss | 8 ++++---- gtk/resources/theme/Adwaita/gtk-contained-dark.css | 8 ++++---- gtk/resources/theme/Adwaita/gtk-contained.css | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index d841c92178..26095349e0 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -515,14 +515,14 @@ GtkColorButton.button { padding: 4px; } // Uniform padding on the &:dir(rtl) { border-width: 0 1px 0 0; } &:hover { color: $fg_color; - background-color: transparentize($fg_color,0.93); + background-color: transparentize(black,0.95); } &:insensitive { color: transparentize($insensitive_fg_color,0.7); } &:active { box-shadow: inset 0 2px 3px -1px transparentize(black,0.8); - background-color: transparentize($fg_color,0.9); + background-color: transparentize(black,0.9); } &:backdrop { border-color: transparentize($backdrop_borders_color,0.7); @@ -1930,7 +1930,7 @@ GtkScrolledWindow { border-radius: 0; // and no rounded corners box-shadow: none; // and no box-shadow &:hover { - background-color: mix($fg_color, $base_color, 5%); + background-color: mix(black, $base_color, 5%); } &:active { color: $selected_bg_color; @@ -1939,7 +1939,7 @@ GtkScrolledWindow { &:selected { @extend .list-row:selected; &:active { box-shadow: inset 0 2px 3px -1px transparentize(black,0.5); } - &:hover { background-color: mix($selected_fg_color,$selected_bg_color,10%);} + &:hover { background-color: mix(black, $selected_bg_color, 10%);} } &:backdrop:hover { @extend %undecorated_button; diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 080ebf6c87..9b9eefe46d 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -653,12 +653,12 @@ GtkColorButton.button { border-width: 0 1px 0 0; } .spinbutton .button:hover { color: #eeeeec; - background-color: rgba(238, 238, 236, 0.07); } + background-color: rgba(0, 0, 0, 0.05); } .spinbutton .button:insensitive { color: rgba(147, 150, 149, 0.3); } .spinbutton .button:active { box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); - background-color: rgba(238, 238, 236, 0.1); } + background-color: rgba(0, 0, 0, 0.1); } .spinbutton .button:backdrop { border-color: rgba(30, 34, 34, 0.3); background-color: transparent; } @@ -2446,14 +2446,14 @@ GtkScrolledWindow GtkViewport.frame { border-radius: 0; box-shadow: none; } .list-row.button:hover { - background-color: #323232; } + background-color: #262626; } .list-row.button:active { color: #215d9c; box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); } .button.list-row:active:selected { box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); } .button.list-row:hover:selected { - background-color: #376da5; } + background-color: #1d538c; } .list-row:selected, .list-row.button:selected { color: white; diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 346a0dcda7..e86f37d44f 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -645,12 +645,12 @@ GtkColorButton.button { border-width: 0 1px 0 0; } .spinbutton .button:hover { color: #2e3436; - background-color: rgba(46, 52, 54, 0.07); } + background-color: rgba(0, 0, 0, 0.05); } .spinbutton .button:insensitive { color: rgba(141, 144, 145, 0.3); } .spinbutton .button:active { box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); - background-color: rgba(46, 52, 54, 0.1); } + background-color: rgba(0, 0, 0, 0.1); } .spinbutton .button:backdrop { border-color: rgba(168, 168, 168, 0.3); background-color: transparent; } @@ -2438,14 +2438,14 @@ GtkScrolledWindow GtkViewport.frame { border-radius: 0; box-shadow: none; } .list-row.button:hover { - background-color: #f4f4f4; } + background-color: #f2f2f2; } .list-row.button:active { color: #4a90d9; box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); } .button.list-row:active:selected { box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); } .button.list-row:hover:selected { - background-color: #5c9bdc; } + background-color: #4281c3; } .list-row:selected, .list-row.button:selected { color: white;