From 44e0e1359c94a0dbd760fa51ff55034d1f8729d5 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Sat, 9 Jan 2016 15:30:20 +0100
Subject: [PATCH] Adwaita: avoid colorswatch growing when drop targets

---
 gtk/theme/Adwaita/_common.scss           | 4 +++-
 gtk/theme/Adwaita/gtk-contained-dark.css | 2 ++
 gtk/theme/Adwaita/gtk-contained.css      | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index afa588968b..2e00a326eb 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3411,6 +3411,8 @@ colorswatch {
   // is colorswatch overlay {}, colorswatch has the programmatically set background, so most of the style is
   // applied to the overlay box.
 
+  &, &:drop(active) { border-style: none; } // FIXME: implement a proper drop(active) state
+
   $_colorswatch_radius: 5px;
   $_colorswatch_overlay_shadow: if($variant == 'light', inset 0 2px 2px -3px transparentize(black, 0.3),
                                                         inset 0 3px 2px -2px transparentize(black, 0.5));
@@ -3715,7 +3717,7 @@ frame.keycap {
 }
 
 *:drop(active):focus,
-*:drop(active) { border: 1px solid black; }
+*:drop(active) { border: 1px solid black; } // FIXME this makes boxes grow and looks pretty bad, needs to be handled differently
 
 stackswitcher button.text-button { min-width: 100px; } // FIXME aggregate with buttons
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index aac39720cc..a47ed9ff86 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -4432,6 +4432,8 @@ tooltip {
 /*****************
  * Color Chooser *
  *****************/
+colorswatch, colorswatch:drop(active) {
+  border-style: none; }
 colorswatch.top {
   border-top-left-radius: 5.5px;
   border-top-right-radius: 5.5px; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 1df0a172dd..cdacc219ae 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -4608,6 +4608,8 @@ tooltip {
 /*****************
  * Color Chooser *
  *****************/
+colorswatch, colorswatch:drop(active) {
+  border-style: none; }
 colorswatch.top {
   border-top-left-radius: 5.5px;
   border-top-right-radius: 5.5px; }