CRM-19723 iconPicker style tweak

civicrm · Jan 23, 2017 · eaa1eca · eaa1eca
1 parent 4d2c594
commit eaa1eca
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/css/civicrm.css b/css/civicrm.css
@@ -2840,10 +2840,24 @@ tbody.scrollContent tr.alternateRow {
 .crm-container .form-layout td.label,
 .crm-container form table.report .label,
 .crm-container form table label,
-.crm-container form table.report label {
+.crm-container form table.report label,
+.crm-container .crm-icon-picker-button .ui-button-icon-primary {
   color: #3e3e3e;
 }
 
+.crm-container .crm-icon-picker-button {
+  min-width: 10em;
+  text-align: inherit;
+}
+
+.crm-container .crm-icon-picker-button .ui-button-text {
+  color: #9f9f9f;
+}
+
+.crm-container .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
@@ -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] || '');
       }