From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 26 Aug 2016 16:35:23 +0000 (+0000)
Subject: fix #620 @0.25
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=72e0472249a7e8706aeefd352d99b1e468a61079;p=fluidbook-v3.git

fix #620 @0.25
---

diff --git a/js/101-header.js b/js/101-header.js
index ce13b2e..12f7562 100644
--- a/js/101-header.js
+++ b/js/101-header.js
@@ -65,22 +65,26 @@ function setHeaderAnimation() {
     var nav = $(h).find('#menu');
     htl.add(TweenMax.fromTo(nav, 1.5, {top: 57}, {top: 24}), 0);
     //Typo logo
-    htl.add(TweenMax.fromTo($(logo).find('.text'), 1, {opacity: 1}, {opacity: 0}), 0);
+    htl.add(TweenMax.fromTo($(logo).find('.text'), 1, {autoAlpha:1}, {autoAlpha:0}), 0);
+    htl.add(TweenMax.fromTo($(logo), 0, {width:220}, {width:32}), 1);
     // Menu position
     htl.add(TweenMax.fromTo(nav, 1, {left: '43.5%'}, {left: 312}), 2);
 
     htl.stop();
 
-    headerScroll();
+    headerScroll(true);
 }
 
 
-function headerScroll() {
+function headerScroll(force) {
+    if (force === undefined) {
+        force = false;
+    }
     var s = $(window).scrollTop();
     var h = $('#h');
 
     // If no move since last call, nothing to do
-    if (s == formerScroll) {
+    if (!force && s == formerScroll) {
         return;
     }
 
diff --git a/less/101-header.less b/less/101-header.less
index db761d2..eb7b323 100644
--- a/less/101-header.less
+++ b/less/101-header.less
@@ -8,7 +8,6 @@ header#h {
 	z-index: 10;
 	transform-origin: 0 0 0;
 
-
 	height: 90px;
 	width: 100%;
 	max-width: @content-max-width;
@@ -46,6 +45,7 @@ header#h {
 		height: 50px;
 		width: 220px;
 		transition: all 0.4s;
+		z-index: 1;
 
 		//.mm-opening & {
 		//	transform: translateX(440px);