wait #3693 @1.5

diff --git a/framework/application/views/helpers/BackgroundBlock.php b/framework/application/views/helpers/BackgroundBlock.php
index f6060f8361004edf120acf8db84a01a09c781df4..21e45274f96eaeef09ecef046b316423128256e8 100644 (file)
--- a/framework/application/views/helpers/BackgroundBlock.php
+++ b/framework/application/views/helpers/BackgroundBlock.php
@@ -44,8 +44,8 @@ class Fluidbook_View_Helper_BackgroundBlock extends CubeIT_View_Helper_Abstract
                     if (!isset($data['backgroundmobileimage'])) {\r
                         $pict = $this->view->imageCms($image_path);\r
                     } else {\r
-                        $pict = '<div class="desktopr">' . $this->view->imageCms($image_path) . '</div>';\r
-                        $pict .= '<div class="mobiler">' . $this->view->imageCms(CubeIT_View_Helper_ImageCms::getPath(CubeIT_Util_Cms::extractFile($data['backgroundmobileimage']))) . '</div>';\r
+                        $pict = '<div class="desktopr">' . $this->view->imageCms($image_path, '', null, null, ['data-nowrapper' => true]) . '</div>';\r
+                        $pict .= '<div class="mobiler">' . $this->view->imageCms(CubeIT_View_Helper_ImageCms::getPath(CubeIT_Util_Cms::extractFile($data['backgroundmobileimage'])), '', null, null, ['data-nowrapper' => true]) . '</div>';\r
                     }\r
                 } else {\r
                     if (isset($data['backgroundmobileimage'])) {\r

diff --git a/js/002-common.js b/js/002-common.js
index c06956559a79c80f8d7660b9996897b051f3847b..d31dd8681faf0f806ee3ad7e5974845cd098ed4f 100644 (file)
--- a/js/002-common.js
+++ b/js/002-common.js
@@ -116,6 +116,9 @@ function resize() {
 \r
 function resize_oam() {\r
     $('iframe.oam,iframe.zip').each(function () {\r
+        if ($(this).closest('.animationIframeWrapper').length > 0) {\r
+            return;\r
+        }\r
         var p = $(this).parent();\r
         var pw = $(p).outerWidth();\r
         var ph = $(p).outerHeight();\r

diff --git a/js/420-features-details.js b/js/420-features-details.js
index f5bb709d8338d2a39fd2ae65cd429dccde5a298a..70a0dbd986310e202256f49dba3047bc97976790 100644 (file)
--- a/js/420-features-details.js
+++ b/js/420-features-details.js
@@ -1,14 +1,5 @@
 registerLoader(load_features_details, true);\r
 \r
 function load_features_details() {\r
-    $(window).on('fluidbookresize', resizeFeatureDetails);\r
-    resizeFeatureDetails();\r
-}\r
 \r
-function resizeFeatureDetails() {\r
-    $('article iframe').each(function () {\r
-        $(this).css('height', null);\r
-        var r = parseInt($(this).attr('width')) / parseInt($(this).attr('height'));\r
-        $(this).css('height', $(this).outerWidth() / r);\r
-    });\r
-}
\ No newline at end of file
+}\r

diff --git a/less/420-features-details.less b/less/420-features-details.less
index 8818516a8a485cb6849c19397f2178b066adfedf..5ab0d7e0d1d712c584f5f86af96a4252adf40d2d 100644 (file)
--- a/less/420-features-details.less
+++ b/less/420-features-details.less
@@ -1,90 +1,102 @@
 @import "000-imports";\r
 \r
 #featureDetails {\r
-       padding-top: 0;\r
-       color: @color-text;\r
-       article {\r
-               margin-top: 110px;\r
-               &:first-child {\r
-                       margin-top: 0;\r
-               }\r
-\r
-               .content {\r
-                       width: 50%;\r
-                       padding: 8% 10% 0;\r
-                       display: inline-block;\r
-                       vertical-align: top;\r
-                       font-size: 14px;\r
-\r
-                       h3 {\r
-                               font-family: @montserrat;\r
-                               text-transform: uppercase;\r
-                               font-weight: 500;\r
-                               margin-bottom: 15px;\r
-                       }\r
-               }\r
-               img {\r
-                       display: inline-block;\r
-                       width: 50%;\r
-                       height: auto;\r
-                       vertical-align: top;\r
-               }\r
-               iframe{\r
-                       width: 50%;\r
-                       vertical-align: top;\r
-               }\r
-\r
-               @media @m1280 {\r
-                       &.ileft {\r
-                               .content {\r
-                                       padding: 0 0 0 4%;\r
-                               }\r
-                       }\r
-\r
-                       &.iright {\r
-                               .content {\r
-                                       padding: 0 4% 0 0;\r
-                               }\r
-                       }\r
-               }\r
-\r
-               @media @m900 {\r
-                       margin-top: 70px;\r
-\r
-                       .content {\r
-                               float: none !important;\r
-                               width: 100%;\r
-                               padding: 0 !important;\r
-                               display: block;\r
-                               margin-top: 20px;\r
-                       }\r
-\r
-                       img {\r
-                               float: none !important;\r
-                               width: 100%;\r
-                               height: auto;\r
-                               display: block;\r
-                       }\r
-\r
-               }\r
-\r
-               &.ileft {\r
-                       .content {\r
-                               float: right;\r
-                       }\r
-                       img {\r
-                               float: left;\r
-                       }\r
-\r
-               }\r
-\r
-               &.iright {\r
-                       .content {\r
-                               float: left;\r
-                       }\r
-                       img {\r
-                               float: right;\r
-                       }\r
-               }\r
-       }\r
+  padding-top: 0;\r
+  color: @color-text;\r
+\r
+  article {\r
+    width: 100%;\r
+    margin-top: 110px;\r
+\r
+    &:first-child {\r
+      margin-top: 0;\r
+    }\r
+\r
+    .content {\r
+      width: 50%;\r
+      padding: 8% 10% 0;\r
+      display: inline-block;\r
+      vertical-align: top;\r
+      font-size: 14px;\r
+\r
+      h3 {\r
+        font-family: @montserrat;\r
+        text-transform: uppercase;\r
+        font-weight: 500;\r
+        margin-bottom: 15px;\r
+      }\r
+    }\r
+\r
+    img {\r
+      display: inline-block;\r
+      width: 50%;\r
+      height: auto;\r
+      vertical-align: top;\r
+    }\r
+\r
+    .animationSuperWrapper {\r
+      width: 50%;\r
+      vertical-align: top;\r
+    }\r
+\r
+    @media @m1280 {\r
+      &.ileft {\r
+        .content {\r
+          padding: 0 0 0 4%;\r
+        }\r
+      }\r
+\r
+      &.iright {\r
+        .content {\r
+          padding: 0 4% 0 0;\r
+        }\r
+      }\r
+    }\r
+\r
+    @media @m900 {\r
+      margin-top: 70px;\r
+\r
+      .content {\r
+        float: none !important;\r
+        width: 100%;\r
+        padding: 0 !important;\r
+        display: block;\r
+        margin-top: 20px;\r
+      }\r
+\r
+      img {\r
+        float: none !important;\r
+        width: 100%;\r
+        height: auto;\r
+        display: block;\r
+      }\r
+\r
+      .animationSuperWrapper {\r
+        float: none !important;\r
+        width: 100%;\r
+      }\r
+\r
+    }\r
+\r
+    &.ileft {\r
+      .content {\r
+        float: right;\r
+      }\r
+\r
+      img, .animationSuperWrapper {\r
+        float: left;\r
+      }\r
+\r
+    }\r
+\r
+    &.iright {\r
+      .content {\r
+        float: left;\r
+      }\r
+\r
+      img, .animationSuperWrapper {\r
+        float: right;\r
+      }\r
+    }\r
+  }\r
 }
\ No newline at end of file