From 14655ba681a04fdcf724be492aaae8f3e618319b Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 5 Sep 2016 16:14:32 +0000 Subject: [PATCH] fix #650 @2 --- .../views/scripts/common/footer.phtml | 2 +- js/002-common.js | 16 +++++++++++----- js/210-home.js | 9 +++++++-- less/002-common.less | 10 ++++++++-- less/211-home-intro.less | 1 + less/315-quote.less | 4 ++++ 6 files changed, 32 insertions(+), 10 deletions(-) diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml index 5ab031f..9982c5e 100644 --- a/framework/application/views/scripts/common/footer.phtml +++ b/framework/application/views/scripts/common/footer.phtml @@ -86,4 +86,4 @@ $res .= ''; // .footer-inner $res .= ''; // footer.legal // Output footer with Organization microdata wrapper -echo $this->microdata($res, ['class' => 'auto-height'], 'Organization'); \ No newline at end of file +echo $this->microdata($res, ['class' => 'auto-height','id'=>'footerHolder'], 'Organization'); \ No newline at end of file diff --git a/js/002-common.js b/js/002-common.js index 4e97ac9..58e895f 100644 --- a/js/002-common.js +++ b/js/002-common.js @@ -47,10 +47,10 @@ function load_common() { }); // Allow different styling (background blurring) when popup is open - $(window).on('cubeitopenpopup', function() { + $(window).on('cubeitopenpopup', function () { $('body').addClass('popupOpen'); // Add class so we can blur the background }); - $(window).on('cubeitpopupremoved', function() { + $(window).on('cubeitpopupremoved', function () { $('body').removeClass('popupOpen'); }); @@ -58,11 +58,11 @@ function load_common() { _resize(); } -function _resize(){ +function _resize() { resize(); - setTimeout(function(){ + setTimeout(function () { resize(); - },150); + }, 150); } function resize() { @@ -119,6 +119,12 @@ function setZoom(ww) { } $('#z,header').css('transform', transform); + if(Modernizr.ie10 || Modernizr.ie11){ + if(zoom>1) { + $("#mm-0").css('height', h + 60); + } + $("#footerHolder").css('transform',transform); + } } function isMobile() { diff --git a/js/210-home.js b/js/210-home.js index 01d47c2..96e2cf7 100644 --- a/js/210-home.js +++ b/js/210-home.js @@ -49,9 +49,14 @@ function resizeHome() { // Recalculate zoom value but don't apply scaling yet calculateZoom(); + var homezoom=zoom; + if(Modernizr.ie10 || Modernizr.ie11){ + homezoom=1; + } + // Resize sections, allowing for scale factor that will be applied to parent element - var wh = $(window).outerHeight() / zoom; - var ww = $(window).outerWidth() / zoom; + var wh = $(window).outerHeight() / homezoom; + var ww = $(window).outerWidth() / homezoom; resizeHomeContact(ww, wh); resizeHomeReferences(ww, wh); diff --git a/less/002-common.less b/less/002-common.less index 293cdda..48d4695 100644 --- a/less/002-common.less +++ b/less/002-common.less @@ -44,6 +44,12 @@ main { transform-origin: 50% 0 0; } +.ie10, .ie11 { + #z { + transform: scale(1) !important; + } +} + #mm-0 { max-width: 100%; overflow: hidden; @@ -241,13 +247,13 @@ a { } .popupLayer { - .popupWindow,.popupOverlay { + .popupWindow, .popupOverlay { opacity: 0; transition: opacity @transition-time-popin; } &.display { - .popupWindow,.popupOverlay { + .popupWindow, .popupOverlay { opacity: 1; } } diff --git a/less/211-home-intro.less b/less/211-home-intro.less index a4b31f5..04bdb6a 100644 --- a/less/211-home-intro.less +++ b/less/211-home-intro.less @@ -8,6 +8,7 @@ section.intro { bottom: 10px; left: 50%; transform: translateX(-50%); + color:transparent !important; &:after { .icon('f'); diff --git a/less/315-quote.less b/less/315-quote.less index 9e057fb..ed5141b 100644 --- a/less/315-quote.less +++ b/less/315-quote.less @@ -55,6 +55,9 @@ > div { flex-basis: 50%; + .ie10 &, .ie11 & { + flex-basis: 47%; + } padding: 0 14px; // To create a 28px gap between cells @media @wrapForm { @@ -84,6 +87,7 @@ font-size: 1em; font-family: @body-font; color: @color-text; + height: 51px; .ios & { @media @m768 { -- 2.39.5