From a65acc7e8d19bc0c46aa06b65e947dbf1cec3eb6 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Tue, 26 Aug 2014 19:24:44 +0200 Subject: [PATCH] Adwaita: minor fixes to GtkLabel --- gtk/resources/theme/Adwaita/_common.scss | 4 ++-- gtk/resources/theme/Adwaita/gtk-contained-dark.css | 4 +++- gtk/resources/theme/Adwaita/gtk-contained.css | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index e90b56388f..f76dded429 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -134,12 +134,12 @@ GtkLabel { &:selected, &:selected:focus, - &:selected:hover, - &:backdrop:selected { + &:selected:hover { @extend %selected_items; } &:insensitive { color: $insensitive_fg_color; + &:backdrop { color: $backdrop_insensitive_color; } } } diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 98d929a2aa..7cf01b28b1 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -118,6 +118,8 @@ GtkLabel:insensitive { color: #939695; } + GtkLabel:insensitive:backdrop { + color: #5d6767; } .dim-label, .titlebar .subtitle, GtkCalendar.header .subtitle, .header-bar .subtitle { @@ -2749,7 +2751,7 @@ GtkLevelBar.vertical { .level-bar.fill-block.empty-fill-block:backdrop { border-color: rgba(201, 203, 201, 0.15); } -.view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, GtkLabel:backdrop:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected { +.view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected { background-color: #215d9c; color: #ffffff; } .view:backdrop:selected, GtkLabel:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected { diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index f6b7c56936..b232776352 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -118,6 +118,8 @@ GtkLabel:insensitive { color: #8d9091; } + GtkLabel:insensitive:backdrop { + color: #c7c7c7; } .dim-label, .titlebar .subtitle, GtkCalendar.header .subtitle, .header-bar .subtitle { @@ -2744,7 +2746,7 @@ GtkLevelBar.vertical { .level-bar.fill-block.empty-fill-block:backdrop { border-color: rgba(84, 89, 90, 0.15); } -.view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, GtkLabel:backdrop:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected { +.view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected { background-color: #4a90d9; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); }