done #579 @1

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index d0a0eb867bd03d814729e576e62d4e0c7872e40b..ff68c52f2b148b8eab9dc7dc2d36da04f4a4c891 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -61,7 +61,7 @@ compat_ie = 9
 dev = true
 firephp = true
 
-minify.js = false
+minify.js = true
 
 seo.universalAnalytics = UA-4339912-9
 

diff --git a/js/002-common.js b/js/002-common.js
index 870716ca31e9e786ba9069f4103d9871ecd423de..45549bf4e487e682fbbdf76d4875367e174c19d1 100644 (file)
--- a/js/002-common.js
+++ b/js/002-common.js
@@ -1,5 +1,6 @@
 registerLoader(load_common, true);\r
 var zoom = 1;\r
+var _mobile = null;\r
 \r
 function load_common() {\r
     // Google analytics\r
@@ -65,6 +66,12 @@ function resize() {
         $(this).css('min-height', Math.round($(this).outerWidth() * $(this).data('bg-ratio')));\r
     });\r
 \r
+    var mobile = isMobile();\r
+    if (mobile !== _mobile) {\r
+        _mobile = mobile;\r
+        $(window).trigger('fluidbooklayout');\r
+    }\r
+\r
     setZoom(ww);\r
     $(window).trigger('fluidbookresize');\r
 }\r
@@ -86,4 +93,8 @@ function setZoom(ww) {
     }\r
 \r
     $('#z,header').css('transform', transform);\r
+}\r
+\r
+function isMobile() {\r
+    return Modernizr.mq('(max-width: 900px)');\r
 }
\ No newline at end of file

diff --git a/js/101-header.js b/js/101-header.js
index 64fe3e9f29bcf103e90e5f99af5457d8b69830cd..16a17fc101714d4308bd798bb385376b2dfef354 100644 (file)
--- a/js/101-header.js
+++ b/js/101-header.js
@@ -9,20 +9,45 @@ var home = false;
 registerLoader(load_header, true);\r
 \r
 function load_header() {\r
+    $(window).on('fluidbooklayout', setHeaderAnimation);\r
+    setHeaderAnimation();\r
+\r
+    $(window).on('fluidbookresize', resizeHeader);\r
+    resizeHeader();\r
+\r
+    $(window).on('scroll', headerScroll);\r
+    headerScroll();\r
+}\r
+\r
+function resizeHeader() {\r
+    setTimeout(function () {\r
+        headerScroll();\r
+    }, 100);\r
+}\r
+\r
+function setHeaderAnimation() {\r
+    fb('set header information');\r
     var h = $('#h');\r
     home = $("body").hasClass('home');\r
 \r
     var bgcolor = "#fff";\r
     var boxshadow = '0 0 120px rgba(0,0,0,0.3)';\r
-    if (home) {\r
+    if (home && !isMobile()) {\r
         bgcolor = 'transparent';\r
         boxshadow = '0 0 0 rgba(0,0,0,0)';\r
     }\r
 \r
+    if (htl !== undefined) {\r
+        htl.remove();\r
+    }\r
+\r
     htl = new TimelineMax();\r
     // Background-color & height\r
     htl.add(TweenMax.fromTo(h, 1.5, {height: 90}, {height: 75}), 0);\r
     htl.add(TweenMax.fromTo(h, 1, {backgroundColor: 'transparent', boxShadow: '0 0 0 rgba(0,0,0,0)'}, {backgroundColor: bgcolor, boxShadow: boxshadow}), 1);\r
+    if (home && isMobile()) {\r
+        htl.add(TweenMax.fromTo($("#h,#nav-icon"), 1, {className: $("main section:first").data('headerstyle')}, {className: "-=light"}), 1);\r
+    }\r
     htl.add(TweenMax.fromTo($(h).find('#header'), 1.5, {height: 90}, {height: 56}), 0);\r
 \r
     // Logo\r
@@ -38,18 +63,7 @@ function load_header() {
 \r
     htl.stop();\r
 \r
-    $(window).on('cubeitresize', resizeHeader);\r
-    resizeHeader();\r
-\r
-    $(window).on('scroll', headerScroll);\r
     headerScroll();\r
-\r
-}\r
-\r
-function resizeHeader() {\r
-    setTimeout(function () {\r
-        headerScroll();\r
-    }, 100);\r
 }\r
 \r
 \r
@@ -99,7 +113,7 @@ function headerScroll() {
     }\r
     // Normalize top value\r
     var top = Math.max(-headerHeight, Math.min(adminHeight, htop + adminHeight));\r
-    if (home) {\r
+    if (home && !isMobile()) {\r
         top = adminHeight;\r
     }\r
     $(h).css('top', top);\r
@@ -110,7 +124,7 @@ function headerScroll() {
     formerScroll = s;\r
     scrollUp = goingUp;\r
 \r
-    if (home) {\r
+    if (home && !isMobile()) {\r
         changeHeaderStyle();\r
     }\r
 }\r

diff --git a/js/210-home.js b/js/210-home.js
index ebe724b751b776b2fd8113c5883afed66ea9c29e..01e730ebdde438ba5706dfbaf267f66a84d49259 100644 (file)
--- a/js/210-home.js
+++ b/js/210-home.js
@@ -39,7 +39,6 @@ function load_home() {
 // }\r
 \r
 function resizeHome() {\r
-\r
     // Resize sections\r
     var wh = $(window).outerHeight() / zoom;\r
     var ww = $(window).outerWidth() / zoom;\r
@@ -51,7 +50,7 @@ function resizeHome() {
     }\r
 \r
     resizeHomeContact(ww, wh);\r
-    resizeHomeReferences(ww,wh);\r
+    resizeHomeReferences(ww, wh);\r
 }\r
 \r
 function resizeHomeContact(ww, wh) {\r

diff --git a/less/215-home-references.less b/less/215-home-references.less
index 2c4b2a59acd74009f59c4278cc240706e4ac0137..4e6a486bf691e36b3c0a904566c9c70bc1c8089c 100644 (file)
--- a/less/215-home-references.less
+++ b/less/215-home-references.less
@@ -13,6 +13,8 @@ section.references {
                        overflow-x: scroll;\r
                        overflow-y: hidden;\r
                        -webkit-overflow-scrolling: touch;\r
+                       scroll-snap-type: mandatory;\r
+                       scroll-snap-points-x: repeat(100%);\r
                }\r
 \r
                .scrollHolder {\r