wip #532 @0.25

diff --git a/framework/application/views/helpers/ExemplePublication.php b/framework/application/views/helpers/ExemplePublication.php
index 17863136b33bd63653c4788467422df6b1f720bf..2dece31a06fa102fc9fe85de5fad1e6e71210062 100644 (file)
--- a/framework/application/views/helpers/ExemplePublication.php
+++ b/framework/application/views/helpers/ExemplePublication.php
@@ -24,9 +24,9 @@ class Fluidbook_View_Helper_ExemplePublication extends CubeIT_View_Helper_Abstra
 \r
                $backgrounds = array();\r
                //              $backgrounds[] = array('image' => '/images/exemples/publications/shadow.png', 'size' => '100% 10%', 'position' => '0 95%', 'blendmode' => null);\r
-               $backgrounds[] = array('image' => $left['url'], 'size' => '50% 100%', 'position' => '0 0', 'blendmode' => null);\r
+               $backgrounds[] = array('image' => $left['url'], 'size' => '50% 100%', 'position' => '0 0', 'blendmode' => 'normal');\r
                $backgrounds[] = array('image' => $right['url'], 'size' => '50% 100%', 'position' => '100% 0', 'blendmode' => 'normal');\r
-               $backgrounds[] = array('image' => '/images/exemples/publications/light.png', 'size' => '30% 100%', 'position' => '50% 0', 'blendmode' => 'overlay');\r
+               $backgrounds[] = array('image' => '/images/exemples/publications/light.png', 'size' => '30% 100%', 'position' => '50% 0', 'blendmode' => 'soft-light');\r
                $backgrounds[] = array('image' => '/images/exemples/publications/dark.png', 'size' => '20% 100%', 'position' => '50% 0', 'blendmode' => 'multiply');\r
 \r
 \r

diff --git a/js/220-exemples.js b/js/220-exemples.js
index f74b7b8adb73759b4b581a759982aefdcaf8d769..ed7c72a4d7db0f5ab18f6d5f34fca653e0c4effa 100644 (file)
--- a/js/220-exemples.js
+++ b/js/220-exemples.js
@@ -34,12 +34,15 @@ function resizeExemples() {
 \r
         var s = Math.min(cw / w, ch / h);\r
 \r
+        var ratio = w / h;\r
+\r
         w *= s;\r
-        h *= s;\r
+        w = Math.round(w / 2) * 2;\r
+        h = w / ratio;\r
 \r
         var left = ((cw / 0.8) - w) / 2;\r
 \r
 \r
-        $(this).css({width: w, height: h, left: left,fontSize:(w/600)*10});\r
+        $(this).css({width: w, height: h, left: left, fontSize: (w / 600) * 10});\r
     });\r
 }\r

diff --git a/less/220-exemples.less b/less/220-exemples.less
index d09446c11b239c96ad176e600b25fab1db77dda6..1bc1bdd1a3a0b3cade36e78efc26552e30c5e425 100644 (file)
--- a/less/220-exemples.less
+++ b/less/220-exemples.less
@@ -95,6 +95,7 @@
        transform-origin: 0 0;\r
        margin: 0 auto;\r
        bottom: 10%;\r
+       background-color: #dddddd;\r
 \r
        .shadow {\r
                background-image: url("/images/exemples/publications/shadow.png");\r