fix #620 @0.25

diff --git a/js/101-header.js b/js/101-header.js
index ce13b2e0e4d7006af134e0fa6ad62d97a33b33f6..12f7562f68abd676ef8a85606ae6a62f44ed6baa 100644 (file)
--- a/js/101-header.js
+++ b/js/101-header.js
@@ -65,22 +65,26 @@ function setHeaderAnimation() {
     var nav = $(h).find('#menu');\r
     htl.add(TweenMax.fromTo(nav, 1.5, {top: 57}, {top: 24}), 0);\r
     //Typo logo\r
-    htl.add(TweenMax.fromTo($(logo).find('.text'), 1, {opacity: 1}, {opacity: 0}), 0);\r
+    htl.add(TweenMax.fromTo($(logo).find('.text'), 1, {autoAlpha:1}, {autoAlpha:0}), 0);\r
+    htl.add(TweenMax.fromTo($(logo), 0, {width:220}, {width:32}), 1);\r
     // Menu position\r
     htl.add(TweenMax.fromTo(nav, 1, {left: '43.5%'}, {left: 312}), 2);\r
 \r
     htl.stop();\r
 \r
-    headerScroll();\r
+    headerScroll(true);\r
 }\r
 \r
 \r
-function headerScroll() {\r
+function headerScroll(force) {\r
+    if (force === undefined) {\r
+        force = false;\r
+    }\r
     var s = $(window).scrollTop();\r
     var h = $('#h');\r
 \r
     // If no move since last call, nothing to do\r
-    if (s == formerScroll) {\r
+    if (!force && s == formerScroll) {\r
         return;\r
     }\r
 \r

diff --git a/less/101-header.less b/less/101-header.less
index db761d2ebf850aae93bbb029547798b14c7119ea..eb7b323976d758568ba3163804a883e51e748f35 100644 (file)
--- a/less/101-header.less
+++ b/less/101-header.less
@@ -8,7 +8,6 @@ header#h {
        z-index: 10;\r
        transform-origin: 0 0 0;\r
 \r
-\r
        height: 90px;\r
        width: 100%;\r
        max-width: @content-max-width;\r
@@ -46,6 +45,7 @@ header#h {
                height: 50px;\r
                width: 220px;\r
                transition: all 0.4s;\r
+               z-index: 1;\r
 \r
                //.mm-opening & {\r
                //      transform: translateX(440px);\r