From 1dcd88961ec7584ed42995a8d6dbba59a8d875df Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Mon, 21 Mar 2016 01:19:12 +0100 Subject: [PATCH] Adwaita: more evident colorswatch drag hilight --- gtk/theme/Adwaita/_common.scss | 16 ++++++++++++++++ gtk/theme/Adwaita/gtk-contained-dark.css | 8 ++++++++ gtk/theme/Adwaita/gtk-contained.css | 8 ++++++++ 3 files changed, 32 insertions(+) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index f7ce355d8c..c0bea682e8 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -3978,6 +3978,22 @@ colorswatch { &:backdrop { color: $backdrop_text_color; } } + &:drop(active) { + box-shadow: none; + + &.light overlay { + border-color: $drop_target_color; + box-shadow: inset 0 0 0 2px if($variant == 'light', darken($drop_target_color, 7%), $borders_color), + inset 0 0 0 1px $drop_target_color; + } + + &.dark overlay { + border-color: $drop_target_color; + box-shadow: inset 0 0 0 2px if($variant == 'light', transparentize(black, 0.7), $borders_color), + inset 0 0 0 1px $drop_target_color; + } + } + overlay { box-shadow: $_colorswatch_overlay_shadow; border: 1px solid if($variant == 'light', transparentize(black, 0.7), $borders_color); diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 04b03e6117..56e2cc59ab 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -4235,6 +4235,14 @@ colorswatch.light overlay { border-color: #1c1f1f; } colorswatch.light overlay:backdrop { color: #d5d5d5; } +colorswatch:drop(active) { + box-shadow: none; } + colorswatch:drop(active).light overlay { + border-color: #4e9a06; + box-shadow: inset 0 0 0 2px #1c1f1f, inset 0 0 0 1px #4e9a06; } + colorswatch:drop(active).dark overlay { + border-color: #4e9a06; + box-shadow: inset 0 0 0 2px #1c1f1f, inset 0 0 0 1px #4e9a06; } colorswatch overlay { box-shadow: inset 0 3px 2px -2px rgba(0, 0, 0, 0.5); border: 1px solid #1c1f1f; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index f7535b3580..1d94570ae5 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -4264,6 +4264,14 @@ colorswatch.light overlay { border-color: rgba(0, 0, 0, 0.5); } colorswatch.light overlay:backdrop { color: #323232; } +colorswatch:drop(active) { + box-shadow: none; } + colorswatch:drop(active).light overlay { + border-color: #4e9a06; + box-shadow: inset 0 0 0 2px #3d7805, inset 0 0 0 1px #4e9a06; } + colorswatch:drop(active).dark overlay { + border-color: #4e9a06; + box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 0.3), inset 0 0 0 1px #4e9a06; } colorswatch overlay { box-shadow: inset 0 2px 2px -3px rgba(0, 0, 0, 0.7); border: 1px solid rgba(0, 0, 0, 0.3); }