Merge lp:~c-lobrano/ubuntu-themes/bug-1721102 into lp:ubuntu-themes/artful

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 585
Merged at revision: 590
Proposed branch: lp:~c-lobrano/ubuntu-themes/bug-1721102
Merge into: lp:ubuntu-themes/artful
Diff against target: 61 lines (+40/-0)
2 files modified
Ambiance/gtk-3.20/gtk-widgets.css (+20/-0)
Radiance/gtk-3.20/gtk-widgets.css (+20/-0)
To merge this branch: bzr merge lp:~c-lobrano/ubuntu-themes/bug-1721102
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers Pending
Review via email: mp+333732@code.launchpad.net

Commit message

Ambiance, Radiance: fix horizontal linked suggested-action and destructive-action

To post a comment you must log in.

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 2017-10-12 05:18:40 +0000
3+++ Ambiance/gtk-3.20/gtk-widgets.css 2017-11-15 06:54:13 +0000
4@@ -312,6 +312,26 @@
5 box-shadow: none;
6 }
7
8+.horizontal.linked button:not(:only-child) {
9+ background-clip: padding-box;
10+}
11+
12+.horizontal.linked button.suggested-action:first-child,
13+.horizontal.linked button.destructive-action:first-child {
14+ border-left-width: 1px;
15+ border-radius: 8px 0 0 8px;
16+}
17+
18+.horizontal.linked button.suggested-action:not(:only-child):not(:first-child):not(:last-child) {
19+ border-radius: 0;
20+}
21+
22+.horizontal.linked button.suggested-action:last-child,
23+.horizontal.linked button.destructive-action:last-child {
24+ border-right-width: 1px;
25+ border-radius: 0 8px 8px 0;
26+}
27+
28 .linked.vertical button:backdrop:not(:only-child),
29 .linked.vertical button.destructive-action:backdrop:not(:only-child),
30 .linked.vertical button:disabled:not(:only-child),
31
32=== modified file 'Radiance/gtk-3.20/gtk-widgets.css'
33--- Radiance/gtk-3.20/gtk-widgets.css 2017-10-12 05:18:40 +0000
34+++ Radiance/gtk-3.20/gtk-widgets.css 2017-11-15 06:54:13 +0000
35@@ -311,6 +311,26 @@
36 box-shadow: none;
37 }
38
39+.horizontal.linked button:not(:only-child) {
40+ background-clip: padding-box;
41+}
42+
43+.horizontal.linked button.suggested-action:first-child,
44+.horizontal.linked button.destructive-action:first-child {
45+ border-left-width: 1px;
46+ border-radius: 8px 0 0 8px;
47+}
48+
49+.horizontal.linked button.suggested-action:not(:only-child):not(:first-child):not(:last-child) {
50+ border-radius: 0;
51+}
52+
53+.horizontal.linked button.suggested-action:last-child,
54+.horizontal.linked button.destructive-action:last-child {
55+ border-right-width: 1px;
56+ border-radius: 0 8px 8px 0;
57+}
58+
59 .linked.vertical button:backdrop:not(:only-child),
60 .linked.vertical button.destructive-action:backdrop:not(:only-child),
61 .linked.vertical button:disabled:not(:only-child),

Subscribers

People subscribed via source and target branches