destructive,suggested: fix unfocused windows

- use border assets and set common color for unfocused windows

4 files changed, 10 insertions, 7 deletions

diff --git a/themes/Adwaita/gtk-3.0/gtk-main-common.css b/themes/Adwaita/gtk-3.0/gtk-main-common.css
index 8819c33c..3d74d014 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main-common.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main-common.css
@@ -6,7 +6,7 @@
 @define-color destructive_action_button_a #e03d3d;
 @define-color destructive_action_button_b #ef2929;
 @define-color destructive_action_button_border #9d4242;
-@define-color destructive_action_button_fg @theme_base_color;
+@define-color destructive_action_button_fg #ffffff;
 @define-color destructive_action_button_shadow shade(@destructive_action_button_border, 1.15);
 
 /*******
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
index 14bc5c3b..5c4f5949 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
@@ -215,7 +215,10 @@ GtkSwitch.trough:backdrop,
 .trough:backdrop,
 .inline-toolbar.toolbar.vertical .button:backdrop,
 .inline-toolbar.toolbar.vertical .button:backdrop:insensitive,
-.inline-toolbar.toolbar.vertical .button:backdrop:active {
+.inline-toolbar.toolbar.vertical .button:backdrop:active,
+.suggested-action.button:backdrop, 
+.toolbar .suggested-action.button:backdrop,
+.destructive-action.button:backdrop {
     border-image: -gtk-scaled (url("borders/generic-border-backdrop-dark.png"),url("borders/generic-border-backdrop-dark@2.png")) 3 3 4 3 / 3px 3px 4px 3px stretch;
     border-radius: 3px;
     border-width: 1px 1px 2px 1px;
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
index c5a16b5d..671d8c33 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
@@ -214,7 +214,10 @@ GtkSwitch.trough:backdrop,
 .trough:backdrop,
 .inline-toolbar.toolbar.vertical .button:backdrop,
 .inline-toolbar.toolbar.vertical .button:backdrop:insensitive,
-.inline-toolbar.toolbar.vertical .button:backdrop:active {
+.inline-toolbar.toolbar.vertical .button:backdrop:active,
+.suggested-action.button:backdrop, 
+.toolbar .suggested-action.button:backdrop,
+.destructive-action.button:backdrop {
     border-image: -gtk-scaled (url("borders/generic-border-backdrop.png"),url("borders/generic-border-backdrop@2.png")) 3 3 4 3 / 3px 3px 4px 3px stretch;
     border-radius: 3px;
     border-width: 1px 1px 2px 1px;
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index a811d493..f91b7a05 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -3134,8 +3134,6 @@ GtkProgressBar.osd.progressbar {
 .toolbar .suggested-action.button:backdrop,
 .suggested-action.button:backdrop {
     background-image: none;
-    border-image: none;
-    border-color: @unfocused_borders;
 }
 
 .toolbar .suggested-action.button,
@@ -3186,8 +3184,7 @@ GtkProgressBar.osd.progressbar {
 
 .destructive-action.button:backdrop {
     background-image: none;
-    border-image: none;
-    border-color: @unfocused_borders;
+    color: @suggested_action_button_fg;
 }
 
 .destructive-action.button {