Merge lp:~3v1n0/ubuntu-themes/places-sidebar-button-theming into lp:ubuntu-themes

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Andrea Azzarone
Approved revision: 609
Merged at revision: 609
Proposed branch: lp:~3v1n0/ubuntu-themes/places-sidebar-button-theming
Merge into: lp:ubuntu-themes
Diff against target: 80 lines (+58/-2)
2 files modified
Ambiance/gtk-3.20/gtk-widgets.css (+29/-1)
Radiance/gtk-3.20/gtk-widgets.css (+29/-1)
To merge this branch: bzr merge lp:~3v1n0/ubuntu-themes/places-sidebar-button-theming
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
Review via email: mp+341925@code.launchpad.net

Commit message

Ambiance, Radiance: theme the places sidebar buttons to match parent

Description of the change

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

Thanks for the quick fix!

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:26:49 +0000
3+++ Ambiance/gtk-3.20/gtk-widgets.css 2018-03-22 17:35:30 +0000
4@@ -2286,7 +2286,35 @@
5 }
6
7 placessidebar.sidebar row.sidebar-row:selected.has-open-popup .sidebar-icon:backdrop,
8-placessidebar.sidebar row.sidebar-row:selected .sidebar-icon:backdrop {
9+placessidebar.sidebar row.sidebar-row:selected .sidebar-icon:backdrop,
10+placessidebar.sidebar .sidebar-button:active:backdrop {
11+ color: mix(shade(@places_sidebar_selected_bg_color, 1.03), shade(@places_sidebar_fg_color, 0.9), 0.3);
12+}
13+
14+placessidebar.sidebar .sidebar-button {
15+ background-image: none;
16+ border-image: none;
17+ margin-right: 4px;
18+ background-color: shade(@places_sidebar_bg, 0.85);
19+ border: 1px solid shade(@places_sidebar_bg, 0.75);
20+ color: shade(@places_sidebar_fg_color, 0.9);
21+}
22+
23+placessidebar.sidebar .sidebar-button:backdrop {
24+ border-color: mix(shade(@places_sidebar_bg, 0.75), @bg_color, 0.15);
25+ background-color: mix(shade(@places_sidebar_bg, 0.85), @bg_color, 0.15);
26+}
27+
28+placessidebar.sidebar .sidebar-button:hover {
29+ color: @places_sidebar_fg_color;
30+}
31+
32+placessidebar.sidebar .sidebar-button:active {
33+ background-color: @places_sidebar_bg;
34+ color: @places_sidebar_selected_bg_color;
35+}
36+
37+placessidebar.sidebar .sidebar-button:active:backdrop {
38 color: mix(shade(@places_sidebar_selected_bg_color, 1.03), shade(@places_sidebar_fg_color, 0.9), 0.3);
39 }
40
41
42=== modified file 'Radiance/gtk-3.20/gtk-widgets.css'
43--- Radiance/gtk-3.20/gtk-widgets.css 2018-03-22 08:26:49 +0000
44+++ Radiance/gtk-3.20/gtk-widgets.css 2018-03-22 17:35:30 +0000
45@@ -2281,7 +2281,35 @@
46 }
47
48 placessidebar.sidebar row.sidebar-row:selected.has-open-popup .sidebar-icon:backdrop,
49-placessidebar.sidebar row.sidebar-row:selected .sidebar-icon:backdrop {
50+placessidebar.sidebar row.sidebar-row:selected .sidebar-icon:backdrop,
51+placessidebar.sidebar .sidebar-button:active:backdrop {
52+ color: mix(shade(@places_sidebar_selected_bg_color, 1.03), shade(@places_sidebar_fg_color, 0.9), 0.3);
53+}
54+
55+placessidebar.sidebar .sidebar-button {
56+ background-image: none;
57+ border-image: none;
58+ margin-right: 4px;
59+ background-color: shade(@places_sidebar_bg, 0.85);
60+ border: 1px solid shade(@places_sidebar_bg, 0.75);
61+ color: shade(@places_sidebar_fg_color, 0.9);
62+}
63+
64+placessidebar.sidebar .sidebar-button:backdrop {
65+ border-color: mix(shade(@places_sidebar_bg, 0.75), @bg_color, 0.15);
66+ background-color: mix(shade(@places_sidebar_bg, 0.85), @bg_color, 0.15);
67+}
68+
69+placessidebar.sidebar .sidebar-button:hover {
70+ color: @places_sidebar_fg_color;
71+}
72+
73+placessidebar.sidebar .sidebar-button:active {
74+ background-color: @places_sidebar_bg;
75+ color: @places_sidebar_selected_bg_color;
76+}
77+
78+placessidebar.sidebar .sidebar-button:active:backdrop {
79 color: mix(shade(@places_sidebar_selected_bg_color, 1.03), shade(@places_sidebar_fg_color, 0.9), 0.3);
80 }
81

Subscribers

People subscribed via source and target branches