Skip to content

Commit

Permalink
Merge pull request #11046 from agh1/logo-improvements
Browse files Browse the repository at this point in the history
CRM-21241 Logo improvements
  • Loading branch information
colemanw authored Oct 2, 2017
2 parents ae6e151 + f0e6f69 commit dce0aa6
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions css/civicrmNavigation.css
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Binary file modified i/loading-overlay.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed i/logo16px.png
Binary file not shown.
Binary file added i/logo_sm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions templates/CRM/common/navigation.js.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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) {
Expand Down Expand Up @@ -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}

0 comments on commit dce0aa6

Please sign in to comment.