summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLapo Calamandrei <calamandrei@gmail.com>2016-04-19 00:11:09 +0200
committerLapo Calamandrei <calamandrei@gmail.com>2016-04-19 00:21:15 +0200
commit5affbbe5455f3805e3805e407719e793dad83b90 (patch)
tree102ef5ccb5467d695c76824d471ee31439ce5dae
parentdadd81768a1b8a47d50c82f994bc7e6b5ccc5c87 (diff)
downloadgtk+-5affbbe5455f3805e3805e407719e793dad83b90.tar.gz
Adwaita: fix infobar text color in backdrop windows
see https://bugzilla.gnome.org/show_bug.cgi?id=765213
-rw-r--r--gtk/theme/Adwaita/_common.scss11
-rw-r--r--gtk/theme/Adwaita/gtk-contained-dark.css33
-rw-r--r--gtk/theme/Adwaita/gtk-contained.css33
3 files changed, 66 insertions, 11 deletions
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index e526210d03..a949e85d9b 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3881,10 +3881,15 @@ infobar { border-style: none; }
.question,
.warning,
.error {
- background-color: $selected_bg_color;
- color: $selected_fg_color;
+ &:backdrop, & {
+ label, & { color: $selected_fg_color; }
+ background-color: $selected_bg_color;
+ border-color: darken($selected_bg_color, 10%);
+ }
+
text-shadow: 0 1px darken($selected_bg_color, 10%);
- border-color: darken($selected_bg_color, 10%);
+
+ &:backdrop { text-shadow: none; }
button {
// FIXME: extend selection mode buttons
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 9aa08172a2..a83723d292 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -4106,10 +4106,35 @@ infobar {
.question,
.warning,
.error {
- background-color: #215d9c;
- color: #ffffff;
- text-shadow: 0 1px #184472;
- border-color: #184472; }
+ text-shadow: 0 1px #184472; }
+ .info:backdrop, .info,
+ .question:backdrop,
+ .question,
+ .warning:backdrop,
+ .warning,
+ .error:backdrop,
+ .error {
+ background-color: #215d9c;
+ border-color: #184472; }
+ .info:backdrop label, .info:backdrop, .info label, .info,
+ .question:backdrop label,
+ .question:backdrop,
+ .question label,
+ .question,
+ .warning:backdrop label,
+ .warning:backdrop,
+ .warning label,
+ .warning,
+ .error:backdrop label,
+ .error:backdrop,
+ .error label,
+ .error {
+ color: #ffffff; }
+ .info:backdrop,
+ .question:backdrop,
+ .warning:backdrop,
+ .error:backdrop {
+ text-shadow: none; }
.info button,
.question button,
.warning button,
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 2f861248a9..b7ef528eec 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -4135,10 +4135,35 @@ infobar {
.question,
.warning,
.error {
- background-color: #4a90d9;
- color: #ffffff;
- text-shadow: 0 1px #2a76c6;
- border-color: #2a76c6; }
+ text-shadow: 0 1px #2a76c6; }
+ .info:backdrop, .info,
+ .question:backdrop,
+ .question,
+ .warning:backdrop,
+ .warning,
+ .error:backdrop,
+ .error {
+ background-color: #4a90d9;
+ border-color: #2a76c6; }
+ .info:backdrop label, .info:backdrop, .info label, .info,
+ .question:backdrop label,
+ .question:backdrop,
+ .question label,
+ .question,
+ .warning:backdrop label,
+ .warning:backdrop,
+ .warning label,
+ .warning,
+ .error:backdrop label,
+ .error:backdrop,
+ .error label,
+ .error {
+ color: #ffffff; }
+ .info:backdrop,
+ .question:backdrop,
+ .warning:backdrop,
+ .error:backdrop {
+ text-shadow: none; }
.info button,
.question button,
.warning button,