From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 28 Sep 2016 16:28:48 +0000 (+0000)
Subject: try  @1.5 #756
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=1ae24b20f2b4c01a90e25a77a2f9731bee6d3e59;p=fluidbook-v3.git

try  @1.5 #756
---

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index 7af8299..57419d7 100644
--- 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 967973b..58e895f 100644
--- a/js/002-common.js
+++ b/js/002-common.js
@@ -71,10 +71,10 @@ function resize() {
 
     var mainHeight = wh;
     $("footer").each(function () {
-        mainHeight -= $(this).outerHeight()*zoom;
+        mainHeight -= $(this).outerHeight();
     });
 
-    $('main').css('min-height', mainHeight/zoom);
+    $('main').css('min-height', mainHeight);
 
     // Handle divs with background images that must have a proportional min-height
     $('body:not(.home) [data-bg-ratio]').each(function () {
@@ -119,11 +119,11 @@ function setZoom(ww) {
     }
 
     $('#z,header').css('transform', transform);
-    if (Modernizr.ie10 || Modernizr.ie11) {
-        if (zoom > 1) {
+    if(Modernizr.ie10 || Modernizr.ie11){
+        if(zoom>1) {
             $("#mm-0").css('height', h + 60);
         }
-        $("#footerHolder").css('transform', transform);
+        $("#footerHolder").css('transform',transform);
     }
 }
 
diff --git a/js/101-header.js b/js/101-header.js
index 55a6c24..36c359a 100644
--- a/js/101-header.js
+++ b/js/101-header.js
@@ -38,7 +38,6 @@ function resizeHeader() {
 function setHeaderAnimation() {
     var h = $('#h');
     home = $('body').hasClass('home');
-    var error = $('#error').length > 0;
     var fullPages = $('body').hasClass('fullpages'); // Are we in full page mode?
 
     if (htl !== undefined) {
@@ -50,14 +49,8 @@ function setHeaderAnimation() {
     // Background-color & height
     htl.add(TweenMax.fromTo(h, 1.5, {height: 90}, {height: 75}), 0);
 
-    if ((home || error) && (isMobile() || !fullPages)) {
-        var c;
-        if (home) {
-            c = $("main section:first").data('headerstyle');
-        } else if (error) {
-            c = 'light';
-        }
-        htl.add(TweenMax.fromTo($("#h,#nav-icon"), 1, {className: c}, {className: "-=light"}), 1);
+    if (home && (isMobile() || !fullPages)) {
+        htl.add(TweenMax.fromTo($("#h,#nav-icon"), 1, {className: $("main section:first").data('headerstyle')}, {className: "-=light"}), 1);
     }
     if (fullPages && !isMobile()) {
         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);
diff --git a/js/315-quote.js b/js/315-quote.js
index 621d4fa..676be1d 100644
--- 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 5581cd0..e69de29 100644
--- a/js/504-e404.js
+++ b/js/504-e404.js
@@ -1,13 +0,0 @@
-registerLoader(load_e404, true);
-function load_e404() {
-    resize_e404();
-    $(window).on('fluidbookresize', resize_e404);
-}
-
-function resize_e404() {
-    var wh = getWindowHeight() / zoom;
-    $('#error').css('height', wh);
-
-    var c = $("#error .dotclear");
-    $(c).css({paddingTop: $("#h").height() + (wh - $("#h").height() - $(c).outerHeight()) / 2})
-}
\ No newline at end of file
diff --git a/less/315-quote.less b/less/315-quote.less
index 49e3619..2bf35ed 100644
--- 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;
 			}
 		}
 	}