From 8d3aedfe6bcaf137855eae0d4c11d404e47e8000 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 4 Oct 2021 21:04:01 -0400
Subject: [PATCH] Angular UI - Fix crmIcon to only add crm-button class to
 non-bootstrap buttons

---
 ang/crmUi.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ang/crmUi.js b/ang/crmUi.js
index 16ef03f0ba..944630d4db 100644
--- a/ang/crmUi.js
+++ b/ang/crmUi.js
@@ -945,7 +945,8 @@
           else {
             $(element).prepend('<span class="icon ui-icon-' + attrs.crmIcon + '"></span> ');
           }
-          if ($(element).is('button')) {
+          // Add crm-* class to non-bootstrap buttons
+          if ($(element).is('button:not(.btn)')) {
             $(element).addClass('crm-button');
           }
         }
-- 
2.25.1