Ubuntu theme

Merge lp:~larsu/ubuntu-themes/overlay-scrollbars into lp:ubuntu-themes

  1. overlay-scrollbars
  2. Merge into trunk
Proposed by Iain Lane
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 441
Merged at revision: 444
Proposed branch: lp:~larsu/ubuntu-themes/overlay-scrollbars
Merge into: lp:ubuntu-themes
Diff against target: 443 lines (+41/-252)
12 files modified
Ambiance/gtk-3.0/apps/california.css (+0/-5)
Ambiance/gtk-3.0/apps/geary.css (+0/-5)
Ambiance/gtk-3.0/apps/software-center.css (+0/-5)
Ambiance/gtk-3.0/gtk-main.css (+0/-3)
Ambiance/gtk-3.0/gtk-widgets-borders.css (+0/-8)
Ambiance/gtk-3.0/gtk-widgets.css (+21/-110)
Radiance/gtk-3.0/apps/california.css (+0/-5)
Radiance/gtk-3.0/apps/geary.css (+0/-5)
Radiance/gtk-3.0/apps/software-center.css (+0/-5)
Radiance/gtk-3.0/gtk-main.css (+0/-3)
Radiance/gtk-3.0/gtk-widgets-borders.css (+0/-11)
Radiance/gtk-3.0/gtk-widgets.css (+20/-87)
To merge this branch: bzr merge lp:~larsu/ubuntu-themes/overlay-scrollbars
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+265372@code.launchpad.net

Commit message

Theme GTK overlay-scrollbars to be more ubuntu-ish

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

looks good to me, much nicer that what we currently have

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file 'Ambiance/gtk-3.0/apps/california.css'
--- Ambiance/gtk-3.0/apps/california.css 2014-09-09 10:51:25 +0000
+++ Ambiance/gtk-3.0/apps/california.css 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
1
2/* for overlay-scrollbars */
3CaliforniaViewWeekGrid {
4 background-color: @bg_color;
5}
60
=== removed file 'Ambiance/gtk-3.0/apps/geary.css'
--- Ambiance/gtk-3.0/apps/geary.css 2015-03-20 16:52:48 +0000
+++ Ambiance/gtk-3.0/apps/geary.css 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
1
2/* for overlay-scrollbars */
3ComposerWidget {
4 background-color: @bg_color;
5}
60
=== removed file 'Ambiance/gtk-3.0/apps/software-center.css'
--- Ambiance/gtk-3.0/apps/software-center.css 2015-03-20 12:45:48 +0000
+++ Ambiance/gtk-3.0/apps/software-center.css 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
1
2/* for overlay-scrollbars */
3.action-bar {
4 background-color: @bg_color;
5}
60
=== modified file 'Ambiance/gtk-3.0/gtk-main.css'
--- Ambiance/gtk-3.0/gtk-main.css 2015-04-10 10:57:46 +0000
+++ Ambiance/gtk-3.0/gtk-main.css 2015-07-21 08:54:26 +0000
@@ -53,7 +53,6 @@
53@import url("gtk-widgets-borders.css");53@import url("gtk-widgets-borders.css");
54@import url("gtk-widgets-assets.css");54@import url("gtk-widgets-assets.css");
55@import url("gtk-widgets.css");55@import url("gtk-widgets.css");
56@import url("apps/geary.css");
57@import url("apps/unity.css");56@import url("apps/unity.css");
58@import url("apps/baobab.css");57@import url("apps/baobab.css");
59@import url("apps/gedit.css");58@import url("apps/gedit.css");
@@ -63,6 +62,4 @@
63@import url("apps/gnome-system-log.css");62@import url("apps/gnome-system-log.css");
64@import url("apps/unity-greeter.css");63@import url("apps/unity-greeter.css");
65@import url("apps/glade.css");64@import url("apps/glade.css");
66@import url("apps/california.css");
67@import url("apps/software-center.css");
68@import url("public-colors.css");65@import url("public-colors.css");
6966
=== modified file 'Ambiance/gtk-3.0/gtk-widgets-borders.css'
--- Ambiance/gtk-3.0/gtk-widgets-borders.css 2014-11-27 13:01:02 +0000
+++ Ambiance/gtk-3.0/gtk-widgets-borders.css 2015-07-21 08:54:26 +0000
@@ -171,14 +171,6 @@
171 border-image: url("assets/progressbar-horizontal-trough.png") 6 7 6 7 / 6px 7px 6px 7px stretch;171 border-image: url("assets/progressbar-horizontal-trough.png") 6 7 6 7 / 6px 7px 6px 7px stretch;
172}172}
173173
174.trough.vertical {
175 border-image: url("assets/progressbar-vertical-trough.png") 7 6 7 6 / 7px 6px 7px 6px stretch;
176}
177
178.trough.vertical {
179 border-image: url("assets/progressbar-vertical-trough.png") 7 6 7 6 / 7px 6px 7px 6px stretch;
180}
181
182GtkSwitch.trough {174GtkSwitch.trough {
183 border-image: url("assets/switch-trough-off.png") 10 12 10 12 / 10px 12px 10px 12px stretch;175 border-image: url("assets/switch-trough-off.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
184}176}
185177
=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
--- Ambiance/gtk-3.0/gtk-widgets.css 2015-05-29 09:06:29 +0000
+++ Ambiance/gtk-3.0/gtk-widgets.css 2015-07-21 08:54:26 +0000
@@ -27,9 +27,6 @@
27 -GtkRange-trough-under-steppers: 1;27 -GtkRange-trough-under-steppers: 1;
28 -GtkRange-stepper-spacing: 0;28 -GtkRange-stepper-spacing: 0;
29 -GtkScale-trough-border: 0;29 -GtkScale-trough-border: 0;
30 -GtkScrollbar-activate-slider: 1;
31 -GtkScrollbar-trough-border: 0;
32 -GtkScrollbar-min-slider-length: 31;
33 -GtkScrolledWindow-scrollbar-spacing: 0;30 -GtkScrolledWindow-scrollbar-spacing: 0;
34 -GtkScrolledWindow-scrollbars-within-bevel: 1;31 -GtkScrolledWindow-scrollbars-within-bevel: 1;
35 -GtkSeparatorMenuItem-horizontal-padding: 0;32 -GtkSeparatorMenuItem-horizontal-padding: 0;
@@ -60,48 +57,6 @@
6057
61.background:backdrop {58.background:backdrop {
62 color: @backdrop_fg_color;59 color: @backdrop_fg_color;
63}
64
65/* LP: #1285783 */
66GtkScrolledWindow {
67 background-color: @bg_color;
68}
69
70GtkPaned {
71 background-color: @bg_color;
72}
73
74/* Background hack to make DejaDup Assistant windows not turn black when
75 * overlay scrollbars are enabled.
76 */
77Assistant GtkEventBox {
78 background-color: @bg_color;
79}
80
81/* ... and for Evolution's mail preferences window */
82EPreferencesWindow GtkNotebook GtkAlignment GtkVBox {
83 background-color: @bg_color;
84}
85
86/*************
87 * assistant *
88 *************/
89GtkAssistant .sidebar .highlight {
90 color: @fg_color;
91 font: bold;
92}
93
94GtkAssistant .sidebar {
95 background-color: shade (@bg_color, 0.97);
96 border-right-color: shade (@bg_color, 0.8);
97 border-radius: 0;
98 border-style: solid;
99 border-width: 0 1px 0 0;
100 padding: 12px;
101
102 color: mix (@fg_color, @bg_color, 0.40);
103 text-shadow: 0 1px shade (@bg_color, 1.04);
104
105 box-shadow: inset -1px 0 shade (@bg_color, 0.94);60 box-shadow: inset -1px 0 shade (@bg_color, 0.94);
106}61}
10762
@@ -239,8 +194,7 @@
239194
240.button.default:hover {195.button.default:hover {
241 border-image-source: url("assets/button-default-hover.png");196 border-image-source: url("assets/button-default-hover.png");
242}197}.
243
244.button.default:focus {198.button.default:focus {
245 border-image-source: url("assets/button-default-focused.png");199 border-image-source: url("assets/button-default-focused.png");
246}200}
@@ -1181,74 +1135,31 @@
1181/*************1135/*************
1182 * scrollbar *1136 * scrollbar *
1183 *************/1137 *************/
1184.scrollbar,1138.scrollbar {
1185.scrollbar.vertical {
1186 -GtkScrollbar-has-backward-stepper: 0;1139 -GtkScrollbar-has-backward-stepper: 0;
1187 -GtkScrollbar-has-forward-stepper: 0;1140 -GtkScrollbar-has-forward-stepper: 0;
1188 -GtkRange-slider-width: 14;1141 -GtkScrollbar-trough-border: 0;
11891142 -GtkScrollbar-min-slider-length: 31;
1190 border-radius: 20px;1143 -GtkRange-slider-width: 3;
11911144
1192 border-image: none;1145 border: none;
1193}1146}
11941147
1195.scrollbar.trough,1148.scrollbar.hovering,
1196.scrollbar.trough.vertical {1149.scrollbar.dragging {
1197 border-color: shade (@bg_color, 0.8);1150 -GtkRange-slider-width: 10;
1198}1151 background-color: alpha(@bg_color, 0.8);
11991152}
1200.scrollbar.slider,1153
1201.scrollbar.slider:hover,1154.scrollbar.slider {
1202.scrollbar.button,1155 background-color: alpha(@selected_bg_color, 0.8);
1203.scrollbar.slider.vertical,1156 border-radius: 8px;
1204.scrollbar.slider.vertical:hover,1157}
1205.scrollbar.button.vertical {1158
1206 border-width: 1px;1159.scrollbar.slider:active {
1207 border-style: solid;
1208 border-color: shade (@bg_color, 0.86);
1209 background-image: -gtk-gradient (linear, left top, right top,
1210 from (shade (@button_bg_color, 1.08)),
1211 color-stop (0.5, @button_bg_color),
1212 to (shade (@button_bg_color, 0.94)));
1213 box-shadow: inset 1px 0 shade (@bg_color, 1.1),
1214 inset -1px 0 shade (@bg_color, 1.01),
1215 inset 0 1px shade (@bg_color, 1.1),
1216 inset 0 -1px shade (@bg_color, 1.1);
1217}
1218
1219.scrollbar.slider.horizontal,
1220.scrollbar.slider.horizontal:hover,
1221.scrollbar.button.horizontal {
1222 background-image: -gtk-gradient (linear, left top, left bottom,
1223 from (shade (@button_bg_color, 1.08)),
1224 color-stop (0.5, @button_bg_color),
1225 to (shade (@button_bg_color, 0.94)));
1226 box-shadow: inset 1px 0 shade (@bg_color, 1.1),
1227 inset -1px 0 shade (@bg_color, 1.1),
1228 inset 0 1px shade (@bg_color, 1.1),
1229 inset 0 -1px shade (@bg_color, 1.01);
1230}
1231
1232/* overlay scrollbar */
1233OsThumb {
1234 color: shade (@fg_color, 1.6);
1235}
1236
1237OsThumb:selected,
1238GtkScrollbar:selected {
1239 background-color: @selected_bg_color;1160 background-color: @selected_bg_color;
1240}1161}
12411162
1242OsThumb:active,
1243GtkScrollbar:active {
1244 background-color: shade (@bg_color, 0.6);
1245}
1246
1247OsThumb:insensitive,
1248GtkScrollbar:insensitive {
1249 background-color: shade (@bg_color, 0.85);
1250}
1251
1252/*******************1163/*******************
1253 * scrolled window *1164 * scrolled window *
1254 *******************/1165 *******************/
12551166
=== removed file 'Radiance/gtk-3.0/apps/california.css'
--- Radiance/gtk-3.0/apps/california.css 2014-09-09 10:51:25 +0000
+++ Radiance/gtk-3.0/apps/california.css 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
1
2/* for overlay-scrollbars */
3CaliforniaViewWeekGrid {
4 background-color: @bg_color;
5}
60
=== removed file 'Radiance/gtk-3.0/apps/geary.css'
--- Radiance/gtk-3.0/apps/geary.css 2015-03-20 16:52:48 +0000
+++ Radiance/gtk-3.0/apps/geary.css 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
1
2/* for overlay-scrollbars */
3ComposerWidget {
4 background-color: @bg_color;
5}
60
=== removed file 'Radiance/gtk-3.0/apps/software-center.css'
--- Radiance/gtk-3.0/apps/software-center.css 2015-03-20 12:45:48 +0000
+++ Radiance/gtk-3.0/apps/software-center.css 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
1
2/* for overlay-scrollbars */
3.action-bar {
4 background-color: @bg_color;
5}
60
=== modified file 'Radiance/gtk-3.0/gtk-main.css'
--- Radiance/gtk-3.0/gtk-main.css 2015-04-10 10:57:46 +0000
+++ Radiance/gtk-3.0/gtk-main.css 2015-07-21 08:54:26 +0000
@@ -55,7 +55,6 @@
55@import url("gtk-widgets-assets-radiance.css");55@import url("gtk-widgets-assets-radiance.css");
56@import url("gtk-widgets.css");56@import url("gtk-widgets.css");
57@import url("gtk-widgets-radiance.css");57@import url("gtk-widgets-radiance.css");
58@import url("apps/geary.css");
59@import url("apps/unity.css");58@import url("apps/unity.css");
60@import url("apps/unity-greeter.css");59@import url("apps/unity-greeter.css");
61@import url("apps/baobab.css");60@import url("apps/baobab.css");
@@ -65,6 +64,4 @@
65@import url("apps/gnome-terminal.css");64@import url("apps/gnome-terminal.css");
66@import url("apps/gnome-system-log.css");65@import url("apps/gnome-system-log.css");
67@import url("apps/glade.css");66@import url("apps/glade.css");
68@import url("apps/california.css");
69@import url("apps/software-center.css");
70@import url("public-colors.css");67@import url("public-colors.css");
7168
=== modified file 'Radiance/gtk-3.0/gtk-widgets-borders.css'
--- Radiance/gtk-3.0/gtk-widgets-borders.css 2014-11-27 13:01:02 +0000
+++ Radiance/gtk-3.0/gtk-widgets-borders.css 2015-07-21 08:54:26 +0000
@@ -180,17 +180,6 @@
180 border-image: url("assets/progressbar-horizontal-trough.png") 6 7 6 7 / 6px 7px 6px 7px stretch;180 border-image: url("assets/progressbar-horizontal-trough.png") 6 7 6 7 / 6px 7px 6px 7px stretch;
181}181}
182182
183.trough.vertical {
184 border-image: url("assets/progressbar-vertical-trough.png") 7 6 7 6 / 7px 6px 7px 6px stretch;
185}
186
187.trough row {
188}
189
190.trough.vertical {
191 border-image: url("assets/progressbar-vertical-trough.png") 7 6 7 6 / 7px 6px 7px 6px stretch;
192}
193
194GtkSwitch.trough {183GtkSwitch.trough {
195 border-image: url("assets/switch-trough-off.png") 10 12 10 12 / 10px 12px 10px 12px stretch;184 border-image: url("assets/switch-trough-off.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
196}185}
197186
=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
--- Radiance/gtk-3.0/gtk-widgets.css 2015-05-29 09:06:29 +0000
+++ Radiance/gtk-3.0/gtk-widgets.css 2015-07-21 08:54:26 +0000
@@ -27,9 +27,6 @@
27 -GtkRange-trough-under-steppers: 1;27 -GtkRange-trough-under-steppers: 1;
28 -GtkRange-stepper-spacing: 0;28 -GtkRange-stepper-spacing: 0;
29 -GtkScale-trough-border: 0;29 -GtkScale-trough-border: 0;
30 -GtkScrollbar-activate-slider: 1;
31 -GtkScrollbar-trough-border: 0;
32 -GtkScrollbar-min-slider-length: 31;
33 -GtkScrolledWindow-scrollbar-spacing: 0;30 -GtkScrolledWindow-scrollbar-spacing: 0;
34 -GtkScrolledWindow-scrollbars-within-bevel: 1;31 -GtkScrolledWindow-scrollbars-within-bevel: 1;
35 -GtkSeparatorMenuItem-horizontal-padding: 0;32 -GtkSeparatorMenuItem-horizontal-padding: 0;
@@ -61,27 +58,6 @@
61 color: @backdrop_fg_color;58 color: @backdrop_fg_color;
62}59}
6360
64/* LP: #1285783 */
65GtkScrolledWindow {
66 background-color: @bg_color;
67}
68
69GtkPaned {
70 background-color: @bg_color;
71}
72
73/* Background hack to make DejaDup Assistant windows not turn black when
74 * overlay scrollbars are enabled.
75 */
76Assistant GtkEventBox {
77 background-color: @bg_color;
78}
79
80/* ... and for Evolution's mail preferences window */
81EPreferencesWindow GtkNotebook GtkAlignment GtkVBox {
82 background-color: @bg_color;
83}
84
85/*************61/*************
86 * assistant *62 * assistant *
87 *************/63 *************/
@@ -1181,74 +1157,31 @@
1181/*************1157/*************
1182 * scrollbar *1158 * scrollbar *
1183 *************/1159 *************/
1184.scrollbar,1160.scrollbar {
1185.scrollbar.vertical {
1186 -GtkScrollbar-has-backward-stepper: 0;1161 -GtkScrollbar-has-backward-stepper: 0;
1187 -GtkScrollbar-has-forward-stepper: 0;1162 -GtkScrollbar-has-forward-stepper: 0;
1188 -GtkRange-slider-width: 14;1163 -GtkScrollbar-trough-border: 0;
11891164 -GtkScrollbar-min-slider-length: 31;
1190 border-radius: 20px;1165 -GtkRange-slider-width: 3;
11911166
1192 border-image: none;1167 border: none;
1193}1168}
11941169
1195.scrollbar.trough,1170.scrollbar.hovering,
1196.scrollbar.trough.vertical {1171.scrollbar.dragging {
1197 border-color: shade (@bg_color, 0.8);1172 -GtkRange-slider-width: 10;
1198}1173 background-color: alpha(@bg_color, 0.8);
11991174}
1200.scrollbar.slider,1175
1201.scrollbar.slider:hover,1176.scrollbar.slider {
1202.scrollbar.button,1177 background-color: alpha(@selected_bg_color, 0.8);
1203.scrollbar.slider.vertical,1178 border-radius: 8px;
1204.scrollbar.slider.vertical:hover,1179}
1205.scrollbar.button.vertical {1180
1206 border-width: 1px;1181.scrollbar.slider:active {
1207 border-style: solid;
1208 border-color: shade (@bg_color, 0.86);
1209 background-image: -gtk-gradient (linear, left top, right top,
1210 from (shade (@button_bg_color, 1.08)),
1211 color-stop (0.5, @button_bg_color),
1212 to (shade (@button_bg_color, 0.94)));
1213 box-shadow: inset 1px 0 shade (@bg_color, 1.1),
1214 inset -1px 0 shade (@bg_color, 1.01),
1215 inset 0 1px shade (@bg_color, 1.1),
1216 inset 0 -1px shade (@bg_color, 1.1);
1217}
1218
1219.scrollbar.slider.horizontal,
1220.scrollbar.slider.horizontal:hover,
1221.scrollbar.button.horizontal {
1222 background-image: -gtk-gradient (linear, left top, left bottom,
1223 from (shade (@button_bg_color, 1.08)),
1224 color-stop (0.5, @button_bg_color),
1225 to (shade (@button_bg_color, 0.94)));
1226 box-shadow: inset 1px 0 shade (@bg_color, 1.1),
1227 inset -1px 0 shade (@bg_color, 1.1),
1228 inset 0 1px shade (@bg_color, 1.1),
1229 inset 0 -1px shade (@bg_color, 1.01);
1230}
1231
1232/* overlay scrollbar */
1233OsThumb {
1234 color: shade (@fg_color, 1.6);
1235}
1236
1237OsThumb:selected,
1238GtkScrollbar:selected {
1239 background-color: @selected_bg_color;1182 background-color: @selected_bg_color;
1240}1183}
12411184
1242OsThumb:active,
1243GtkScrollbar:active {
1244 background-color: shade (@bg_color, 0.6);
1245}
1246
1247OsThumb:insensitive,
1248GtkScrollbar:insensitive {
1249 background-color: shade (@bg_color, 0.85);
1250}
1251
1252/*******************1185/*******************
1253 * scrolled window *1186 * scrolled window *
1254 *******************/1187 *******************/

Subscribers

People subscribed via source and target branches