Ubuntu theme

Merge lp:~3v1n0/ubuntu-themes/rtl-linked-buttons-fix into lp:ubuntu-themes

  1. rtl-linked-buttons-fix
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Andrea Azzarone
Approved revision: 610
Merged at revision: 604
Proposed branch: lp:~3v1n0/ubuntu-themes/rtl-linked-buttons-fix
Merge into: lp:ubuntu-themes
Prerequisite: lp:~3v1n0/ubuntu-themes/linked-items-fixes
Diff against target: 137 lines (+52/-6)
2 files modified
Ambiance/gtk-3.20/gtk-widgets.css (+26/-3)
Radiance/gtk-3.20/gtk-widgets.css (+26/-3)
To merge this branch: bzr merge lp:~3v1n0/ubuntu-themes/rtl-linked-buttons-fix
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
Review via email: mp+341881@code.launchpad.net

This proposal supersedes a proposal from 2018-03-22.

Commit message

Ambiance, Radiance: use proper border-width for first/last linked buttons in rtl

Description of the change

Before: https://imgur.com/CWrD5FG.png
After: https://imgur.com/7aSxTbJ.png

To post a comment you must log in.
lp:~3v1n0/ubuntu-themes/rtl-linked-buttons-fix updated
610. By Marco Trevisan (Treviño)

Ambiance, Radiance: don't forget only-child's on rtl

Revision history for this message
Andrea Azzarone (azzar1) wrote :

LGTM.

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.20/gtk-widgets.css'
2--- Ambiance/gtk-3.20/gtk-widgets.css 2018-03-22 08:24:15 +0000
3+++ Ambiance/gtk-3.20/gtk-widgets.css 2018-03-22 08:24:15 +0000
4@@ -286,38 +286,61 @@
5 }
6
7 .linked entry:first-child,
8+.linked entry:last-child:dir(rtl),
9 .linked button:first-child,
10+.linked button:last-child:dir(rtl),
11 .linked combobox:first-child box.linked button,
12+.linked combobox:last-child box.linked button:dir(rtl),
13 .horizontal.linked entry:first-child,
14+.horizontal.linked entry:last-child:dir(rtl),
15 .horizontal.linked button:first-child,
16+.horizontal.linked button:last-child:dir(rtl),
17 .horizontal.linked combobox:first-child box.linked button,
18-combobox:first-child entry + box.linked button {
19+.horizontal.linked combobox:last-child box.linked button:dir(rtl),
20+combobox:first-child entry + box.linked button,
21+combobox:last-child entry + box.linked button:dir(rtl) {
22 border-image-width: 10px 0 10px 12px;
23 border-radius: 8px 0 0 8px;
24 }
25
26 .linked entry:last-child,
27+.linked entry:first-child:dir(rtl),
28 .linked button:last-child,
29+.linked button:first-child:dir(rtl),
30 .linked combobox:last-child box.linked button,
31+.linked combobox:first-child box.linked button:dir(rtl),
32 .horizontal.linked entry:last-child,
33+.horizontal.linked entry:first-child:dir(rtl),
34 .horizontal.linked button:last-child,
35+.horizontal.linked button:first-child:dir(rtl),
36 .horizontal.linked combobox:last-child box.linked button,
37-combobox:last-child entry + box.linked button {
38+.horizontal.linked combobox:first-child box.linked button:dir(rtl),
39+combobox:last-child entry + box.linked button,
40+combobox:first-child entry + box.linked button:dir(rtl) {
41 border-image-width: 10px 12px 10px 0;
42 border-radius: 0 8px 8px 0;
43 box-shadow: none;
44 }
45
46 .linked entry:only-child,
47+.linked entry:only-child:dir(rtl),
48 .linked button:only-child,
49+.linked button:only-child:dir(rtl),
50 .linked combobox:only-child box.linked button,
51+.linked combobox:only-child box.linked button:dir(rtl),
52 .horizontal.linked entry:only-child,
53+.horizontal.linked entry:only-child:dir(rtl),
54 .horizontal.linked button:only-child,
55+.horizontal.linked button:only-child:dir(rtl),
56 .horizontal.linked combobox:only-child box.linked button,
57+.horizontal.linked combobox:only-child box.linked button:dir(rtl),
58 .vertical.linked entry:only-child,
59+.vertical.linked entry:only-child:dir(rtl),
60 .vertical.linked button:only-child,
61+.vertical.linked button:only-child:dir(rtl),
62 .vertical.linked combobox:only-child box.linked button,
63-combobox:only-child entry + box.linked button {
64+.vertical.linked combobox:only-child box.linked button:dir(rtl),
65+combobox:only-child entry + box.linked button:dir(rtl) {
66 border-image-width: 10px 12px 10px 12px;
67 border-radius: 8px;
68 }
69
70=== modified file 'Radiance/gtk-3.20/gtk-widgets.css'
71--- Radiance/gtk-3.20/gtk-widgets.css 2018-03-22 08:24:15 +0000
72+++ Radiance/gtk-3.20/gtk-widgets.css 2018-03-22 08:24:15 +0000
73@@ -287,38 +287,61 @@
74 }
75
76 .linked entry:first-child,
77+.linked entry:last-child:dir(rtl),
78 .linked button:first-child,
79+.linked button:last-child:dir(rtl),
80 .linked combobox:first-child box.linked button,
81+.linked combobox:last-child box.linked button:dir(rtl),
82 .horizontal.linked entry:first-child,
83+.horizontal.linked entry:last-child:dir(rtl),
84 .horizontal.linked button:first-child,
85+.horizontal.linked button:last-child:dir(rtl),
86 .horizontal.linked combobox:first-child box.linked button,
87-combobox:first-child entry + box.linked button {
88+.horizontal.linked combobox:last-child box.linked button:dir(rtl),
89+combobox:first-child entry + box.linked button,
90+combobox:last-child entry + box.linked button:dir(rtl) {
91 border-image-width: 10px 0 10px 12px;
92 border-radius: 8px 0 0 8px;
93 }
94
95 .linked entry:last-child,
96+.linked entry:first-child:dir(rtl),
97 .linked button:last-child,
98+.linked button:first-child:dir(rtl),
99 .linked combobox:last-child box.linked button,
100+.linked combobox:first-child box.linked button:dir(rtl),
101 .horizontal.linked entry:last-child,
102+.horizontal.linked entry:first-child:dir(rtl),
103 .horizontal.linked button:last-child,
104+.horizontal.linked button:first-child:dir(rtl),
105 .horizontal.linked combobox:last-child box.linked button,
106-combobox:last-child entry + box.linked button {
107+.horizontal.linked combobox:first-child box.linked button:dir(rtl),
108+combobox:last-child entry + box.linked button,
109+combobox:first-child entry + box.linked button:dir(rtl) {
110 border-image-width: 10px 12px 10px 0;
111 border-radius: 0 8px 8px 0;
112 box-shadow: none;
113 }
114
115 .linked entry:only-child,
116+.linked entry:only-child:dir(rtl),
117 .linked button:only-child,
118+.linked button:only-child:dir(rtl),
119 .linked combobox:only-child box.linked button,
120+.linked combobox:only-child box.linked button:dir(rtl),
121 .horizontal.linked entry:only-child,
122+.horizontal.linked entry:only-child:dir(rtl),
123 .horizontal.linked button:only-child,
124+.horizontal.linked button:only-child:dir(rtl),
125 .horizontal.linked combobox:only-child box.linked button,
126+.horizontal.linked combobox:only-child box.linked button:dir(rtl),
127 .vertical.linked entry:only-child,
128+.vertical.linked entry:only-child:dir(rtl),
129 .vertical.linked button:only-child,
130+.vertical.linked button:only-child:dir(rtl),
131 .vertical.linked combobox:only-child box.linked button,
132-combobox:only-child entry + box.linked button {
133+.vertical.linked combobox:only-child box.linked button:dir(rtl),
134+combobox:only-child entry + box.linked button:dir(rtl) {
135 border-image-width: 10px 12px 10px 12px;
136 border-radius: 8px;
137 }

Subscribers

People subscribed via source and target branches