[gnome-themes-standard/wip/sass] pushed suggested and destructive buttons got overriden by hover



commit aa2673b9409cebb8db0344c34b4646b13567c06c
Author: Jakub Steiner <jimmac gmail com>
Date:   Thu May 15 16:38:17 2014 +0200

    pushed suggested and destructive buttons got overriden by hover

 themes/Adwaita/gtk-3.0/_common.scss           |    2 +-
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   16 ++++++++++++----
 themes/Adwaita/gtk-3.0/gtk-contained.css      |   16 ++++++++++++----
 3 files changed, 25 insertions(+), 9 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index 5405042..c173ca6 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -246,7 +246,7 @@ GtkGrid:insensitive {
     &.#{$b_type} {
       @include button_normal($b_color);
       color: $theme_base_color; 
-      &:active {
+      &:active, &:hover:active {
         @include button_active($b_color);
       }
       &:hover {
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 9b0118b..a2548d9 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -224,11 +224,15 @@ GtkGrid:insensitive {
     background-image: linear-gradient(to bottom, #4a90d9, #2a76c6 40%, #215d9c);
     box-shadow: inset 0 1px rgba(51, 51, 51, 0.6), 0 1px rgba(51, 51, 51, 0.6);
     color: #333333; }
-    .button.suggested-action:active,
+    .button.suggested-action:active, .button.suggested-action:hover:active,
     .toolbar .button.raised.suggested-action:active,
+    .toolbar .button.raised.suggested-action:hover:active,
     .toolbar .raised .button.suggested-action:active,
+    .toolbar .raised .button.suggested-action:hover:active,
     .toolbar GtkComboBox .suggested-action.button:active,
-    .spinbutton.vertical .button.suggested-action:active {
+    .toolbar GtkComboBox .suggested-action.button:hover:active,
+    .spinbutton.vertical .button.suggested-action:active,
+    .spinbutton.vertical .button.suggested-action:hover:active {
       border: 1px solid #0f2b48;
       background-image: linear-gradient(to bottom, #184472, #1c5187 5%, #215d9c);
       box-shadow: inset 0 1px 2px #0f2b48; }
@@ -276,11 +280,15 @@ GtkGrid:insensitive {
     background-image: linear-gradient(to bottom, #ef2929, #d51010 40%, #a60c0c);
     box-shadow: inset 0 1px rgba(51, 51, 51, 0.6), 0 1px rgba(51, 51, 51, 0.6);
     color: #333333; }
-    .button.destructive-action:active,
+    .button.destructive-action:active, .button.destructive-action:hover:active,
     .toolbar .button.raised.destructive-action:active,
+    .toolbar .button.raised.destructive-action:hover:active,
     .toolbar .raised .button.destructive-action:active,
+    .toolbar .raised .button.destructive-action:hover:active,
     .toolbar GtkComboBox .destructive-action.button:active,
-    .spinbutton.vertical .button.destructive-action:active {
+    .toolbar GtkComboBox .destructive-action.button:hover:active,
+    .spinbutton.vertical .button.destructive-action:active,
+    .spinbutton.vertical .button.destructive-action:hover:active {
       border: 1px solid #470505;
       background-image: linear-gradient(to bottom, #760909, #8e0b0b 5%, #a60c0c);
       box-shadow: inset 0 1px 2px #470505; }
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 7263d27..07482d3 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -224,11 +224,15 @@ GtkGrid:insensitive {
     background-image: linear-gradient(to bottom, #98b9dc, #729fcf 40%, #4c85c2);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(255, 255, 255, 0.05);
     color: white; }
-    .button.suggested-action:active,
+    .button.suggested-action:active, .button.suggested-action:hover:active,
     .toolbar .button.raised.suggested-action:active,
+    .toolbar .button.raised.suggested-action:hover:active,
     .toolbar .raised .button.suggested-action:active,
+    .toolbar .raised .button.suggested-action:hover:active,
     .toolbar GtkComboBox .suggested-action.button:active,
-    .spinbutton.vertical .button.suggested-action:active {
+    .toolbar GtkComboBox .suggested-action.button:hover:active,
+    .spinbutton.vertical .button.suggested-action:active,
+    .spinbutton.vertical .button.suggested-action:hover:active {
       border: 1px solid #2b537d;
       background-image: linear-gradient(to bottom, #386ca3, #3e78b6 5%, #4c85c2);
       box-shadow: inset 0 1px 2px #2b537d; }
@@ -276,11 +280,15 @@ GtkGrid:insensitive {
     background-image: linear-gradient(to bottom, #f35858, #ef2929 40%, #d51010);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(255, 255, 255, 0.05);
     color: white; }
-    .button.destructive-action:active,
+    .button.destructive-action:active, .button.destructive-action:hover:active,
     .toolbar .button.raised.destructive-action:active,
+    .toolbar .button.raised.destructive-action:hover:active,
     .toolbar .raised .button.destructive-action:active,
+    .toolbar .raised .button.destructive-action:hover:active,
     .toolbar GtkComboBox .destructive-action.button:active,
-    .spinbutton.vertical .button.destructive-action:active {
+    .toolbar GtkComboBox .destructive-action.button:hover:active,
+    .spinbutton.vertical .button.destructive-action:active,
+    .spinbutton.vertical .button.destructive-action:hover:active {
       border: 1px solid #760909;
       background-image: linear-gradient(to bottom, #a60c0c, #bd0e0e 5%, #d51010);
       box-shadow: inset 0 1px 2px #760909; }


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