From efde7d15aacc6bdde602f35b0e53a743855125e2 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Wed, 8 Feb 2017 16:45:51 +0100 Subject: [PATCH] adwaita: insensitive styling for views Add an insensitive style to views, somehow we didn't ship one, so for example, disabled textviews looked the same as sensitive ones. --- gtk/theme/Adwaita/_common.scss | 6 ++++++ gtk/theme/Adwaita/gtk-contained-dark.css | 11 +++++++++++ gtk/theme/Adwaita/gtk-contained.css | 11 +++++++++++ 3 files changed, 28 insertions(+) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index acd4dfc510..999b25ff92 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -98,6 +98,12 @@ $button_transition: all 200ms $ease-out-quad; &:backdrop { color: $backdrop_text_color; background-color: $backdrop_base_color; + &:disabled { color: $backdrop_insensitive_color; } + } + + &:disabled { + color: $insensitive_fg_color; + background-color: $insensitive_bg_color; } &:selected { diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 6232ba9af9..da5c453d40 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -64,6 +64,17 @@ textview text { textview text:backdrop { color: #d3d4d5; background-color: #252a2c; } + .view:backdrop:disabled, iconview:backdrop:disabled, + .view text:backdrop:disabled, + iconview text:backdrop:disabled, + textview text:backdrop:disabled { + color: #566164; } + .view:disabled, iconview:disabled, + .view text:disabled, + iconview text:disabled, + textview text:disabled { + color: #919494; + background-color: #2d3234; } .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, .view text:selected:focus, iconview text:selected:focus, diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 6104172b83..c0f43698d0 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -64,6 +64,17 @@ textview text { textview text:backdrop { color: #323232; background-color: #fcfcfc; } + .view:backdrop:disabled, iconview:backdrop:disabled, + .view text:backdrop:disabled, + iconview text:backdrop:disabled, + textview text:backdrop:disabled { + color: #c3c3c0; } + .view:disabled, iconview:disabled, + .view text:disabled, + iconview text:disabled, + textview text:disabled { + color: #8b8e8f; + background-color: #f1f1f1; } .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, .view text:selected:focus, iconview text:selected:focus,