hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 04:23:19 +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

9
resources/www/_shared/styles/_main-menu.scss
View File

@@ -4,9 +4,8 @@ $mainMenuLineHeight: 36px !default;
$mainMenuBackgroundColor: #fceb3f !default; $mainMenuBackgroundColor: #fceb3f !default;
$mainMenuLinkColor: #000000 !default; $mainMenuLinkColor: #000000 !default;
$mainMenuLinkHoverColor: #fffbcd !default; $mainMenuLinkHoverColor: #fffbcd !default;
$mainMenuLinkActiveColor: #000000 !default; $mainMenuLinkActiveColor: #FFFFFF !default;
$mainMenuLinkBackgroundHoverColor: transparent !default;
$mainMenuLinkBackgroundHoverColor: #FFFFFF !default;
$mainMenuLinkHoverColor: #000000 !default; $mainMenuLinkHoverColor: #000000 !default;
$mainMenuMarginBottom: 0 !default; $mainMenuMarginBottom: 0 !default;
$mainMenuBottomBorder: none !default; $mainMenuBottomBorder: none !default;
@@ -27,7 +26,7 @@ $mainMenuBottomBorder: none !default;
} }
#mainLogo { #mainLogo {
margin:0 10px; margin:0 10px;
margin-top: 5px; margin-top: 3px;
} }
li { li {
@@ -50,7 +49,7 @@ $mainMenuBottomBorder: none !default;
padding: 0 5px; padding: 0 5px;
height: $mainMenuHeight - 3; height: $mainMenuHeight - 3;
&.selected { &.selected {
border-top: 3px solid white; border-top: 3px solid $mainMenuLinkActiveColor;
} }
} }
&:hover { &:hover {

7
resources/www/admin/styles/main.scss
View File

@@ -113,14 +113,17 @@ div.finder div.content div.title {
$mainMenuBackgroundColor: #fceb3f; $mainMenuBackgroundColor: #fceb3f;
$mainMenuLinkColor: #000000; $mainMenuLinkColor: #333333;
$mainMenuLinkHoverColor: #fffbcd; $mainMenuLinkHoverColor: #000000;
$mainMenuLinkActiveColor: #000000; $mainMenuLinkActiveColor: #000000;
$mainMenuLinkBackgroundHoverColor: transparent;
@import '../../_shared/styles/main-menu'; @import '../../_shared/styles/main-menu';
#mainContent { #mainContent {
margin-top: $mainMenuHeight; margin-top: $mainMenuHeight;
} }
/******* LEFT SIDE ************************************************************/ /******* LEFT SIDE ************************************************************/
#left { #left {
background-color: #fffbcd; background-color: #fffbcd;

7
resources/www/common/js/jquery.tooltip.js
View File

@@ -623,8 +623,11 @@
// hide helper and restore added classes and the title // hide helper and restore added classes and the title
function hide(event) { function hide(event) {
var isBrowsable = false;
if( $.tooltip.currentHover && settings($.tooltip.current).isBrowsable ) { if( $.tooltip.current !== null ) {
isBrowsable = settings($.tooltip.current).isBrowsable;
}
if( $.tooltip.currentHover && isBrowsable ) {
return; return;
} }

13
resources/www/prod/js/jquery.main-prod.js
View File

@@ -636,16 +636,17 @@ function loadFacets(facets) {
} }
function sortByPredefinedFacets(source, field, predefinedFieldOrder) { function sortByPredefinedFacets(source, field, predefinedFieldOrder) {
var filteredSource = source, var filteredSource = _.extend([], source),
ordered = []; ordered = [];
_.forEach(predefinedFieldOrder, function(fieldValue, index){ _.forEach(predefinedFieldOrder, function(fieldValue, index){
_.forEach(source, function(facet, facetIndex) { _.forEach(source, function(facet, facetIndex) {
if (facet[field] === fieldValue) { if( facet[field] !== undefined) {
ordered.push(facet); if (facet[field] === fieldValue) {
// remove from filtered ordered.push(facet);
filteredSource.splice(facetIndex, 1); // 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; $mainMenuMarginBottom: 0;
$mainMenuLinkColor: $mainMenuLinkColor; $mainMenuLinkColor: $mainMenuLinkColor;
$mainMenuLinkBackgroundHoverColor: $bgInverseHoverColor; $mainMenuLinkBackgroundHoverColor: transparent; //$bgInverseHoverColor;
$mainMenuLinkHoverColor: $textInverseHoverColor; $mainMenuLinkHoverColor: $textPrimaryHoverColor;
// already defined $mainMenuLinkColor: #212121;
//$mainMenuLinkHoverColor: #BFBFBF;
//$mainMenuLinkActiveColor: #BFBFBF;
@import '../../../_shared/styles/main-menu'; @import '../../../_shared/styles/main-menu';

3
templates/web/prod/index.html.twig
View File

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