Merge branch 'activatable-colorswatch-style' into 'master'

Adwaita: Limit color swatch's hover effect to .activatable

See merge request GNOME/gtk!2411

2 files changed, 14 insertions, 13 deletions

diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index f117d8bef7..511f26bd59 100644
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -272,6 +272,7 @@ gtk_color_button_init (GtkColorButton *button)
 
   button->swatch = gtk_color_swatch_new ();
   gtk_widget_set_can_focus (button->swatch, FALSE);
+  gtk_widget_remove_css_class (button->swatch, "activatable");
   g_object_set (button->swatch, "has-menu", FALSE, NULL);
   layout = gtk_widget_create_pango_layout (GTK_WIDGET (button), "Black");
   pango_layout_get_pixel_extents (layout, NULL, &rect);
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 15e2dd6e46..c453733828 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3641,24 +3641,22 @@ colorswatch {
   }
 
   &.dark {
-
-
     > overlay {
       color: white;
+    }
 
-      &:hover { border-color: if($variant == 'light', transparentize(black, 0.2), $borders_color); }
-
+    &.activatable:hover > overlay {
+      border-color: if($variant == 'light', transparentize(black, 0.2), $borders_color);
     }
   }
 
   &.light {
-
-
     > overlay {
       color: black;
+    }
 
-      &:hover { border-color: if($variant == 'light', transparentize(black, 0.5), $borders_color); }
-
+    &.activatable:hover > overlay {
+      border-color: if($variant == 'light', transparentize(black, 0.5), $borders_color);
     }
   }
 
@@ -3680,11 +3678,11 @@ colorswatch {
 
   > overlay {
     border: 1px solid if($variant == 'light', transparentize(black, 0.7), $borders_color);
+  }
 
-    &:hover {
-      box-shadow: inset 0 1px transparentize(white, 0.6),
-                  inset 0 -1px transparentize(black, 0.8);
-    }
+  &.activatable:hover > overlay {
+    box-shadow: inset 0 1px transparentize(white, 0.6),
+                inset 0 -1px transparentize(black, 0.8);
   }
 
   &#add-color-button {
@@ -3694,8 +3692,10 @@ colorswatch {
 
     > overlay {
       @include button(normal);
+    }
 
-      &:hover { @include button(hover); }
+    &.activatable:hover > overlay {
+      @include button(hover);
     }
   }