From 1eb462a994ce62b3843742d0315cb2d6650b07c0 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Tue, 22 Mar 2016 13:03:08 +0100 Subject: dnd updates --- common/gtk-3.0/3.20/sass/_common.scss | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'common/gtk-3.0/3.20/sass') diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index 06e7cfa..4e406d7 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -253,7 +253,7 @@ entry { &:drop(active) { &:focus, & { border-color: $drop_target_color; - box-shadow: inset 0 0 0 1px $drop_target_color; + box-shadow: none; } } @@ -396,7 +396,7 @@ button { &:drop(active) { color: $drop_target_color; border-color: $drop_target_color; - box-shadow: inset 0 0 0 1px $drop_target_color; + box-shadow: none; } // big standalone buttons like in Documents pager @@ -579,14 +579,15 @@ toolbar.inline-toolbar toolbutton { > entry.error + entry.warning { border-#{$_border}-color: if($var=='light', $error_color, transparentize($e_border, $a));} - @each $e_type, $e_color in ('',$selected_bg_color), - ('.warning', $warning_color), - ('.error', $error_color) { + @each $e_type, $e_color in (':focus',$selected_bg_color), + (':drop(active)', $drop_target_color), + ('.warning:focus', $warning_color), + ('.error:focus', $error_color) { - > entry + entry#{$e_type}:focus:not(:last-child), - > entry + entry#{$e_type}:focus:last-child { border-#{$_border}-color: if($var=='light', $e_color, $e_border); } + > entry + entry#{$e_type}:not(:last-child), + > entry + entry#{$e_type}:last-child { border-#{$_border}-color: if($var=='light', $e_color, $e_border); } - > entry#{$e_type}:focus:not(:only-child) { + > entry#{$e_type}:not(:only-child) { + entry, + button, + combobox > box > button.combo { border-#{$_border}-color: if($var=='light', $e_color, $e_border); } @@ -751,6 +752,8 @@ button:link, button:visited { // spinbutton { + &:drop(active) { box-shadow: none; } + button:active { color: $selected_fg_color; } &:disabled { color: $insensitive_fg_color; } @@ -772,6 +775,8 @@ spinbutton { > entry + button:not(:active):hover { box-shadow: none; } > entry:focus + button { border-left-color: if($variant=='light', $selected_bg_color, $entry_border); } + + > entry:drop(active) + button { border-left-color: $drop_target_color; } } &.vertical { button, entry { @@ -785,6 +790,8 @@ spinbutton { button.up { border-radius: 3px 3px 0 0; } > entry:focus + button { border-top-color: if($variant=='light', $selected_bg_color, $entry_border); } + + > entry:drop(active) + button { border-top-color: $drop_target_color; } } } @@ -2936,7 +2943,6 @@ stackswitcher button { // *:drop(active):focus, *:drop(active) { - border-color: $drop_target_color; box-shadow: inset 0 0 0 1px $drop_target_color; } -- cgit v1.2.3