From 87cc4575d7107a74b59e877b0e909c8a8e9a726c Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 5 Jul 2016 14:20:08 +0000 Subject: [PATCH] wip #532 @0.25 --- framework/application/views/helpers/ExemplePublication.php | 4 ++-- js/220-exemples.js | 7 +++++-- less/220-exemples.less | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/framework/application/views/helpers/ExemplePublication.php b/framework/application/views/helpers/ExemplePublication.php index 1786313..2dece31 100644 --- 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 $backgrounds = array(); // $backgrounds[] = array('image' => '/images/exemples/publications/shadow.png', 'size' => '100% 10%', 'position' => '0 95%', 'blendmode' => null); - $backgrounds[] = array('image' => $left['url'], 'size' => '50% 100%', 'position' => '0 0', 'blendmode' => null); + $backgrounds[] = array('image' => $left['url'], 'size' => '50% 100%', 'position' => '0 0', 'blendmode' => 'normal'); $backgrounds[] = array('image' => $right['url'], 'size' => '50% 100%', 'position' => '100% 0', 'blendmode' => 'normal'); - $backgrounds[] = array('image' => '/images/exemples/publications/light.png', 'size' => '30% 100%', 'position' => '50% 0', 'blendmode' => 'overlay'); + $backgrounds[] = array('image' => '/images/exemples/publications/light.png', 'size' => '30% 100%', 'position' => '50% 0', 'blendmode' => 'soft-light'); $backgrounds[] = array('image' => '/images/exemples/publications/dark.png', 'size' => '20% 100%', 'position' => '50% 0', 'blendmode' => 'multiply'); diff --git a/js/220-exemples.js b/js/220-exemples.js index f74b7b8..ed7c72a 100644 --- a/js/220-exemples.js +++ b/js/220-exemples.js @@ -34,12 +34,15 @@ function resizeExemples() { var s = Math.min(cw / w, ch / h); + var ratio = w / h; + w *= s; - h *= s; + w = Math.round(w / 2) * 2; + h = w / ratio; var left = ((cw / 0.8) - w) / 2; - $(this).css({width: w, height: h, left: left,fontSize:(w/600)*10}); + $(this).css({width: w, height: h, left: left, fontSize: (w / 600) * 10}); }); } diff --git a/less/220-exemples.less b/less/220-exemples.less index d09446c..1bc1bdd 100644 --- a/less/220-exemples.less +++ b/less/220-exemples.less @@ -95,6 +95,7 @@ transform-origin: 0 0; margin: 0 auto; bottom: 10%; + background-color: #dddddd; .shadow { background-image: url("/images/exemples/publications/shadow.png"); -- 2.39.5