Merge lp:~desrt/ubuntu-themes/gtk3.8-fixes into lp:ubuntu-themes

Proposed by desrt on 2013-02-19
Status: Merged
Approved by: desrt on 2013-02-19
Approved revision: 276
Merged at revision: 275
Proposed branch: lp:~desrt/ubuntu-themes/gtk3.8-fixes
Merge into: lp:ubuntu-themes
Diff against target: 35 lines (+6/-6)
2 files modified
Ambiance/gtk-3.0/gtk-widgets.css (+3/-3)
Radiance/gtk-3.0/gtk-widgets.css (+3/-3)
To merge this branch: bzr merge lp:~desrt/ubuntu-themes/gtk3.8-fixes
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2013-02-19 Approve on 2013-02-19
PS Jenkins bot continuous-integration Pending
Review via email: mp+149274@code.launchpad.net

Description of the change

Fix a few issues caused by Gtk 3.8's improved CSS support

We were setting a solid border around menu items (for debugging?) that
wasn't being rendered by old Gtk versions and now is. Similar for
background colour. Also: Gtk used to automatically add 3 to the padding
around menuitems and it no longer does that, so increase our padding
(but turn off the old implicit padding to maintain compatibility with
Gtk 3.6).

To post a comment you must log in.
Mathieu Trudel-Lapierre (cyphermox) wrote :

Approve

review: Approve

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-02-10 12:59:27 +0000
3+++ Ambiance/gtk-3.0/gtk-widgets.css 2013-02-19 14:03:23 +0000
4@@ -956,10 +956,10 @@
5 }*/
6
7 .menuitem {
8+ -GtkMenuItem-horizontal-padding: 0;
9+ background: transparent;
10 border-radius: 0;
11- border-style: solid;
12- border-width: 1px;
13- padding: 3px 2px 3px 2px;
14+ padding: 3px 5px 3px 5px;
15
16 text-shadow: none;
17 }
18
19=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
20--- Radiance/gtk-3.0/gtk-widgets.css 2013-02-10 12:59:27 +0000
21+++ Radiance/gtk-3.0/gtk-widgets.css 2013-02-19 14:03:23 +0000
22@@ -956,10 +956,10 @@
23 }*/
24
25 .menuitem {
26+ -GtkMenuItem-horizontal-padding: 0;
27+ background: transparent;
28 border-radius: 0;
29- border-style: solid;
30- border-width: 1px;
31- padding: 3px 2px 3px 2px;
32+ padding: 3px 5px 3px 5px;
33
34 text-shadow: none;
35 }

Subscribers

People subscribed via source and target branches