Merge lp:~satyajit-happy/egtk/fix-gtkscale into lp:~elementary-design/egtk/trunk

Proposed by Satyajit Sahoo
Status: Merged
Approved by: Danielle Foré
Approved revision: 153
Merged at revision: 153
Proposed branch: lp:~satyajit-happy/egtk/fix-gtkscale
Merge into: lp:~elementary-design/egtk/trunk
Diff against target: 71 lines (+29/-6)
1 file modified
gtk-3.0/gtk-widgets.css (+29/-6)
To merge this branch: bzr merge lp:~satyajit-happy/egtk/fix-gtkscale
Reviewer Review Type Date Requested Status
Danielle Foré Approve
Review via email: mp+202189@code.launchpad.net

Commit message

Fix vertical scale style

Description of the change

The styling of vertical GtkScale widget is all messed up. This commit styles the vertical GtkScale properly to be similar to the horizontal GtkScale.

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) wrote :

Look solid! Thanks for the fix :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gtk-3.0/gtk-widgets.css'
2--- gtk-3.0/gtk-widgets.css 2013-12-21 07:42:34 +0000
3+++ gtk-3.0/gtk-widgets.css 2014-01-18 03:33:24 +0000
4@@ -532,6 +532,7 @@
5 }
6
7 .scale.trough:insensitive {
8+ background-image: none;
9 background-color: shade (@theme_bg_color, 1.25);
10 border-color: shade (@inactive_frame_color, 0.9);
11 border-radius: 0 12px 12px 0;
12@@ -539,7 +540,7 @@
13 }
14
15 .scale.trough.vertical {
16- margin: 0 8px;
17+ margin: 0 5px 0 6px;
18
19 background-image: linear-gradient(to right,
20 alpha (#000, 0.15),
21@@ -548,10 +549,10 @@
22 }
23
24 .scale.trough.vertical:insensitive {
25- background-image: linear-gradient(to right,
26- alpha (#000, 0.10),
27- alpha (#000, 0.02)
28- );
29+ background-image: none;
30+ background-color: shade (@theme_bg_color, 1.25);
31+ border-radius: 0 0 12px 12px;
32+ border-width: 1px 1px 0 1px;
33 }
34
35 .scale.mark {
36@@ -580,6 +581,28 @@
37 );
38 }
39
40+.scale.highlight.bottom {
41+ border: 1px solid alpha (#000, 0.50);
42+ border-radius: 0 0 12px 12px;
43+
44+ background-image: linear-gradient(to right,
45+ alpha (#000, 0.40),
46+ alpha (#000, 0.30)
47+ );
48+
49+ box-shadow: inset 0 0 0 1px alpha (#000, 0.05),
50+ 0 1px 0 1px alpha (#fff, 0.30);
51+}
52+
53+.scale.highlight.bottom:insensitive {
54+ border: 1px solid alpha (#000, 0.40);
55+
56+ background-image: linear-gradient(to right,
57+ alpha (#000, 0.30),
58+ alpha (#000, 0.20)
59+ );
60+}
61+
62 /*********
63 * Frames *
64 *********/
65@@ -2189,4 +2212,4 @@
66 .h3 { font: open sans bold 12; }
67
68 @import url("granite-widgets.css");
69-@import url("apps.css");
70\ No newline at end of file
71+@import url("apps.css");

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: