CRM-19723 iconPicker style tweak

diff --git a/css/civicrm.css b/css/civicrm.css
index 91f7efae72b49aa90064060c68bf54e0a0c0e1a1..d9db723990e8641d5f31225e06bfa36fa878f21b 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -2844,6 +2844,20 @@ tbody.scrollContent tr.alternateRow {
   color: #3e3e3e;
 }
 
+.crm-container a.crm-icon-picker-button {
+  min-width: 10em;
+  text-align: inherit;
+  color: #3e3e3e;
+}
+
+.crm-container a.crm-icon-picker-button .ui-button-text {
+  color: #9f9f9f;
+}
+
+.crm-container a.crm-icon-picker-button.ui-button-text-only .ui-button-text {
+  padding: .4em .2em;
+}
+
 /* search results */
 .crm-container .crm-search-tasks,
 .crm-container .crm-tasks {

diff --git a/js/jquery/jquery.crmIconPicker.js b/js/jquery/jquery.crmIconPicker.js
index d98028128d3f3935f6a892c56958dc543704853c..8fce94267fc2500c39f70309d862e10bb4ef6217 100644 (file)
--- a/js/jquery/jquery.crmIconPicker.js
+++ b/js/jquery/jquery.crmIconPicker.js
@@ -42,8 +42,7 @@
         $button.button('option', {
           label: split[0] || ts('None'),
           icons: {primary: $input.val()}
-        })
-          .css('color', split[0] ? '#3e3e3e' : '#9f9f9f');
+        });
         $style.toggle(!!split[0]).val(split[1] || '');
       }