Merge lp:~danrabbit/egtk/source-list-selection into lp:egtk/1.0

Proposed by Danielle Foré
Status: Merged
Merged at revision: 605
Proposed branch: lp:~danrabbit/egtk/source-list-selection
Merge into: lp:egtk/1.0
Diff against target: 101 lines (+20/-17)
2 files modified
gtk-3.0/granite-widgets.css (+20/-14)
gtk-3.0/gtk-widgets.css (+0/-3)
To merge this branch: bzr merge lp:~danrabbit/egtk/source-list-selection
Reviewer Review Type Date Requested Status
Cassidy James Blaede Pending
Review via email: mp+158804@code.launchpad.net

Description of the change

This branch changes the source-list selection style to a kind of pushed in look much like Jolicloud.

I feel like this style helps to create less of a conflict between colored icons and a colored background, while still being stylish and clear in it's meaning.

To post a comment you must log in.
Revision history for this message
Victor Martinez (victored) wrote :

This makes me want to lick the screen.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gtk-3.0/granite-widgets.css'
2--- gtk-3.0/granite-widgets.css 2013-03-03 02:12:16 +0000
3+++ gtk-3.0/granite-widgets.css 2013-04-14 19:05:30 +0000
4@@ -32,13 +32,15 @@
5 .sidebar,
6 .source-list {
7 -GtkTreeView-horizontal-separator: 1;
8- -GtkTreeView-vertical-separator: 1;
9+ -GtkTreeView-vertical-separator: 6;
10 }
11
12 .sidebar.view:selected,
13 .sidebar.view:prelight:selected,
14 .source-list.view:selected,
15 .source-list.view:prelight:selected {
16+
17+ color: shade (@bg_color, 0.50);
18 border-style: solid;
19 border-width: 1px 0 1px 0;
20 -unico-inner-stroke-width: 1px 0 1px 0;
21@@ -46,18 +48,18 @@
22 background-image: -gtk-gradient (linear,
23 left top,
24 left bottom,
25- from (shade (@selected_bg_color, 1.25)),
26- to (shade (@selected_bg_color, 0.98)));
27+ from (alpha (#000, 0.11)),
28+ to (alpha (#000, 0.07)));
29
30 -unico-border-gradient: -gtk-gradient (linear,
31 left top, left bottom,
32- from (shade (@selected_bg_color, 1.05)),
33- to (shade (@selected_bg_color, 0.88)));
34+ from (alpha (#000, 0.25)),
35+ to (alpha (#fff, 0.30)));
36
37 -unico-inner-stroke-gradient: -gtk-gradient (linear,
38 left top, left bottom,
39- from (alpha (#fff, 0.20)),
40- to (alpha (#fff, 0.10)));
41+ from (alpha (#000, 0.03)),
42+ to (alpha (#000, 0.10)));
43 }
44
45 .sidebar.view:selected:backdrop,
46@@ -67,15 +69,19 @@
47 background-image: -gtk-gradient (linear,
48 left top,
49 left bottom,
50- from (shade (@bg_color, 0.95)),
51- to (shade (@bg_color, 0.83)));
52+ from (alpha (#000, 0.08)),
53+ to (alpha (#000, 0.04)));
54
55 -unico-border-gradient: -gtk-gradient (linear,
56 left top, left bottom,
57- from (shade (@bg_color, 0.85)),
58- to (shade (@bg_color, 0.73)));
59-
60- color: shade (@bg_color, 0.50);
61+ from (alpha (#000, 0.19)),
62+ to (alpha (#fff, 0.25)));
63+
64+ -unico-inner-stroke-gradient: -gtk-gradient (linear,
65+ left top, left bottom,
66+ from (alpha (#000, 0.03)),
67+ to (alpha (#000, 0.10)));
68+
69 }
70
71 .sidebar.view:prelight,
72@@ -115,7 +121,7 @@
73
74 .source-list.badge:selected,
75 .source-list.badge:prelight:selected {
76- color: shade (@selected_bg_color, 1.25);
77+ color: @bg_color;
78 }
79
80 .source-list.badge:selected:backdrop,
81
82=== modified file 'gtk-3.0/gtk-widgets.css'
83--- gtk-3.0/gtk-widgets.css 2013-03-22 22:16:28 +0000
84+++ gtk-3.0/gtk-widgets.css 2013-04-14 19:05:30 +0000
85@@ -235,7 +235,6 @@
86 .menu *:prelight,
87 .progressbar row,
88 .sidebar.view:selected,
89-.source-list.view:selected,
90 .tooltip *,
91 GtkSwitch.trough:active {
92 color: @selected_fg_color;
93@@ -247,8 +246,6 @@
94 .menu *:active,
95 .menu *:prelight,
96 .progressbar row,
97-.sidebar.view:selected,
98-.source-list.view:selected,
99 .tooltip,
100 GtkSwitch.trough:active {
101 text-shadow: 0 1 alpha (#000, 0.3);

Subscribers

People subscribed via source and target branches

to all changes: