Ubuntu theme

Merge lp:~flexiondotorg/ubuntu-themes/ubuntu-themes-gtktoolbutton-lp1641915-xenial into lp:ubuntu-themes/xenial

  1. ubuntu-themes-gtktoolbutton-lp1641915-xenial
  2. Merge into 16.04
Proposed by Martin Wimpress 
Status: Needs review
Proposed branch: lp:~flexiondotorg/ubuntu-themes/ubuntu-themes-gtktoolbutton-lp1641915-xenial
Merge into: lp:ubuntu-themes/xenial
Diff against target: 133 lines (+42/-42)
2 files modified
Ambiance/gtk-3.0/gtk-widgets.css (+21/-21)
Radiance/gtk-3.0/gtk-widgets.css (+21/-21)
To merge this branch: bzr merge lp:~flexiondotorg/ubuntu-themes/ubuntu-themes-gtktoolbutton-lp1641915-xenial
Reviewer Review Type Date Requested Status
Iain Lane Needs Fixing
Review via email: mp+310889@code.launchpad.net

Description of the change

Correct GtkToolButton first-child, only-child and last-child styling to prevent buttons clipping/overlapping in GNOME Disks and Ubiquity disk partitioner. (LP: #1641915)

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

I don't understand this change, can you please elaborate?

The rules already have

  .inline-toolbar.toolbar .button:first-child,

...etc selectors.

So can you tell me what you're trying to achieve here? As far as I can see what's happening after this change is that the ".button:only-child" rule always applies, because the GtkButton is always the only child of the GtkToolButton and there's now no more specific rule to apply the first/last styles.

I think there's a problem with the "middle" button rules, probably. They are supposed to look 'merged' but they don't. It seems like the "Single button" rules are being applied instead of the "Middle button" ones, so probably something to do with the selectors.

BTW, when this is fixed, we need to update trunk too so it stays backportable.

review: Needs Fixing
Reply
Revision history for this message
Amr Ibrahim (amribrahim1987) wrote :

Ping!

Reply

Unmerged revisions

487. By Martin Wimpress 

Correct GtkToolButton first-child, only-child and last-child styling to
prevent buttons clipping/overlapping in GNOME Disks and Ubiquity disk
partioner. (LP: #1641915)

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-10-24 16:20:32 +0000
3+++ Ambiance/gtk-3.0/gtk-widgets.css 2016-11-15 14:53:17 +0000
4@@ -1862,13 +1862,13 @@
5 .inline-toolbar.toolbar .button:insensitive:first-child,
6 .inline-toolbar.toolbar .button:backdrop:first-child,
7 .inline-toolbar.toolbar .button:backdrop:insensitive:first-child,
8-.inline-toolbar.toolbar GtkToolButton:first-child .button,
9-.inline-toolbar.toolbar GtkToolButton:first-child .button:active,
10-.inline-toolbar.toolbar GtkToolButton:first-child .button:focus,
11-.inline-toolbar.toolbar GtkToolButton:first-child .button:focus:active,
12-.inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive,
13-.inline-toolbar.toolbar GtkToolButton:first-child .button:backdrop,
14-.inline-toolbar.toolbar GtkToolButton:first-child .button:backdrop:insensitive {
15+.inline-toolbar.toolbar GtkToolButton .button:first-child,
16+.inline-toolbar.toolbar GtkToolButton .button:active:first-child,
17+.inline-toolbar.toolbar GtkToolButton .button:focus:first-child,
18+.inline-toolbar.toolbar GtkToolButton .button:focus:active:first-child,
19+.inline-toolbar.toolbar GtkToolButton .button:insensitive:first-child,
20+.inline-toolbar.toolbar GtkToolButton .button:backdrop:first-child,
21+.inline-toolbar.toolbar GtkToolButton .button:backdrop:insensitive:first-child {
22 border-left-width: 1px;
23 border-right-width: 0;
24 border-image-width: 10px 0 10px 12px;
25@@ -1885,13 +1885,13 @@
26 .inline-toolbar.toolbar .button:insensitive:last-child,
27 .inline-toolbar.toolbar .button:backdrop:last-child,
28 .inline-toolbar.toolbar .button:backdrop:insensitive:last-child,
29-.inline-toolbar.toolbar GtkToolButton:last-child .button,
30-.inline-toolbar.toolbar GtkToolButton:last-child .button:active,
31-.inline-toolbar.toolbar GtkToolButton:last-child .button:focus,
32-.inline-toolbar.toolbar GtkToolButton:last-child .button:focus:active,
33-.inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive,
34-.inline-toolbar.toolbar GtkToolButton:last-child .button:backdrop,
35-.inline-toolbar.toolbar GtkToolButton:last-child .button:backdrop:insensitive {
36+.inline-toolbar.toolbar GtkToolButton .button:last-child,
37+.inline-toolbar.toolbar GtkToolButton .button:active:last-child,
38+.inline-toolbar.toolbar GtkToolButton .button:focus:last-child,
39+.inline-toolbar.toolbar GtkToolButton .button:focus:active:last-child,
40+.inline-toolbar.toolbar GtkToolButton .button:insensitive:last-child,
41+.inline-toolbar.toolbar GtkToolButton .button:backdrop:last-child,
42+.inline-toolbar.toolbar GtkToolButton .button:backdrop:insensitive:last-child {
43 border-left-width: 0;
44 border-right-width: 1px;
45 border-image-width: 10px 12px 10px 0;
46@@ -1908,13 +1908,13 @@
47 .inline-toolbar.toolbar .button:insensitive:only-child,
48 .inline-toolbar.toolbar .button:backdrop:only-child,
49 .inline-toolbar.toolbar .button:backdrop:insensitive:only-child,
50-.inline-toolbar.toolbar GtkToolButton:only-child .button,
51-.inline-toolbar.toolbar GtkToolButton:only-child .button:active,
52-.inline-toolbar.toolbar GtkToolButton:only-child .button:focus,
53-.inline-toolbar.toolbar GtkToolButton:only-child .button:focus:active,
54-.inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive,
55-.inline-toolbar.toolbar GtkToolButton:only-child .button:backdrop,
56-.inline-toolbar.toolbar GtkToolButton:only-child .button:backdrop:insensitive {
57+.inline-toolbar.toolbar GtkToolButton .button:only-child,
58+.inline-toolbar.toolbar GtkToolButton .button:active:only-child,
59+.inline-toolbar.toolbar GtkToolButton .button:focus:only-child,
60+.inline-toolbar.toolbar GtkToolButton .button:focus:active:only-child,
61+.inline-toolbar.toolbar GtkToolButton .button:insensitive:only-child,
62+.inline-toolbar.toolbar GtkToolButton .button:backdrop:only-child,
63+.inline-toolbar.toolbar GtkToolButton .button:backdrop:insensitive:only-child {
64 border-right-width: 1px;
65 border-left-width: 1px;
66 border-image-width: 10px 12px 10px 12px;
67
68=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
69--- Radiance/gtk-3.0/gtk-widgets.css 2016-10-24 16:20:32 +0000
70+++ Radiance/gtk-3.0/gtk-widgets.css 2016-11-15 14:53:17 +0000
71@@ -1881,13 +1881,13 @@
72 .inline-toolbar.toolbar .button:insensitive:first-child,
73 .inline-toolbar.toolbar .button:backdrop:first-child,
74 .inline-toolbar.toolbar .button:backdrop:insensitive:first-child,
75-.inline-toolbar.toolbar GtkToolButton:first-child .button,
76-.inline-toolbar.toolbar GtkToolButton:first-child .button:active,
77-.inline-toolbar.toolbar GtkToolButton:first-child .button:focus,
78-.inline-toolbar.toolbar GtkToolButton:first-child .button:focus:active,
79-.inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive,
80-.inline-toolbar.toolbar GtkToolButton:first-child .button:backdrop,
81-.inline-toolbar.toolbar GtkToolButton:first-child .button:backdrop:insensitive {
82+.inline-toolbar.toolbar GtkToolButton .button:first-child,
83+.inline-toolbar.toolbar GtkToolButton .button:active:first-child,
84+.inline-toolbar.toolbar GtkToolButton .button:focus:first-child,
85+.inline-toolbar.toolbar GtkToolButton .button:focus:active:first-child,
86+.inline-toolbar.toolbar GtkToolButton .button:insensitive:first-child,
87+.inline-toolbar.toolbar GtkToolButton .button:backdrop:first-child,
88+.inline-toolbar.toolbar GtkToolButton .button:backdrop:insensitive:first-child {
89 border-left-width: 1px;
90 border-right-width: 0;
91 border-image-width: 10px 0 10px 12px;
92@@ -1904,13 +1904,13 @@
93 .inline-toolbar.toolbar .button:insensitive:last-child,
94 .inline-toolbar.toolbar .button:backdrop:last-child,
95 .inline-toolbar.toolbar .button:backdrop:insensitive:last-child,
96-.inline-toolbar.toolbar GtkToolButton:last-child .button,
97-.inline-toolbar.toolbar GtkToolButton:last-child .button:active,
98-.inline-toolbar.toolbar GtkToolButton:last-child .button:focus,
99-.inline-toolbar.toolbar GtkToolButton:last-child .button:focus:active,
100-.inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive,
101-.inline-toolbar.toolbar GtkToolButton:last-child .button:backdrop,
102-.inline-toolbar.toolbar GtkToolButton:last-child .button:backdrop:insensitive {
103+.inline-toolbar.toolbar GtkToolButton .button:last-child,
104+.inline-toolbar.toolbar GtkToolButton .button:active:last-child,
105+.inline-toolbar.toolbar GtkToolButton .button:focus:last-child,
106+.inline-toolbar.toolbar GtkToolButton .button:focus:active:last-child,
107+.inline-toolbar.toolbar GtkToolButton .button:insensitive:last-child,
108+.inline-toolbar.toolbar GtkToolButton .button:backdrop:last-child,
109+.inline-toolbar.toolbar GtkToolButton .button:backdrop:insensitive:last-child {
110 border-left-width: 0;
111 border-right-width: 1px;
112 border-image-width: 10px 12px 10px 0;
113@@ -1927,13 +1927,13 @@
114 .inline-toolbar.toolbar .button:insensitive:only-child,
115 .inline-toolbar.toolbar .button:backdrop:only-child,
116 .inline-toolbar.toolbar .button:backdrop:insensitive:only-child,
117-.inline-toolbar.toolbar GtkToolButton:only-child .button,
118-.inline-toolbar.toolbar GtkToolButton:only-child .button:active,
119-.inline-toolbar.toolbar GtkToolButton:only-child .button:focus,
120-.inline-toolbar.toolbar GtkToolButton:only-child .button:focus:active,
121-.inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive,
122-.inline-toolbar.toolbar GtkToolButton:only-child .button:backdrop,
123-.inline-toolbar.toolbar GtkToolButton:only-child .button:backdrop:insensitive {
124+.inline-toolbar.toolbar GtkToolButton .button:only-child,
125+.inline-toolbar.toolbar GtkToolButton .button:active:only-child,
126+.inline-toolbar.toolbar GtkToolButton .button:focus:only-child,
127+.inline-toolbar.toolbar GtkToolButton .button:focus:active:only-child,
128+.inline-toolbar.toolbar GtkToolButton .button:insensitive:only-child,
129+.inline-toolbar.toolbar GtkToolButton .button:backdrop:only-child,
130+.inline-toolbar.toolbar GtkToolButton .button:backdrop:insensitive:only-child {
131 border-right-width: 1px;
132 border-left-width: 1px;
133 border-image-width: 10px 12px 10px 12px;

Subscribers

People subscribed via source and target branches