Adwaita: remove borders from insensitive flat buttons

3 files changed, 53 insertions, 13 deletions

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 4e9313ec3d..84ac3ea986 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -355,7 +355,7 @@ $_dot_color: if($variant=='light', $selected_bg_color,
       @include button(backdrop-insensitive-active);
     }
   }
-  &.flat:backdrop {
+  &.flat:backdrop, &.flat:insensitive, &.flat:backdrop:insensitive {
     @include button(undecorated);
   }
   &:insensitive {
@@ -466,7 +466,7 @@ $_dot_color: if($variant=='light', $selected_bg_color,
           }
         }
       }
-      &.flat:backdrop {
+      &.flat:backdrop, &.flat:insensitive, &.flat:backdrop:insensitive {
         @include button(undecorated);
         color: transparentize($b_color, 0.2);
       }
@@ -1033,7 +1033,7 @@ GtkComboBox {
           border-color: $selected_borders_color;
         }
       }
-      &.flat:backdrop {
+      &.flat:backdrop, &.flat:insensitive, &.flat:insensitive:backdrop {
         @include button(undecorated);
       }
       &:insensitive {
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 4ccd4dc808..ca3d978b9e 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -367,7 +367,11 @@ GtkCalendar.header .button.titlebutton {
         color: inherit; }
   .button.flat:backdrop, .header-bar .titlebutton.button:backdrop,
   .titlebar .titlebutton.button:backdrop,
-  GtkCalendar.header .titlebutton.button:backdrop {
+  GtkCalendar.header .titlebutton.button:backdrop, .button.flat:insensitive, .header-bar .titlebutton.button:insensitive,
+  .titlebar .titlebutton.button:insensitive,
+  GtkCalendar.header .titlebutton.button:insensitive, .button.flat:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
+  .titlebar .titlebutton.button:backdrop:insensitive,
+  GtkCalendar.header .titlebutton.button:backdrop:insensitive {
     border-color: transparent;
     background-color: transparent;
     background-image: none;
@@ -591,7 +595,11 @@ GtkCalendar.header .button.titlebutton {
             color: inherit; }
     .button.suggested-action.flat:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
     .titlebar .suggested-action.titlebutton.button:backdrop,
-    GtkCalendar.header .suggested-action.titlebutton.button:backdrop {
+    GtkCalendar.header .suggested-action.titlebutton.button:backdrop, .button.suggested-action.flat:insensitive, .header-bar .suggested-action.titlebutton.button:insensitive,
+    .titlebar .suggested-action.titlebutton.button:insensitive,
+    GtkCalendar.header .suggested-action.titlebutton.button:insensitive, .button.suggested-action.flat:backdrop:insensitive, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive,
+    .titlebar .suggested-action.titlebutton.button:backdrop:insensitive,
+    GtkCalendar.header .suggested-action.titlebutton.button:backdrop:insensitive {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
@@ -737,7 +745,11 @@ GtkCalendar.header .button.titlebutton {
             color: inherit; }
     .button.destructive-action.flat:backdrop, .header-bar .destructive-action.titlebutton.button:backdrop,
     .titlebar .destructive-action.titlebutton.button:backdrop,
-    GtkCalendar.header .destructive-action.titlebutton.button:backdrop {
+    GtkCalendar.header .destructive-action.titlebutton.button:backdrop, .button.destructive-action.flat:insensitive, .header-bar .destructive-action.titlebutton.button:insensitive,
+    .titlebar .destructive-action.titlebutton.button:insensitive,
+    GtkCalendar.header .destructive-action.titlebutton.button:insensitive, .button.destructive-action.flat:backdrop:insensitive, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive,
+    .titlebar .destructive-action.titlebutton.button:backdrop:insensitive,
+    GtkCalendar.header .destructive-action.titlebutton.button:backdrop:insensitive {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
@@ -1581,9 +1593,17 @@ GtkComboBox {
             color: inherit; }
       .titlebar.selection-mode .button.flat:backdrop, GtkCalendar.selection-mode.header .button.flat:backdrop,
       .titlebar.selection-mode .titlebutton.button:backdrop,
-      GtkCalendar.selection-mode.header .titlebutton.button:backdrop,
+      GtkCalendar.selection-mode.header .titlebutton.button:backdrop, .titlebar.selection-mode .button.flat:insensitive, GtkCalendar.selection-mode.header .button.flat:insensitive,
+      .titlebar.selection-mode .titlebutton.button:insensitive,
+      GtkCalendar.selection-mode.header .titlebutton.button:insensitive, .titlebar.selection-mode .button.flat:insensitive:backdrop, GtkCalendar.selection-mode.header .button.flat:insensitive:backdrop,
+      .titlebar.selection-mode .titlebutton.button:insensitive:backdrop,
+      GtkCalendar.selection-mode.header .titlebutton.button:insensitive:backdrop,
       .header-bar.selection-mode .button.flat:backdrop,
-      .header-bar.selection-mode .titlebutton.button:backdrop {
+      .header-bar.selection-mode .titlebutton.button:backdrop,
+      .header-bar.selection-mode .button.flat:insensitive,
+      .header-bar.selection-mode .titlebutton.button:insensitive,
+      .header-bar.selection-mode .button.flat:insensitive:backdrop,
+      .header-bar.selection-mode .titlebutton.button:insensitive:backdrop {
         border-color: transparent;
         background-color: transparent;
         background-image: none;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index a2a7b15f6f..60b5f951df 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -359,7 +359,11 @@ GtkCalendar.header .button.titlebutton {
         color: inherit; }
   .button.flat:backdrop, .header-bar .titlebutton.button:backdrop,
   .titlebar .titlebutton.button:backdrop,
-  GtkCalendar.header .titlebutton.button:backdrop {
+  GtkCalendar.header .titlebutton.button:backdrop, .button.flat:insensitive, .header-bar .titlebutton.button:insensitive,
+  .titlebar .titlebutton.button:insensitive,
+  GtkCalendar.header .titlebutton.button:insensitive, .button.flat:backdrop:insensitive, .header-bar .titlebutton.button:backdrop:insensitive,
+  .titlebar .titlebutton.button:backdrop:insensitive,
+  GtkCalendar.header .titlebutton.button:backdrop:insensitive {
     border-color: transparent;
     background-color: transparent;
     background-image: none;
@@ -583,7 +587,11 @@ GtkCalendar.header .button.titlebutton {
             color: inherit; }
     .button.suggested-action.flat:backdrop, .header-bar .suggested-action.titlebutton.button:backdrop,
     .titlebar .suggested-action.titlebutton.button:backdrop,
-    GtkCalendar.header .suggested-action.titlebutton.button:backdrop {
+    GtkCalendar.header .suggested-action.titlebutton.button:backdrop, .button.suggested-action.flat:insensitive, .header-bar .suggested-action.titlebutton.button:insensitive,
+    .titlebar .suggested-action.titlebutton.button:insensitive,
+    GtkCalendar.header .suggested-action.titlebutton.button:insensitive, .button.suggested-action.flat:backdrop:insensitive, .header-bar .suggested-action.titlebutton.button:backdrop:insensitive,
+    .titlebar .suggested-action.titlebutton.button:backdrop:insensitive,
+    GtkCalendar.header .suggested-action.titlebutton.button:backdrop:insensitive {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
@@ -729,7 +737,11 @@ GtkCalendar.header .button.titlebutton {
             color: inherit; }
     .button.destructive-action.flat:backdrop, .header-bar .destructive-action.titlebutton.button:backdrop,
     .titlebar .destructive-action.titlebutton.button:backdrop,
-    GtkCalendar.header .destructive-action.titlebutton.button:backdrop {
+    GtkCalendar.header .destructive-action.titlebutton.button:backdrop, .button.destructive-action.flat:insensitive, .header-bar .destructive-action.titlebutton.button:insensitive,
+    .titlebar .destructive-action.titlebutton.button:insensitive,
+    GtkCalendar.header .destructive-action.titlebutton.button:insensitive, .button.destructive-action.flat:backdrop:insensitive, .header-bar .destructive-action.titlebutton.button:backdrop:insensitive,
+    .titlebar .destructive-action.titlebutton.button:backdrop:insensitive,
+    GtkCalendar.header .destructive-action.titlebutton.button:backdrop:insensitive {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
@@ -1573,9 +1585,17 @@ GtkComboBox {
             color: inherit; }
       .titlebar.selection-mode .button.flat:backdrop, GtkCalendar.selection-mode.header .button.flat:backdrop,
       .titlebar.selection-mode .titlebutton.button:backdrop,
-      GtkCalendar.selection-mode.header .titlebutton.button:backdrop,
+      GtkCalendar.selection-mode.header .titlebutton.button:backdrop, .titlebar.selection-mode .button.flat:insensitive, GtkCalendar.selection-mode.header .button.flat:insensitive,
+      .titlebar.selection-mode .titlebutton.button:insensitive,
+      GtkCalendar.selection-mode.header .titlebutton.button:insensitive, .titlebar.selection-mode .button.flat:insensitive:backdrop, GtkCalendar.selection-mode.header .button.flat:insensitive:backdrop,
+      .titlebar.selection-mode .titlebutton.button:insensitive:backdrop,
+      GtkCalendar.selection-mode.header .titlebutton.button:insensitive:backdrop,
       .header-bar.selection-mode .button.flat:backdrop,
-      .header-bar.selection-mode .titlebutton.button:backdrop {
+      .header-bar.selection-mode .titlebutton.button:backdrop,
+      .header-bar.selection-mode .button.flat:insensitive,
+      .header-bar.selection-mode .titlebutton.button:insensitive,
+      .header-bar.selection-mode .button.flat:insensitive:backdrop,
+      .header-bar.selection-mode .titlebutton.button:insensitive:backdrop {
         border-color: transparent;
         background-color: transparent;
         background-image: none;