]> _ Git - fluidbook-v3.git/commitdiff
Fix #597 @1
authorstephen@cubedesigners.com <stephen@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Tue, 30 Aug 2016 15:43:02 +0000 (15:43 +0000)
committerstephen@cubedesigners.com <stephen@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Tue, 30 Aug 2016 15:43:02 +0000 (15:43 +0000)
framework/application/controllers/AjaxpopupController.php
js/002-common.js
js/210-home.js
less/002-common.less

index c653b38af7e29a81e495b68c3842e52341ecebd6..4dbd875644c01bf2b86a63e48f5d5e1fcef69dae 100644 (file)
@@ -3,9 +3,10 @@
 class AjaxpopupController extends CubeIT_Controller_AjaxpopupController {
 
     public function quoteForm() {
-        $this->setPopupMaxWidth('1440');
-        $this->setPopupPadding('20');
-        $this->setVerticalMargin('20');
+        $this->setPopupMaxWidth(1440);
+        $this->setPopupPadding(20);
+        $this->setVerticalMargin(20);
+        $this->setOverlayOpacity(0.5);
         return $this->view->quoteForm('requestQuotePopup'); // Different ID for popup form so it doesn't conflict with contact page form
     }
 
index 0a277e90c4da952dbbca0251023a6c204c3cc4a5..4e97ac9dfcce2254dd1c5224e1eb0f640636fd34 100644 (file)
@@ -46,6 +46,13 @@ function load_common() {
         return true;\r
     });\r
 \r
+    // Allow different styling (background blurring) when popup is open\r
+    $(window).on('cubeitopenpopup', function() {\r
+        $('body').addClass('popupOpen'); // Add class so we can blur the background\r
+    });\r
+    $(window).on('cubeitpopupremoved', function() {\r
+        $('body').removeClass('popupOpen');\r
+    });\r
 \r
     $(window).on('cubeitresize', _resize);\r
     _resize();\r
index 18d9a541f97780998242da9e0e91983e52b3b291..a44297b3ff72e912a1e4fcce696a0c0e49843cca 100644 (file)
@@ -24,12 +24,12 @@ function load_home() {
         $.scrollify.move($(this).data('section'));\r
     });\r
 \r
-    // Handle clicks to AJAX popups and disable scrollify when they open\r
-    // because it interferes with internal popup scrolling\r
-    $(document).on('click', '.popup', function () {\r
+    // Disable scrollify when popups are open because it\r
+    // interferes with internal popup scrolling\r
+    $(window).on('cubeitopenpopup', function() {\r
         disableScrollify();\r
     });\r
-    $(document).on('click', '.closePopup', function () {\r
+    $(window).on('cubeitpopupremoved', function() {\r
         resizeHome(); // Update layout and re-enable scrollify if space requirements are met\r
     });\r
 }\r
index 7ece960b355d990892ffd272c07eabdbef25daaa..3d5366e1da7862a3c86c131e9a37c7ae15dd33e8 100644 (file)
@@ -20,6 +20,12 @@ body {
        opacity: 0;\r
        transition: opacity @transition-time-buttons;\r
 \r
+       &.popupOpen {\r
+               #mm-0, #h {\r
+                       filter: blur(5px);\r
+               }\r
+       }\r
+\r
        .wf-active & {\r
                opacity: 1;\r
        }\r