From: Coleman Watts Date: Mon, 23 Jan 2017 01:25:16 +0000 (-0500) Subject: CRM-19723 iconPicker style tweak X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e03e6f281da19cb7397568d6cf76312f9c0886c5;p=civicrm-core.git CRM-19723 iconPicker style tweak --- diff --git a/css/civicrm.css b/css/civicrm.css index 91f7efae72..d9db723990 100644 --- 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 d98028128d..8fce94267f 100644 --- 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] || ''); }