[gnome-themes-standard] Move all border styling into main css file

[William Jon McCann <mccann src gnome org>]

commit d9c24ec193fa75f469d20235102bf7da61bc6ff8
Author: William Jon McCann <william jon mccann gmail com>
Date:   Tue May 6 07:32:38 2014 -0400

    Move all border styling into main css file

 themes/Adwaita/gtk-3.0/gtk-main-dark.css           |    1 -
 themes/Adwaita/gtk-3.0/gtk-main.css                |    1 -
 .../Adwaita/gtk-3.0/gtk-widgets-borders-dark.css   |  285 --------------------
 themes/Adwaita/gtk-3.0/gtk-widgets-borders.css     |  177 ------------
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |  118 ++++++++
 themes/Adwaita/gtk-3.0/gtk.gresource.xml           |    2 -
 6 files changed, 118 insertions(+), 466 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-main-dark.css b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
index a3883f3..ff66a63 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
@@ -209,7 +209,6 @@
 
 @import url("gtk-main-common.css");
 @import url("gtk-widgets-backgrounds.css");
- import url("gtk-widgets-borders-dark.css");
 @import url("gtk-widgets-assets-dark.css");
 @import url("gtk-widgets.css");
 @import url("gtk-widgets-dark-overrides.css");
diff --git a/themes/Adwaita/gtk-3.0/gtk-main.css b/themes/Adwaita/gtk-3.0/gtk-main.css
index cd438b7..6483755 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main.css
@@ -209,7 +209,6 @@
 
 @import url("gtk-main-common.css");
 @import url("gtk-widgets-backgrounds.css");
- import url("gtk-widgets-borders.css");
 @import url("gtk-widgets-assets.css");
 @import url("gtk-widgets.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 688cdec..4aa9353 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -1194,6 +1194,66 @@ GtkComboBox.combobox-entry .button {
     text-shadow: 0 1px @button_text_shadow;
 }
 
+/* generic button borders */
+.button:active,
+.button:insensitive,
+.button.default:insensitive,
+.spinbutton.vertical .button:active,
+.spinbutton.vertical .button:insensitive,
+.inline-toolbar.toolbar.vertical .button:active,
+.inline-toolbar.toolbar.vertical .button:insensitive,
+.inline-toolbar.toolbar.vertical .button.default:insensitive,
+GtkSwitch.trough,
+GtkSwitch.trough:active:insensitive,
+.titlebar .titlebutton:hover,
+.titlebar .titlebutton:active {
+    box-shadow: inset .5px .5px @borders,
+                inset -.5px .5px @borders,
+                inset .5px -.5px @borders,
+                inset -.5px -.5px @borders;
+    border-image: none;
+    border-width: 0px 0px 1px;
+    border-radius: 3.5px;
+    border-style: solid;
+    border-color: alpha(white, 0.5);
+}
+
+/* focused button borders */
+.button.default:active,
+.inline-toolbar.toolbar.vertical .button.default:active,
+GtkSwitch.trough:active {
+    box-shadow: inset .5px .5px @theme_selected_bg_color,
+                inset -.5px .5px @theme_selected_bg_color,
+                inset .5px -.5px @theme_selected_bg_color,
+                inset -.5px -.5px @theme_selected_bg_color;
+    border-image: none;
+    border-width: 0px 0px 1px;
+    border-radius: 3.5px;
+    border-style: solid;
+    border-color: alpha(white, 0.5);
+}
+
+/* unfocused window: generic button borders */
+.button:backdrop,
+.spinbutton.vertical .button:backdrop,
+GtkSwitch.trough:backdrop,
+.inline-toolbar.toolbar.vertical .button:backdrop,
+.inline-toolbar.toolbar.vertical .button:backdrop:insensitive,
+.inline-toolbar.toolbar.vertical .button:backdrop:active,
+.suggested-action.button:backdrop,
+.toolbar .suggested-action.button:backdrop,
+.destructive-action.button:backdrop {
+    box-shadow: inset .5px .5px @borders,
+                inset -.5px .5px @borders,
+                inset .5px -.5px @borders,
+                inset -.5px -.5px @borders;
+    border-image: none;
+    border-radius: 3.5px;
+    border-width: 0 0 1px;
+    border-style: solid;
+    border-color: transparent;
+}
+
 /* We may want a background for focused buttons, but in the meantime let's remove it too */
 .primary-toolbar .button,
 .primary-toolbar .button:insensitive,
@@ -3900,6 +3960,64 @@ GtkIconView.cell:selected:focus {
     color: @theme_unfocused_selected_fg_color;
 }
 
+/* column-headers borders */
+column-header.button,
+column-header .button,
+column-header.button:active,
+column-header .button:active,
+column-header.button:active:hover,
+column-header .button:active:hover,
+column-header.button:backdrop,
+column-header .button:backdrop,
+column-header.button:insensitive,
+column-header .button:insensitive,
+column-header.button:last-child:backdrop,
+column-header:last-child .button:backdrop {
+    border-width: 0 1px 1px 0;
+    border-radius: 0;
+    border-style: solid;
+    border-color: transparent;
+}
+
+column-header.button,
+column-header .button,
+column-header.button:active,
+column-header .button:active,
+column-header.button:active:hover,
+column-header .button:active:hover,
+column-header .button.dnd {
+    border-image: linear-gradient(to top,
+                                  mix(@borders, @theme_base_color, 0.5),
+                                  @theme_base_color
+                                  ) 0 1 1 0;
+}
+
+column-header.button:backdrop,
+column-header .button:backdrop,
+column-header.button:last-child:backdrop,
+column-header:last-child .button:backdrop {
+    border-image: none;
+}
+
+column-header.button:insensitive,
+column-header .button:insensitive {
+    border-image: linear-gradient(to top,
+                                  mix(@insensitive_borders, @insensitive_bg_color, 0.5),
+                                  @insensitive_bg_color
+                                  ) 0 1 1 0;
+}
+
+column-header.button:last-child,
+column-header:last-child .button,
+column-header.button:last-child:active,
+column-header:last-child .button:active,
+column-header.button:last-child:active:hover,
+column-header:last-child .button:active:hover,
+column-header.button:last-child:backdrop,
+column-header:last-child .button:backdrop {
+    border-right-width: 0;
+}
+
 column-header.button,
 column-header .button {
     color: @internal_element_color;
diff --git a/themes/Adwaita/gtk-3.0/gtk.gresource.xml b/themes/Adwaita/gtk-3.0/gtk.gresource.xml
index 4e33c10..3b275cf 100644
--- a/themes/Adwaita/gtk-3.0/gtk.gresource.xml
+++ b/themes/Adwaita/gtk-3.0/gtk.gresource.xml
@@ -385,8 +385,6 @@
     <file>gnome-applications-dark-overrides.css</file>
     <file>gtk-widgets.css</file>
     <file>gtk-widgets-backgrounds.css</file>
-    <file>gtk-widgets-borders.css</file>
-    <file>gtk-widgets-borders-dark.css</file>
     <file>gtk-widgets-dark-overrides.css</file>
     <file>gtk-widgets-assets.css</file>
     <file>gtk-widgets-assets-dark.css</file>