fix main menu colors, fix facets display on IE8

This commit is contained in:
Florian BLOUET
2015-11-26 17:38:33 +01:00
parent 6c469ea28b
commit 3807b2f74c
6 changed files with 25 additions and 21 deletions

View File

@@ -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 {

View File

@@ -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;

View File

@@ -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;
}

View File

@@ -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] !== undefined) {
if (facet[field] === fieldValue) {
ordered.push(facet);
// remove from filtered
filteredSource.splice(facetIndex, 1);
}
}
});
});

View File

@@ -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';

View File

@@ -778,9 +778,10 @@
}, function(data){
return;
});
if ($.browser.msie && $.browser.version === "6.0")
if (( navigator.userAgent.match(/msie/i) && navigator.userAgent.match(/6/) )) {
$("select").hide().show();
}
}
</script>
<script type="text/javascript" id="bitly_loader"></script>