Home slideshow

diff --git a/framework/application/forms/CMS/Sub/Home/Slideshow/Slide.php b/framework/application/forms/CMS/Sub/Home/Slideshow/Slide.php
index b0129facb4871489eb3d4f11d4d0545e59efa3db..585c5082245eb53da774ab6843f3186febcc4b7d 100644 (file)
--- a/framework/application/forms/CMS/Sub/Home/Slideshow/Slide.php
+++ b/framework/application/forms/CMS/Sub/Home/Slideshow/Slide.php
@@ -10,16 +10,6 @@ class Cubedesigners_Form_CMS_Sub_Home_Slideshow_Slide extends CubeIT_Form_SubFor
                $image->setMaxItems(1);
                $this->addElement($image);
 
-               $fond = new CubeIT_Form_Element_File_Image('background');
-               $fond->setLabel('Image de fond');
-               $fond->setMaxItems(1);
-               $this->addElement($fond);
-
-               $mask = new CubeIT_Form_Element_File_Image('mask');
-               $mask->setLabel('Masque');
-               $mask->setMaxItems(1);
-               $this->addElement($mask);
-
                $legend = new CubeIT_Form_Element_Markitup('legende');
                $legend->setLabel('Legende');
                $this->addElement($legend);
@@ -33,6 +23,4 @@ class Cubedesigners_Form_CMS_Sub_Home_Slideshow_Slide extends CubeIT_Form_SubFor
                $this->addSubForm($link, 'lien');
        }
 
-}
-
-?>
+}
\ No newline at end of file

diff --git a/framework/application/views/helpers/HomeSlideshow.php b/framework/application/views/helpers/HomeSlideshow.php
index 79c3bc5aaf1e565ce4f514ca5081023a949b615b..04645a27aa1fe11b4fc307df46ef8ef904edb41e 100644 (file)
--- a/framework/application/views/helpers/HomeSlideshow.php
+++ b/framework/application/views/helpers/HomeSlideshow.php
@@ -16,32 +16,22 @@ class Cubedesigners_View_Helper_HomeSlideshow extends CubeIT_View_Helper_Abstrac
                $s = '';
 
                foreach ($slides as $id => $slide) {
-                       if (null !== $slide['mask']) {
-                               $image = $this->view->imageMasked($slide['image'], $slide['mask']);
-                               $d = CubeIT_View_Helper_Image::$lastDimensions;
-                       } else {
-                               $image = $this->view->imageCms($slide['image']);
-                       }
-                       $offset = $d[1] - 572;
-
-
+                       $image = $this->view->imageCms($slide['image']);
                        if (!$slide['time']) {
                                $time = 300000;
                        } else {
                                $time = $slide['time'] * 1000;
                        }
+
+                       $attributes['style'] = 'background-image:url("/images/slideshow/pattern.png"),url("' . CubeIT_View_Helper_ImageCms::getPath($slide['image']) . '");';
                        $attributes['data-time'] = $time;
                        $attributes['class'] = 'slide';
-                       $attributes['style'] = 'background-image:url(' . CubeIT_View_Helper_ImageCms::getPath($slide['background']) . ');';
-                       $imgHolder = $this->view->htmlElement($image, 'div', array('class' => 'imgholder'));
-                       $mask = $this->htmlElement($imgHolder, 'div', array('data-overlap' => $offset, 'class' => 'masque', 'style' => 'top:-' . $offset . 'px;height:' . (572 + $offset) . 'px;'));
-
                        $link = $slide['lien'];
                        $link['label'] = $this->markupDotclear($slide['legende']);
-                       $s .= $this->view->htmlElement($mask . $this->view->linkCMS($link), 'div', $attributes);
+                       $s .= $this->view->htmlElement($this->view->linkCMS($link), 'div', $attributes);
                }
 
-               $options = array('arrows' => true, 'arrowspermanent' => true, 'autoMode' => true, 'transitionType' => 'slide', 'baseHeight' => 572, 'responsive' => true);
+               $options = array('arrows' => false, 'arrowspermanent' => false, 'autoMode' => true, 'transitionType' => 'slide', 'baseHeight' => 836, 'responsive' => true);
                $res .= $this->htmlElement($s, 'div', array('class' => 'slides slideshow', 'data-options' => $options));
 
                $res .= '</div>';

diff --git a/framework/application/views/scripts/common/content.phtml b/framework/application/views/scripts/common/content.phtml
index 6ccce67cea157aa264b813af59e40bc261429ff4..edde11ca954572759d80013c8e420891a208b45b 100644 (file)
--- a/framework/application/views/scripts/common/content.phtml
+++ b/framework/application/views/scripts/common/content.phtml
@@ -8,8 +8,8 @@ foreach ($feeds as $feed) {
 }
 
 $content = $this->layout()->content . "\n";
-echo $this->render('common/header.phtml');
 echo '<div id="wrapper">';
+echo $this->render('common/header.phtml');
 if ($this->beforeMain) {
        echo $this->beforeMain;
 }

diff --git a/framework/application/views/scripts/common/header.phtml b/framework/application/views/scripts/common/header.phtml
index 3f2698a4119691dad5296535b9d207508da159f8..5f1deecdb8b99ae347fabc1fc9cb441218581192 100644 (file)
--- a/framework/application/views/scripts/common/header.phtml
+++ b/framework/application/views/scripts/common/header.phtml
@@ -8,10 +8,10 @@ if (!is_null($homepage)) {
 }
 ?>
 <header>
-    <div id="header" class="content">
+       <div id="header" class="content">
                <?php
                /* LOGO */
-               echo $this->link($this->image('/images/logo.svg', '', 318, 132), $home, array('class' => 'logo'));
+               echo $this->link($this->image('/images/logo.svg', "Cubedesigners Logo"), $home, array('class' => 'logo'));
                if ($this->currentPage && $this->currentPage->getTemplate() == 'home') {
                        echo '<div class="sublogo"><h1>' . $this->cmsValue('logoTitle') . '</h1><h2>' . $this->cmsValue('baseline') . '</h2></div>';
                } else {
@@ -19,11 +19,11 @@ if (!is_null($homepage)) {
                }
                /* NAVIGATION */
                $mainMenu = $this->navigation()->findOneById($this->localeDefault() . '/' . CubeIT_Navigation::MAIN);
-//             echo '<a href="#menu" class="menu-link">&#9776;</a>';
+               //              echo '<a href="#menu" class="menu-link">&#9776;</a>';
                echo '<div class="nav-icon"><div></div></div>';
-        echo '<nav id="menu" role="navigation">';
-        echo $this->navigation()->menu()->renderMenu($mainMenu, array('maxDepth' => 0)) . "\n";
-        echo '</nav>';
+               echo '<nav id="menu" role="navigation">';
+               echo $this->navigation()->menu()->renderMenu($mainMenu, array('maxDepth' => 0)) . "\n";
+               echo '</nav>';
                ?>
-    </div>
+       </div>
 </header>
\ No newline at end of file

diff --git a/images/logo.svg b/images/logo.svg
index a5710f6150414676eab7ac3ca5f9377770144be4..61e78f025aa6a867f72776a59e7025aed3928b00 100644 (file)
--- a/images/logo.svg
+++ b/images/logo.svg
@@ -1,62 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>\r
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<!-- Generator: Adobe Illustrator 19.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
 <svg version="1.0" id="Isolation_Mode" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"\r
-        y="0px" viewBox="0 0 387.5 88.6" enable-background="new 0 0 387.5 88.6" xml:space="preserve">\r
+        y="0px" viewBox="-111.3 440.8 264.3 60.5" style="enable-background:new -111.3 440.8 264.3 60.5;" xml:space="preserve">\r
+<style type="text/css">\r
+       .st0{fill:#FFFFFF;}\r
+       .st1{fill:#FFFFFF;stroke:#FFFFFF;stroke-width:0.5;stroke-miterlimit:10;}\r
+</style>\r
 <g>\r
        <g>\r
                <g>\r
                        <g>\r
                                <g>\r
-                                       <path fill="#FFFFFF" d="M125,33.4v20c0,1.7,0.9,2.4,2.5,2.4c1.9,0,6-1.2,8.8-2.6V33.4h4.5v26.1h-3.6l-0.4-2.3\r
-                                               c-2.9,1.4-7.4,2.8-10.5,2.8c-4.2,0-5.7-2.6-5.7-6.7v-20H125z"/>\r
-                                       <path fill="#FFFFFF" d="M167.2,50.3c0,6-2.1,9.8-11.1,9.8c-2.4,0-6.3-0.3-9.3-1V22.8l4.5-0.6v12.6c1.8-1,4.9-1.8,8.3-1.8\r
-                                               c5.4,0,7.7,3.2,7.7,8.2V50.3z M151.2,55.8c1.8,0.3,3.5,0.4,5.2,0.4c5.3,0,6.3-2.1,6.3-5.6v-9.6c0-2.7-1.2-4-4.2-4\r
-                                               c-2.3,0-5.4,1.1-7.2,2V55.8z"/>\r
-                                       <path fill="#FFFFFF" d="M182.1,56.2c2.6,0,5.4-0.5,8.3-1.2l0.6,3.6c-2.5,0.9-6,1.5-9.2,1.5c-7.7,0-10.4-3.7-10.4-9.6v-7.8\r
-                                               c0-5.4,2.5-9.8,10.3-9.8c7.7,0,9.8,4.5,9.8,9.9v5.5h-15.6v2.2C175.9,54.6,177,56.2,182.1,56.2z M175.9,44.5h11.2v-2.1\r
-                                               c0-3.6-1.2-5.7-5.5-5.7c-4.2,0-5.8,2-5.8,5.7V44.5z"/>\r
-                                       <path fill="#FFFFFF" d="M197.6,41.4c0-5.2,2.4-8.5,8.5-8.5c2.3,0,5.4,0.4,7.5,0.8V22.8l4.5-0.6v37.5h-3.8l-0.4-2.4\r
-                                               c-2.1,1.7-5.2,2.9-8.6,2.9c-5.1,0-7.6-2.7-7.6-8V41.4z M213.5,37.7c-2.4-0.5-5.4-0.8-7.2-0.8c-3,0-4.2,1.4-4.2,4.6v10.7\r
-                                               c0,2.7,0.9,4,4,4c2.6,0,5.5-1.4,7.4-3.1V37.7z"/>\r
-                                       <path fill="#FFFFFF" d="M234.1,56.2c2.6,0,5.4-0.5,8.3-1.2l0.6,3.6c-2.5,0.9-6,1.5-9.2,1.5c-7.7,0-10.4-3.7-10.4-9.6v-7.8\r
-                                               c0-5.4,2.5-9.8,10.3-9.8c7.7,0,9.8,4.5,9.8,9.9v5.5h-15.6v2.2C227.9,54.6,229,56.2,234.1,56.2z M227.9,44.5h11.2v-2.1\r
-                                               c0-3.6-1.2-5.7-5.5-5.7c-4.2,0-5.7,2-5.7,5.7V44.5z"/>\r
-                                       <path fill="#FFFFFF" d="M255.9,60.1c-2.7,0-6.2-0.6-8.3-1.4l0.6-3.5c2.3,0.6,5.2,1.1,7.5,1.1c4.1,0,4.8-0.7,4.8-3.5\r
-                                               c0-2.8-0.2-3.1-5.5-4.4c-6.5-1.6-7.1-3-7.1-8.4c0-4.8,2.1-7,9-7c2.5,0,5.3,0.3,7.4,0.9l-0.3,3.7c-2.2-0.4-5.1-0.8-7.2-0.8\r
-                                               c-3.9,0-4.4,0.9-4.4,3.3c0,2.9,0.1,3.4,4.5,4.5c7.5,1.9,8.1,2.8,8.1,8C264.9,57.6,263.4,60.1,255.9,60.1z"/>\r
-                                       <path fill="#FFFFFF" d="M270.3,29.2v-6.5h4.5v6.5H270.3z M270.3,59.6V33.4h4.5v26.1H270.3z"/>\r
-                                       <path fill="#FFFFFF" d="M321.8,59.6v-20c0-1.7-0.9-2.4-2.5-2.4c-1.9,0-6,1.2-8.8,2.6v19.8H306V33.4h3.7l0.4,2.3\r
-                                               c2.9-1.4,7.4-2.8,10.5-2.8c4.2,0,5.7,2.6,5.7,6.6v20H321.8z"/>\r
-                                       <path fill="#FFFFFF" d="M342.1,56.2c2.6,0,5.4-0.5,8.3-1.2l0.6,3.6c-2.5,0.9-6,1.5-9.2,1.5c-7.7,0-10.4-3.7-10.4-9.6v-7.8\r
-                                               c0-5.4,2.5-9.8,10.3-9.8c7.7,0,9.8,4.5,9.8,9.9v5.5h-15.6v2.2C335.9,54.6,337,56.2,342.1,56.2z M335.9,44.5h11.2v-2.1\r
-                                               c0-3.6-1.2-5.7-5.5-5.7c-4.2,0-5.7,2-5.7,5.7V44.5z"/>\r
-                                       <path fill="#FFFFFF" d="M368.6,37c-2.5,1.2-5.3,3-7.5,4.5v18h-4.5V33.4h3.9l0.3,3.6c1.9-1.5,4.6-3.1,7.2-4.2L368.6,37z"/>\r
-                                       <path fill="#FFFFFF" d="M378.5,60.1c-2.7,0-6.2-0.6-8.3-1.4l0.6-3.5c2.3,0.6,5.2,1.1,7.5,1.1c4.1,0,4.8-0.7,4.8-3.5\r
-                                               c0-2.8-0.2-3.1-5.5-4.4c-6.5-1.6-7.1-3-7.1-8.4c0-4.8,2.2-7,9-7c2.5,0,5.3,0.3,7.4,0.9l-0.3,3.7c-2.2-0.4-5.1-0.8-7.2-0.8\r
-                                               c-3.9,0-4.4,0.9-4.4,3.3c0,2.9,0.1,3.4,4.4,4.5c7.5,1.9,8.1,2.8,8.1,8C387.5,57.6,386,60.1,378.5,60.1z"/>\r
-                                       <path fill="#FFFFFF" d="M283.3,50.4c-1.4,1.1-2.5,2.7-2.5,4.6c0,2.4,1.2,4.5,5.1,4.8c3.1,0.3,4,0.4,6.9,0.6\r
-                                               c3.1,0.3,3.9,0.6,3.9,2.8c0,0.4,0,0.7-0.1,1h4.2c0-0.4,0-0.8,0-1.2c0-4-1.8-5.8-6.5-6.3c-3.3-0.3-4.7-0.5-7.4-0.8\r
-                                               c-1.2-0.1-1.7-0.5-1.7-1.5c0-1.1,1-2,1.9-2.8c0.8,0.1,1.7,0.2,2.7,0.2c6.8,0,10.3-3.3,10.3-8.9v-1.2c-0.1-2-0.5-3.9-1.5-5.2\r
-                                               l3.1-0.6v-2.6h-7.5c-1.2-0.4-3.1-0.5-4.4-0.5c-7.5,0-10.2,3.3-10.2,9V43C279.7,46.5,280.9,49.1,283.3,50.4z M283.9,41.9\r
-                                               c0-3.9,1.6-5.3,6-5.3c4.3,0,6,1.5,6,5.3V43c0,3.4-1.7,5.2-6,5.2c-4.3,0-6-1.2-6-5.2V41.9z"/>\r
+                                       <path class="st0" d="M-26,463.6v13.6c0,1.2,0.6,1.6,1.7,1.6c1.3,0,4.1-0.8,6-1.8v-13.5h3.1v17.8h-2.5l-0.3-1.6\r
+                                               c-2,1-5,1.9-7.2,1.9c-2.9,0-3.9-1.8-3.9-4.6v-13.6L-26,463.6L-26,463.6z"/>\r
+                                       <path class="st0" d="M2.8,475.1c0,4.1-1.4,6.7-7.6,6.7c-1.6,0-4.3-0.2-6.3-0.7v-24.7L-8,456v8.6c1.2-0.7,3.3-1.2,5.7-1.2\r
+                                               c3.7,0,5.2,2.2,5.2,5.6L2.8,475.1L2.8,475.1z M-8.1,478.9c1.2,0.2,2.4,0.3,3.5,0.3c3.6,0,4.3-1.4,4.3-3.8v-6.5\r
+                                               c0-1.8-0.8-2.7-2.9-2.7c-1.6,0-3.7,0.7-4.9,1.4L-8.1,478.9L-8.1,478.9z"/>\r
+                                       <path class="st0" d="M13,479.1c1.8,0,3.7-0.3,5.7-0.8l0.4,2.5c-1.7,0.6-4.1,1-6.3,1c-5.2,0-7.1-2.5-7.1-6.5v-5.3\r
+                                               c0-3.7,1.7-6.7,7-6.7c5.2,0,6.7,3.1,6.7,6.7v3.7H8.7v1.5C8.7,478,9.5,479.1,13,479.1z M8.7,471.2h7.6v-1.4\r
+                                               c0-2.5-0.8-3.9-3.7-3.9c-2.9,0-4,1.4-4,3.9L8.7,471.2L8.7,471.2z"/>\r
+                                       <path class="st0" d="M23.5,469c0-3.5,1.6-5.8,5.8-5.8c1.6,0,3.7,0.3,5.1,0.5v-7.4l3.1-0.4v25.6h-2.6l-0.3-1.6\r
+                                               c-1.4,1.2-3.5,2-5.9,2c-3.5,0-5.2-1.8-5.2-5.5L23.5,469L23.5,469z M34.4,466.5c-1.6-0.3-3.7-0.5-4.9-0.5c-2,0-2.9,1-2.9,3.1\r
+                                               v7.3c0,1.8,0.6,2.7,2.7,2.7c1.8,0,3.8-1,5-2.1V466.5z"/>\r
+                                       <path class="st0" d="M48.4,479.1c1.8,0,3.7-0.3,5.7-0.8l0.4,2.5c-1.7,0.6-4.1,1-6.3,1c-5.3,0-7.1-2.5-7.1-6.5v-5.3\r
+                                               c0-3.7,1.7-6.7,7-6.7c5.2,0,6.7,3.1,6.7,6.7v3.7H44.2v1.5C44.2,478,44.9,479.1,48.4,479.1z M44.2,471.2h7.6v-1.4\r
+                                               c0-2.5-0.8-3.9-3.8-3.9c-2.9,0-3.9,1.4-3.9,3.9V471.2z"/>\r
+                                       <path class="st0" d="M63.3,481.8c-1.8,0-4.2-0.4-5.7-1l0.4-2.4c1.6,0.4,3.5,0.7,5.1,0.7c2.8,0,3.3-0.5,3.3-2.4s-0.1-2.1-3.7-3\r
+                                               c-4.4-1.1-4.8-2-4.8-5.7c0-3.3,1.4-4.8,6.1-4.8c1.7,0,3.6,0.2,5,0.6l-0.2,2.5c-1.5-0.3-3.5-0.5-4.9-0.5c-2.7,0-3,0.6-3,2.2\r
+                                               c0,2,0.1,2.3,3.1,3.1c5.1,1.3,5.5,1.9,5.5,5.5C69.4,480.1,68.4,481.8,63.3,481.8z"/>\r
+                                       <path class="st0" d="M73.1,460.7v-4.4h3.1v4.4H73.1z M73.1,481.4v-17.9h3.1v17.8L73.1,481.4L73.1,481.4z"/>\r
+                                       <path class="st0" d="M108.2,481.4v-13.6c0-1.2-0.6-1.6-1.7-1.6c-1.3,0-4.1,0.8-6,1.8v13.5h-3.1v-17.9h2.5l0.3,1.6\r
+                                               c2-1,5-1.9,7.2-1.9c2.9,0,3.9,1.8,3.9,4.5v13.6L108.2,481.4L108.2,481.4z"/>\r
+                                       <path class="st0" d="M122,479.1c1.8,0,3.7-0.3,5.7-0.8l0.4,2.5c-1.7,0.6-4.1,1-6.3,1c-5.3,0-7.1-2.5-7.1-6.5v-5.3\r
+                                               c0-3.7,1.7-6.7,7-6.7c5.3,0,6.7,3.1,6.7,6.7v3.7h-10.6v1.5C117.8,478,118.6,479.1,122,479.1z M117.8,471.2h7.6v-1.4\r
+                                               c0-2.5-0.8-3.9-3.8-3.9c-2.9,0-3.9,1.4-3.9,3.9V471.2z"/>\r
+                                       <path class="st0" d="M140.1,466c-1.7,0.8-3.6,2-5.1,3.1v12.3h-3.1v-17.8h2.7l0.2,2.5c1.3-1,3.1-2.1,4.9-2.9L140.1,466z"/>\r
+                                       <path class="st0" d="M146.9,481.8c-1.8,0-4.2-0.4-5.7-1l0.4-2.4c1.6,0.4,3.5,0.7,5.1,0.7c2.8,0,3.3-0.5,3.3-2.4s-0.1-2.1-3.8-3\r
+                                               c-4.4-1.1-4.8-2-4.8-5.7c0-3.3,1.5-4.8,6.1-4.8c1.7,0,3.6,0.2,5,0.6l-0.2,2.5c-1.5-0.3-3.5-0.5-4.9-0.5c-2.7,0-3,0.6-3,2.2\r
+                                               c0,2,0.1,2.3,3,3.1c5.1,1.3,5.5,1.9,5.5,5.5C153,480.1,152,481.8,146.9,481.8z"/>\r
+                                       <path class="st0" d="M82,475.2c-1,0.7-1.7,1.8-1.7,3.1c0,1.6,0.8,3.1,3.5,3.3c2.1,0.2,2.7,0.3,4.7,0.4c2.1,0.2,2.7,0.4,2.7,1.9\r
+                                               c0,0.3,0,0.5-0.1,0.7h2.9c0-0.3,0-0.5,0-0.8c0-2.7-1.2-4-4.4-4.3c-2.2-0.2-3.2-0.3-5-0.5c-0.8-0.1-1.2-0.3-1.2-1\r
+                                               c0-0.7,0.7-1.4,1.3-1.9c0.5,0.1,1.2,0.1,1.8,0.1c4.6,0,7-2.2,7-6.1v-0.8c-0.1-1.4-0.3-2.7-1-3.5l2.1-0.4v-1.8h-5.1\r
+                                               c-0.8-0.3-2.1-0.3-3-0.3c-5.1,0-7,2.2-7,6.1v0.8C79.5,472.5,80.3,474.3,82,475.2z M82.4,469.4c0-2.7,1.1-3.6,4.1-3.6\r
+                                               c2.9,0,4.1,1,4.1,3.6v0.7c0,2.3-1.2,3.5-4.1,3.5s-4.1-0.8-4.1-3.5V469.4z"/>\r
                                </g>\r
                        </g>\r
                </g>\r
                <g>\r
-                       <path fill="#FFFFFF" d="M98.9,50.6v-8.3c0-6,2.3-9.5,10.5-9.5c2.3,0,4.9,0.4,6.3,0.8l-0.4,3.8c-2-0.4-3.9-0.6-5.8-0.6\r
-                               c-4.5,0-6,1.3-6,5.4v8.6c0,4.1,1.5,5.4,6,5.4c1.8,0,3.7-0.2,5.8-0.6l0.4,3.8c-1.3,0.4-4,0.8-6.3,0.8\r
-                               C100.9,60.1,98.9,56.6,98.9,50.6z"/>\r
+                       <path class="st0" d="M-43.8,475.3v-5.7c0-4.1,1.6-6.5,7.2-6.5c1.6,0,3.3,0.3,4.3,0.5l-0.3,2.6c-1.4-0.3-2.7-0.4-4-0.4\r
+                               c-3.1,0-4.1,0.9-4.1,3.7v5.9c0,2.8,1,3.7,4.1,3.7c1.2,0,2.5-0.1,4-0.4l0.3,2.6c-0.9,0.3-2.7,0.5-4.3,0.5\r
+                               C-42.4,481.8-43.8,479.4-43.8,475.3z"/>\r
                </g>\r
        </g>\r
        <g>\r
-               <path fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.5" stroke-miterlimit="10" d="M35.6,0.7c-1.7,0.9-28.8,16.2-33,18.6\r
-                       c-2,1.1-2.3,2.7-2.3,4.8c0,1.5,0,36.4,0,40.9c0,2.7,1.3,3.3,2.3,3.9c6.7,4.2,27.2,16.7,30.3,18.5c3.8,2.3,8-0.7,5.9-4.6\r
-                       C36.6,78.8,24,54.8,24,54.8c6-3.5,11.7-6.9,13.4-8c3.4-2,3.7-2.2,3.7-6.7c0-3,0-29.8,0-35.7C41.2,1,38.2-0.6,35.6,0.7z M35.7,84.4\r
-                       l-0.6,0.5L5.4,66.5c0,0,8.2-5.5,15.7-10L35.7,84.4z M3.7,63.2V22.8l33.5-19l0.6,0.4v38.1L3.7,63.2z"/>\r
-               <path fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.5" stroke-miterlimit="10" d="M49,87.8c1.7-0.9,28.8-16.2,33-18.6\r
-                       c2-1.1,2.3-2.7,2.3-4.8c0-1.5,0-36.4,0-40.9c0-2.7-1.3-3.3-2.3-3.9C75.4,15.4,54.9,2.9,51.8,1.1c-3.8-2.3-8,0.7-5.9,4.6\r
-                       C48,9.8,60.6,33.8,60.6,33.8c-6,3.5-11.7,6.9-13.4,8c-3.4,2-3.7,2.2-3.7,6.7c0,3,0,29.8,0,35.7C43.4,87.6,46.4,89.2,49,87.8z\r
-                        M48.9,4.2l0.6-0.5L79.2,22c0,0-8.2,5.5-15.7,10L48.9,4.2z M80.9,25.3v40.4l-33.5,19l-0.6-0.4V46.3L80.9,25.3z"/>\r
+               <path class="st1" d="M-86.9,441.3c-1.2,0.6-19.6,11-22.5,12.7c-1.4,0.7-1.6,1.8-1.6,3.3c0,1,0,24.8,0,27.9c0,1.8,0.9,2.2,1.6,2.7\r
+                       c4.6,2.9,18.5,11.4,20.7,12.6c2.6,1.6,5.5-0.5,4-3.1c-1.5-2.7-10.1-19.1-10.1-19.1c4.1-2.4,8-4.7,9.1-5.5c2.3-1.4,2.5-1.5,2.5-4.6\r
+                       c0-2,0-20.3,0-24.3C-83.1,441.5-85.2,440.4-86.9,441.3z M-86.9,498.3l-0.4,0.3l-20.3-12.5c0,0,5.6-3.7,10.7-6.8L-86.9,498.3z\r
+                        M-108.7,483.9v-27.5l22.8-12.9l0.4,0.3v26L-108.7,483.9z"/>\r
+               <path class="st1" d="M-77.8,500.7c1.2-0.6,19.6-11,22.5-12.7c1.4-0.7,1.6-1.8,1.6-3.3c0-1,0-24.8,0-27.9c0-1.8-0.9-2.2-1.6-2.7\r
+                       c-4.5-2.9-18.5-11.4-20.6-12.6c-2.6-1.6-5.5,0.5-4,3.1c1.4,2.8,10,19.1,10,19.1c-4.1,2.4-8,4.7-9.1,5.5c-2.3,1.4-2.5,1.5-2.5,4.6\r
+                       c0,2,0,20.3,0,24.3C-81.6,500.5-79.6,501.6-77.8,500.7z M-77.9,443.7l0.4-0.3l20.2,12.5c0,0-5.6,3.7-10.7,6.8L-77.9,443.7z\r
+                        M-56,458.1v27.5l-22.8,12.9l-0.4-0.3v-25.9L-56,458.1z"/>\r
        </g>\r
 </g>\r
 </svg>\r

diff --git a/images/slideshow/pattern.png b/images/slideshow/pattern.png
new file mode 100644 (file)
index 0000000..377cb37
Binary files /dev/null and b/images/slideshow/pattern.png differ

diff --git a/js/common.js b/js/common.js
index 37fb3f03b121e2f826c655a189507e76ca160c60..29d1ebec63bb0b5c9f8b88ec524865f7268591ae 100644 (file)
--- a/js/common.js
+++ b/js/common.js
@@ -1,8 +1,8 @@
 registerLoader(load_commons);
 
 function load_commons() {
-       $(window).on('cubeitresize', resize);
-       resize();
+    $(window).on('cubeitresize', resize);
+    resize();
 
     $(window).on('orientationchange', orientationchange);
     $(screen).on('orientationchange', orientationchange);
@@ -11,7 +11,7 @@ function load_commons() {
     var $menu = $('#menu'),
         $menulink = $('.nav-icon');
 
-    $menulink.click(function() {
+    $menulink.click(function () {
         $menulink.toggleClass('active');
         $menu.toggleClass('active');
         //$menulink.parent().toggleClass('menu-active');
@@ -19,7 +19,7 @@ function load_commons() {
     });
 
     // Fallback to display content in case web fonts haven't triggered the display yet
-    setTimeout(function() {
+    setTimeout(function () {
         $('html').addClass('wf-active');
     }, 4000);
 
@@ -27,24 +27,10 @@ function load_commons() {
 
 function resize() {
 
-    //var ww = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
-    //
-    //
-       //if (ww < 1040) {
-       //      $("html").addClass('small');
-       //} else {
-       //      $("html").removeClass('small');
-       //}
-
 }
 
 function orientationchange() {
-
-    //if( $("[name='viewport']").length==0){
-    //    $("head").append('<meta name="viewport" content="" />');
-    //}
-
-    if(Modernizr.mq('screen and (max-device-width: 530px)')) {
+    if (Modernizr.mq('screen and (max-device-width: 530px)')) {
         $("[name='viewport']").attr("content", "width=530");
     } else {
         $("[name='viewport']").attr("content", "width=device-width, initial-scale=1.0");

diff --git a/js/home.js b/js/home.js
new file mode 100644 (file)
index 0000000..182b193
--- /dev/null
+++ b/js/home.js
@@ -0,0 +1,27 @@
+registerLoader(load_home, true);\r
+\r
+function load_home() {\r
+    $(window).on('cubeitresize', resize_home);\r
+    $(document).on("beforechange afterchange", "#home-slideshow", resize_home);\r
+    resize_home();\r
+}\r
+\r
+function resize_home() {\r
+    $("#home-slideshow .slide").each(function () {\r
+        var c = $(this).find('.dotclear');\r
+        var sh = $(this).height();\r
+\r
+        $(c).children().show();\r
+        var ch = $(c).height();\r
+\r
+        var available = sh - 130;\r
+\r
+\r
+        if (ch > available) {\r
+            $(c).children().hide();\r
+            $(c).find('h1').show();\r
+            ch = $(c).height();\r
+        }\r
+        $(c).css({marginTop: (sh - ch) / 2});\r
+    });\r
+}
\ No newline at end of file

diff --git a/less/00-constants.less b/less/00-constants.less
index 28ddc07211d8ef370b14f3d56cf852ade73d317e..a0b5811834e9ec1a52926a008e28802509d3999b 100644 (file)
--- a/less/00-constants.less
+++ b/less/00-constants.less
@@ -5,35 +5,4 @@
 \r
 @yellow: #f6ae01;\r
 \r
-.media {\r
-       overflow: hidden;\r
-}\r
-\r
-.media--item {\r
-       float: left;\r
-       margin-right: 25px;\r
-}\r
-\r
-.media--body {\r
-       overflow: hidden;\r
-}\r
-\r
-.link(@color,@hovercolor) {\r
-       color: @color;\r
-       &:hover {\r
-               color: @hovercolor;\r
-       }\r
-}\r
-\r
-.button(@textcolor,@backgroundcolor,@hovercolor,@hoverbackgroundcolor) {\r
-       color: @textcolor !important;\r
-       background-color: @backgroundcolor !important;\r
-       &:hover {\r
-               color: @hovercolor !important;\r
-               background-color: @hoverbackgroundcolor !important;\r
-       }\r
-}\r
-\r
-.button(@textcolor,@backgroundcolor) {\r
-       .button(@textcolor, @backgroundcolor, #fff, @yellow);\r
-}
\ No newline at end of file
+@import "01-mixins";
\ No newline at end of file

diff --git a/less/01-mixins.less b/less/01-mixins.less
new file mode 100644 (file)
index 0000000..b85f859
--- /dev/null
+++ b/less/01-mixins.less
@@ -0,0 +1,114 @@
+.media {\r
+       overflow: hidden;\r
+}\r
+\r
+.media--item {\r
+       float: left;\r
+       margin-right: 25px;\r
+}\r
+\r
+.media--body {\r
+       overflow: hidden;\r
+}\r
+\r
+.link(@color,@hovercolor) {\r
+       color: @color;\r
+       &:hover {\r
+               color: @hovercolor;\r
+       }\r
+}\r
+\r
+.button(@textcolor,@backgroundcolor,@hovercolor,@hoverbackgroundcolor) {\r
+       color: @textcolor !important;\r
+       background-color: @backgroundcolor !important;\r
+       &:hover {\r
+               color: @hovercolor !important;\r
+               background-color: @hoverbackgroundcolor !important;\r
+       }\r
+}\r
+\r
+.button(@textcolor,@backgroundcolor) {\r
+       .button(@textcolor, @backgroundcolor, #fff, @yellow);\r
+}\r
+\r
+.content-center() {\r
+       max-width: 1048px; // = 980+(34*2) - Allow room for the 34px padding on each side\r
+       min-width: 530px; // Be careful of this setting and affecting the viewport initial-scale\r
+       padding-right: 34px;\r
+       padding-left: 34px;\r
+       margin: 0 auto;\r
+}\r
+\r
+.slideshowmixin() {\r
+\r
+       height: 572px;\r
+       position: relative;\r
+       width: 100%;\r
+       overflow: visible;\r
+\r
+       .slide {\r
+               position: absolute;\r
+               display: none;\r
+               background-repeat: repeat-x;\r
+               background-position: 0 100%;\r
+               width: 100%;\r
+               height: 572px;\r
+               overflow: visible;\r
+               .masque {\r
+                       width: 100%;\r
+                       position: relative;\r
+                       overflow: hidden;\r
+                       .imgholder {\r
+                               width: 1600px;\r
+                               height: 572px;\r
+                               position: relative;\r
+                               margin: 0 auto;\r
+                               overflow: visible;\r
+\r
+                               img, canvas {\r
+\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+       a {\r
+               margin: 0;\r
+               padding: 0;\r
+       }\r
+\r
+       .arrows {\r
+               position: absolute;\r
+               bottom: 18px;\r
+               display: block;\r
+               width: 77px;\r
+               height: 38px;\r
+               white-space: nowrap;\r
+               z-index: 3;\r
+               border: 30px solid transparent;\r
+               a {\r
+                       background-color: transparent;\r
+                       width: 37px;\r
+                       height: 38px;\r
+                       top: auto !important;\r
+                       display: inline-block;\r
+                       position: static;\r
+                       border-radius: 3px;\r
+\r
+                       //padding: 0 0 25px;\r
+                       &:hover {\r
+                               background-color: @yellow;\r
+                       }\r
+\r
+                       &.prev {\r
+                               background-image: url('/images/slideshow/arrows.png');\r
+                               background-position: 10px 8px;\r
+                               margin-right: 10px;\r
+                       }\r
+\r
+                       &.next {\r
+                               background-image: url('/images/slideshow/arrows.png');\r
+                               background-position: -26px 8px;\r
+                       }\r
+               }\r
+       }\r
+}
\ No newline at end of file

diff --git a/less/common.less b/less/common.less
index 718ed8f7b5b22d2e1a57151b056d740d74f74ea3..25f0f15fcf67ac42abe14c8b1309996a200153f8 100644 (file)
--- a/less/common.less
+++ b/less/common.less
@@ -16,11 +16,7 @@ img.responsive {
 }
 
 .content, .cubeit-content {
-       max-width: 1048px; // = 980+(34*2) - Allow room for the 34px padding on each side
-       min-width: 530px; // Be careful of this setting and affecting the viewport initial-scale
-       margin: 0 auto;
-       padding-right: 34px;
-       padding-left: 34px;
+       .content-center();
        position: relative;
 
 }

diff --git a/less/header.less b/less/header.less
index 22c4276bf4307cefde08afafd9933b5be90b3aba..0ec8af062577dbaaa2eb33059b06148079318d97 100644 (file)
--- a/less/header.less
+++ b/less/header.less
@@ -9,6 +9,7 @@ header {
        ul {
                text-transform: uppercase;
                font-family: @Klavika;
+               font-weight: 400;
                font-size: 16px;
                list-style: none;
 
@@ -43,10 +44,9 @@ header {
        }
 
        .logo {
-               width: 318px;
-               height: 132px;
+
                position: absolute;
-               top: 0;
+               top: 36px;
 
                &:hover {
                        .svg {

diff --git a/less/home.less b/less/home.less
index 4cbfec4ffcf8d36853f35c597469b58a674a0c80..2af0977b993d2c035e336d18e455256727126fca 100644 (file)
--- a/less/home.less
+++ b/less/home.less
@@ -1,5 +1,11 @@
 @import "00-constants";
 
+header {
+       background-color: transparent !important;
+       position: relative;
+       z-index: 4;
+}
+
 /* Home Title */
 .home-title {
        padding: 50px 0px 50px 0;
@@ -15,10 +21,61 @@
        }
 }
 
-#header {
-       min-height: 168px !important;
-}
-
 nav.active[role="navigation"] {
        padding-bottom: 50px !important;
+}
+
+/* Home Slideshow */
+#home-slideshow {
+       overflow: visible;
+       margin-top: -130px;
+       .slides-holder {
+               overflow: visible;
+               .slides {
+                       .slideshowmixin();
+                       .slide {
+                               background-repeat: repeat, no-repeat;
+                               background-size: auto, cover;
+                               background-position: 0 0, 50% 0;
+                               background-blend-mode: multiply;
+                               > div {
+
+                                       text-align: center;
+                                       color: #fff;
+                                       .content-center();
+                                       margin: 0 auto;
+
+                                       h1 {
+                                               font-size: 85px;
+                                               text-transform: none;
+                                               font-weight: 400;
+                                       }
+
+                                       h2 {
+                                               font-weight: 300;
+                                               text-transform: none;
+                                               font-size: 35px;
+                                       }
+
+                                       p {
+                                               margin: 45px 0 0 0;
+                                       }
+
+                                       img {
+                                               margin: 0 15px;
+                                       }
+                               }
+
+                               a {
+                                       display: block;
+                                       height: 100%;
+                                       left: 0;
+                                       position: absolute;
+                                       top: 0;
+                                       width: 100%;
+                                       opacity: 0;
+                               }
+                       }
+               }
+       }
 }
\ No newline at end of file

diff --git a/less/slideshow.less b/less/slideshow.less
index fdc2c0cf8baf2da2b87f3e580bdab7dedd21dbe8..64baf3a4f951acba26e36687449b1ca9e938dc53 100644 (file)
--- a/less/slideshow.less
+++ b/less/slideshow.less
@@ -1,29 +1,5 @@
 @import "00-constants";
 
-/* Home Slideshow */
-#home-slideshow {
-       overflow: visible;
-       .slides-holder {
-               overflow: visible;
-
-               .slides {
-                       .slideshowmixin();
-
-                       .slide {
-                               a {
-                                       display: block;
-                                       height: 100%;
-                                       left: 0;
-                                       position: absolute;
-                                       top: 0;
-                                       width: 100%;
-                                       opacity: 0;
-                               }
-                       }
-               }
-       }
-}
-
 .slideshowscroll {
        .slideshowmixin();
 
@@ -78,76 +54,3 @@
        float: right;
 }
 
-.slideshowmixin() {
-
-       height: 572px;
-       position: relative;
-       width: 100%;
-       overflow: visible;
-
-       .slide {
-               position: absolute;
-               display: none;
-               background-repeat: repeat-x;
-               background-position: 0 100%;
-               width: 100%;
-               height: 572px;
-               overflow: visible;
-               .masque {
-                       width: 100%;
-                       position: relative;
-                       overflow: hidden;
-                       .imgholder {
-                               width: 1600px;
-                               height: 572px;
-                               position: relative;
-                               margin: 0 auto;
-                               overflow: visible;
-
-                               img, canvas {
-
-                               }
-                       }
-               }
-       }
-       a {
-               margin: 0;
-               padding: 0;
-       }
-
-       .arrows {
-               position: absolute;
-               bottom: 18px;
-               display: block;
-               width: 77px;
-               height: 38px;
-               white-space: nowrap;
-               z-index: 3;
-               border: 30px solid transparent;
-               a {
-                       background-color: transparent;
-                       width: 37px;
-                       height: 38px;
-                       top: auto !important;
-                       display: inline-block;
-                       position: static;
-                       border-radius: 3px;
-
-                       //padding: 0 0 25px;
-                       &:hover {
-                               background-color: @yellow;
-                       }
-
-                       &.prev {
-                               background-image: url('../images/slideshow/arrows.png');
-                               background-position: 10px 8px;
-                               margin-right: 10px;
-                       }
-
-                       &.next {
-                               background-image: url('../images/slideshow/arrows.png');
-                               background-position: -26px 8px;
-                       }
-               }
-       }
-}
\ No newline at end of file