diff options
| author | Lapo Calamandrei <calamandrei@gmail.com> | 2016-06-08 13:39:39 +0200 |
|---|---|---|
| committer | Lapo Calamandrei <calamandrei@gmail.com> | 2016-06-08 13:39:39 +0200 |
| commit | 199ad2c14ba9a2ed305858d23f19913c33c1178e (patch) | |
| tree | 54a727489b8eb96228ef21575384d8deb2151dd9 | |
| parent | a0ee8f7f0a511f251da050a430da5ec93d7a1396 (diff) | |
| download | gtk+-199ad2c14ba9a2ed305858d23f19913c33c1178e.tar.gz | |
Adwaita: .osd button.color
remove box-shadow from colorbutton colorswatch when an ancestor has
the osd styleclass applied.
| -rw-r--r-- | gtk/theme/Adwaita/_common.scss | 16 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/gtk-contained.css | 4 |
2 files changed, 14 insertions, 6 deletions
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 0b4382914e..c211afe8ea 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -944,14 +944,20 @@ button.color { colorswatch:only-child { &, overlay { border-radius: 0; } - @if $variant == 'light' { box-shadow: 0 1px _text_shadow_color(); } + @if $variant == 'light' { + box-shadow: 0 1px _text_shadow_color(); + + .osd & { box-shadow: none; } + } } @if $variant == 'light' { - &:disabled, - &:backdrop, - &:active, - &:checked { colorswatch:only-child { box-shadow: none; }} + .osd &, & { + &:disabled, + &:backdrop, + &:active, + &:checked { colorswatch:only-child { box-shadow: none; }} + } } } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 25e454dc47..14f2c7c586 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1408,7 +1408,9 @@ button.color { box-shadow: 0 1px rgba(255, 255, 255, 0.76923); } button.color colorswatch:only-child, button.color colorswatch:only-child overlay { border-radius: 0; } - button.color:disabled colorswatch:only-child, button.color:backdrop colorswatch:only-child, button.color:active colorswatch:only-child, button.color:checked colorswatch:only-child { + .osd button.color colorswatch:only-child { + box-shadow: none; } + .osd button.color:disabled colorswatch:only-child, .osd button.color:backdrop colorswatch:only-child, .osd button.color:active colorswatch:only-child, .osd button.color:checked colorswatch:only-child, button.color:disabled colorswatch:only-child, button.color:backdrop colorswatch:only-child, button.color:active colorswatch:only-child, button.color:checked colorswatch:only-child { box-shadow: none; } /********* |