diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2018-09-26 16:11:43 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2018-09-26 16:11:43 +0000 |
| commit | 77c8d2df00019e1801b8e58bfae7407bb7843842 (patch) | |
| tree | dbf8b4b188d02d4ddce01a085f7b79e3d07ed7ac | |
| parent | 89b96a864efa627435e503c6a1d114e81e665265 (diff) | |
| parent | aeca5858d83fd9045d8c75d65f338a8c2a2407a2 (diff) | |
| download | gtk+-77c8d2df00019e1801b8e58bfae7407bb7843842.tar.gz | |
Merge branch 'wip/jimmac/nightly-headerbar' into 'master'
Adwaita: tone down the 'devel' styling
See merge request GNOME/gtk!357
| -rw-r--r-- | gtk/theme/Adwaita/_common.scss | 6 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/gtk-contained-dark.css | 4 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/gtk-contained.css | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index fe14e285c0..5fd176598b 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1723,9 +1723,9 @@ headerbar { // headerbar border rounding // Development versions of apps to use a differently styled headerbar window.devel { - headerbar { // FIXME: avoid using hardcoded colors - background: transparent -gtk-icontheme("system-run-symbolic") 80% 0/128px 128px no-repeat, - linear-gradient(to left, mix($selected_bg_color, $bg_color, 50%) 8%, $bg_color 25%); + headerbar { + background: transparent -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, + linear-gradient(to left, mix($selected_bg_color, $bg_color, 10%) 8%, $bg_color 25%); color: transparentize($fg_color,.9); label { color: $fg_color; } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 66293c066c..4b362f5505 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -694,7 +694,7 @@ window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparen .titlebar:not(headerbar) > separator { background-color: #1b1f20; } -window.devel headerbar { background: transparent -gtk-icontheme("system-run-symbolic") 80% 0/128px 128px no-repeat, linear-gradient(to left, #2a4b6c 8%, #33393b 25%); color: rgba(238, 238, 236, 0.1); } +window.devel headerbar { background: transparent -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, linear-gradient(to left, #313d45 8%, #33393b 25%); color: rgba(238, 238, 236, 0.1); } window.devel headerbar label { color: #eeeeec; } @@ -1616,7 +1616,7 @@ expander title > arrow:disabled { color: #919494; } expander title > arrow:disabled:backdrop { color: #566164; } -expander title > arrow:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } +expander title > arrow:checked, expander title:checked > arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } expander title:hover > arrow { color: white; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 9fddf7525f..67aef82932 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -702,7 +702,7 @@ window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparen .titlebar:not(headerbar) > separator { background-color: #b6b6b3; } -window.devel headerbar { background: transparent -gtk-icontheme("system-run-symbolic") 80% 0/128px 128px no-repeat, linear-gradient(to left, #99bce0 8%, #e8e8e7 25%); color: rgba(46, 52, 54, 0.1); } +window.devel headerbar { background: transparent -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, linear-gradient(to left, #d8dfe6 8%, #e8e8e7 25%); color: rgba(46, 52, 54, 0.1); } window.devel headerbar label { color: #2e3436; } @@ -1636,7 +1636,7 @@ expander title > arrow:disabled { color: #8b8e8f; } expander title > arrow:disabled:backdrop { color: #c3c3c0; } -expander title > arrow:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } +expander title > arrow:checked, expander title:checked > arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } expander title:hover > arrow { color: #748489; } |