Ubuntu theme

Merge lp:~larsu/ubuntu-themes/fix-linked-entries into lp:ubuntu-themes

  1. fix-linked-entries
  2. Merge into trunk
Proposed by Lars Karlitski
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 361
Merged at revision: 361
Proposed branch: lp:~larsu/ubuntu-themes/fix-linked-entries
Merge into: lp:ubuntu-themes
Diff against target: 189 lines (+42/-40)
2 files modified
Ambiance/gtk-3.0/gtk-widgets.css (+21/-20)
Radiance/gtk-3.0/gtk-widgets.css (+21/-20)
To merge this branch: bzr merge lp:~larsu/ubuntu-themes/fix-linked-entries
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Sebastien Bacher Approve
Review via email: mp+210448@code.launchpad.net

Commit message

Fix styling of linked entries

Needed for evince's page selector.

Description of the change

Fix styling of linked entries

Needed for evince's page selector.

To post a comment you must log in.
lp:~larsu/ubuntu-themes/fix-linked-entries updated
361. By Lars Karlitski

Apply linked button borders for :backdrop as well

Revision history for this message
Sebastien Bacher (seb128) wrote :

looks better indeed

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:360
http://jenkins.qa.ubuntu.com/job/ubuntu-themes-ci/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-trusty-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-trusty-armhf-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-trusty-i386-ci/33

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-themes-ci/53/rebuild

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 2014-03-11 08:23:50 +0000
3+++ Ambiance/gtk-3.0/gtk-widgets.css 2014-03-11 16:48:04 +0000
4@@ -290,6 +290,9 @@
5
6 /* Middle button */
7 .linked .entry,
8+.linked .entry:active,
9+.linked .entry:focus,
10+.linked .entry:focus:active,
11 .linked .button,
12 .linked .button:active,
13 .linked .button:active:hover,
14@@ -306,12 +309,17 @@
15
16 /* Leftmost button */
17 .linked .entry:first-child,
18+.linked .entry:active:first-child,
19+.linked .entry:focus:first-child,
20+.linked .entry:focus:active:first-child,
21 .linked .button:first-child,
22 .linked .button:active:first-child,
23 .linked .button:active:hover:first-child,
24 .linked .button:focus:first-child,
25 .linked .button:focus:active:first-child,
26-.linked .button:insensitive:first-child {
27+.linked .button:insensitive:first-child,
28+.linked .button:backdrop:first-child,
29+.linked .button:active:backdrop:first-child {
30 border-width: 1px;
31 border-right-width: 0;
32 border-image-width: 10px 0 10px 12px;
33@@ -322,12 +330,17 @@
34
35 /* Rightmost button */
36 .linked .entry:last-child,
37+.linked .entry:active:last-child,
38+.linked .entry:focus:last-child,
39+.linked .entry:focus:active:last-child,
40 .linked .button:last-child,
41 .linked .button:active:last-child,
42 .linked .button:active:hover:last-child,
43 .linked .button:focus:last-child,
44 .linked .button:focus:active:last-child,
45-.linked .button:insensitive:last-child {
46+.linked .button:insensitive:last-child,
47+.linked .button:backdrop:last-child,
48+.linked .button:active:backdrop:last-child {
49 border-width: 1px;
50 border-left-width: 0;
51 border-image-width: 10px 12px 10px 0;
52@@ -338,12 +351,17 @@
53
54 /* Linked single button */
55 .linked .entry:only-child,
56+.linked .entry:active:only-child,
57+.linked .entry:focus:only-child,
58+.linked .entry:focus:active:only-child,
59 .linked .button:only-child,
60 .linked .button:active:only-child,
61 .linked .button:active:hover:only-child,
62 .linked .button:focus:only-child,
63 .linked .button:focus:active:only-child,
64-.linked .button:insensitive:only-child {
65+.linked .button:insensitive:only-child,
66+.linked .button:backdrop:only-child,
67+.linked .button:active:backdrop:only-child {
68 border-right-width: 1px;
69 border-left-width: 1px;
70 border-image-width: 10px 12px 10px 12px;
71@@ -2031,23 +2049,6 @@
72 to (shade (@dark_bg_color, 1.02)));
73 }
74
75-.primary-toolbar .entry,
76-.primary-toolbar .entry:active,
77-.primary-toolbar .entry:focused,
78-.menubar.toolbar .entry,
79-.menubar.toolbar .entry:active,
80-.menubar.toolbar .entry:focused,
81-.header-bar .entry,
82-.header-bar .entry:active,
83-.header-bar .entry:focused {
84- border-radius: 9px;
85-
86-/* background-color: @dark_bg_color;
87- background-image: none;
88-
89- background-clip: border-box;*/
90-}
91-
92 .primary-toolbar GtkSeparatorToolItem,
93 .primary-toolbar .separator,
94 .primary-toolbar .separator:insensitive,
95
96=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
97--- Radiance/gtk-3.0/gtk-widgets.css 2014-03-11 08:23:50 +0000
98+++ Radiance/gtk-3.0/gtk-widgets.css 2014-03-11 16:48:04 +0000
99@@ -292,6 +292,9 @@
100
101 /* Middle button */
102 .linked .entry,
103+.linked .entry:active,
104+.linked .entry:focus,
105+.linked .entry:focus:active,
106 .linked .button,
107 .linked .button:active,
108 .linked .button:active:hover,
109@@ -308,12 +311,17 @@
110
111 /* Leftmost button */
112 .linked .entry:first-child,
113+.linked .entry:active:first-child,
114+.linked .entry:focus:first-child,
115+.linked .entry:focus:active:first-child,
116 .linked .button:first-child,
117 .linked .button:active:first-child,
118 .linked .button:active:hover:first-child,
119 .linked .button:focus:first-child,
120 .linked .button:focus:active:first-child,
121-.linked .button:insensitive:first-child {
122+.linked .button:insensitive:first-child,
123+.linked .button:backdrop:first-child,
124+.linked .button:active:backdrop:first-child {
125 border-width: 1px;
126 border-right-width: 0;
127 border-image-width: 10px 0 10px 12px;
128@@ -324,12 +332,17 @@
129
130 /* Rightmost button */
131 .linked .entry:last-child,
132+.linked .entry:active:last-child,
133+.linked .entry:focus:last-child,
134+.linked .entry:focus:active:last-child,
135 .linked .button:last-child,
136 .linked .button:active:last-child,
137 .linked .button:active:hover:last-child,
138 .linked .button:focus:last-child,
139 .linked .button:focus:active:last-child,
140-.linked .button:insensitive:last-child {
141+.linked .button:insensitive:last-child,
142+.linked .button:backdrop:last-child,
143+.linked .button:active:backdrop:last-child {
144 border-width: 1px;
145 border-left-width: 0;
146 border-image-width: 10px 12px 10px 0;
147@@ -340,12 +353,17 @@
148
149 /* Linked single button */
150 .linked .entry:only-child,
151+.linked .entry:active:only-child,
152+.linked .entry:focus:only-child,
153+.linked .entry:focus:active:only-child,
154 .linked .button:only-child,
155 .linked .button:active:only-child,
156 .linked .button:active:hover:only-child,
157 .linked .button:focus:only-child,
158 .linked .button:focus:active:only-child,
159-.linked .button:insensitive:only-child {
160+.linked .button:insensitive:only-child,
161+.linked .button:backdrop:only-child,
162+.linked .button:active:backdrop:only-child {
163 border-right-width: 1px;
164 border-left-width: 1px;
165 border-image-width: 10px 12px 10px 12px;
166@@ -2041,23 +2059,6 @@
167 to (shade (@dark_bg_color, 1.02)));
168 }
169
170-.primary-toolbar .entry,
171-.primary-toolbar .entry:active,
172-.primary-toolbar .entry:focused,
173-.menubar.toolbar .entry,
174-.menubar.toolbar .entry:active,
175-.menubar.toolbar .entry:focused,
176-.header-bar .entry,
177-.header-bar .entry:active,
178-.header-bar .entry:focused {
179- border-radius: 9px;
180-
181-/* background-color: @dark_bg_color;
182- background-image: none;
183-
184- background-clip: border-box;*/
185-}
186-
187 .primary-toolbar GtkSeparatorToolItem,
188 .primary-toolbar .separator,
189 .primary-toolbar .separator:insensitive,

Subscribers

People subscribed via source and target branches