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
1=== modified file 'Ambiance/gtk-3.20/gtk-widgets.css'
2--- Ambiance/gtk-3.20/gtk-widgets.css 2017-05-15 11:59:58 +0000
3+++ Ambiance/gtk-3.20/gtk-widgets.css 2017-05-18 15:49:03 +0000
4@@ -2174,6 +2174,8 @@
5 * primary-toolbar *
6 *******************/
7 .primary-toolbar,
8+/* Workaround for LP: #1689239, selects headerbars used as toolbar in Unity */
9+:not(.titlebar) > headerbar:not(.titlebar),
10 .titlebar.toolbar-mode {
11 -GtkWidget-window-dragging: true;
12
13@@ -2193,6 +2195,8 @@
14 }
15
16 .primary-toolbar:backdrop,
17+/* Workaround for LP: #1689239, selects headerbars used as toolbar in Unity */
18+:not(.titlebar) > headerbar:not(.titlebar):backdrop,
19 .titlebar.toolbar-mode:backdrop {
20 background-image: none;
21 background-color: @dark_bg_color;
22@@ -2339,7 +2343,9 @@
23 .primary-toolbar separator,
24 .primary-toolbar separator:disabled,
25 headerbar separator,
26-headerbar separator:disabled {
27+headerbar separator:disabled,
28+.titlebar separator,
29+.titlebar separator:disabled {
30 border-color: alpha (shade (@dark_bg_color, 0.94), 0.35);
31 border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
32 border-right-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
33
34=== modified file 'Radiance/gtk-3.20/gtk-widgets.css'
35--- Radiance/gtk-3.20/gtk-widgets.css 2017-05-15 11:59:58 +0000
36+++ Radiance/gtk-3.20/gtk-widgets.css 2017-05-18 15:49:03 +0000
37@@ -2177,6 +2177,8 @@
38 * primary-toolbar *
39 *******************/
40 .primary-toolbar,
41+/* Workaround for LP: #1689239, selects headerbars used as toolbar in Unity */
42+:not(.titlebar) > headerbar:not(.titlebar),
43 .titlebar.toolbar-mode {
44 -GtkWidget-window-dragging: true;
45
46@@ -2196,6 +2198,8 @@
47 }
48
49 .primary-toolbar:backdrop,
50+/* Workaround for LP: #1689239, selects headerbars used as toolbar in Unity */
51+:not(.titlebar) > headerbar:not(.titlebar):backdrop,
52 .titlebar.toolbar-mode:backdrop {
53 background-image: none;
54 background-color: @dark_bg_color;
55@@ -2342,7 +2346,9 @@
56 .primary-toolbar separator,
57 .primary-toolbar separator:disabled,
58 headerbar separator,
59-headerbar separator:disabled {
60+headerbar separator:disabled,
61+.titlebar separator,
62+.titlebar separator:disabled {
63 border-color: alpha (shade (@dark_bg_color, 0.94), 0.35);
64 border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5);
65 border-right-color: alpha (shade (@dark_bg_color, 1.26), 0.5);

Subscribers

People subscribed via source and target branches