Style fixes

3 files changed, 21 insertions, 93 deletions

diff --git a/src/Adwaita.css b/src/Adwaita.css
index ec96c6d23..729eb915c 100644
--- a/src/Adwaita.css
+++ b/src/Adwaita.css
@@ -29,15 +29,6 @@ NautilusWindow .sidebar .frame {
     border-style: none;
 }
 
-NautilusWindow > GtkGrid > .pane-separator,
-NautilusWindow > GtkGrid > .pane-separator:hover {
-    border-width: 0 1px 0 0;
-    border-style: solid;
-    border-color: @borders;
-    background-color: @sidebar_bg;
-    color: shade (@theme_bg_color, 0.9);
-}
-
 NautilusNotebook .frame {
     border-width: 0;
 }
@@ -46,98 +37,34 @@ NautilusNotebook.notebook tab .button {
     padding: 0px;
 }
 
-NautilusQueryEditor .search-bar.toolbar {
-    border-top-width: 0;
-    border-bottom-width: 0;
-}
-
-NautilusQueryEditor .toolbar {
-    padding-top: 3px;
-    padding-bottom: 2px;
-
-    border-width: 1px 0 0 0;
-    border-style: solid;
-}
-
-NautilusQueryEditor .toolbar:nth-child(2) {
-    border-color: @borders;
-}
-
-NautilusQueryEditor .toolbar:last-child,
-NautilusQueryEditor .search-bar.toolbar:only-child {
-    border-bottom-width: 1px;
-    border-bottom-color: @borders;
-}
-
-NautilusQueryEditor .toolbar:backdrop:nth-child(2) {
-    border-color: @unfocused_borders;
-}
-
-@define-color floating_bar_inset_color alpha(white, 0.45);
-
+/* Floating status bar */
 .floating-bar {
-    background-image: linear-gradient(to bottom,
-                                      @theme_base_color 20%,
-                                      shade(@theme_base_color, 0.9)
-                                      );
-    background-color: @theme_base_color;
-    border-color: @borders;
-
-    color: @theme_fg_color;
-    text-shadow: 0 1px alpha(white, 0.40);
-
-    border-radius: 3px;
-    border-width: 1px;
-    border-style: solid;
-    box-shadow: inset 1px 1px @floating_bar_inset_color, -1px -1px @floating_bar_inset_color;
-}
-
-.floating-bar.top {
-    border-top-width: 0;
-    border-top-right-radius: 0;
-    border-top-left-radius: 0;
-}
-
-.floating-bar.right {
-    border-right-width: 0;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-}
-
-.floating-bar.bottom {
-    border-bottom-width: 0;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
+  padding: 2px;
+  background-color: @theme_base_color;
+  border-width: 1px;
+  border-style: solid solid none;
+  border-color: @borders;
+  border-radius: 3px 3px 0 0;
 }
 
-.floating-bar.left {
-    border-left-width: 0;
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
+.floating-bar.bottom.left { /* axes left border and border radius */
+  border-left-style: none;
+  border-top-left-radius: 0;
 }
-
-.floating-bar.bottom.right {
-    box-shadow: inset 1px 1px @floating_bar_inset_color;
-}
-
-.floating-bar.bottom.left {
-    box-shadow: inset -1px 1px @floating_bar_inset_color;
+.floating-bar.bottom.right { /* axes right border and border radius */
+  border-right-style: none;
+  border-top-right-radius: 0;
 }
 
 .floating-bar:backdrop {
-    background-color: @theme_unfocused_base_color;
-    border-color: shade(@theme_unfocused_base_color, 0.9);
-    background-image: none;
-    box-shadow: none;
+  background-color: @theme_unfocused_base_color;
+  border-color: @unfocused_borders;
 }
 
 .floating-bar .button {
-    background-color: transparent;
-    background-image: none;
-
-    border-style: none;
-    border-image: none;
+    padding: 4px;
+}
 
-    -GtkButton-image-spacing: 0;
-    -GtkButton-inner-border: 0;
+.search-bar {
+    box-shadow: none;
 }
diff --git a/src/nautilus-floating-bar.c b/src/nautilus-floating-bar.c
index a9c298c50..da1bde0d1 100644
--- a/src/nautilus-floating-bar.c
+++ b/src/nautilus-floating-bar.c
@@ -484,6 +484,7 @@ nautilus_floating_bar_add_action (NautilusFloatingBar *self,
 	gtk_widget_show (w);
 
 	button = gtk_button_new ();
+	gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
 	gtk_button_set_image (GTK_BUTTON (button), w);
 	gtk_box_pack_end (GTK_BOX (self), button, FALSE, FALSE, 0);
 	gtk_widget_show (button);
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 9b589711b..ea2ff71a8 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -2214,7 +2214,7 @@ real_setup_loading_floating_bar (NautilusWindowSlot *slot)
 	nautilus_floating_bar_set_show_spinner (NAUTILUS_FLOATING_BAR (slot->details->floating_bar),
 						TRUE);
 	nautilus_floating_bar_add_action (NAUTILUS_FLOATING_BAR (slot->details->floating_bar),
-					  "gtk-stop",
+					  "process-stop-symbolic",
 					  NAUTILUS_FLOATING_BAR_ACTION_ID_STOP);
 
 	gtk_widget_set_halign (slot->details->floating_bar, GTK_ALIGN_END);