Merge lp:~3v1n0/ubuntu-themes/closer-window-buttons into lp:ubuntu-themes

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 542
Merged at revision: 541
Proposed branch: lp:~3v1n0/ubuntu-themes/closer-window-buttons
Merge into: lp:ubuntu-themes
Diff against target: 67 lines (+30/-2)
2 files modified
Ambiance/gtk-3.20/gtk-widgets.css (+15/-1)
Radiance/gtk-3.20/gtk-widgets.css (+15/-1)
To merge this branch: bzr merge lp:~3v1n0/ubuntu-themes/closer-window-buttons
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers Pending
Review via email: mp+323973@code.launchpad.net

Commit message

Ambiance, Radiance: keep the windows button closer

Set the distance of window buttons like the one we've in Unity

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

Feel free to ignore this, but I would prefer to avoid the :not and set the margin-{left,right} properties in the first/last case directly (to 'inherit' if you want, or 0).

Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

Does this work if there is only one button? Then it will be first and last child...

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

> Does this work if there is only one button? Then it will be first and last
> child...

Yes, sure... And in that case there won't be any margin set

> Feel free to ignore this, but I would prefer to avoid the :not and set the
> margin-{left,right} properties in the first/last case directly (to 'inherit'
> if you want, or 0).

Mh, I see things using :not to be more explicit, but we've probably a different way to think :-)

Anyway, I've updated this for your pleasure ;-).

542. By Marco Trevisan (Treviño)

Ambiance, Radiance: use explicit definition for titlebutton margins instead of :not's

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Self global-approving as per:

19:04:44 <Laney> Trevinho: ok, feel free to publish

;-)

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-05-10 12:37:58 +0000
3+++ Ambiance/gtk-3.20/gtk-widgets.css 2017-05-15 03:31:22 +0000
4@@ -283,7 +283,7 @@
5 }
6
7 button separator {
8- color: shade(@bg_color, 1.30);
9+ color: shade(@bg_color, 1.30);
10 }
11
12 /* actionbar */
13@@ -2105,6 +2105,20 @@
14 background-image: linear-gradient(to top, #5a5955, #75746d 50%, #8e8d88);
15 }
16
17+/* keep buttons closer */
18+.titlebar button.titlebutton {
19+ margin-left: -2px;
20+ margin-right: -2px;
21+}
22+
23+.titlebar button.titlebutton:first-child {
24+ margin-left: inherit;
25+}
26+
27+.titlebar button.titlebutton:last-child {
28+ margin-right: inherit;
29+}
30+
31 .titlebar button.titlebutton.close {
32 color: #323112;
33 -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.25);
34
35=== modified file 'Radiance/gtk-3.20/gtk-widgets.css'
36--- Radiance/gtk-3.20/gtk-widgets.css 2017-05-10 12:37:58 +0000
37+++ Radiance/gtk-3.20/gtk-widgets.css 2017-05-15 03:31:22 +0000
38@@ -282,7 +282,7 @@
39 }
40
41 button separator {
42- color: shade(@bg_color, 1.30);
43+ color: shade(@bg_color, 1.30);
44 }
45
46 /* actionbar */
47@@ -2108,6 +2108,20 @@
48 background-image: linear-gradient(to top, #d5d2ce, #ece8e4 50%, #f7f4f3);
49 }
50
51+/* keep buttons closer */
52+.titlebar button.titlebutton {
53+ margin-left: -2px;
54+ margin-right: -2px;
55+}
56+
57+.titlebar button.titlebutton:first-child {
58+ margin-left: inherit;
59+}
60+
61+.titlebar button.titlebutton:last-child {
62+ margin-right: inherit;
63+}
64+
65 .titlebar button.titlebutton.close {
66 color: #7f4025;
67 -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.25);

Subscribers

People subscribed via source and target branches