Merge lp:~3v1n0/ubuntu-themes/only-child-scale-states-fix into lp:ubuntu-themes

Proposed by Marco Trevisan (Treviño) on 2018-03-28
Status: Merged
Approved by: Andrea Azzarone on 2018-03-28
Approved revision: 609
Merged at revision: 614
Proposed branch: lp:~3v1n0/ubuntu-themes/only-child-scale-states-fix
Merge into: lp:ubuntu-themes
Diff against target: 77 lines (+16/-8)
2 files modified
Ambiance/gtk-3.20/gtk-widgets-assets.css (+8/-4)
Radiance/gtk-3.20/gtk-widgets-assets.css (+8/-4)
To merge this branch: bzr merge lp:~3v1n0/ubuntu-themes/only-child-scale-states-fix
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) 2018-03-28 Approve on 2018-03-28
Review via email: mp+342262@code.launchpad.net

Commit message

Ambiance, Radiance: add more specific selectors for scale states

And thus it was always painted as enabled also if it wasn't

To post a comment you must log in.
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-assets.css'
2--- Ambiance/gtk-3.20/gtk-widgets-assets.css 2016-10-06 18:53:39 +0000
3+++ Ambiance/gtk-3.20/gtk-widgets-assets.css 2018-03-28 06:20:31 +0000
4@@ -536,26 +536,30 @@
5 }
6
7 scale slider:hover,
8-scale.horizontal slider:hover {
9+scale.horizontal slider:hover,
10+scale.horizontal contents:only-child trough slider:hover {
11 background-image: -gtk-scaled(url("assets/slider-horizontal-hover.png"),
12 url("assets/slider-horizontal-hover@2.png"));
13 background-repeat: no-repeat;
14 }
15
16 scale slider:focus,
17-scale.horizontal slider:focus {
18+scale.horizontal slider:focus,
19+scale.horizontal contents:only-child trough slider:focus {
20 background-image: -gtk-scaled(url("assets/slider-horizontal-focused.png"),
21 url("assets/slider-horizontal-focused@2.png"));
22 }
23
24 scale slider:hover:focus,
25-scale.horizontal slider:hover:focus {
26+scale.horizontal slider:hover:focus,
27+scale.horizontal contents:only-child trough slider:hover:focus {
28 background-image: -gtk-scaled(url("assets/slider-horizontal-focused-hover.png"),
29 url("assets/slider-horizontal-focused-hover@2.png"));
30 }
31
32 scale:disabled slider,
33-scale.horizontal:disabled slider {
34+scale.horizontal:disabled slider,
35+scale.horizontal:disabled contents:only-child trough slider {
36 background-image: -gtk-scaled(url("assets/slider-horizontal-disabled.png"),
37 url("assets/slider-horizontal-disabled@2.png"));
38 }
39
40=== modified file 'Radiance/gtk-3.20/gtk-widgets-assets.css'
41--- Radiance/gtk-3.20/gtk-widgets-assets.css 2016-10-06 18:53:39 +0000
42+++ Radiance/gtk-3.20/gtk-widgets-assets.css 2018-03-28 06:20:31 +0000
43@@ -541,26 +541,30 @@
44 }
45
46 scale slider:hover,
47-scale.horizontal slider:hover {
48+scale.horizontal slider:hover,
49+scale.horizontal contents:only-child trough slider:hover {
50 background-image: -gtk-scaled(url("assets/slider-horizontal-hover.png"),
51 url("assets/slider-horizontal-hover@2.png"));
52 background-repeat: no-repeat;
53 }
54
55 scale slider:focus,
56-scale.horizontal slider:focus {
57+scale.horizontal slider:focus,
58+scale.horizontal contents:only-child trough slider:focus {
59 background-image: -gtk-scaled(url("assets/slider-horizontal-focused.png"),
60 url("assets/slider-horizontal-focused@2.png"));
61 }
62
63 scale slider:hover:focus,
64-scale.horizontal slider:hover:focus {
65+scale.horizontal slider:hover:focus,
66+scale.horizontal contents:only-child trough slider:hover:focus {
67 background-image: -gtk-scaled(url("assets/slider-horizontal-focused-hover.png"),
68 url("assets/slider-horizontal-focused-hover@2.png"));
69 }
70
71 scale:disabled slider,
72-scale.horizontal:disabled slider {
73+scale.horizontal:disabled slider,
74+scale.horizontal:disabled contents:only-child trough slider {
75 background-image: -gtk-scaled(url("assets/slider-horizontal-disabled.png"),
76 url("assets/slider-horizontal-disabled@2.png"));
77 }

Subscribers

People subscribed via source and target branches