From: Andrew Hunt Date: Fri, 29 Sep 2017 21:40:12 +0000 (-0400) Subject: CRM-21241 nav menu: spinning logo should be centered and spin smoothly X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=961648808ba0f191ce0466538d047db9939180b6;p=civicrm-core.git CRM-21241 nav menu: spinning logo should be centered and spin smoothly ---------------------------------------- * CRM-21241: Spinning logo is too jumpy https://issues.civicrm.org/jira/browse/CRM-21241 --- diff --git a/css/civicrmNavigation.css b/css/civicrmNavigation.css index 18bc29f25c..1ec8ce4956 100644 --- a/css/civicrmNavigation.css +++ b/css/civicrmNavigation.css @@ -129,11 +129,11 @@ li.menu-separator{ } #civicrm-menu .crm-logo-sm, .crm-container .crm-logo-sm { - background: url('../i/item_sprites.png') no-repeat scroll -80px -16px; + background: url('../i/logo_sm.png') no-repeat; display: inline-block; width: 16px; height: 16px; - vertical-align:middle; + vertical-align: middle; } #civicrm-menu .ui-autocomplete-input, diff --git a/i/logo_sm.png b/i/logo_sm.png new file mode 100644 index 0000000000..0501f535cb Binary files /dev/null and b/i/logo_sm.png differ diff --git a/templates/CRM/common/navigation.js.tpl b/templates/CRM/common/navigation.js.tpl index 7d26bce704..9ed7aa7c45 100644 --- a/templates/CRM/common/navigation.js.tpl +++ b/templates/CRM/common/navigation.js.tpl @@ -93,7 +93,7 @@ $('#civicrm-menu').ready(function() { .autocomplete({ source: function(request, response) { //start spinning the civi logo - $('.crm-logo-sm').addClass('crm-i fa-spin fa-pulse'); + $('.crm-logo-sm').addClass('crm-i fa-spin'); var option = $('input[name=quickSearchField]:checked'), params = { @@ -120,7 +120,7 @@ $('#civicrm-menu').ready(function() { } response(ret); //stop spinning the civi logo - $('.crm-logo-sm').removeClass('crm-i fa-spin fa-pulse'); + $('.crm-logo-sm').removeClass('crm-i fa-spin'); }) }, focus: function (event, ui) { @@ -209,6 +209,6 @@ $('#civicrm-menu').ready(function() { }); $('#civicrm-menu').menuBar({arrowSrc: CRM.config.resourceBase + 'packages/jquery/css/images/arrow.png'}); $(window).on("beforeunload", function() { - $('.crm-logo-sm', '#civicrm-menu').addClass('crm-i fa-spin fa-pulse'); + $('.crm-logo-sm', '#civicrm-menu').addClass('crm-i fa-spin'); }); })(CRM.$);{/literal}