Merge lp:~danrabbit/egtk/bottom-toolbar into lp:egtk/1.0

Proposed by Daniel Fore
Status: Merged
Approved by: Cassidy James Blaede
Approved revision: 509
Merged at revision: 512
Proposed branch: lp:~danrabbit/egtk/bottom-toolbar
Merge into: lp:egtk/1.0
Diff against target: 116 lines (+36/-4)
4 files modified
gtk-3.0/content-view.css (+22/-0)
gtk-3.0/gtk-widgets.css (+10/-2)
gtk-3.0/progressbar.css (+2/-0)
gtk-3.0/toolbar.css (+2/-2)
To merge this branch: bzr merge lp:~danrabbit/egtk/bottom-toolbar
Reviewer Review Type Date Requested Status
Cassidy James Blaede Approve
Review via email: mp+111097@code.launchpad.net

Description of the change

This adjust toolbar and button padding for the bottom-toolbar style.

To post a comment you must log in.
Revision history for this message
Cassidy James Blaede (cassidyjames) wrote :

Looks better than before. Approved for merging!

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/content-view.css'
2--- gtk-3.0/content-view.css 2012-06-13 21:52:27 +0000
3+++ gtk-3.0/content-view.css 2012-06-19 19:39:39 +0000
4@@ -37,6 +37,28 @@
5
6 }
7
8+.content-view column-header .button {
9+ border-width: 0 0 1px 1px;
10+
11+ -unico-outer-stroke-style: none;
12+
13+ background-image: -gtk-gradient (linear,
14+ left top,
15+ left bottom,
16+ from (shade (@base_color, 0.98)),
17+ to (shade (@base_color, 0.92)));
18+
19+ -unico-border-gradient: -gtk-gradient (linear,
20+ left top, left bottom,
21+ from (shade (@base_color, 0.86)),
22+ to (shade (@base_color, 0.70)));
23+
24+}
25+
26+.content-view column-header .button * {
27+ color: #666;
28+}
29+
30 .content-view .entry {
31
32 background-image: -gtk-gradient (linear,
33
34=== modified file 'gtk-3.0/gtk-widgets.css'
35--- gtk-3.0/gtk-widgets.css 2012-06-13 21:52:27 +0000
36+++ gtk-3.0/gtk-widgets.css 2012-06-19 19:39:39 +0000
37@@ -162,7 +162,8 @@
38 .spinbutton .button:focus,
39 .view,
40 GtkTreeView .entry,
41-column-header .button {
42+column-header .button,
43+.content-view column-header .button {
44 border-radius: 0;
45 }
46
47@@ -207,6 +208,8 @@
48 .sidebar,
49 .sidebar.view,
50 .toolbar,
51+.trough row:selected,
52+.trough row:selected:focused,
53 GraniteWidgetsStatusBar,
54 GtkSwitch {
55 text-shadow: 0 1 alpha (#fff, 0.4);
56@@ -224,6 +227,8 @@
57 .menubar *:prelight,
58 .menu *:active,
59 .menu *:prelight,
60+.progressbar row:selected,
61+.progressbar row:selected:focused,
62 .sidebar.view:selected,
63 .tooltip *,
64 GtkInfoBar *,
65@@ -236,6 +241,8 @@
66 .menubar.menuitem:prelight,
67 .menu *:active,
68 .menu *:prelight,
69+.progressbar row:selected,
70+.progressbar row:selected:focused,
71 .sidebar.view:selected,
72 .tooltip,
73 GtkInfoBar,
74@@ -1171,7 +1178,8 @@
75 column-header {
76 }
77
78-column-header:nth-child(first) .button {
79+column-header:nth-child(first) .button,
80+.content-view column-header:nth-child(first) .button {
81 border-width: 0 0 1px 0;
82 }
83
84
85=== modified file 'gtk-3.0/progressbar.css'
86--- gtk-3.0/progressbar.css 2012-06-13 21:52:27 +0000
87+++ gtk-3.0/progressbar.css 2012-06-19 19:39:39 +0000
88@@ -135,6 +135,8 @@
89 .trough row:selected,
90 .trough row:selected:focused {
91
92+ color: @text_color;
93+
94 -unico-border-gradient: -gtk-gradient (linear,
95 left top, left bottom,
96 from (shade (@selected_bg_color, 0.87)),
97
98=== modified file 'gtk-3.0/toolbar.css'
99--- gtk-3.0/toolbar.css 2012-06-13 21:52:27 +0000
100+++ gtk-3.0/toolbar.css 2012-06-19 19:39:39 +0000
101@@ -76,7 +76,7 @@
102 ******************/
103
104 .bottom-toolbar.toolbar {
105- padding: 10px;
106+ padding: 8px;
107 border-style: solid;
108 border-width: 1px 0 0 0;
109 -unico-inner-stroke-width: 1px;
110@@ -90,7 +90,7 @@
111 }
112
113 .bottom-toolbar.toolbar .button {
114- padding: 1px 3px 1px 3px;
115+ padding: 2px 3px 2px 3px;
116 }
117
118

Subscribers

People subscribed via source and target branches

to all changes: