From 972bd8974a95be4fc46957a7f748e5beab1583dc Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Sat, 3 Oct 2015 15:41:30 -0400 Subject: [PATCH] CRM-16415 done with wrenches ---------------------------------------- * CRM-16415: https://issues.civicrm.org/jira/browse/CRM-16415 --- CRM/Core/Form/Renderer.php | 2 +- css/civicrm.css | 22 +++++++++++++++---- css/crm-i.css | 22 +++++++++++-------- js/Common.js | 6 ++--- js/crm.insert-shortcode.js | 6 ++--- js/jquery/jquery.crmeditable.js | 4 ++-- templates/CRM/Admin/Page/CKEditorConfig.tpl | 10 +++++---- templates/CRM/Contact/Form/Contact.tpl | 2 +- .../CRM/Event/Form/ManageEvent/EventInfo.tpl | 3 +-- templates/CRM/Event/Page/EventInfo.tpl | 6 ++--- 10 files changed, 51 insertions(+), 32 deletions(-) diff --git a/CRM/Core/Form/Renderer.php b/CRM/Core/Form/Renderer.php index 57275373a0..1339757e57 100644 --- a/CRM/Core/Form/Renderer.php +++ b/CRM/Core/Form/Renderer.php @@ -311,7 +311,7 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty { $path = $field->getAttribute('data-option-edit-path'); // NOTE: If we ever needed to support arguments in this link other than reset=1 we could split $path here if it contains a ? $url = CRM_Utils_System::url($path, 'reset=1'); - $el['html'] .= ' '; + $el['html'] .= ' '; } } diff --git a/css/civicrm.css b/css/civicrm.css index 3cbf85a1a2..dbef827a94 100644 --- a/css/civicrm.css +++ b/css/civicrm.css @@ -2240,6 +2240,24 @@ a.crm-i:hover { color: #6177D5; } +.crm-i-button>.crm-i { + padding-left: 2px; +} + +.crm-container .ui-dialog-titlebar .ui-button .ui-icon[class*=" fa-"] { + background: none repeat scroll 0 0 transparent !important; + color: #F5F6F1; +} + +.crm-container .ui-dialog-titlebar .ui-button .ui-icon[class*=" fa-"]:hover { + +} + +.crm-container .crm-button.crm-i-button input[type="button"], +.crm-container .crm-button.crm-i-button input.crm-form-submit { + padding-left: 0; +} + .crm-container .inform-icon { background-position: -16px -144px; margin-right: 5px; @@ -2266,10 +2284,6 @@ a.crm-i:hover { content: "\f059"; } -.crm-container div.crm-accordion-header a.helpicon { - color: #2786C2; -} - /* These .crm-icon classes use item_sprites.png */ .crm-container .crm-icon { diff --git a/css/crm-i.css b/css/crm-i.css index cbdee15029..4b6875319c 100644 --- a/css/crm-i.css +++ b/css/crm-i.css @@ -12,23 +12,27 @@ is loaded before font-awesome.css so that .fa-XXX classes can modify it. */ transform: translate(0, 0); } +i.crm-i { + font-style: normal; +} + /* Have FA handle jQuery UI icons */ .ui-icon[class*=" fa-"] { - /* Remove the jQuery UI Icon */ - background: none repeat scroll 0 0 transparent !important; - /* Remove the jQuery UI Text Indent */ - text-indent: 0; - /* Bump it up - jQuery UI is -8px */ - margin-top: -0.5em; + /* Remove the jQuery UI Icon */ + background: none repeat scroll 0 0 transparent !important; + /* Remove the jQuery UI Text Indent */ + text-indent: 0; + /* Bump it up - jQuery UI is -8px */ + margin-top: -0.5em; } /* Allow use of icon-large to be properly aligned */ .ui-icon.icon-large { - margin-top: -0.75em; + margin-top: -0.75em; } .ui-button-icon-only .ui-icon[class*=" fa-"] { - /* Bump it - jQuery UI is -8px */ - margin-left: -7px; + /* Bump it - jQuery UI is -8px */ + margin-left: -7px; } diff --git a/js/Common.js b/js/Common.js index b54cff9e32..c2134fa802 100644 --- a/js/Common.js +++ b/js/Common.js @@ -608,7 +608,7 @@ if (!CRM.vars) CRM.vars = {}; $clearLink = $(); if (settings.allowClear !== undefined ? settings.allowClear : !$dataField.is('.required, [required]')) { - $clearLink = $('') + $clearLink = $('') .insertAfter($dataField); } if (settings.time !== false) { @@ -920,7 +920,7 @@ if (!CRM.vars) CRM.vars = {}; } // Add resize button if ($el.parent().hasClass('crm-container') && $el.dialog('option', 'resizable')) { - $el.parent().find('.ui-dialog-titlebar').append($('', - submit: '', + cancel: '', + submit: '', cssclass: 'crm-editable-form', data: getData, onreset: restoreContainer diff --git a/templates/CRM/Admin/Page/CKEditorConfig.tpl b/templates/CRM/Admin/Page/CKEditorConfig.tpl index 522bc94825..0024b4d46b 100644 --- a/templates/CRM/Admin/Page/CKEditorConfig.tpl +++ b/templates/CRM/Admin/Page/CKEditorConfig.tpl @@ -25,7 +25,9 @@ *}