Adwaita: disable separators in buttons

3 files changed, 11 insertions, 7 deletions

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 573208fdb0..cb15d2e411 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -287,6 +287,10 @@
   }
 
   .primary-toolbar & { icon-shadow: none; } // tango icons don't need added shadows
+  .separator {
+    -GtkWidget-wide-separators: true;
+    -GtkWidget-horizontal-separator: 0;
+   }
   .linked &, .linked &:backdrop {
     @extend %linked_buttons;
   }
@@ -358,7 +362,7 @@ GtkColorButton.button { padding: 4px; } // Uniform padding on the GtkColorButton
 
 .inline-toolbar.toolbar GtkToolButton .button { @include button(normal); }
 
-GtkCheckButton:hover { -gtk-image-effect: highlight; }
+//GtkCheckButton:hover { -gtk-image-effect: highlight; }
 
 /*********
  * Links *
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index c907edb8dd..61eb51630f 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -419,6 +419,9 @@
     border-width: 1px; }
   .primary-toolbar .button {
     icon-shadow: none; }
+  .button .separator {
+    -GtkWidget-wide-separators: true;
+    -GtkWidget-horizontal-separator: 0; }
 
 .osd .button, .osd .button:hover, .osd .button:active, .osd .button:insensitive, .osd .button:backdrop, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked .button, .linked .button:backdrop {
   border-radius: 0;
@@ -477,9 +480,6 @@ GtkColorButton.button {
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
 
-GtkCheckButton:hover {
-  -gtk-image-effect: highlight; }
-
 /*********
  * Links *
  *********/
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 073348eabc..6365a20f03 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -419,6 +419,9 @@
     border-width: 1px; }
   .primary-toolbar .button {
     icon-shadow: none; }
+  .button .separator {
+    -GtkWidget-wide-separators: true;
+    -GtkWidget-horizontal-separator: 0; }
 
 .osd .button, .osd .button:hover, .osd .button:active, .osd .button:insensitive, .osd .button:backdrop, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked .button, .linked .button:backdrop {
   border-radius: 0;
@@ -477,9 +480,6 @@ GtkColorButton.button {
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   box-shadow: inset 0 1px white, 0 1px white; }
 
-GtkCheckButton:hover {
-  -gtk-image-effect: highlight; }
-
 /*********
  * Links *
  *********/