Ubuntu theme

Merge lp:~mitya57/ubuntu-themes/headerbar-fixes into lp:ubuntu-themes

  1. headerbar-fixes
  2. Merge into trunk
Proposed by Dmitry Shachnev on 2014-01-05
Status: Merged
Approved by: Sebastien Bacher on 2014-02-12
Approved revision: 332
Merged at revision: 343
Proposed branch: lp:~mitya57/ubuntu-themes/headerbar-fixes
Merge into: lp:ubuntu-themes
Diff against target: 55 lines (+20/-0)
2 files modified
Ambiance/gtk-3.0/gtk-widgets.css (+10/-0)
Radiance/gtk-3.0/gtk-widgets.css (+10/-0)
To merge this branch: bzr merge lp:~mitya57/ubuntu-themes/headerbar-fixes
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2014-02-12
Lars Karlitski (community) Approve on 2014-01-15
Sebastien Bacher 2014-01-15 Pending
Ubuntu Artwork Packagers 2014-01-05 Pending
Review via email: mp+200477@code.launchpad.net

Commit Message

Move GtkWindow close button to the left and make GtkStacks inside GtkHeaderBar transparent.

Description of the Change

* Move GtkWindow close button to the left.
* Make GtkStacks inside GtkHeaderBar transparent.

The latter is needed for Polari IRC app.

The first change is tested with gnome-calculator and gnome-system-monitor, close button moved to left in both cases.

Currently the close button image is 'window-close-symbolic' from the icon theme.

Note that in Gtk 3.11 (which won't be in Trusty) the decoration code has been re-written and allows minimize/maximize buttons, so this integration will need to be re-done after Trusty release.

To post a comment you must log in.
Dmitry Shachnev (mitya57) wrote :

For Gtk 3.11, we will need something like this: <https://bugzilla.gnome.org/show_bug.cgi?id=720913#c0>.

And probably that will be done in ubuntu-settings, not in ubuntu-themes.

Lars Karlitski (larsu) wrote :

Thanks!

Note that we won't need the transparency stuff anymore once lp:~larsu/ubuntu-themes/dont-set-all-bgs has landed.

review: Approve
Dmitry Shachnev (mitya57) wrote :

Can someone please mark it as approved? This is waiting for a while now.

PS Jenkins bot (ps-jenkins) :
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 2013-11-25 16:46:01 +0000
3+++ Ambiance/gtk-3.0/gtk-widgets.css 2014-01-05 05:52:01 +0000
4@@ -51,6 +51,7 @@
5 -GtkWidget-focus-line-width: 1px;
6 -GtkWidget-link-color: @link_color;
7 -GtkWidget-visited-link-color: @link_color;
8+ -GtkWindow-decoration-button-layout: "close:";
9 -GtkWindow-resize-grip-width: 0;
10 -GtkWindow-resize-grip-height: 0;
11 -WnckTasklist-fade-overlay-rect: 0;
12@@ -868,6 +869,15 @@
13 background-color: transparent;
14 }
15
16+/*********
17+ * stack *
18+ *********/
19+
20+GtkHeaderBar > GtkStack,
21+GtkHeaderBar > GtkStack:insensitive {
22+ background-color: transparent;
23+}
24+
25 /********
26 * menu *
27 ********/
28
29=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
30--- Radiance/gtk-3.0/gtk-widgets.css 2013-11-11 12:28:29 +0000
31+++ Radiance/gtk-3.0/gtk-widgets.css 2014-01-05 05:52:01 +0000
32@@ -50,6 +50,7 @@
33 -GtkWidget-focus-line-width: 1px;
34 -GtkWidget-link-color: @link_color;
35 -GtkWidget-visited-link-color: @link_color;
36+ -GtkWindow-decoration-button-layout: "close:";
37 -GtkWindow-resize-grip-width: 0;
38 -GtkWindow-resize-grip-height: 0;
39 -WnckTasklist-fade-overlay-rect: 0;
40@@ -870,6 +871,15 @@
41 background-color: transparent;
42 }
43
44+/*********
45+ * stack *
46+ *********/
47+
48+GtkHeaderBar > GtkStack,
49+GtkHeaderBar > GtkStack:insensitive {
50+ background-color: transparent;
51+}
52+
53 /********
54 * menu *
55 ********/

Subscribers

People subscribed via source and target branches