all: move applications overrides into a separate stylesheet

And import the Nautilus styles there as well.

5 files changed, 112 insertions, 15 deletions

diff --git a/themes/Adwaita/gtk-3.0/Makefile.am b/themes/Adwaita/gtk-3.0/Makefile.am
index 01f8d1a8..59b89546 100644
--- a/themes/Adwaita/gtk-3.0/Makefile.am
+++ b/themes/Adwaita/gtk-3.0/Makefile.am
@@ -2,6 +2,7 @@ SUBDIRS = assets
 
 themedir = $(datadir)/themes/Adwaita/gtk-3.0
 theme_DATA = 		\
+	gnome-applications.css \
 	gtk.css 	\
 	gtk-dark.css	\
 	gtk-widgets.css \
diff --git a/themes/Adwaita/gtk-3.0/gnome-applications.css b/themes/Adwaita/gtk-3.0/gnome-applications.css
new file mode 100644
index 00000000..206fb5b5
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/gnome-applications.css
@@ -0,0 +1,109 @@
+@define-color nautilus_cluebar_color #729fcf;
+
+/****************
+ * Applications *
+ ****************/
+ApDocView, /* Abiword */
+EogScrollView, /* Eog */
+CheeseThumbView /* Cheese */
+{
+    background-color: @chrome_bg_color;
+    -EogScrollView-shadow-type: none;
+}
+
+/* gnome-terminal */
+TerminalScreen {
+    background-color: @theme_base_color;
+    color: @theme_fg_color;
+    -TerminalScreen-background-darkness: 0.95;
+}
+
+/* nautilus */
+.nautilus-canvas-item {
+    border-radius: 5;
+}
+
+.nautilus-desktop.nautilus-canvas-item {
+    color: @theme_bg_color;
+    text-shadow: 0 1 black;
+}
+
+.nautilus-desktop.nautilus-canvas-item:active {
+    color: @theme_text_color;
+}
+
+.nautilus-desktop.nautilus-canvas-item:selected {
+    color: @theme_selected_fg_color;
+}
+
+.nautilus-desktop.nautilus-canvas-item:active,
+.nautilus-desktop.nautilus-canvas-item:prelight,
+.nautilus-desktop.nautilus-canvas-item:selected {
+    text-shadow: none;
+}
+
+NautilusTrashBar.info,
+NautilusXContentBar.info,
+NautilusSearchBar.info,
+NautilusQueryEditor.info {
+    background-color: @nautilus_cluebar_color;
+    border-color: darker (@nautilus_cluebar_color);
+
+    border-radius: 0;
+    border-width: 1 0;
+    border-style: solid;
+}
+
+NautilusSearchBar .entry {
+    border-image: none;
+    border-color: @nautilus_cluebar_color;
+
+    -GtkEntry-inner-border: 3;
+}
+
+.nautilus-cluebar-label {
+    font: bold;
+    color: @theme_base_color;
+}
+
+#nautilus-search-button *:active,
+#nautilus-search-button *:active:prelight {
+    color: darker (@nautilus_cluebar_color);
+}
+
+NautilusFloatingBar {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade (@notebook_tab_gradient_a, 0.97)),
+                                     to (shade (@notebook_tab_gradient_b, 0.90)));
+
+    border-color: shade (@notebook_tab_gradient_b, 0.80);
+
+    border-radius: 3 3 0 0;
+    border-width: 1;
+    border-style: solid;
+}
+
+NautilusFloatingBar .button {
+    background-color: alpha (@theme_base_color, 0.0);
+    background-image: none;
+
+    border-style: none;
+    border-image: none;
+
+    -GtkButton-image-spacing: 0;
+    -GtkButton-inner-border: 0;
+}
+
+NautilusWindow .sidebar .frame {
+    border-width: 1 0 0 0;
+    border-style: solid;
+    border-color: shade (@theme_bg_color, 0.66);
+    border-radius: 0;
+}
+
+NautilusWindow > GtkTable > .pane-separator {
+    border-width: 1 1 0 0;
+    border-style: solid;
+    border-color: shade (@theme_bg_color, 0.66);
+}
diff --git a/themes/Adwaita/gtk-3.0/gtk-dark.css b/themes/Adwaita/gtk-3.0/gtk-dark.css
index 63cd49e8..cca9d9d2 100644
--- a/themes/Adwaita/gtk-3.0/gtk-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-dark.css
@@ -150,3 +150,4 @@
 @import url("gtk-widgets-assets-dark.css");
 @import url("gtk-widgets.css");
 @import url("gtk-widgets-dark-overrides.css");
+@import url("gnome-applications.css");
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index a5105a7d..f0cd7d47 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -1474,21 +1474,6 @@ GtkCalendar.highlight {
     color: mix (@theme_selected_fg_color, @theme_base_color, 0.50);
 }
 
-ApDocView, /* Abiword */
-EogScrollView, /* Eog */
-CheeseThumbView /* Cheese */
-{
-    background-color: @chrome_bg_color;
-    -EogScrollView-shadow-type: none;
-}
-
-/* gnome-terminal */
-TerminalScreen {
-    background-color: @theme_base_color;
-    color: @theme_fg_color;
-    -TerminalScreen-background-darkness: 0.95;
-}
-
 /**********************
  * Fallback Mode Panel
  **********************/
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index c9ffafef..1bdd19ee 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -154,3 +154,4 @@
 
 @import url("gtk-widgets.css");
 @import url("gtk-widgets-assets.css");
+@import url("gnome-applications.css");