diff --git a/resources/www/_shared/styles/_main-menu.scss b/resources/www/_shared/styles/_main-menu.scss index cf2c97fec1..8c49cc8901 100644 --- a/resources/www/_shared/styles/_main-menu.scss +++ b/resources/www/_shared/styles/_main-menu.scss @@ -4,9 +4,8 @@ $mainMenuLineHeight: 36px !default; $mainMenuBackgroundColor: #fceb3f !default; $mainMenuLinkColor: #000000 !default; $mainMenuLinkHoverColor: #fffbcd !default; -$mainMenuLinkActiveColor: #000000 !default; - -$mainMenuLinkBackgroundHoverColor: #FFFFFF !default; +$mainMenuLinkActiveColor: #FFFFFF !default; +$mainMenuLinkBackgroundHoverColor: transparent !default; $mainMenuLinkHoverColor: #000000 !default; $mainMenuMarginBottom: 0 !default; $mainMenuBottomBorder: none !default; @@ -27,7 +26,7 @@ $mainMenuBottomBorder: none !default; } #mainLogo { margin:0 10px; - margin-top: 5px; + margin-top: 3px; } li { @@ -50,7 +49,7 @@ $mainMenuBottomBorder: none !default; padding: 0 5px; height: $mainMenuHeight - 3; &.selected { - border-top: 3px solid white; + border-top: 3px solid $mainMenuLinkActiveColor; } } &:hover { diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss index cf2738874c..672bde3372 100644 --- a/resources/www/admin/styles/main.scss +++ b/resources/www/admin/styles/main.scss @@ -113,14 +113,17 @@ div.finder div.content div.title { $mainMenuBackgroundColor: #fceb3f; -$mainMenuLinkColor: #000000; -$mainMenuLinkHoverColor: #fffbcd; +$mainMenuLinkColor: #333333; +$mainMenuLinkHoverColor: #000000; $mainMenuLinkActiveColor: #000000; +$mainMenuLinkBackgroundHoverColor: transparent; + @import '../../_shared/styles/main-menu'; #mainContent { margin-top: $mainMenuHeight; } + /******* LEFT SIDE ************************************************************/ #left { background-color: #fffbcd; diff --git a/resources/www/common/js/jquery.tooltip.js b/resources/www/common/js/jquery.tooltip.js index 5df8f9ea2c..b239e94824 100644 --- a/resources/www/common/js/jquery.tooltip.js +++ b/resources/www/common/js/jquery.tooltip.js @@ -623,8 +623,11 @@ // hide helper and restore added classes and the title function hide(event) { - - if( $.tooltip.currentHover && settings($.tooltip.current).isBrowsable ) { + var isBrowsable = false; + if( $.tooltip.current !== null ) { + isBrowsable = settings($.tooltip.current).isBrowsable; + } + if( $.tooltip.currentHover && isBrowsable ) { return; } diff --git a/resources/www/prod/js/jquery.main-prod.js b/resources/www/prod/js/jquery.main-prod.js index caa679efa7..6c2cd02c61 100644 --- a/resources/www/prod/js/jquery.main-prod.js +++ b/resources/www/prod/js/jquery.main-prod.js @@ -636,16 +636,17 @@ function loadFacets(facets) { } function sortByPredefinedFacets(source, field, predefinedFieldOrder) { - var filteredSource = source, + var filteredSource = _.extend([], source), ordered = []; _.forEach(predefinedFieldOrder, function(fieldValue, index){ _.forEach(source, function(facet, facetIndex) { - if (facet[field] === fieldValue) { - ordered.push(facet); - // remove from filtered - filteredSource.splice(facetIndex, 1); - + if( facet[field] !== undefined) { + if (facet[field] === fieldValue) { + ordered.push(facet); + // remove from filtered + filteredSource.splice(facetIndex, 1); + } } }); }); diff --git a/resources/www/prod/skins/ui-components/_main-menu.scss b/resources/www/prod/skins/ui-components/_main-menu.scss index c13aaed1bb..5a81cec973 100644 --- a/resources/www/prod/skins/ui-components/_main-menu.scss +++ b/resources/www/prod/skins/ui-components/_main-menu.scss @@ -6,10 +6,7 @@ $mainMenuBottomBorder: none; $mainMenuMarginBottom: 0; $mainMenuLinkColor: $mainMenuLinkColor; -$mainMenuLinkBackgroundHoverColor: $bgInverseHoverColor; -$mainMenuLinkHoverColor: $textInverseHoverColor; +$mainMenuLinkBackgroundHoverColor: transparent; //$bgInverseHoverColor; +$mainMenuLinkHoverColor: $textPrimaryHoverColor; -// already defined $mainMenuLinkColor: #212121; -//$mainMenuLinkHoverColor: #BFBFBF; -//$mainMenuLinkActiveColor: #BFBFBF; @import '../../../_shared/styles/main-menu'; diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index 5bfe65d0c4..4051b92ca7 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -778,8 +778,9 @@ }, function(data){ return; }); - if ($.browser.msie && $.browser.version === "6.0") + if (( navigator.userAgent.match(/msie/i) && navigator.userAgent.match(/6/) )) { $("select").hide().show(); + } }