From 218f965993594e22bc887187b2562309271f10cd Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 5 Jul 2016 14:07:25 +0000 Subject: [PATCH] done #531 @0.25 --- framework/application/views/helpers/IntroBlock.php | 3 +-- .../application/views/scripts/common/content.phtml | 2 ++ js/002-common.js | 13 ++++++++++++- less/002-common.less | 4 ++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/framework/application/views/helpers/IntroBlock.php b/framework/application/views/helpers/IntroBlock.php index ea4b5fa..48a0fd8 100644 --- 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 .= ''; // .col-2 $res .= ''; // .grid - $res .= ''; $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 4e06e18..483d1be 100644 --- a/framework/application/views/scripts/common/content.phtml +++ b/framework/application/views/scripts/common/content.phtml @@ -1,8 +1,10 @@ layout()->content . "\n"; +echo '
'; echo $this->render('common/header.phtml'); echo '
'; echo $content; echo '
'; echo $this->render('common/footer.phtml'); +echo '
'; diff --git a/js/002-common.js b/js/002-common.js index d5b02ce..b0b57bf 100644 --- a/js/002-common.js +++ b/js/002-common.js @@ -17,7 +17,18 @@ function resize() { $('main').css('min-height', mainHeight); // Handle divs with background images that must have a proportional min-height - $('[data-bg-ratio]').each(function() { + $('[data-bg-ratio]').each(function () { $(this).css('min-height', Math.round($(this).outerWidth() * $(this).data('bg-ratio'))); }); + + setZoom(ww); +} + +function setZoom(ww) { + var z = 1; + if (ww >= 1680) { + z = ww / 1680; + } + $('#z').css('transform', 'scale(' + z + ')'); + } \ No newline at end of file diff --git a/less/002-common.less b/less/002-common.less index daa073a..756e39f 100644 --- a/less/002-common.less +++ b/less/002-common.less @@ -21,6 +21,10 @@ main { margin: 0 auto; } +#z { + transform-origin: 50% 0 0; +} + // Main heading style h1, h2 { &.title { -- 2.39.5