try @1.5 #756

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index 7af82994223de1921bfbd03c5b2a38462549a711..57419d7e0292ad716fd231521c7a0b72aa27d895 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -18,7 +18,6 @@ timezone = 'Europe/Paris'
 
 session.lifetime = 31536000 ;1 year
 session.adapter = cache
-session.cookieDomain = fluidbook.com
 
 database.adapter = pdo_mysql
 database.params.host = localhost
@@ -58,6 +57,8 @@ mail.test = APPLICATION_PATH "/../data/email/test"
 
 compat_ie = 9
 
+;weinre = https://6114024f.ngrok.io/target/target-script-min.js#anonymous
+
 [testing : production]
 
 dev = true

diff --git a/js/002-common.js b/js/002-common.js
index 967973bfc0018e9dea46e3b5597fbc8fd145ebac..58e895fa34eba2ecd75d4d847b5be9ee33c842db 100644 (file)
--- a/js/002-common.js
+++ b/js/002-common.js
@@ -71,10 +71,10 @@ function resize() {
 \r
     var mainHeight = wh;\r
     $("footer").each(function () {\r
-        mainHeight -= $(this).outerHeight()*zoom;\r
+        mainHeight -= $(this).outerHeight();\r
     });\r
 \r
-    $('main').css('min-height', mainHeight/zoom);\r
+    $('main').css('min-height', mainHeight);\r
 \r
     // Handle divs with background images that must have a proportional min-height\r
     $('body:not(.home) [data-bg-ratio]').each(function () {\r
@@ -119,11 +119,11 @@ function setZoom(ww) {
     }\r
 \r
     $('#z,header').css('transform', transform);\r
-    if (Modernizr.ie10 || Modernizr.ie11) {\r
-        if (zoom > 1) {\r
+    if(Modernizr.ie10 || Modernizr.ie11){\r
+        if(zoom>1) {\r
             $("#mm-0").css('height', h + 60);\r
         }\r
-        $("#footerHolder").css('transform', transform);\r
+        $("#footerHolder").css('transform',transform);\r
     }\r
 }\r
 \r

diff --git a/js/101-header.js b/js/101-header.js
index 55a6c2477bbe5d42addfb2e95b24ae577616813b..36c359adcb096889290ced2b87ba480c891337f1 100644 (file)
--- a/js/101-header.js
+++ b/js/101-header.js
@@ -38,7 +38,6 @@ function resizeHeader() {
 function setHeaderAnimation() {\r
     var h = $('#h');\r
     home = $('body').hasClass('home');\r
-    var error = $('#error').length > 0;\r
     var fullPages = $('body').hasClass('fullpages'); // Are we in full page mode?\r
 \r
     if (htl !== undefined) {\r
@@ -50,14 +49,8 @@ function setHeaderAnimation() {
     // Background-color & height\r
     htl.add(TweenMax.fromTo(h, 1.5, {height: 90}, {height: 75}), 0);\r
 \r
-    if ((home || error) && (isMobile() || !fullPages)) {\r
-        var c;\r
-        if (home) {\r
-            c = $("main section:first").data('headerstyle');\r
-        } else if (error) {\r
-            c = 'light';\r
-        }\r
-        htl.add(TweenMax.fromTo($("#h,#nav-icon"), 1, {className: c}, {className: "-=light"}), 1);\r
+    if (home && (isMobile() || !fullPages)) {\r
+        htl.add(TweenMax.fromTo($("#h,#nav-icon"), 1, {className: $("main section:first").data('headerstyle')}, {className: "-=light"}), 1);\r
     }\r
     if (fullPages && !isMobile()) {\r
         htl.add(TweenMax.fromTo(h, 0.75, {backgroundColor: 'transparent', boxShadow: '0 0 0 rgba(0,0,0,0)'}, {backgroundColor: 'transparent', boxShadow: '0 0 0 rgba(0,0,0,0)'}), 0);\r

diff --git a/js/315-quote.js b/js/315-quote.js
index 621d4fac7919507594bc81b02b487b3a459655d4..676be1d52ff5936a32afb35bae49ec74d5dac5cf 100644 (file)
--- a/js/315-quote.js
+++ b/js/315-quote.js
@@ -4,13 +4,15 @@ function load_quoteform() {
 
     initFancySelect();
 
-    $(window).on('cubeitopenpopup', function() {
+    $(window).on('cubeitopenpopup', function () {
         initFancySelect();
     });
 }
 
 function initFancySelect() {
-    $('#requestQuote select, #requestQuotePopup select').fancySelect();
+    if ((!$('html').hasClass('ie11') && !$('html').hasClass('ie10')) || !isMobile()) {
+        $('#requestQuote select, #requestQuotePopup select').fancySelect();
+    }
 }
 
 function displayErrors(formID) {
@@ -21,15 +23,15 @@ function displayErrors(formID) {
     $('#' + formID + ' .errormessage').each(function () {
         errors.push($(this).text());
 
-        $('.validation-messages').html(errors.join('<br>')).fadeIn(500, function() {
-            setTimeout(function() {
+        $('.validation-messages').html(errors.join('<br>')).fadeIn(500, function () {
+            setTimeout(function () {
                 $('.validation-messages').fadeOut(500);
             }, 3000);
         });
     });
 
     // Hide on any click/touch after messages are displayed
-    $(document).one('click touchend', function() {
+    $(document).one('click touchend', function () {
         $('.validation-messages').hide();
     });
 

diff --git a/js/504-e404.js b/js/504-e404.js
index 5581cd047ac773ec6bff39a765449ada626f12af..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/js/504-e404.js
+++ b/js/504-e404.js
@@ -1,13 +0,0 @@
-registerLoader(load_e404, true);\r
-function load_e404() {\r
-    resize_e404();\r
-    $(window).on('fluidbookresize', resize_e404);\r
-}\r
-\r
-function resize_e404() {\r
-    var wh = getWindowHeight() / zoom;\r
-    $('#error').css('height', wh);\r
-\r
-    var c = $("#error .dotclear");\r
-    $(c).css({paddingTop: $("#h").height() + (wh - $("#h").height() - $(c).outerHeight()) / 2})\r
-}
\ No newline at end of file

diff --git a/less/315-quote.less b/less/315-quote.less
index 49e36197ff1544d7e07a0af15eb27a778661e563..2bf35ed7ae6130d4aa0af354dd60a95ac4bf80c0 100644 (file)
--- a/less/315-quote.less
+++ b/less/315-quote.less
@@ -61,7 +61,7 @@
                        padding: 0 14px; // To create a 28px gap between cells
 
                        @media @wrapForm {
-                               flex-basis: 100%;
+                               flex-basis: 100% !important;
                        }
                }
        }