Merge lp:~3v1n0/ubuntu-themes/toolbar-mode-headerbar-gradient into lp:ubuntu-themes

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Iain Lane
Approved revision: 468
Merged at revision: 469
Proposed branch: lp:~3v1n0/ubuntu-themes/toolbar-mode-headerbar-gradient
Merge into: lp:ubuntu-themes
Diff against target: 85 lines (+22/-3)
3 files modified
Ambiance/gtk-3.0/gtk-widgets.css (+10/-1)
Radiance/gtk-3.0/gtk-widgets-radiance.css (+2/-1)
Radiance/gtk-3.0/gtk-widgets.css (+10/-1)
To merge this branch: bzr merge lp:~3v1n0/ubuntu-themes/toolbar-mode-headerbar-gradient
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ubuntu Artwork Packagers Pending
Review via email: mp+288701@code.launchpad.net

Commit message

Ambiance, Radiance: use inverted gradient in headerbar when in toolbar-mode

Headerbars in unity can be in toolbar-mode, this is the case when the window is maximized.
So in that case we need to use the same gradient of toolbars and remove borders.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
2--- Ambiance/gtk-3.0/gtk-widgets.css 2016-01-20 12:04:47 +0000
3+++ Ambiance/gtk-3.0/gtk-widgets.css 2016-03-10 20:29:38 +0000
4@@ -1567,6 +1567,10 @@
5 border: none;
6 }
7
8+.maximized .titlebar.header-bar.toolbar-mode {
9+ box-shadow: none;
10+}
11+
12 .titlebar.header-bar .button.titlebutton {
13 background-clip: padding-box;
14 border: 1px solid #383734;
15@@ -1629,7 +1633,8 @@
16 * primary-toolbar *
17 *******************/
18 .primary-toolbar,
19-.header-bar {
20+.header-bar,
21+.maximized .titlebar.header-bar.toolbar-mode:not(:backdrop) {
22 -GtkWidget-window-dragging: true;
23
24 background-image: -gtk-gradient (linear, left top, left bottom,
25@@ -1647,6 +1652,10 @@
26 box-shadow: inset 0 1px shade (@dark_bg_color, 0.94);
27 }
28
29+.maximized .titlebar.header-bar.toolbar-mode:not(:backdrop) {
30+ border-width: 0;
31+}
32+
33 .primary-toolbar:backdrop,
34 .header-bar:backdrop {
35 background-image: none;
36
37=== modified file 'Radiance/gtk-3.0/gtk-widgets-radiance.css'
38--- Radiance/gtk-3.0/gtk-widgets-radiance.css 2014-03-24 15:47:08 +0000
39+++ Radiance/gtk-3.0/gtk-widgets-radiance.css 2016-03-10 20:29:38 +0000
40@@ -106,7 +106,8 @@
41 .primary-toolbar .toolbar,
42 .primary-toolbar.toolbar,
43 .menubar.toolbar,
44-.header-bar {
45+.header-bar,
46+.maximized .titlebar.header-bar.toolbar-mode:not(:backdrop) {
47 background-image: -gtk-gradient (linear, left top, left bottom,
48 from (shade (@dark_bg_color, 0.96)),
49 to (shade (@dark_bg_color, 1.1)));
50
51=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
52--- Radiance/gtk-3.0/gtk-widgets.css 2016-01-20 12:04:47 +0000
53+++ Radiance/gtk-3.0/gtk-widgets.css 2016-03-10 20:29:38 +0000
54@@ -1586,6 +1586,10 @@
55 border: none;
56 }
57
58+.maximized .titlebar.header-bar.toolbar-mode {
59+ box-shadow: none;
60+}
61+
62 .titlebar.header-bar .button.titlebutton {
63 background-clip: padding-box;
64 border: 1px solid #d0c7bf;
65@@ -1647,7 +1651,8 @@
66 * primary-toolbar *
67 *******************/
68 .primary-toolbar,
69-.header-bar {
70+.header-bar,
71+.maximized .titlebar.header-bar.toolbar-mode:not(:backdrop) {
72 -GtkWidget-window-dragging: true;
73
74 background-image: -gtk-gradient (linear, left top, left bottom,
75@@ -1665,6 +1670,10 @@
76 box-shadow: inset 0 1px shade (@dark_bg_color, 0.94);
77 }
78
79+.maximized .titlebar.header-bar.toolbar-mode:not(:backdrop) {
80+ border-width: 0;
81+}
82+
83 .primary-toolbar:backdrop,
84 .header-bar:backdrop {
85 background-image: none;

Subscribers

People subscribed via source and target branches