Merge lp:~satyajit-happy/egtk/vertical-progressbar into lp:~elementary-design/egtk/trunk

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

Commit message

Fix vertical progressbar style

Description of the change

This commit changes the progressbar styling to use class name instead of the widget name.

The styling for vertical progressbars was missing. Hence vertical progressbar gradients looked out of place. This commit also adds styling for vertical progressbars.

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

Not sure where to test the vertical progressbar, but it seems it doesn't break horizontal ones and the code doesn't look crazy so I'll approve ha

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:43:32 +0000
4@@ -317,7 +317,11 @@
5 padding: 1px;
6 }
7
8-GtkProgressBar.progressbar {
9+.progressbar,
10+.progressbar row,
11+.progressbar row:hover,
12+.progressbar row:selected,
13+.progressbar row:selected:focus {
14 background-image: linear-gradient(to bottom,
15 shade (@base_color, 0.88),
16 @base_color
17@@ -327,7 +331,18 @@
18 box-shadow: inset 0 0 0 1px alpha (#fff, 0.40);
19 }
20
21-GtkProgressBar.trough {
22+.progressbar.vertical {
23+ background-image: linear-gradient(to right,
24+ shade (@base_color, 0.88),
25+ @base_color
26+ );
27+}
28+
29+.trough,
30+.trough row,
31+.trough row:hover,
32+.trough row:selected,
33+.trough row:selected:focus {
34 border: 1px solid alpha (#000, 0.35);
35
36 background-image: linear-gradient(to bottom,
37@@ -339,6 +354,13 @@
38 0 1px 0 1px alpha (#fff, 0.30);
39 }
40
41+.trough.vertical {
42+ background-image: linear-gradient(to right,
43+ alpha (#000, 0.15),
44+ alpha (#000, 0.07)
45+ );
46+}
47+
48 /**********************************
49 * Progress bar in a Tree or Cell *
50 *********************************/
51@@ -2189,4 +2211,4 @@
52 .h3 { font: open sans bold 12; }
53
54 @import url("granite-widgets.css");
55-@import url("apps.css");
56\ No newline at end of file
57+@import url("apps.css");

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: