Ubuntu theme

Merge lp:~3v1n0/ubuntu-themes/non-titlebar-headerbar-as-toolbar into lp:ubuntu-themes

  1. non-titlebar-headerbar-as-toolbar
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Superseded
Proposed branch: lp:~3v1n0/ubuntu-themes/non-titlebar-headerbar-as-toolbar
Merge into: lp:ubuntu-themes
Diff against target: 65 lines (+14/-2)
2 files modified
Ambiance/gtk-3.20/gtk-widgets.css (+7/-1)
Radiance/gtk-3.20/gtk-widgets.css (+7/-1)
To merge this branch: bzr merge lp:~3v1n0/ubuntu-themes/non-titlebar-headerbar-as-toolbar
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers Pending
Review via email: mp+324266@code.launchpad.net

This proposal has been superseded by a proposal from 2017-05-18.

Commit message

Ambiance, Radiance: apply toolbar style to headerbars that are not child or are not .titlebar's

Some patched apps to work in Unity have converted headerbar's to toolbars
in the wrong way, not to fix them all this is the faster (and safer, so far) way.

To post a comment you must log in.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Ambiance/gtk-3.20/gtk-widgets.css'
--- Ambiance/gtk-3.20/gtk-widgets.css 2017-05-15 11:59:58 +0000
+++ Ambiance/gtk-3.20/gtk-widgets.css 2017-05-18 15:49:03 +0000
@@ -2174,6 +2174,8 @@
2174 * primary-toolbar *2174 * primary-toolbar *
2175 *******************/2175 *******************/
2176.primary-toolbar,2176.primary-toolbar,
2177/* Workaround for LP: #1689239, selects headerbars used as toolbar in Unity */
2178:not(.titlebar) > headerbar:not(.titlebar),
2177.titlebar.toolbar-mode {2179.titlebar.toolbar-mode {
2178 -GtkWidget-window-dragging: true;2180 -GtkWidget-window-dragging: true;
21792181
@@ -2193,6 +2195,8 @@
2193}2195}
21942196
2195.primary-toolbar:backdrop,2197.primary-toolbar:backdrop,
2198/* Workaround for LP: #1689239, selects headerbars used as toolbar in Unity */
2199:not(.titlebar) > headerbar:not(.titlebar):backdrop,
2196.titlebar.toolbar-mode:backdrop {2200.titlebar.toolbar-mode:backdrop {
2197 background-image: none;2201 background-image: none;
2198 background-color: @dark_bg_color;2202 background-color: @dark_bg_color;
@@ -2339,7 +2343,9 @@
2339.primary-toolbar separator,2343.primary-toolbar separator,
2340.primary-toolbar separator:disabled,2344.primary-toolbar separator:disabled,
2341headerbar separator,2345headerbar separator,
2342headerbar separator:disabled {2346headerbar separator:disabled,
2347.titlebar separator,
2348.titlebar separator:disabled {
2343 border-color: alpha (shade (@dark_bg_color, 0.94), 0.35);2349 border-color: alpha (shade (@dark_bg_color, 0.94), 0.35);
2344 border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5);2350 border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
2345 border-right-color: alpha (shade (@dark_bg_color, 1.26), 0.5);2351 border-right-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
23462352
=== modified file 'Radiance/gtk-3.20/gtk-widgets.css'
--- Radiance/gtk-3.20/gtk-widgets.css 2017-05-15 11:59:58 +0000
+++ Radiance/gtk-3.20/gtk-widgets.css 2017-05-18 15:49:03 +0000
@@ -2177,6 +2177,8 @@
2177 * primary-toolbar *2177 * primary-toolbar *
2178 *******************/2178 *******************/
2179.primary-toolbar,2179.primary-toolbar,
2180/* Workaround for LP: #1689239, selects headerbars used as toolbar in Unity */
2181:not(.titlebar) > headerbar:not(.titlebar),
2180.titlebar.toolbar-mode {2182.titlebar.toolbar-mode {
2181 -GtkWidget-window-dragging: true;2183 -GtkWidget-window-dragging: true;
21822184
@@ -2196,6 +2198,8 @@
2196}2198}
21972199
2198.primary-toolbar:backdrop,2200.primary-toolbar:backdrop,
2201/* Workaround for LP: #1689239, selects headerbars used as toolbar in Unity */
2202:not(.titlebar) > headerbar:not(.titlebar):backdrop,
2199.titlebar.toolbar-mode:backdrop {2203.titlebar.toolbar-mode:backdrop {
2200 background-image: none;2204 background-image: none;
2201 background-color: @dark_bg_color;2205 background-color: @dark_bg_color;
@@ -2342,7 +2346,9 @@
2342.primary-toolbar separator,2346.primary-toolbar separator,
2343.primary-toolbar separator:disabled,2347.primary-toolbar separator:disabled,
2344headerbar separator,2348headerbar separator,
2345headerbar separator:disabled {2349headerbar separator:disabled,
2350.titlebar separator,
2351.titlebar separator:disabled {
2346 border-color: alpha (shade (@dark_bg_color, 0.94), 0.35);2352 border-color: alpha (shade (@dark_bg_color, 0.94), 0.35);
2347 border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5);2353 border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
2348 border-right-color: alpha (shade (@dark_bg_color, 1.26), 0.5);2354 border-right-color: alpha (shade (@dark_bg_color, 1.26), 0.5);

Subscribers

People subscribed via source and target branches