done #531 @0.25

diff --git a/framework/application/views/helpers/IntroBlock.php b/framework/application/views/helpers/IntroBlock.php
index ea4b5fafa6ead7b78c7ae5282dd6146d32e2e3a5..48a0fd826bd3141e9511b177895074f57dc50881 100644 (file)
--- a/framework/application/views/helpers/IntroBlock.php
+++ b/framework/application/views/helpers/IntroBlock.php
@@ -16,14 +16,13 @@ class Fluidbook_View_Helper_IntroBlock extends CubeIT_View_Helper_Abstract {
 
                $res .= '</div>'; // .col-2
                $res .= '</div>'; // .grid
-               $res .= '</div>';
 
                $res = $this->backgroundBlock($res, $intro);
 
                if ($intro['chapo']) {
                        $res .= $this->htmlElement(nl2br($intro['chapo']), 'blockquote');
                }
-               
+
                return $this->htmlElement($res, 'section', array('class' => 'intro'));
        }
 }
\ No newline at end of file

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

diff --git a/js/002-common.js b/js/002-common.js
index d5b02ce2efaaf7a37f9898754dbdbcc3627a5a77..b0b57bf5244c8deb56962854b4461a9279af3dc0 100644 (file)
--- a/js/002-common.js
+++ b/js/002-common.js
@@ -17,7 +17,18 @@ function resize() {
     $('main').css('min-height', mainHeight);\r
 \r
     // Handle divs with background images that must have a proportional min-height\r
-    $('[data-bg-ratio]').each(function() {\r
+    $('[data-bg-ratio]').each(function () {\r
         $(this).css('min-height', Math.round($(this).outerWidth() * $(this).data('bg-ratio')));\r
     });\r
+\r
+    setZoom(ww);\r
+}\r
+\r
+function setZoom(ww) {\r
+    var z = 1;\r
+    if (ww >= 1680) {\r
+        z = ww / 1680;\r
+    }\r
+    $('#z').css('transform', 'scale(' + z + ')');\r
+\r
 }
\ No newline at end of file

diff --git a/less/002-common.less b/less/002-common.less
index daa073a5500c0a3727bace8b9db3e2a104566d46..756e39f8db224c3bba514c8cff4c7bd63735cae2 100644 (file)
--- a/less/002-common.less
+++ b/less/002-common.less
@@ -21,6 +21,10 @@ main {
        margin: 0 auto;\r
 }\r
 \r
+#z {\r
+       transform-origin: 50% 0 0;\r
+}\r
+\r
 // Main heading style\r
 h1, h2 {\r
        &.title {\r