fix #650 @2

diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml
index 5ab031f654c5a5fa4717c6f3f594c4553cdd7cb0..9982c5e6b46a228137350bcd6809735f62cb3099 100644 (file)
--- a/framework/application/views/scripts/common/footer.phtml
+++ b/framework/application/views/scripts/common/footer.phtml
@@ -86,4 +86,4 @@ $res .= '</div>'; // .footer-inner
 $res .= '</footer>'; // footer.legal\r
 \r
 // Output footer with Organization microdata wrapper\r
-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 4e97ac9dfcce2254dd1c5224e1eb0f640636fd34..58e895fa34eba2ecd75d4d847b5be9ee33c842db 100644 (file)
--- a/js/002-common.js
+++ b/js/002-common.js
@@ -47,10 +47,10 @@ function load_common() {
     });\r
 \r
     // Allow different styling (background blurring) when popup is open\r
-    $(window).on('cubeitopenpopup', function() {\r
+    $(window).on('cubeitopenpopup', function () {\r
         $('body').addClass('popupOpen'); // Add class so we can blur the background\r
     });\r
-    $(window).on('cubeitpopupremoved', function() {\r
+    $(window).on('cubeitpopupremoved', function () {\r
         $('body').removeClass('popupOpen');\r
     });\r
 \r
@@ -58,11 +58,11 @@ function load_common() {
     _resize();\r
 }\r
 \r
-function _resize(){\r
+function _resize() {\r
     resize();\r
-    setTimeout(function(){\r
+    setTimeout(function () {\r
         resize();\r
-    },150);\r
+    }, 150);\r
 }\r
 \r
 function resize() {\r
@@ -119,6 +119,12 @@ function setZoom(ww) {
     }\r
 \r
     $('#z,header').css('transform', transform);\r
+    if(Modernizr.ie10 || Modernizr.ie11){\r
+        if(zoom>1) {\r
+            $("#mm-0").css('height', h + 60);\r
+        }\r
+        $("#footerHolder").css('transform',transform);\r
+    }\r
 }\r
 \r
 function isMobile() {\r

diff --git a/js/210-home.js b/js/210-home.js
index 01d47c2c75be1cf94274efcea11a72d8549cd398..96e2cf72180d23bd0551a29c129633a016a5f64c 100644 (file)
--- 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\r
     calculateZoom();\r
 \r
+    var homezoom=zoom;\r
+    if(Modernizr.ie10 || Modernizr.ie11){\r
+        homezoom=1;\r
+    }\r
+\r
     // Resize sections, allowing for scale factor that will be applied to parent element\r
-    var wh = $(window).outerHeight() / zoom;\r
-    var ww = $(window).outerWidth() / zoom;\r
+    var wh = $(window).outerHeight() / homezoom;\r
+    var ww = $(window).outerWidth() / homezoom;\r
 \r
     resizeHomeContact(ww, wh);\r
     resizeHomeReferences(ww, wh);\r

diff --git a/less/002-common.less b/less/002-common.less
index 293cddaa92f90855a338741edb13b157bfc634f6..48d46951d2bdb16bccc80e25cd60a5ea8e514883 100644 (file)
--- a/less/002-common.less
+++ b/less/002-common.less
@@ -44,6 +44,12 @@ main {
        transform-origin: 50% 0 0;\r
 }\r
 \r
+.ie10, .ie11 {\r
+       #z {\r
+               transform: scale(1) !important;\r
+       }\r
+}\r
+\r
 #mm-0 {\r
        max-width: 100%;\r
        overflow: hidden;\r
@@ -241,13 +247,13 @@ a {
 }\r
 \r
 .popupLayer {\r
-       .popupWindow,.popupOverlay {\r
+       .popupWindow, .popupOverlay {\r
                opacity: 0;\r
                transition: opacity @transition-time-popin;\r
        }\r
 \r
        &.display {\r
-               .popupWindow,.popupOverlay {\r
+               .popupWindow, .popupOverlay {\r
                        opacity: 1;\r
                }\r
        }\r

diff --git a/less/211-home-intro.less b/less/211-home-intro.less
index a4b31f5c099f15d8ee018b7496e89071b34854af..04bdb6a6e1b1d8cdba5a9625ab3bf8e1ff363610 100644 (file)
--- 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 9e057fb4bb44f39d86e47fcedfd17549ab67ce7a..ed5141b32e77eee82597732e37c963bfb15d5b04 100644 (file)
--- 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 {