Merge remote-tracking branch 'upstream/3.5.2rc' into 1705-dbclean-advanced

This commit is contained in:
Michael 2017-05-23 06:07:02 +00:00
commit 0ae92f0e72
2 changed files with 2 additions and 3 deletions

View file

@ -22,7 +22,7 @@
#fc-header-right { #fc-header-right {
margin-top: -4px; margin-top: -4px;
} }
#fc-header-right button { #fc-header-right .dropdown > button {
color: inherit; color: inherit;
} }
#event-calendar-title { #event-calendar-title {

View file

@ -4,9 +4,8 @@
// Catch the GUID from the URL // Catch the GUID from the URL
var itemGuid = window.location.pathname.split("/").pop(); var itemGuid = window.location.pathname.split("/").pop();
var itemGuidSafe = itemGuid.replace(/%.*/, '');
$(window).load(function(){ $(window).load(function(){
// Scroll to the Item by its GUID // Scroll to the Item by its GUID
scrollToItem('item-' + itemGuidSafe); scrollToItem('item-' + itemGuid);
}); });