hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix main menu colors, fix facets display on IE8

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

13
resources/www/prod/js/jquery.main-prod.js
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] === 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);
}
}
});
});

7
resources/www/prod/skins/ui-components/_main-menu.scss
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';