[gnome-themes-standard] gtk3: fix selection toolbar done button backdrop state and minor tweaks to normal state.



commit c934e2ab253fd8b87960d0bacedd66ef5e79761d
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Sun Sep 30 13:08:25 2012 +0200

    gtk3: fix selection toolbar done button backdrop state and minor tweaks to
          normal state.
    
          Some css simplifications.

 themes/Adwaita/gtk-3.0/gtk-main-common.css |    2 +-
 themes/Adwaita/gtk-3.0/gtk-widgets.css     |   50 ++++++++++++++--------------
 2 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-main-common.css b/themes/Adwaita/gtk-3.0/gtk-main-common.css
index cc6cf67..5e217bc 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main-common.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main-common.css
@@ -60,7 +60,7 @@
 @define-color selection_toolbar_suggested_button_c #4e9a06;
 
 @define-color selection_toolbar_suggested_button_fg #ffffff;
- define-color selection_toolbar_suggested_button_shadow alpha(#000000, 0.20);
+ define-color selection_toolbar_suggested_button_shadow alpha(black, 0.30);
 
 /*********************
  * Error/Warning/... *
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index b6a2c9f..c14d53a 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -2783,6 +2783,13 @@ GtkOverlay.osd {
                                       @selection_toolbar_suggested_button_c);
     padding-left: 6px;
     padding-right: 6px;
+
+    box-shadow: inset 0 2px alpha(white, 0.2), inset 0 1px @selection_toolbar_suggested_button_a;
+
+    text-shadow: 0 -1px @selection_toolbar_suggested_button_shadow;
+    icon-shadow: 0 -1px @selection_toolbar_suggested_button_shadow;
+
+    color: @selection_toolbar_suggested_button_fg;
 }
 
 .selection-mode.toolbar .suggested-action.button:hover,
@@ -2800,40 +2807,33 @@ GtkOverlay.osd {
     background-image: linear-gradient(to bottom,
                                       @selection_toolbar_suggested_button_b,
                                       shade(@selection_toolbar_suggested_button_a, 0.90));
+    box-shadow: none;
+
+    text-shadow: 0 1px @button_active_text_shadow;
+    icon-shadow: 0 1px @button_active_text_shadow;
 }
 
 .selection-mode.toolbar .suggested-action.button:backdrop,
 .selection-mode.toolbar GtkToolButton.suggested-action .button:backdrop {
-    background-image: none;
-    border-image: none;
-    border-color: @unfocused_borders;
-}
+    text-shadow: none;
+    icon-shadow: none;
 
-.selection-mode.toolbar .suggested-action.button *,
-.selection-mode.toolbar GtkToolButton.suggested-action .button * {
-    text-shadow: 0 -1px @selection_toolbar_suggested_button_shadow;
-    icon-shadow: 0 -1px @selection_toolbar_suggested_button_shadow;
-}
+    background-image: none; /* remove custom bg, we want colored buttons to look like normal buttons in backdrop*/
 
-.selection-mode.toolbar .suggested-action.button *:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button *:active {
-    text-shadow: 0 1px @selection_toolbar_suggested_button_shadow;
-    icon-shadow: 0 1px @selection_toolbar_suggested_button_shadow;
-}
+    box-shadow: none;
 
-.selection-mode.toolbar .suggested-action.button *:hover,
-.selection-mode.toolbar .suggested-action.button *:active,
-.selection-mode.toolbar .suggested-action.button *:hover:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button *:hover,
-.selection-mode.toolbar GtkToolButton.suggested-action .button *:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button *:hover:active {
-    color: @selection_toolbar_suggested_button_fg;
+    color: @theme_unfocused_fg_color;
+
+    /* compensate different border images border-width settings */
+    padding-left: 5px;
+    padding-right: 5px;
 }
 
-.selection-mode.toolbar .suggested-action.button *:backdrop,
-.selection-mode.toolbar GtkToolButton.suggested-action .button *:backdrop {
-    text-shadow: none;
-    icon-shadow: none;
+.selection-mode.toolbar .suggested-action.button *,
+.selection-mode.toolbar GtkToolButton.suggested-action .button * {
+    text-shadow: inherit;
+    icon-shadow: inherit;
+    color: inherit;
 }
 
 /****************



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]