improve linked button styling

1 files changed, 18 insertions, 9 deletions

diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index aa0286b..b163e62 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -622,7 +622,8 @@ toolbar.inline-toolbar toolbutton {
     > 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 (':focus',$selected_bg_color),
                                (':drop(active)', $drop_target_color),
@@ -638,17 +639,23 @@ toolbar.inline-toolbar toolbutton {
         + combobox > box > button.combo { border-#{$_border}-color: if($var=='light', $e_color, $e_border); }
       }
     }
+    > button:active + entry,
     > button:checked + entry { border-#{$_border}-color: if($var=='light', $selected_bg_color, $e_border); }
   }
   @if $button_rules=='true' {
+    $_uncolored_button: 'button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action)';
+
     > button + button { border-#{$_border}-style: none; }
 
-    > 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; }
+    > #{$_uncolored_button}:hover:not(:only-child),
+    > #{$_uncolored_button}:hover + #{$_uncolored_button} { box-shadow: inset if($vert=='false', 1px 0, 0 1px) $b_border; }
 
-    > button:first-child:hover:not(:checked):not(:active),
-    > button:checked + button:not(:checked):not(:active):hover,
-    > entry + button:not(:checked):not(:active):not(:only-child):hover { box-shadow: none; }
+    > #{$_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; }
   }
 }
 
@@ -1223,9 +1230,11 @@ headerbar {
       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