From dae5c8c3b10eca6e68cab3f9cb91cfa23353dc7e Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 30 Jul 2020 14:15:02 -0400
Subject: [PATCH] No need for crm-i-button class

---
 css/civicrm.css                             | 6 +++---
 templates/CRM/Admin/Page/APIExplorer.tpl    | 2 +-
 templates/CRM/Admin/Page/CKEditorConfig.tpl | 4 ++--
 templates/CRM/common/formButtons.tpl        | 1 -
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/css/civicrm.css b/css/civicrm.css
index ea4941adec..bd8a686893 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -2121,12 +2121,12 @@ a.crm-i:hover {
   color: #86c661;
 }
 
-.crm-i-button>.crm-i {
+.crm-button>.crm-i {
   padding-left: 5px;
 }
 
-.crm-container .crm-button.crm-i-button input[type="button"],
-.crm-container .crm-button.crm-i-button input.crm-form-submit {
+.crm-container .crm-button .crm-i + input[type="button"],
+.crm-container .crm-button .crm-i + input.crm-form-submit {
   padding-left: 0;
 }
 
diff --git a/templates/CRM/Admin/Page/APIExplorer.tpl b/templates/CRM/Admin/Page/APIExplorer.tpl
index 1e1b8eb497..ced1f3668d 100644
--- a/templates/CRM/Admin/Page/APIExplorer.tpl
+++ b/templates/CRM/Admin/Page/APIExplorer.tpl
@@ -285,7 +285,7 @@
         </table>
       </div>
       <div class="crm-submit-buttons">
-        <span class="crm-button crm-i-button">
+        <span class="crm-button">
           <i class="crm-i fa-bolt" aria-hidden="true"></i><input type="submit" value="{ts}Execute{/ts}" class="crm-form-submit" accesskey="S" title="{ts}Execute API call and display results{/ts}"/>
         </span>
       </div>
diff --git a/templates/CRM/Admin/Page/CKEditorConfig.tpl b/templates/CRM/Admin/Page/CKEditorConfig.tpl
index 14af566be2..ad179df5ab 100644
--- a/templates/CRM/Admin/Page/CKEditorConfig.tpl
+++ b/templates/CRM/Admin/Page/CKEditorConfig.tpl
@@ -99,10 +99,10 @@
     </div>
 
     <div class="crm-submit-buttons">
-      <span class="crm-button crm-i-button">
+      <span class="crm-button">
         <i class="crm-i fa-wrench" aria-hidden="true"></i> <input type="submit" value="{ts}Save{/ts}" name="save" class="crm-form-submit" accesskey="S"/>
       </span>
-      <span class="crm-button crm-i-button">
+      <span class="crm-button">
         <i class="crm-i fa-times" aria-hidden="true"></i> <input type="submit" value="{ts}Revert to Default{/ts}" name="revert" class="crm-form-submit" onclick="return confirm('{$revertConfirm}');"/>
       </span>
     </div>
diff --git a/templates/CRM/common/formButtons.tpl b/templates/CRM/common/formButtons.tpl
index 92b41f4dff..9af85592f3 100644
--- a/templates/CRM/common/formButtons.tpl
+++ b/templates/CRM/common/formButtons.tpl
@@ -41,7 +41,6 @@
     {crmGetAttribute html=$html attr='crm-icon' assign='icon'}
     {capture assign=iconPrefix}{$icon|truncate:3:"":true}{/capture}
     {if $icon && $iconPrefix eq 'fa-'}
-      {assign var='buttonClass' value=' crm-i-button'}
       {capture assign=iconDisp}<i class="crm-i {$icon}" aria-hidden="true"></i>{/capture}
     {elseif $icon}
       {assign var='buttonClass' value=' crm-icon-button'}
-- 
2.25.1