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

[Lars Karlitski]

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.

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.

[PS Jenkins bot (ps-jenkins)]

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)

[Sebastien Bacher (seb128)]

looks good to me, thanks

review: Approve

=== 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 @@
-@define-color cluebar_color shade (mix (@bg_color, @base_color, 0.5), 0.95);
-
 NautilusWindow * {
     -GtkPaned-handle-size: 1;
 }
@@ -37,125 +35,3 @@
 .nautilus-desktop.nautilus-canvas-item:selected {
     text-shadow: none;
 }
-
-/* browser window */
-NautilusTrashBar.info,
-NautilusXContentBar.info,
-NautilusSearchBar.info,
-NautilusQueryEditor.info {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@cluebar_color, 1.02)),
-                                     to (shade (@cluebar_color, 0.98)));
-    background-color: @cluebar_color;
-    border-bottom-color: shade (@cluebar_color, 0.92);
-    border-radius: 0;
-    border-style: solid;
-    border-width: 0px 0px 1px 0px;
-
-    box-shadow: inset -1px 0px shade (@cluebar_color, 1.02),
-                inset 1px 0px shade (@cluebar_color, 1.02),
-                inset 0 1px shade (@cluebar_color, 1.04),
-                inset 0 -1px shade (@cluebar_color, 1.01);
-}
-
-NautilusTrashBar.info:backdrop,
-NautilusXContentBar.info:backdrop,
-NautilusSearchBar.info:backdrop,
-NautilusQueryEditor.info:backdrop {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@cluebar_color, 1.01)),
-                                     to (shade (@cluebar_color, 0.99)));
-    background-color: @cluebar_color;
-    border-bottom-color: shade (@cluebar_color, 0.92);
-
-    box-shadow: inset -1px 0px shade (@cluebar_color, 1.01),
-                inset 1px 0px shade (@cluebar_color, 1.01),
-                inset 0 1px shade (@cluebar_color, 1.02),
-                inset 0 -1px shade (@cluebar_color, 1.0);
-}
-
-NautilusSearchBar .entry {
-}
-
-.nautilus-cluebar-label {
-    font: bold;
-    text-shadow: 0 1px shade (@cluebar_color, 1.06);
-}
-
-.nautilus-cluebar-label:backdrop {
-    color: mix (@fg_color, @cluebar_color, 0.2);
-    text-shadow: 0 1px shade (@cluebar_color, 1.02);
-}
-
-#nautilus-search-button *:active,
-#nautilus-search-button *:active:prelight {
-    color: @dark_fg_color;
-}
-
-NautilusFloatingBar {
-    background-color: @info_bg_color;
-    border-radius: 3px 3px 0 0;
-    border-style: solid;
-    border-width: 1px;
-    border-color: darker (@info_bg_color);
-}
-
-NautilusFloatingBar .button {
-    -GtkButton-image-spacing: 0;
-    -GtkButton-inner-border: 0;
-}
-
-NautilusWindow .header-bar .button {
-    padding: 9px;
-}
-
-/* sidebar */
-NautilusWindow .sidebar,
-NautilusWindow .sidebar .view {
-    background-color: shade (@bg_color, 0.95);
-
-    /*background-color: @bg_color;*/
-
-    color: @fg_color;
-    text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.04); 
-}
-
-NautilusWindow .sidebar .frame {
-    border-width: 1px 0 0 0;
-    border-style: solid;
-    border-color: shade (@bg_color, 0.86);
-    border-radius: 0;
-}
-
-NautilusWindow .sidebar:backdrop,
-NautilusWindow .sidebar .view:backdrop {
-    color: mix (@fg_color, shade (@bg_color, 0.95), 0.2);
-    text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.02); 
-}
-
-NautilusWindow .sidebar row:selected {
-    color: @selected_fg_color;
-    text-shadow: 0 1px shade (@selected_bg_color, 0.8); 
-}
-
-NautilusWindow .sidebar row:selected:backdrop {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (shade (@bg_color, 0.95), 0.94)),
-                                     to (shade (shade (@bg_color, 0.95), 0.86)));
-    border-top-color: shade (shade (@bg_color, 0.95), 0.88);
-
-    color: @fg_color;
-    text-shadow: 0 1px shade (shade (@bg_color, 0.95), 0.96); 
-}
-
-NautilusWindow .pane-separator {
-    background-color: shade (shade (@bg_color, 0.95), 0.94);
-    border-color: @dark_bg_color;
-    border-style: solid;
-    border-width: 0;
-    box-shadow: none;
-}
-
-NautilusWindow .pane-separator:backdrop {
-    background-color: shade (shade (@bg_color, 0.95), 0.96);
-}

=== 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 @@
 /***********
  * sidebar *
  ***********/
-.sidebar row:selected {
+GtkPlacesSidebar.sidebar .view {
+    background-color: shade (@bg_color, 0.95);
+
+    color: @fg_color;
+    text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.04);
+}
+
+GtkPlacesSidebar.sidebar:backdrop {
+    color: mix (@fg_color, shade (@bg_color, 0.95), 0.2);
+    text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.02);
+}
+
+GtkPlacesSidebar.sidebar row:selected {
+    color: @selected_fg_color;
     text-shadow: 0 1px shade (@selected_bg_color, 0.7);
 }
 
-.sidebar .frame {
-    border-width: 0;
+GtkPlacesSidebar.sidebar row:selected:backdrop {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (shade (@bg_color, 0.95), 0.94)),
+                                     to (shade (shade (@bg_color, 0.95), 0.86)));
+    border-top-color: shade (shade (@bg_color, 0.95), 0.88);
+
+    color: @fg_color;
+    text-shadow: 0 1px shade (shade (@bg_color, 0.95), 0.96);
 }
 
 /**************
@@ -1655,6 +1674,7 @@
     color: @dark_fg_color;
     text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
     border-image-source: url("assets/button-toolbar.png");
+    padding: 9px;
 }
 
 .primary-toolbar .button.flat {
@@ -1977,6 +1997,15 @@
     background: none;
 }
 
+/* Floating bars */
+.floating-bar {
+    background-color: @info_bg_color;
+    border-radius: 3px 3px 0 0;
+    border-style: solid;
+    border-width: 1px;
+    border-color: darker (@info_bg_color);
+}
+
 
 /* OSD overlays */
 .osd,

=== 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 @@
-@define-color cluebar_color shade (mix (@bg_color, @base_color, 0.5), 0.95);
-
 NautilusWindow * {
     -GtkPaned-handle-size: 1;
 }
@@ -37,125 +35,3 @@
 .nautilus-desktop.nautilus-canvas-item:selected {
     text-shadow: none;
 }
-
-/* browser window */
-NautilusTrashBar.info,
-NautilusXContentBar.info,
-NautilusSearchBar.info,
-NautilusQueryEditor.info {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@cluebar_color, 1.02)),
-                                     to (shade (@cluebar_color, 0.98)));
-    background-color: @cluebar_color;
-    border-bottom-color: shade (@cluebar_color, 0.92);
-    border-radius: 0;
-    border-style: solid;
-    border-width: 0px 0px 1px 0px;
-
-    box-shadow: inset -1px 0px shade (@cluebar_color, 1.02),
-                inset 1px 0px shade (@cluebar_color, 1.02),
-                inset 0 1px shade (@cluebar_color, 1.04),
-                inset 0 -1px shade (@cluebar_color, 1.01);
-}
-
-NautilusTrashBar.info:backdrop,
-NautilusXContentBar.info:backdrop,
-NautilusSearchBar.info:backdrop,
-NautilusQueryEditor.info:backdrop {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@cluebar_color, 1.01)),
-                                     to (shade (@cluebar_color, 0.99)));
-    background-color: @cluebar_color;
-    border-bottom-color: shade (@cluebar_color, 0.92);
-
-    box-shadow: inset -1px 0px shade (@cluebar_color, 1.01),
-                inset 1px 0px shade (@cluebar_color, 1.01),
-                inset 0 1px shade (@cluebar_color, 1.02),
-                inset 0 -1px shade (@cluebar_color, 1.0);
-}
-
-NautilusSearchBar .entry {
-}
-
-.nautilus-cluebar-label {
-    font: bold;
-    text-shadow: 0 1px shade (@cluebar_color, 1.06);
-}
-
-.nautilus-cluebar-label:backdrop {
-    color: mix (@fg_color, @cluebar_color, 0.2);
-    text-shadow: 0 1px shade (@cluebar_color, 1.02);
-}
-
-#nautilus-search-button *:active,
-#nautilus-search-button *:active:prelight {
-    color: @dark_fg_color;
-}
-
-NautilusFloatingBar {
-    background-color: @info_bg_color;
-    border-radius: 3px 3px 0 0;
-    border-style: solid;
-    border-width: 1px;
-    border-color: darker (@info_bg_color);
-}
-
-NautilusFloatingBar .button {
-    -GtkButton-image-spacing: 0;
-    -GtkButton-inner-border: 0;
-}
-
-NautilusWindow .header-bar .button {
-    padding: 9px;
-}
-
-/* sidebar */
-NautilusWindow .sidebar,
-NautilusWindow .sidebar .view {
-    background-color: shade (@bg_color, 0.95);
-
-    /*background-color: @bg_color;*/
-
-    color: @fg_color;
-    text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.04); 
-}
-
-NautilusWindow .sidebar .frame {
-    border-width: 1px 0 0 0;
-    border-style: solid;
-    border-color: shade (@bg_color, 0.86);
-    border-radius: 0;
-}
-
-NautilusWindow .sidebar:backdrop,
-NautilusWindow .sidebar .view:backdrop {
-    color: mix (@fg_color, shade (@bg_color, 0.95), 0.2);
-    text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.02); 
-}
-
-NautilusWindow .sidebar row:selected {
-    color: @selected_fg_color;
-    text-shadow: 0 1px shade (@selected_bg_color, 0.8); 
-}
-
-NautilusWindow .sidebar row:selected:backdrop {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (shade (@bg_color, 0.95), 0.94)),
-                                     to (shade (shade (@bg_color, 0.95), 0.86)));
-    border-top-color: shade (shade (@bg_color, 0.95), 0.88);
-
-    color: @fg_color;
-    text-shadow: 0 1px shade (shade (@bg_color, 0.95), 0.96); 
-}
-
-NautilusWindow .pane-separator {
-    background-color: shade (shade (@bg_color, 0.95), 0.94);
-    border-color: @dark_bg_color;
-    border-style: solid;
-    border-width: 0;
-    box-shadow: none;
-}
-
-NautilusWindow .pane-separator:backdrop {
-    background-color: shade (shade (@bg_color, 0.95), 0.96);
-}

=== 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 @@
 /***********
  * sidebar *
  ***********/
-.sidebar row:selected {
+GtkPlacesSidebar.sidebar .view {
+    background-color: shade (@bg_color, 0.95);
+
+    color: @fg_color;
+    text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.04);
+}
+
+GtkPlacesSidebar.sidebar:backdrop {
+    color: mix (@fg_color, shade (@bg_color, 0.95), 0.2);
+    text-shadow: 0 1px shade (shade (@bg_color, 0.95), 1.02);
+}
+
+GtkPlacesSidebar.sidebar row:selected {
+    color: @selected_fg_color;
     text-shadow: 0 1px shade (@selected_bg_color, 0.7);
 }
 
-.sidebar .frame {
-    border-width: 0;
+GtkPlacesSidebar.sidebar row:selected:backdrop {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (shade (@bg_color, 0.95), 0.94)),
+                                     to (shade (shade (@bg_color, 0.95), 0.86)));
+    border-top-color: shade (shade (@bg_color, 0.95), 0.88);
+
+    color: @fg_color;
+    text-shadow: 0 1px shade (shade (@bg_color, 0.95), 0.96);
 }
 
 /**************
@@ -1652,6 +1671,7 @@
     color: @dark_fg_color;
     text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
     border-image-source: url("assets/radiance-button-toolbar.png");
+    padding: 9px;
 }
 
 .primary-toolbar .button.flat {
@@ -1969,6 +1989,15 @@
     background: none;
 }
 
+/* Floating bars */
+.floating-bar {
+    background-color: @info_bg_color;
+    border-radius: 3px 3px 0 0;
+    border-style: solid;
+    border-width: 1px;
+    border-color: darker (@info_bg_color);
+}
+
 
 /* OSD overlays */
 .osd,