Merge pull request #436 from remy727/feature/button-non-primary-destr…

…uctive Support non-primary destructive button
baoagency · Aug 10, 2024 · 19f6287 · 19f6287
2 parents f13db88 + 31290f7
commit 19f6287
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/app/assets/stylesheets/polaris_view_components.css b/app/assets/stylesheets/polaris_view_components.css
diff --git a/app/assets/stylesheets/polaris_view_components/button.pcss b/app/assets/stylesheets/polaris_view_components/button.pcss
@@ -54,7 +54,6 @@ html[class~="Polaris-Summer-Editions-2023"] .Polaris-Button {
   }
 
   /* Destructive */
-  &.Polaris-Button--destructive,
   &.Polaris-Button--destructive:is(.Polaris-Button--primary) {
     --pc-button-color: var(--p-color-bg-fill-critical);
     --pc-button-text: var(--p-color-bg-surface);
@@ -68,6 +67,13 @@ html[class~="Polaris-Summer-Editions-2023"] .Polaris-Button {
     }
   }
 
+  &.Polaris-Button--destructive:not(.Polaris-Button--primary) {
+    --pc-button-color: var(--p-color-text-critical);
+    --pc-button-color-hover: var(--p-color-text-critical-hover);
+    --pc-button-color-active: var(--p-color-text-critical-active);
+    --pc-button-icon-fill: currentColor;
+  }
+
   /* Primary */
   &.Polaris-Button--primary {
     --pc-button-bg-gradient: var(--p-color-button-gradient-bg-fill);

diff --git a/demo/app/previews/button_component_preview.rb b/demo/app/previews/button_component_preview.rb
@@ -23,6 +23,9 @@ def plain_destructive
   def primary
   end
 
+  def primary_destructive
+  end
+
   def destructive
   end
 

diff --git a/demo/app/previews/button_component_preview/primary_destructive.html.erb b/demo/app/previews/button_component_preview/primary_destructive.html.erb
@@ -0,0 +1 @@
+<%= polaris_button(primary: true, destructive: true) { "Delete theme" } %>