From 35e4421bb8455ba9b1ad881ba80dad1dc4b8c696 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Tue, 22 Jul 2014 10:27:49 +0200 Subject: [PATCH] Adwaita: less distracting active list-rows --- gtk/resources/theme/Adwaita/_common.scss | 5 +---- gtk/resources/theme/Adwaita/gtk-contained-dark.css | 11 +++++------ gtk/resources/theme/Adwaita/gtk-contained.css | 11 +++++------ 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 2977627cca..163ba46e26 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -2063,14 +2063,11 @@ GtkScrolledWindow { background-color: mix(black, $base_color, 5%); } &:active { - color: $selected_bg_color; - box-shadow: inset 0 2px 3px -1px transparentize(black,0.7); + box-shadow: inset 0 2px 2px -2px transparentize(black,0.8); } &:selected { - @extend .list-row:selected; &:active { box-shadow: inset 0 2px 3px -1px transparentize(black,0.5); } &:hover { - @extend .list-row:selected; background-color: mix(black, $selected_bg_color, 10%); } } diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 0eb35d44b3..bcfcea9b27 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -2522,17 +2522,16 @@ GtkScrolledWindow GtkViewport.frame { .list-row.button:hover { 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 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); } - .button.list-row:hover:selected { + .list-row.button:selected:hover { background-color: #1d538c; } -.list-row:selected, .list-row.button:selected, .list-row.button:selected:hover { +.list-row:selected { color: white; background-color: #215d9c; } - .list-row:selected:backdrop, .list-row.button:backdrop:selected:hover { + .list-row:selected:backdrop { color: #2c2c2c; } /*.list-row.button:selected, diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 94f7a6fcd2..ca9396ffd6 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -2517,17 +2517,16 @@ GtkScrolledWindow GtkViewport.frame { .list-row.button:hover { 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 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); } - .button.list-row:hover:selected { + .list-row.button:selected:hover { background-color: #4281c3; } -.list-row:selected, .list-row.button:selected, .list-row.button:selected:hover { +.list-row:selected { color: white; background-color: #4a90d9; } - .list-row:selected:backdrop, .list-row.button:backdrop:selected:hover { + .list-row:selected:backdrop { color: #fcfcfc; } /*.list-row.button:selected,