Ubuntu theme

Merge lp:~larsu/ubuntu-themes/nautilus-sidebar into lp:ubuntu-themes

  1. nautilus-sidebar
  2. Merge into trunk
Proposed by Lars Karlitski
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 448
Merged at revision: 445
Proposed branch: lp:~larsu/ubuntu-themes/nautilus-sidebar
Merge into: lp:ubuntu-themes
Diff against target: 397 lines (+64/-254)
4 files modified
Ambiance/gtk-3.0/apps/nautilus.css (+0/-124)
Ambiance/gtk-3.0/gtk-widgets.css (+32/-3)
Radiance/gtk-3.0/apps/nautilus.css (+0/-124)
Radiance/gtk-3.0/gtk-widgets.css (+32/-3)
To merge this branch: bzr merge lp:~larsu/ubuntu-themes/nautilus-sidebar
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+264823@code.launchpad.net

Commit message

Clean up nautilus theming. Mostly, this consists of moving from nautilus-specific widgets and classes to more generic gtk ones.

Also remove some unused rules due to changes in nautilus' widgets.

As a side-effect, apps that have buttons in headerbars (that are used as toolbars) look more consistent with nautilus now.

Description of the change

Clean up nautilus theming. Mostly, this consists of moving from nautilus-specific widgets and classes to more generic gtk ones.

Also remove some unused rules due to changes in nautilus' widgets.

As a side-effect, apps that have buttons in headerbars (that are used as toolbars) look more consistent with nautilus now.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:448
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~larsu/ubuntu-themes/nautilus-sidebar/+merge/264823/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-themes-ci/109/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-vivid-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-vivid-armhf-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-vivid-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-themes-ci/109/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

looks good to me, thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Ambiance/gtk-3.0/apps/nautilus.css'
--- Ambiance/gtk-3.0/apps/nautilus.css 2014-07-10 15:06:44 +0000
+++ Ambiance/gtk-3.0/apps/nautilus.css 2015-07-15 11:12:29 +0000
@@ -1,5 +1,3 @@
1@define-color cluebar_color shade (mix (@bg_color, @base_color, 0.5), 0.95);
2
3NautilusWindow * {1NautilusWindow * {
4 -GtkPaned-handle-size: 1;2 -GtkPaned-handle-size: 1;
5}3}
@@ -37,125 +35,3 @@
37.nautilus-desktop.nautilus-canvas-item:selected {35.nautilus-desktop.nautilus-canvas-item:selected {
38 text-shadow: none;36 text-shadow: none;
39}37}
40
41/* browser window */
42NautilusTrashBar.info,
43NautilusXContentBar.info,
44NautilusSearchBar.info,
45NautilusQueryEditor.info {
46 background-image: -gtk-gradient (linear, left top, left bottom,
47 from (shade (@cluebar_color, 1.02)),
48 to (shade (@cluebar_color, 0.98)));
49 background-color: @cluebar_color;
50 border-bottom-color: shade (@cluebar_color, 0.92);
51 border-radius: 0;
52 border-style: solid;
53 border-width: 0px 0px 1px 0px;
54
55 box-shadow: inset -1px 0px shade (@cluebar_color, 1.02),
56 inset 1px 0px shade (@cluebar_color, 1.02),
57 inset 0 1px shade (@cluebar_color, 1.04),
58 inset 0 -1px shade (@cluebar_color, 1.01);
59}
60
61NautilusTrashBar.info:backdrop,
62NautilusXContentBar.info:backdrop,
63NautilusSearchBar.info:backdrop,
64NautilusQueryEditor.info:backdrop {
65 background-image: -gtk-gradient (linear, left top, left bottom,
66 from (shade (@cluebar_color, 1.01)),
67 to (shade (@cluebar_color, 0.99)));
68 background-color: @cluebar_color;
69 border-bottom-color: shade (@cluebar_color, 0.92);
70
71 box-shadow: inset -1px 0px shade (@cluebar_color, 1.01),
72 inset 1px 0px shade (@cluebar_color, 1.01),
73 inset 0 1px shade (@cluebar_color, 1.02),
74 inset 0 -1px shade (@cluebar_color, 1.0);
75}
76
77NautilusSearchBar .entry {
78}
79
80.nautilus-cluebar-label {
81 font: bold;
82 text-shadow: 0 1px shade (@cluebar_color, 1.06);
83}
84
85.nautilus-cluebar-label:backdrop {
86 color: mix (@fg_color, @cluebar_color, 0.2);
87 text-shadow: 0 1px shade (@cluebar_color, 1.02);
88}
89
90#nautilus-search-button *:active,
91#nautilus-search-button *:active:prelight {
92 color: @dark_fg_color;
93}
94
95NautilusFloatingBar {
96 background-color: @info_bg_color;
97 border-radius: 3px 3px 0 0;
98 border-style: solid;
99 border-width: 1px;
100 border-color: darker (@info_bg_color);
101}
102
103NautilusFloatingBar .button {
104 -GtkButton-image-spacing: 0;
105 -GtkButton-inner-border: 0;
106}
107
108NautilusWindow .header-bar .button {
109 padding: 9px;
110}
111
112/* sidebar */
113NautilusWindow .sidebar,
114NautilusWindow .sidebar .view {
115 background-color: shade (@bg_color, 0.95);
116
117 /*background-color: @bg_color;*/
118
119 color: @fg_color;
120 text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.04);
121}
122
123NautilusWindow .sidebar .frame {
124 border-width: 1px 0 0 0;
125 border-style: solid;
126 border-color: shade (@bg_color, 0.86);
127 border-radius: 0;
128}
129
130NautilusWindow .sidebar:backdrop,
131NautilusWindow .sidebar .view:backdrop {
132 color: mix (@fg_color, shade (@bg_color, 0.95), 0.2);
133 text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.02);
134}
135
136NautilusWindow .sidebar row:selected {
137 color: @selected_fg_color;
138 text-shadow: 0 1px shade (@selected_bg_color, 0.8);
139}
140
141NautilusWindow .sidebar row:selected:backdrop {
142 background-image: -gtk-gradient (linear, left top, left bottom,
143 from (shade (shade (@bg_color, 0.95), 0.94)),
144 to (shade (shade (@bg_color, 0.95), 0.86)));
145 border-top-color: shade (shade (@bg_color, 0.95), 0.88);
146
147 color: @fg_color;
148 text-shadow: 0 1px shade (shade (@bg_color, 0.95), 0.96);
149}
150
151NautilusWindow .pane-separator {
152 background-color: shade (shade (@bg_color, 0.95), 0.94);
153 border-color: @dark_bg_color;
154 border-style: solid;
155 border-width: 0;
156 box-shadow: none;
157}
158
159NautilusWindow .pane-separator:backdrop {
160 background-color: shade (shade (@bg_color, 0.95), 0.96);
161}
16238
=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
--- Ambiance/gtk-3.0/gtk-widgets.css 2015-05-29 09:06:29 +0000
+++ Ambiance/gtk-3.0/gtk-widgets.css 2015-07-15 11:12:29 +0000
@@ -1340,12 +1340,31 @@
1340/***********1340/***********
1341 * sidebar *1341 * sidebar *
1342 ***********/1342 ***********/
1343.sidebar row:selected {1343GtkPlacesSidebar.sidebar .view {
1344 background-color: shade (@bg_color, 0.95);
1345
1346 color: @fg_color;
1347 text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.04);
1348}
1349
1350GtkPlacesSidebar.sidebar:backdrop {
1351 color: mix (@fg_color, shade (@bg_color, 0.95), 0.2);
1352 text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.02);
1353}
1354
1355GtkPlacesSidebar.sidebar row:selected {
1356 color: @selected_fg_color;
1344 text-shadow: 0 1px shade (@selected_bg_color, 0.7);1357 text-shadow: 0 1px shade (@selected_bg_color, 0.7);
1345}1358}
13461359
1347.sidebar .frame {1360GtkPlacesSidebar.sidebar row:selected:backdrop {
1348 border-width: 0;1361 background-image: -gtk-gradient (linear, left top, left bottom,
1362 from (shade (shade (@bg_color, 0.95), 0.94)),
1363 to (shade (shade (@bg_color, 0.95), 0.86)));
1364 border-top-color: shade (shade (@bg_color, 0.95), 0.88);
1365
1366 color: @fg_color;
1367 text-shadow: 0 1px shade (shade (@bg_color, 0.95), 0.96);
1349}1368}
13501369
1351/**************1370/**************
@@ -1655,6 +1674,7 @@
1655 color: @dark_fg_color;1674 color: @dark_fg_color;
1656 text-shadow: 0 -1px shade (@dark_bg_color, 0.7);1675 text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
1657 border-image-source: url("assets/button-toolbar.png");1676 border-image-source: url("assets/button-toolbar.png");
1677 padding: 9px;
1658}1678}
16591679
1660.primary-toolbar .button.flat {1680.primary-toolbar .button.flat {
@@ -1977,6 +1997,15 @@
1977 background: none;1997 background: none;
1978}1998}
19791999
2000/* Floating bars */
2001.floating-bar {
2002 background-color: @info_bg_color;
2003 border-radius: 3px 3px 0 0;
2004 border-style: solid;
2005 border-width: 1px;
2006 border-color: darker (@info_bg_color);
2007}
2008
19802009
1981/* OSD overlays */2010/* OSD overlays */
1982.osd,2011.osd,
19832012
=== modified file 'Radiance/gtk-3.0/apps/nautilus.css'
--- Radiance/gtk-3.0/apps/nautilus.css 2014-07-10 15:06:44 +0000
+++ Radiance/gtk-3.0/apps/nautilus.css 2015-07-15 11:12:29 +0000
@@ -1,5 +1,3 @@
1@define-color cluebar_color shade (mix (@bg_color, @base_color, 0.5), 0.95);
2
3NautilusWindow * {1NautilusWindow * {
4 -GtkPaned-handle-size: 1;2 -GtkPaned-handle-size: 1;
5}3}
@@ -37,125 +35,3 @@
37.nautilus-desktop.nautilus-canvas-item:selected {35.nautilus-desktop.nautilus-canvas-item:selected {
38 text-shadow: none;36 text-shadow: none;
39}37}
40
41/* browser window */
42NautilusTrashBar.info,
43NautilusXContentBar.info,
44NautilusSearchBar.info,
45NautilusQueryEditor.info {
46 background-image: -gtk-gradient (linear, left top, left bottom,
47 from (shade (@cluebar_color, 1.02)),
48 to (shade (@cluebar_color, 0.98)));
49 background-color: @cluebar_color;
50 border-bottom-color: shade (@cluebar_color, 0.92);
51 border-radius: 0;
52 border-style: solid;
53 border-width: 0px 0px 1px 0px;
54
55 box-shadow: inset -1px 0px shade (@cluebar_color, 1.02),
56 inset 1px 0px shade (@cluebar_color, 1.02),
57 inset 0 1px shade (@cluebar_color, 1.04),
58 inset 0 -1px shade (@cluebar_color, 1.01);
59}
60
61NautilusTrashBar.info:backdrop,
62NautilusXContentBar.info:backdrop,
63NautilusSearchBar.info:backdrop,
64NautilusQueryEditor.info:backdrop {
65 background-image: -gtk-gradient (linear, left top, left bottom,
66 from (shade (@cluebar_color, 1.01)),
67 to (shade (@cluebar_color, 0.99)));
68 background-color: @cluebar_color;
69 border-bottom-color: shade (@cluebar_color, 0.92);
70
71 box-shadow: inset -1px 0px shade (@cluebar_color, 1.01),
72 inset 1px 0px shade (@cluebar_color, 1.01),
73 inset 0 1px shade (@cluebar_color, 1.02),
74 inset 0 -1px shade (@cluebar_color, 1.0);
75}
76
77NautilusSearchBar .entry {
78}
79
80.nautilus-cluebar-label {
81 font: bold;
82 text-shadow: 0 1px shade (@cluebar_color, 1.06);
83}
84
85.nautilus-cluebar-label:backdrop {
86 color: mix (@fg_color, @cluebar_color, 0.2);
87 text-shadow: 0 1px shade (@cluebar_color, 1.02);
88}
89
90#nautilus-search-button *:active,
91#nautilus-search-button *:active:prelight {
92 color: @dark_fg_color;
93}
94
95NautilusFloatingBar {
96 background-color: @info_bg_color;
97 border-radius: 3px 3px 0 0;
98 border-style: solid;
99 border-width: 1px;
100 border-color: darker (@info_bg_color);
101}
102
103NautilusFloatingBar .button {
104 -GtkButton-image-spacing: 0;
105 -GtkButton-inner-border: 0;
106}
107
108NautilusWindow .header-bar .button {
109 padding: 9px;
110}
111
112/* sidebar */
113NautilusWindow .sidebar,
114NautilusWindow .sidebar .view {
115 background-color: shade (@bg_color, 0.95);
116
117 /*background-color: @bg_color;*/
118
119 color: @fg_color;
120 text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.04);
121}
122
123NautilusWindow .sidebar .frame {
124 border-width: 1px 0 0 0;
125 border-style: solid;
126 border-color: shade (@bg_color, 0.86);
127 border-radius: 0;
128}
129
130NautilusWindow .sidebar:backdrop,
131NautilusWindow .sidebar .view:backdrop {
132 color: mix (@fg_color, shade (@bg_color, 0.95), 0.2);
133 text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.02);
134}
135
136NautilusWindow .sidebar row:selected {
137 color: @selected_fg_color;
138 text-shadow: 0 1px shade (@selected_bg_color, 0.8);
139}
140
141NautilusWindow .sidebar row:selected:backdrop {
142 background-image: -gtk-gradient (linear, left top, left bottom,
143 from (shade (shade (@bg_color, 0.95), 0.94)),
144 to (shade (shade (@bg_color, 0.95), 0.86)));
145 border-top-color: shade (shade (@bg_color, 0.95), 0.88);
146
147 color: @fg_color;
148 text-shadow: 0 1px shade (shade (@bg_color, 0.95), 0.96);
149}
150
151NautilusWindow .pane-separator {
152 background-color: shade (shade (@bg_color, 0.95), 0.94);
153 border-color: @dark_bg_color;
154 border-style: solid;
155 border-width: 0;
156 box-shadow: none;
157}
158
159NautilusWindow .pane-separator:backdrop {
160 background-color: shade (shade (@bg_color, 0.95), 0.96);
161}
16238
=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
--- Radiance/gtk-3.0/gtk-widgets.css 2015-05-29 09:06:29 +0000
+++ Radiance/gtk-3.0/gtk-widgets.css 2015-07-15 11:12:29 +0000
@@ -1340,12 +1340,31 @@
1340/***********1340/***********
1341 * sidebar *1341 * sidebar *
1342 ***********/1342 ***********/
1343.sidebar row:selected {1343GtkPlacesSidebar.sidebar .view {
1344 background-color: shade (@bg_color, 0.95);
1345
1346 color: @fg_color;
1347 text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.04);
1348}
1349
1350GtkPlacesSidebar.sidebar:backdrop {
1351 color: mix (@fg_color, shade (@bg_color, 0.95), 0.2);
1352 text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.02);
1353}
1354
1355GtkPlacesSidebar.sidebar row:selected {
1356 color: @selected_fg_color;
1344 text-shadow: 0 1px shade (@selected_bg_color, 0.7);1357 text-shadow: 0 1px shade (@selected_bg_color, 0.7);
1345}1358}
13461359
1347.sidebar .frame {1360GtkPlacesSidebar.sidebar row:selected:backdrop {
1348 border-width: 0;1361 background-image: -gtk-gradient (linear, left top, left bottom,
1362 from (shade (shade (@bg_color, 0.95), 0.94)),
1363 to (shade (shade (@bg_color, 0.95), 0.86)));
1364 border-top-color: shade (shade (@bg_color, 0.95), 0.88);
1365
1366 color: @fg_color;
1367 text-shadow: 0 1px shade (shade (@bg_color, 0.95), 0.96);
1349}1368}
13501369
1351/**************1370/**************
@@ -1652,6 +1671,7 @@
1652 color: @dark_fg_color;1671 color: @dark_fg_color;
1653 text-shadow: 0 -1px shade (@dark_bg_color, 0.7);1672 text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
1654 border-image-source: url("assets/radiance-button-toolbar.png");1673 border-image-source: url("assets/radiance-button-toolbar.png");
1674 padding: 9px;
1655}1675}
16561676
1657.primary-toolbar .button.flat {1677.primary-toolbar .button.flat {
@@ -1969,6 +1989,15 @@
1969 background: none;1989 background: none;
1970}1990}
19711991
1992/* Floating bars */
1993.floating-bar {
1994 background-color: @info_bg_color;
1995 border-radius: 3px 3px 0 0;
1996 border-style: solid;
1997 border-width: 1px;
1998 border-color: darker (@info_bg_color);
1999}
2000
19722001
1973/* OSD overlays */2002/* OSD overlays */
1974.osd,2003.osd,

Subscribers

People subscribed via source and target branches