diff options
Diffstat (limited to 'common/gtk-3.0/3.18/sass/_common.scss')
| -rw-r--r-- | common/gtk-3.0/3.18/sass/_common.scss | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index 0fc3a4c..13c483c 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -539,7 +539,8 @@ $_dot_color: $selected_bg_color; > .entry.warning + .entry, > .entry + .entry.warning { border-#{$_border}-color: if($var=='light', $warning_color, transparentize($e_border, $a)); } - > .entry.error + .entry.warning { border-#{$_border}-color: if($var=='light', $error_color, transparentize($e_border, $a));} + > .entry.error + .entry.warning, + > .entry.warning + .entry.error { border-#{$_border}-color: if($var=='light', mix($error_color, $warning_color, 50%), transparentize($e_border, $a));} @each $e_type, $e_color in ('',$selected_bg_color), ('.warning', $warning_color), @@ -557,14 +558,19 @@ $_dot_color: $selected_bg_color; > .button:checked + .entry { border-#{$_border}-color: if($var=='light', $selected_bg_color, $e_border); } } @if $button_rules=='true' { - > .button + .button { border-#{$_border}-style: none; } + $_uncolored_button: '.button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action)'; - > .button:hover:not(:checked):not(:active):not(:only-child), - > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: inset if($vert=='false', 1px 0, 0 1px) $b_border; } + > button + button { border-#{$_border}-style: none; } - > .button:first-child:hover:not(:checked):not(:active), - > .button:checked + .button:not(:checked):not(:active):hover, - > .entry + .button:not(:checked):not(:active):hover { box-shadow: none; } + > #{$_uncolored_button}:hover:not(:only-child), + > #{$_uncolored_button}:hover + #{$_uncolored_button} { box-shadow: inset if($vert=='false', 1px 0, 0 1px) $b_border; } + + > #{$_uncolored_button}:first-child:hover, + > .button:active + #{$_uncolored_button}:hover, + > .button:checked + #{$_uncolored_button}:hover, + > .button.suggested-action + #{$_uncolored_button}:hover, + > .button.destructive-action + #{$_uncolored_button}:hover, + > .entry + #{$_uncolored_button}:hover:not(:only-child) { box-shadow: none; } } } @@ -1159,17 +1165,17 @@ GtkComboBox { // Linking stuff // Reset buttons - .linked:not(.vertical):not(.path-bar) > .button, - .linked:not(.vertical):not(.path-bar) > .button:hover, - .linked:not(.vertical):not(.path-bar) > .button:active, - .linked:not(.vertical):not(.path-bar) > .button:checked, - .linked:not(.vertical):not(.path-bar) > .button:insensitive { - border-radius: 3px; - border-style: solid; + .linked:not(.vertical):not(.path-bar) > .button { + &, &:hover, &:active, &:checked, &:disabled { + border-radius: 3px; + border-style: solid; + } } - .linked:not(.vertical):not(.path-bar), .linked:not(.vertical).path-bar { - > .button:hover:not(:checked):not(:active):not(:only-child), - > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: none; } + .linked:not(.vertical):not(.path-bar) { + $_uncolored_button: '.button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action)'; + + > #{$_uncolored_button}:hover:not(:only-child), + > #{$_uncolored_button}:hover + #{$_uncolored_button} { box-shadow: none; } } // special case for path-bars and stack-switchers |