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
=== modified file 'gtk-3.0/content-view.css'
--- gtk-3.0/content-view.css 2012-06-13 21:52:27 +0000
+++ gtk-3.0/content-view.css 2012-06-19 19:39:39 +0000
@@ -37,6 +37,28 @@
3737
38}38}
3939
40.content-view column-header .button {
41 border-width: 0 0 1px 1px;
42
43 -unico-outer-stroke-style: none;
44
45 background-image: -gtk-gradient (linear,
46 left top,
47 left bottom,
48 from (shade (@base_color, 0.98)),
49 to (shade (@base_color, 0.92)));
50
51 -unico-border-gradient: -gtk-gradient (linear,
52 left top, left bottom,
53 from (shade (@base_color, 0.86)),
54 to (shade (@base_color, 0.70)));
55
56}
57
58.content-view column-header .button * {
59 color: #666;
60}
61
40.content-view .entry {62.content-view .entry {
4163
42 background-image: -gtk-gradient (linear,64 background-image: -gtk-gradient (linear,
4365
=== modified file 'gtk-3.0/gtk-widgets.css'
--- gtk-3.0/gtk-widgets.css 2012-06-13 21:52:27 +0000
+++ gtk-3.0/gtk-widgets.css 2012-06-19 19:39:39 +0000
@@ -162,7 +162,8 @@
162.spinbutton .button:focus,162.spinbutton .button:focus,
163.view,163.view,
164GtkTreeView .entry,164GtkTreeView .entry,
165column-header .button {165column-header .button,
166.content-view column-header .button {
166 border-radius: 0;167 border-radius: 0;
167}168}
168169
@@ -207,6 +208,8 @@
207.sidebar,208.sidebar,
208.sidebar.view,209.sidebar.view,
209.toolbar,210.toolbar,
211.trough row:selected,
212.trough row:selected:focused,
210GraniteWidgetsStatusBar,213GraniteWidgetsStatusBar,
211GtkSwitch {214GtkSwitch {
212 text-shadow: 0 1 alpha (#fff, 0.4);215 text-shadow: 0 1 alpha (#fff, 0.4);
@@ -224,6 +227,8 @@
224.menubar *:prelight,227.menubar *:prelight,
225.menu *:active,228.menu *:active,
226.menu *:prelight,229.menu *:prelight,
230.progressbar row:selected,
231.progressbar row:selected:focused,
227.sidebar.view:selected,232.sidebar.view:selected,
228.tooltip *,233.tooltip *,
229GtkInfoBar *,234GtkInfoBar *,
@@ -236,6 +241,8 @@
236.menubar.menuitem:prelight,241.menubar.menuitem:prelight,
237.menu *:active,242.menu *:active,
238.menu *:prelight,243.menu *:prelight,
244.progressbar row:selected,
245.progressbar row:selected:focused,
239.sidebar.view:selected,246.sidebar.view:selected,
240.tooltip,247.tooltip,
241GtkInfoBar,248GtkInfoBar,
@@ -1171,7 +1178,8 @@
1171column-header {1178column-header {
1172}1179}
11731180
1174column-header:nth-child(first) .button {1181column-header:nth-child(first) .button,
1182.content-view column-header:nth-child(first) .button {
1175 border-width: 0 0 1px 0;1183 border-width: 0 0 1px 0;
1176}1184}
11771185
11781186
=== modified file 'gtk-3.0/progressbar.css'
--- gtk-3.0/progressbar.css 2012-06-13 21:52:27 +0000
+++ gtk-3.0/progressbar.css 2012-06-19 19:39:39 +0000
@@ -135,6 +135,8 @@
135.trough row:selected,135.trough row:selected,
136.trough row:selected:focused {136.trough row:selected:focused {
137137
138 color: @text_color;
139
138 -unico-border-gradient: -gtk-gradient (linear,140 -unico-border-gradient: -gtk-gradient (linear,
139 left top, left bottom,141 left top, left bottom,
140 from (shade (@selected_bg_color, 0.87)),142 from (shade (@selected_bg_color, 0.87)),
141143
=== modified file 'gtk-3.0/toolbar.css'
--- gtk-3.0/toolbar.css 2012-06-13 21:52:27 +0000
+++ gtk-3.0/toolbar.css 2012-06-19 19:39:39 +0000
@@ -76,7 +76,7 @@
76******************/76******************/
7777
78.bottom-toolbar.toolbar {78.bottom-toolbar.toolbar {
79 padding: 10px;79 padding: 8px;
80 border-style: solid;80 border-style: solid;
81 border-width: 1px 0 0 0;81 border-width: 1px 0 0 0;
82 -unico-inner-stroke-width: 1px;82 -unico-inner-stroke-width: 1px;
@@ -90,7 +90,7 @@
90}90}
9191
92.bottom-toolbar.toolbar .button {92.bottom-toolbar.toolbar .button {
93 padding: 1px 3px 1px 3px;93 padding: 2px 3px 2px 3px;
94}94}
9595
9696

Subscribers

People subscribed via source and target branches

to all changes: