[gnome-themes-standard] Revert "Revert "entry: fix progressbars on entries""

[Cosimo Cecchi <cosimoc src gnome org>]

commit 8461f958eea60b84c5865f29b8b3e2f9879c5d2e
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Jun 13 11:19:36 2011 -0400

    Revert "Revert "entry: fix progressbars on entries""
    
    This reverts commit 24443f26438bee9b442cd31c6f06c69536ddf3fd.

 themes/Adwaita/gtk-3.0/gtk-widgets.css |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 3b467fc..9442f43 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -36,9 +36,6 @@
 
     -WnckTasklist-fade-overlay-rect: 0;
 
-    -GtkEntry-inner-border: 2;
-    -GtkEntry-progress-border: 0;
-
     -GtkWidget-focus-padding: 2;
     -GtkWidget-focus-line-width: 1;
     -adwaita-focus-border-color: alpha(@theme_text_color, 0.4);
@@ -125,12 +122,17 @@ GtkStatusbar {
 .entry {
     background-color: @theme_base_color;
 
-    padding: 3;
-
     border-style: none;
     border-width: 1;
     border-radius: 2;
 
+    /* we use inner-border instead of padding because padding
+     * also applies to the progressbar.
+     */
+    padding: 0;
+    -GtkEntry-inner-border: 5;
+    -GtkEntry-progress-border: 0;
+
     /* border-image defined in the -assets variants */
 }
 
@@ -888,9 +890,11 @@ GtkTreeMenu .menuitem * {
                                      from (@trough_bg_color_a),
                                      to (@trough_bg_color_b));
 
-    border-width: 0;
+    border-width: 1;
     border-radius: 2;
-    border-color: shade (@inactive_frame_color, 0.925);
+    border-style: solid;
+    border-color: shade(@internal_element_color, 1.10);
+    border-image: none;
 
     color: @theme_text_color;