From bd2cf65cb9dbc5a68a539e2f5bf9acbe8e7f77a2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 30 Jun 2014 11:35:38 -0400 Subject: [PATCH] Adwaita: Make selectable labels work This brings back white-on-blue selection in selectable labels. https://bugzilla.gnome.org/show_bug.cgi?id=732441 --- gtk/resources/theme/Adwaita/_common.scss | 9 +++++++++ gtk/resources/theme/Adwaita/gtk-contained-dark.css | 4 ++-- gtk/resources/theme/Adwaita/gtk-contained.css | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 6b42bec50b..a6ad8ac328 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -124,6 +124,15 @@ background-color: transparentize($selected_bg_color,0.8); } +GtkLabel { + &:selected, + &:selected:focus, + &:selected:hover, + &:backdrop:selected { + @extend %selected_items; + } +} + /********************* * Spinner Animation * *********************/ diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 0cd4c5d33d..db26ef606b 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -2249,11 +2249,11 @@ 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, .entry:selected, .entry:selected:focus { +.view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, GtkLabel:backdrop:selected, .entry:selected, .entry:selected:focus { background-color: #215d9c; color: white; outline-color: rgba(255, 255, 255, 0.3); } - .view:backdrop:selected, .entry:backdrop:selected { + .view:backdrop:selected, GtkLabel:backdrop:selected, .entry:backdrop:selected { color: #2c2c2c; } /********** diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 5cef645d5d..dea509163e 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -2247,11 +2247,11 @@ 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, .entry:selected, .entry:selected:focus { +.view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, GtkLabel:backdrop:selected, .entry:selected, .entry:selected:focus { background-color: #4a90d9; color: white; outline-color: rgba(255, 255, 255, 0.3); } - .view:backdrop:selected, .entry:backdrop:selected { + .view:backdrop:selected, GtkLabel:backdrop:selected, .entry:backdrop:selected { color: #fcfcfc; } /**********