From: Andrew Hunt Date: Sun, 27 Sep 2015 21:39:14 +0000 (-0400) Subject: CRM-16415 Font Awesome Use class crm-i instead of fa X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=bc8360e14fc2b8a0da7c64895ece45ba53378755;p=civicrm-core.git CRM-16415 Font Awesome Use class crm-i instead of fa This allows for independence from a site's theme's implementation of Font Awesome. If they theme .fa.fa-something, that won't screw up .crm-i.fa-something. ---------------------------------------- * CRM-16415: https://issues.civicrm.org/jira/browse/CRM-16415 --- diff --git a/css/civicrm.css b/css/civicrm.css index 914420b0f1..514cdda996 100644 --- a/css/civicrm.css +++ b/css/civicrm.css @@ -2201,10 +2201,28 @@ input.crm-form-entityref { background-image: url("../i/icons/jquery-ui-8A1F11.png"); } -.crm-container .fa.icon-red { +/* Font Awesome */ + +/* Direct copy of .fa from font-awesome.css +This is separate to avoid conflict with a site theme's implementation of FA. */ +.crm-i { + display: inline-block; + font: normal normal normal 14px/1 FontAwesome; + font-size: inherit; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + transform: translate(0, 0); +} + +.crm-i.crm-i-red { color: #8A1F11; } +.crm-i.crm-i-blue { + color: #6177D5; +} + .crm-container .inform-icon { background-position: -16px -144px; margin-right: 5px; diff --git a/templates/CRM/Admin/Form/Options.tpl b/templates/CRM/Admin/Form/Options.tpl index 1320e79203..8ad0f209df 100644 --- a/templates/CRM/Admin/Form/Options.tpl +++ b/templates/CRM/Admin/Form/Options.tpl @@ -79,7 +79,7 @@ {$form.value.label} {$form.value.html}
- {ts}Changing the Value field will unlink records which have been marked with this option. This change can not be undone except by restoring the previous value.{/ts} + {ts}Changing the Value field will unlink records which have been marked with this option. This change can not be undone except by restoring the previous value.{/ts} {/if} diff --git a/templates/CRM/Admin/Page/APIExplorer.js b/templates/CRM/Admin/Page/APIExplorer.js index d27a59547d..7571271877 100644 --- a/templates/CRM/Admin/Page/APIExplorer.js +++ b/templates/CRM/Admin/Page/APIExplorer.js @@ -527,7 +527,7 @@ .addClass('crm-error') .css('width', '82%') .attr('title', msg) - .before(' ') + .before(' ') .tooltip(); } } diff --git a/templates/CRM/Admin/Page/OptionGroup.tpl b/templates/CRM/Admin/Page/OptionGroup.tpl index a7ca128179..6e520f8896 100644 --- a/templates/CRM/Admin/Page/OptionGroup.tpl +++ b/templates/CRM/Admin/Page/OptionGroup.tpl @@ -29,7 +29,7 @@ {else}
{ts}CiviCRM stores configurable choices for various drop-down fields as 'option groups'. You can click Options to view the available choices.{/ts} -

{ts}WARNING: Many option groups are used programatically and values should be added or modified with caution.{/ts}

+

{ts}WARNING: Many option groups are used programatically and values should be added or modified with caution.{/ts}

{/if} diff --git a/templates/CRM/Batch/Form/Entry.tpl b/templates/CRM/Batch/Form/Entry.tpl index 50559b4980..729d03f80c 100755 --- a/templates/CRM/Batch/Form/Entry.tpl +++ b/templates/CRM/Batch/Form/Entry.tpl @@ -29,7 +29,7 @@ {if $batchAmountMismatch}
- {ts}Total for amounts entered below does not match the expected batch total.{/ts} + {ts}Total for amounts entered below does not match the expected batch total.{/ts}
{$form._qf_Entry_upload_force.html} diff --git a/templates/CRM/Campaign/Form/Task/Interview.tpl b/templates/CRM/Campaign/Form/Task/Interview.tpl index e9dbadb8f2..0be9238635 100644 --- a/templates/CRM/Campaign/Form/Task/Interview.tpl +++ b/templates/CRM/Campaign/Form/Task/Interview.tpl @@ -329,7 +329,7 @@ var surveyActivityIds = {/literal}{$surveyActivityIds}{literal}; if (interview.errors[error]) errorList = errorList + '
  • ' + interview.errors[error] + '
    • '; } if ( errorList ) { - var allErrors = ' ' + ts('Please correct the following errors in the survey fields below:') + ''; + var allErrors = ' ' + ts('Please correct the following errors in the survey fields below:') + ''; CRM.$('#responseErrors').show( ).html(allErrors); } } diff --git a/templates/CRM/Core/Page/RecurringEntityPreview.tpl b/templates/CRM/Core/Page/RecurringEntityPreview.tpl index 0528717db3..97f8a4eda9 100644 --- a/templates/CRM/Core/Page/RecurringEntityPreview.tpl +++ b/templates/CRM/Core/Page/RecurringEntityPreview.tpl @@ -25,7 +25,7 @@ *} {if !empty($participantData)}
    - + {ts}There are participants registered for repeating events being removed from the set. Those with participants will be converted to standalone events, and those without registration will be deleted.{/ts}
    diff --git a/templates/CRM/Custom/Form/Field.tpl b/templates/CRM/Custom/Form/Field.tpl index 0834e4cb15..3df7a5635b 100644 --- a/templates/CRM/Custom/Form/Field.tpl +++ b/templates/CRM/Custom/Form/Field.tpl @@ -184,7 +184,7 @@ function custom_option_html_type( ) { {$form.group_id.html}   {ts}Advanced Filter{/ts} {capture assign=searchPreferences}{crmURL p="civicrm/admin/setting/search" q="reset=1"}{/capture} -
    {ts 1=$searchPreferences}If you are planning on using this field in front-end profile, event registration or contribution forms, you should 'Limit List to Group' or configure an 'Advanced Filter' (so that you do not unintentionally expose your entire set of contacts). Users must have either 'access contact reference fields' OR 'access CiviCRM' permission in order to use contact reference autocomplete fields. You can assign 'access contact reference fields' to the anonymous role if you want un-authenticated visitors to use this field. Use Search Preferences - Contact Reference Options to control the fields included in the search results.{/ts} +
    {ts 1=$searchPreferences}If you are planning on using this field in front-end profile, event registration or contribution forms, you should 'Limit List to Group' or configure an 'Advanced Filter' (so that you do not unintentionally expose your entire set of contacts). Users must have either 'access contact reference fields' OR 'access CiviCRM' permission in order to use contact reference autocomplete fields. You can assign 'access contact reference fields' to the anonymous role if you want un-authenticated visitors to use this field. Use Search Preferences - Contact Reference Options to control the fields included in the search results.{/ts}
    diff --git a/templates/CRM/Event/Form/Participant.tpl b/templates/CRM/Event/Form/Participant.tpl index 7aa85cd109..ee494532df 100644 --- a/templates/CRM/Event/Form/Participant.tpl +++ b/templates/CRM/Event/Form/Participant.tpl @@ -122,7 +122,7 @@ } if ( showError ) { - cj('#validate_pricefield').show().html("{/literal} {ts escape='js'}This Option is already full for this event.{/ts}{literal}"); + cj('#validate_pricefield').show().html("{/literal} {ts escape='js'}This Option is already full for this event.{/ts}{literal}"); } else { cj('#validate_pricefield').hide( ).html(''); diff --git a/templates/CRM/Form/body.tpl b/templates/CRM/Form/body.tpl index f7534f2b33..06b90d2821 100644 --- a/templates/CRM/Form/body.tpl +++ b/templates/CRM/Form/body.tpl @@ -33,7 +33,7 @@ {if ($snippet !== 'json') and !$suppressForm and count($form.errors) gt 0}
    - + {ts}Please correct the following errors in the form fields below:{/ts}
      {foreach from=$form.errors key=errorName item=error} diff --git a/templates/CRM/common/fatal.tpl b/templates/CRM/common/fatal.tpl index 587d6e4529..6daa183d19 100644 --- a/templates/CRM/common/fatal.tpl +++ b/templates/CRM/common/fatal.tpl @@ -46,7 +46,7 @@ @import url({$config->resourceBase}bower_components/font-awesome/css/font-awesome.min.css); {/if} -
      +
      {ts}Sorry but we are not able to provide this at the moment.{/ts}
      {$message}
      {if $error.message && $message != $error.message}