Add support of scaling for header | #431 @0:50

diff --git a/framework/application/views/scripts/common/content.phtml b/framework/application/views/scripts/common/content.phtml
index 483d1beac4622e7ec7bdd32f8c9691e601654007..b0ce4f986aa529190dc186d71c7b807a5f34d497 100644 (file)
--- a/framework/application/views/scripts/common/content.phtml
+++ b/framework/application/views/scripts/common/content.phtml
@@ -1,8 +1,8 @@
 <?php\r
 \r
 $content = $this->layout()->content . "\n";\r
-echo '<div id="z">';\r
 echo $this->render('common/header.phtml');\r
+echo '<div id="z">';\r
 echo '<main>';\r
 echo $content;\r
 echo '</main>';\r

diff --git a/js/002-common.js b/js/002-common.js
index b0b57bf5244c8deb56962854b4461a9279af3dc0..4fbb3dae1ebcf32d3b5c93a721cc15a8c38ea708 100644 (file)
--- a/js/002-common.js
+++ b/js/002-common.js
@@ -1,4 +1,5 @@
 registerLoader(load_common, true);\r
+var zoom = 1;\r
 \r
 function load_common() {\r
     $(window).on('cubeitresize', resize);\r
@@ -25,10 +26,11 @@ function resize() {
 }\r
 \r
 function setZoom(ww) {\r
-    var z = 1;\r
+    zoom = 1;\r
     if (ww >= 1680) {\r
-        z = ww / 1680;\r
+        zoom = ww / 1680;\r
     }\r
-    $('#z').css('transform', 'scale(' + z + ')');\r
+    $('#z,header').css('transform', 'scale(' + zoom + ')');\r
+\r
 \r
 }
\ No newline at end of file

diff --git a/js/101-header.js b/js/101-header.js
index 33972baffff7325ae4354efee5e555734a5415e1..c13f7b5a7a1d08287246b03a201d74376ae80103 100644 (file)
--- a/js/101-header.js
+++ b/js/101-header.js
@@ -54,7 +54,7 @@ function headerScroll() {
         goingUp = false;\r
     }\r
     var adminHeight = $("#adminBar").outerHeight();\r
-    var headerHeight = $("header").outerHeight();\r
+    var headerHeight = $("header").outerHeight() * zoom;\r
     if (scrollUp != goingUp) {\r
         lastDirChange = s;\r
         scrolledDistance = 0;\r

diff --git a/less/101-header.less b/less/101-header.less
index 0729a5194088a374824ab45b3bd3a31e12444c55..d2a3f3c63fc80bcaad959a3ef5d420386bf5fa03 100644 (file)
--- a/less/101-header.less
+++ b/less/101-header.less
@@ -3,9 +3,9 @@
 header {\r
        position: fixed;\r
        top: 0px;\r
-       left: 50%;\r
-       transform: translateX(-50%);\r
+       //left: 50%;\r
        z-index: 10;\r
+       transform-origin: 0 0 0;\r
 \r
        height: 90px;\r
        width: 100%;\r
@@ -15,11 +15,12 @@ header {
        padding: 0 5%;\r
        vertical-align: bottom;\r
 \r
+\r
        #header {\r
                height: 90px;\r
                width: 100%;\r
                position: relative;\r
-\r
+               transform-origin: 0 0 0;\r
        }\r
 \r
        nav {\r