[gnome-themes-standard] Don't use assets for backdrop borders

[William Jon McCann <mccann src gnome org>]

commit cde1135e251331c73652572aedbe2611411e09e6
Author: William Jon McCann <william jon mccann gmail com>
Date:   Tue May 6 05:49:03 2014 -0400

    Don't use assets for backdrop borders

 themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css |    7 --
 themes/Adwaita/gtk-3.0/gtk-widgets-borders.css     |   18 ++---
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |   67 ++++++++++++++++----
 3 files changed, 62 insertions(+), 30 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css 
b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
index 0ab8657..c6a8124 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
@@ -127,7 +127,6 @@
 }
 
 /* Entry background */
-.entry,
 GtkComboBox.combobox-entry .button,
 GtkComboBox.combobox-entry .button:hover,
 .primary-toolbar GtkComboBox.combobox-entry .button,
@@ -161,8 +160,6 @@ column-header .button:active:hover {
 }
 
 /* Insensitive entry background */
-.entry:insensitive,
-GtkComboBox.combobox-entry .button:insensitive,
 .level-bar.trough:insensitive {
     background-color: @insensitive_bg_color;
     background-image: none;
@@ -170,8 +167,6 @@ GtkComboBox.combobox-entry .button:insensitive,
 }
 
 /* Unfocused windows entry background */
-.entry:backdrop,
-GtkComboBox.combobox-entry .button:backdrop,
 column-header.button:backdrop,
 column-header .button:backdrop,
 column-header.button:insensitive:backdrop,
@@ -184,8 +179,6 @@ column-header .button:insensitive:backdrop,
 }
 
 /* Unfocused windows insensitive entry background */
-.entry:insensitive:backdrop,
-GtkComboBox.combobox-entry .button:insensitive:backdrop,
 .level-bar.trough:insensitive:backdrop,
 .spinbutton.vertical.entry:insensitive:backdrop {
     background-image: none;
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
index 66a8b9a..9d07397 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
@@ -1,9 +1,6 @@
 /* Borders */
 
 /* generic element borders */
-.entry,
-GtkComboBox.combobox-entry .entry,
-GtkComboBox.combobox-entry .button,
 .button:active,
 .button:insensitive,
 .button.default:insensitive,
@@ -30,8 +27,6 @@ GtkSwitch.trough:active:insensitive,
 }
 
 /* focused element borders */
-.entry:focus,
-GtkComboBox.combobox-entry .entry:focus,
 .button.default:active,
 .inline-toolbar.toolbar.vertical .button.default:active,
 GtkSwitch.trough:active {
@@ -215,9 +210,6 @@ column-header:last-child .button:backdrop {
 /* unfocused window: generic element borders */
 .button:backdrop,
 .spinbutton.vertical .button:backdrop,
-GtkComboBox.combobox-entry .entry:backdrop,
-GtkComboBox.combobox-entry .button:backdrop,
-.entry:backdrop,
 GtkSwitch.trough:backdrop,
 .trough:backdrop,
 .inline-toolbar.toolbar.vertical .button:backdrop,
@@ -226,9 +218,13 @@ GtkSwitch.trough:backdrop,
 .suggested-action.button:backdrop, 
 .toolbar .suggested-action.button:backdrop,
 .destructive-action.button:backdrop {
-    border-image: -gtk-scaled 
(url("borders/generic-border-backdrop.png"),url("borders/generic-border-backdrop 2 png")) 3 3 4 3 / 3px 3px 
4px 3px stretch;
-    border-radius: 3px;
-    border-width: 1px 1px 2px 1px;
+    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;
 }
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 88ebc36..728f963 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -343,11 +343,28 @@ GtkTreeView.separator:backdrop,
 /****************
  * Text Entries *
  ****************/
-.entry {
-    border-style: solid;
+
+.entry,
+.entry:insensitive,
+GtkComboBox.combobox-entry .entry,
+GtkComboBox.combobox-entry .button {
     padding: 6px 4px;
 
-    /* border-image defined in the -assets variants */
+    box-shadow: inset 0 2px 2px alpha(@borders, 0.3),
+                inset .5px .5px alpha(@borders, 0.9),
+                inset -.5px .5px alpha(@borders, 0.9),
+                inset .5px -.5px alpha(@borders, 0.9),
+                inset -.5px -.5px alpha(@borders, 0.9);
+    border-image: none;
+    border-width: 0px 0px 1px;
+    border-radius: 3.5px;
+    border-style: solid;
+    border-color: alpha(white, 0.5);
+
+    background-image: linear-gradient(to bottom,
+                                      @entry_background_a,
+                                      @entry_background_b
+                                      );
 
     color: @entry_text_color;
     background-color: @theme_base_color;
@@ -358,7 +375,8 @@ GtkTreeView.separator:backdrop,
     padding-right: 6px;
 }
 
-.entry:focus {
+.entry:focus,
+GtkComboBox.combobox-entry .entry:focus {
     box-shadow: inset .5px .5px 2px alpha(@theme_selected_bg_color, 0.3),
                 inset -.5px .5px 2px alpha(@theme_selected_bg_color, 0.3),
                 inset .5px -.5px 2px alpha(@theme_selected_bg_color, 0.3),
@@ -420,16 +438,39 @@ GtkTreeView.separator:backdrop,
     background-color: @theme_selected_bg_color;
 }
 
-.entry:insensitive {
+.entry:insensitive,
+GtkComboBox.combobox-entry .entry:insensitive,
+GtkComboBox.combobox-entry .button:insensitive {
     color: @insensitive_fg_color;
+    background-color: @insensitive_bg_color;
+    background-image: none;
+
+    box-shadow: inset .5px .5px alpha(@borders, 0.9),
+                inset -.5px .5px alpha(@borders, 0.9),
+                inset .5px -.5px alpha(@borders, 0.9),
+                inset -.5px -.5px alpha(@borders, 0.9);
 }
 
-.entry:backdrop {
+.entry:backdrop,
+GtkComboBox.combobox-entry .entry:backdrop,
+GtkComboBox.combobox-entry .button:backdrop {
     color: @theme_unfocused_text_color;
+    background-image: none;
+    background-color: @theme_unfocused_base_color;
+
+    box-shadow: inset .5px .5px @borders,
+                inset -.5px .5px @borders,
+                inset .5px -.5px @borders,
+                inset -.5px -.5px @borders;
+    border-color: transparent;
 }
 
-.entry:insensitive:backdrop {
+.entry:insensitive:backdrop,
+GtkComboBox.combobox-entry .entry:insensitive:backdrop,
+GtkComboBox.combobox-entry .button:insensitive:backdrop {
     color: @unfocused_insensitive_fg_color;
+    background-color: @unfocused_insensitive_bg_color;
+    background-image: none;
 }
 
 .entry:selected:backdrop {
@@ -2019,6 +2060,13 @@ GtkComboBox.combobox-entry .entry:first-child,
 GtkComboBox.combobox-entry .button:first-child {
     border-radius: 3.5px 0 0 3.5px;
     border-image: none;
+    box-shadow: inset 0 2px 2px alpha(@borders, 0.3),
+                inset .5px .5px shade(@borders, 0.8),
+                inset .5px -.5px shade(@borders, 0.8),
+                inset -1px 0 @inset_dark_color;
+}
+
+GtkComboBox.combobox-entry .entry:first-child:insensitive {
     box-shadow: inset .5px .5px shade(@borders, 0.8),
                 inset .5px -.5px shade(@borders, 0.8),
                 inset -1px 0 @inset_dark_color;
@@ -2060,11 +2108,6 @@ GtkComboBox.combobox-entry .entry:focus:last-child {
                 inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
 }
 
-GtkComboBox.combobox-entry .button:backdrop:first-child,
-GtkComboBox.combobox-entry .button:backdrop:last-child {
-    box-shadow: none;
-}
-
 GtkComboBox.combobox-entry .button:active,
 GtkComboBox.combobox-entry .button:active:hover {
     color: @theme_text_color;