]> _ Git - cubedesigners-v7.git/commitdiff
Adjust home page, case studies, portfolio, and expertise / client pages plus many...
authorstephen@cubedesigners.com <stephen@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Fri, 28 Aug 2015 09:12:11 +0000 (09:12 +0000)
committerstephen@cubedesigners.com <stephen@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Fri, 28 Aug 2015 09:12:11 +0000 (09:12 +0000)
26 files changed:
framework/application/forms/CMS/Expertises.php
framework/application/forms/CMS/Sub/ExpertiseCategories.php
framework/application/forms/CMS/Sub/Home/Agence/Bloc.php
framework/application/forms/CMS/Sub/Home/Clients/Bloc.php
framework/application/forms/CMS/Sub/Home/Expertises/Bloc.php
framework/application/views/helpers/CasestudiesList.php
framework/application/views/helpers/FooterContact.php
framework/application/views/helpers/HomeBlocs.php
framework/application/views/helpers/HomeSlideshow.php
framework/application/views/helpers/Liste.php
framework/application/views/helpers/RealisationsList.php
framework/application/views/scripts/templates/casestudies.phtml
framework/application/views/scripts/templates/expertise.phtml
framework/application/views/scripts/templates/expertises.phtml
framework/application/views/scripts/templates/home.phtml
framework/application/views/scripts/templates/realisations.phtml
js/header.js
less/casestudies.less
less/common.less
less/expertises.less
less/footer.less
less/header.less
less/home.less
less/list.less
less/realisations.less
less/twocols.less

index 5d5002f9ebd3ed09de84ab655de0d288f66cfcce..42aecfa3f5c6d50ff226ee9bb803135b98ef27c2 100644 (file)
@@ -11,6 +11,10 @@ class Cubedesigners_Form_CMS_Expertises extends Cubedesigners_Form_CMS_Twocolumn
                $citation->setAttrib('rows', 3);
                $this->addElement($citation);
 
+               $citation_author = new Zend_Form_Element_Text('citation_author');
+               $citation_author->setLabel('Citation Author');
+               $this->addElement($citation_author);
+
                $expertises = new Cubedesigners_Form_CMS_Sub_Home_Expertises();
                $expertises->setLegend('Domaines d\'expertises');
                $this->addSubForm($expertises, 'expertises');
index 837ddcdb12746abc3f02149e0bb830bbef27d240..183358f9f0c5ca7befe289c302505ed6a8beef2c 100644 (file)
@@ -6,7 +6,7 @@ class Cubedesigners_Form_CMS_Sub_ExpertiseCategories extends CubeIT_Form_SubForm
         parent::init();
 
         $titre = new Zend_Form_Element_Text('title');
-        $titre->setLabel('Expertise Titre');
+        $titre->setLabel('Case Studies sous-titre');
         $this->addElementLocalized($titre);
 
         $categories = new Cubedesigners_Form_Element_CategoriesCheckboxes('categories');
index 39c0f0e94aa9606501d88e01d9afa475de77732c..7e6b85991374fe4c3efce019a5541c1b51ab00cb 100644 (file)
@@ -9,6 +9,10 @@ class Cubedesigners_Form_CMS_Sub_Home_Agence_Bloc extends CubeIT_Form_SubForm {
         $titre->setLabel('Titre du bloc');
         $this->addElement($titre);
 
+        $page = new CubeIT_Form_Element_Page('lien');
+        $page->setLabel('Lien vers');
+        $this->addElement($page);
+
         $texte = new CubeIT_Form_Element_Markitup_Basic('texte');
         $texte->setLabel('Texte');
         $this->addElement($texte);
index ca99f4e81cd3744a6db6a43e17fc7f2e3ae7756f..e9a360ddae383e882bc4dcd7f22d4115b2239d15 100755 (executable)
@@ -9,6 +9,10 @@ class Cubedesigners_Form_CMS_Sub_Home_Clients_Bloc extends CubeIT_Form_SubForm {
         $titre->setLabel('Titre du bloc');
         $this->addElement($titre);
 
+        $page = new CubeIT_Form_Element_Page('lien');
+        $page->setLabel('Lien vers');
+        $this->addElement($page);
+
         $texte = new CubeIT_Form_Element_Markitup_Basic('texte');
         $texte->setLabel('Texte');
         $this->addElement($texte);
index 4a8752225733bd9f2fd6f4fa52a326030a075c7d..05d71aeb5f092f25920530e6126cb8a4695a77a6 100644 (file)
@@ -9,6 +9,10 @@ class Cubedesigners_Form_CMS_Sub_Home_Expertises_Bloc extends CubeIT_Form_SubFor
                $titre->setLabel('Titre du bloc');
                $this->addElement($titre);
 
+        $page = new CubeIT_Form_Element_Page('lien');
+        $page->setLabel('Lien vers');
+        $this->addElement($page);
+
                $texte = new CubeIT_Form_Element_Markitup_Basic('texte');
                $texte->setLabel('Texte');
                $this->addElement($texte);
@@ -17,10 +21,6 @@ class Cubedesigners_Form_CMS_Sub_Home_Expertises_Bloc extends CubeIT_Form_SubFor
                $picto->setLabel('Pictogramme');
                $picto->setMaxItems(1);
                $this->addElement($picto);
-
-               $page = new CubeIT_Form_Element_Page('lien');
-               $page->setLabel('Lien vers');
-               $this->addElement($page);
        }
 
 }
index 09b5ce8afc4d4a5249e1fdd08f915c9004eb0183..35a93c48710900ca14d4a9c84b55116dde3ea159 100644 (file)
@@ -152,10 +152,13 @@ class Cubedesigners_View_Helper_CasestudiesList extends CubeIT_View_Helper_Abstr
                  $addOffline = 'data-offline="1"';
                  } */
 
-               $image = $this->view->imageProcess($s->visuel, $s->titre, 318, 318);
-               $url = Cubedesigners_Util::generateAutoUri($s, $this->_datas['seourl_stu']);
+        // Max display size is 318 but we over-sample the size by 20% because there is a CSS scale effect on hover
+        $image = $this->view->imageProcess($s->visuel, $s->titre, 382, 382);
+        $url = Cubedesigners_Util::generateAutoUri($s, $this->_datas['seourl_stu']);
 
-               $c = $image;
+        $c = '<div class="img-wrapper">';
+        $c.= $image;
+        $c.= '</div>';
                $c.= '<h2>' . $s->titre . '</h2>';
                $c.='<h3>' . $s->description . '</h3>';
 
index c02f8009ab7f9ed6005d69fcf2476257eedfcb7c..fca2e596a2c9a79acce04f270cd2421c18707173 100644 (file)
@@ -18,7 +18,7 @@ class Cubedesigners_View_Helper_FooterContact extends Zend_View_Helper_Abstract
 
                        $res.='<div class="numeros">';
                        $res.='<p itemprop="telephone">' . __('Tel') . ' ' . $this->view->linkPhone($bureau['coordonnees']['tel']) . '</p>';
-                       $res.='<p itemprop="faxNumber">' . __('Fax') . ' ' . $this->view->linkPhone($bureau['coordonnees']['fax']) . '</p>';
+                       //$res.='<p itemprop="faxNumber">' . __('Fax') . ' ' . $this->view->linkPhone($bureau['coordonnees']['fax']) . '</p>';
                        $res.='</div>';
 
                        //$res.= $this->view->microdataPlace($bureau['coordonnees']['adresse']);
index d3ec6bfc9433f92e84d167aabb04c27141403e0e..f9ba244e8bd1bf5d0eb6f91d2182af9da14a53dc 100644 (file)
@@ -15,11 +15,17 @@ class Cubedesigners_View_Helper_HomeBlocs extends Zend_View_Helper_Abstract {
 //                             }
 //                     }
                        $image = $this->view->imageCms($bloc['picto'], $bloc['titre'], 120, 120);
+
+            if(!empty($bloc['lien'])) {
+                $image = $this->view->linkInternal($image, $bloc['lien']);
+            }
+
                        $res .= '<article class="sousbloc">';
                        $res.= $image;
 
                        $res.= '<div class="text">';
-                       $res.= '<h3>' . $bloc['titre'] . '</h3>';
+            $titre = !empty($bloc['lien']) ? $this->view->linkInternal($bloc['titre'], $bloc['lien']) : $bloc['titre'];
+                       $res.= '<h3>' . $titre . '</h3>';
                        $res.=$this->view->markupDotclear($bloc['texte']);
                        if ($displayDetailsButton && isset($bloc['lien']) && $bloc['lien']) {
                                $res.=$this->view->linkInternal(__('En savoir plus'), $bloc['lien'], array('class' => 'but'));
index 04645a27aa1fe11b4fc307df46ef8ef904edb41e..dcfe2c78f2fe492d4d7a9e897e9ad4a90427f91f 100644 (file)
@@ -23,7 +23,7 @@ class Cubedesigners_View_Helper_HomeSlideshow extends CubeIT_View_Helper_Abstrac
                                $time = $slide['time'] * 1000;
                        }
 
-                       $attributes['style'] = 'background-image:url("/images/slideshow/pattern.png"),url("' . CubeIT_View_Helper_ImageCms::getPath($slide['image']) . '");';
+                       $attributes['style'] = 'background-image:url("' . CubeIT_View_Helper_ImageCms::getPath($slide['image']) . '");';
                        $attributes['data-time'] = $time;
                        $attributes['class'] = 'slide';
                        $link = $slide['lien'];
index 266af9e6acdd13647de8a5c87a76191d8181c37c..13edc64f1686006becb26ce43f14892c3ac0a81d 100644 (file)
@@ -9,7 +9,16 @@ class Cubedesigners_View_Helper_Liste extends CubeIT_View_Helper_Abstract {
                $this->view->headLink()->appendStylesheet('/less/list.less');
                $res = '<div class="bloc-holder content">';
                if ($items['titre']) {
-                       $res .= '<h2>' . ucfirst($items['titre']) . '</h2>';
+                       $t = '<h2>' . ucfirst($items['titre']) . '</h2>';
+
+            // Link title if applicable
+            if ($items['button']['label']) {
+                $title_link = $items['button']; // Copy the button details
+                $title_link['label'] = $t; // Override the title of the link
+                $res .= $this->view->linkCMS($title_link);
+            } else {
+                $res .= $t; // no link on the title
+            }
                }
                $res .= $this->view->homeBlocs($items, $displayDetailsButtons, $cols);
                if ($items['button']['label']) {
index 67f5d4e2d6b6ebcf20d0422de9e14c1d514d6b8d..64d2c3520f4a729a5a5dee2a3999936dda797594 100644 (file)
@@ -31,7 +31,7 @@ class Cubedesigners_View_Helper_RealisationsList extends CubeIT_View_Helper_Abst
                        //$visuel = $this->view->imageProcess($r->visuel_detail, '', null, 440);
 
             $rea = '<div class="img-wrapper">';
-            $rea .= $this->view->imageProcess($r->visuel, $r->titre, 236, 236);
+            $rea .= $this->view->imageProcess($r->visuel, $r->titre, 284, 284);
             $rea .= '</div>';
 //            fb($r, 'r');
             $rea.= '<div class="details-positioner">';
index 375f9bf324be5952d625d378d00d529d86d0b3bc..0779798035cd4f94c43cbcc998c4046d0852d55c 100644 (file)
@@ -7,7 +7,7 @@ $this->headScript()->addScriptAndStyle('casestudies');
 
        <div id="casestudies-tagslist">
                <?php
-               echo $this->CategoriesList('casestudies', 'casestudies-list', 300, 40);
+               echo $this->CategoriesList('casestudies', 'casestudies-list', 382, 13);
                ?>
        </div>
 
index 73a441cffc0016c7d3a0d9a122b5e00cc5895532..6a6aaff3643eb15222d31ccb8d3dce824859b4a5 100644 (file)
@@ -2,17 +2,23 @@
 
 $this->headScript()->addScriptAndStyle('expertises');
 echo $this->twocols();
-echo $this->htmlElement($this->citation, 'blockquote', array('class' => 'citation content'));
+
+if(!empty($this->citation)) {
+    $citation_author = isset($this->citation_author) ? $this->htmlElement($this->citation_author, 'div', array('class' => 'citation-author')) : '';
+    $citation = $this->htmlElement($this->citation . $citation_author, 'blockquote');
+    echo $this->htmlElement($citation, 'div', array('class' => 'citation'));
+}
+
 echo $this->liste($this->expertises, true, array('id' => 'expertises'), 1);
 
 $casestudy_page_data = Bootstrap::getInstance()->getCMSDatasOfPage(4); // Fetch page details - needed for the SEO URL to build links
 
 $expertise = CubeIT_Util_Cms::unserialize($this->expertises);
 
-echo '<div class="casestudies-list related content">';
+echo '<div class="casestudies-list related content jgroup">';
 echo '<div class="title">';
 echo '<h1>'. __('Case Studies') .'</h1>';
-echo '<h2>'. sprintf(__('Projets de %s'), $expertise['related_categories']['title']) .'</h2>'; // ToDo: improve the way this is done
+echo '<h2>'. $expertise['related_categories']['title'] .'</h2>';
 echo '</div>'; // .title
 
 $limit_results = 3; // How many case studies to return
index 1970ada03ca345df486cf952df4ed5b80e5a5755..d56e1e43f9296c3742d5c0e73a585a07f3516e06 100644 (file)
@@ -2,5 +2,11 @@
 
 $this->headScript()->addScriptAndStyle('expertises');
 echo $this->twocols();
-echo $this->htmlElement($this->citation, 'blockquote', array('class' => 'citation'));
+
+if(!empty($this->citation)) {
+    $citation_author = isset($this->citation_author) ? $this->htmlElement($this->citation_author, 'div', array('class' => 'citation-author')) : '';
+    $citation = $this->htmlElement($this->citation . $citation_author, 'blockquote');
+    echo $this->htmlElement($citation, 'div', array('class' => 'citation'));
+}
+
 echo $this->liste($this->expertises, true, array('id' => 'expertises'));
index 3d467c1ebc8660c4431f038714e0bc5ec1a4dbdc..baa8b24dec124af72a21ac034c8238fc7a8fa971 100644 (file)
@@ -10,8 +10,18 @@ $case_studies_data = Bootstrap::getInstance()->getCMSDatasOfPage($case_studies_p
 
 echo '<section id="casestudies">';
 echo '<div class="bloc-holder content">';
-echo '<h2 class="title">'. $this->case_studies['titre'] .'</h2>';
-echo $this->markupDotclear($this->case_studies['texte']);
+
+$t = '<h2 class="title">'. $this->case_studies['titre'] .'</h2>';
+// Link title using button link
+if ($this->case_studies['button']['label']) {
+    $title_link = $this->case_studies['button']; // Copy the button details
+    $title_link['label'] = $t; // Override the title of the link
+    echo $this->linkCMS($title_link);
+} else {
+    echo $t; // no link on the title
+}
+
+echo $this->markupDotclear($this->case_studies['texte'], array(), array('class' => 'intro'));
 
 echo '<div class="casestudies-list jgroup">';
 echo $this->CasestudiesList($case_studies_data, null, null, $this->case_studies['display_count']);
index 5ab73b37cfd9f428b1ab774eac7241327a4065ae..4ea2ad455636ee7a20ee0c5d212bcfc0fe171cd9 100644 (file)
@@ -6,7 +6,7 @@ $this->headScript()->addScriptAndStyle('realisations');
 
        <div id="realisations-tagslist">
                <?php
-               echo $this->CategoriesList("realisations", 'realisations-list', 236, 12);
+               echo $this->CategoriesList("realisations", 'realisations-list', 284, 12);
                ?>
        </div>
 
index f0c71cf8a9d432d24ee6864ab5e27b687684c9b7..75f1a313a5d86027bef61a79940118fc5b79e2d1 100644 (file)
@@ -19,7 +19,7 @@ function load_header() {
         {backgroundColor: 'rgba(34,36,40,1)', height: 68}), 0);\r
     // Navigation\r
     var nav = $(h).find('.navigation');\r
-    htl.add(TweenMax.fromTo(nav, 1, {marginTop: 57}, {marginTop: 24}), 0);\r
+    htl.add(TweenMax.fromTo(nav, 1, {marginTop: 59}, {marginTop: 24}), 0);\r
     // Logo\r
     var logo = $(h).find('.logo');\r
     htl.add(TweenMax.fromTo(logo, 1, {top: 36}, {top: 14}), 0);\r
index f9b1a19e66283455c25b0137ee323f26cf973330..89c216d21fc9a2218f33967911368fee478c531a 100644 (file)
@@ -4,30 +4,51 @@
        //min-width: 980px;
        //max-width: 980px;
        //margin: 0 auto;
-       padding-bottom: 50px;
+//     padding-bottom: 50px;
        overflow: hidden;
 
        // Settings specific to the isotope grid
        &.grid {
                display: none; // Hidden until Isotope is ready
-
-               img {
-                       margin-top: 0;
-               }
+        margin-bottom: 50px;
        }
 
        a {
                display: inline-block;
-               margin: 0;
+        margin-bottom: 4.333333%;
+
+      .img-wrapper {
+        overflow: hidden; // Give blurred image hovers a sharp edge by hiding any blur bleed
+        position: relative;
+
+        &:before {
+          content: '';
+          display: block;
+          width: 100%;
+          height: 100%;
+          background-color: transparent;
+          background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEIAAABCCAMAAADUivDaAAABp1BMVEUAAAD2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH5x1H967/84Z/////+9d/714D5zGH3sxH85q/++u/98M/4vTH4wkH3uCH60nH7249RxKUJAAAAfHRSTlMAIlmJsM/k8/LOrocCRJvjmEIeiOGGHCWc+ZkjDI77+lLlTgqdCB/QzBsy598mOO/qM/DtLejJBp6PU/5MDQ+NJIuCBd4BSj6R1Bdainmizcfg3ezx+NfGr6FRIRXSmkg76dx+GSDiTwnF2xYuKMsYn/aTHYUDQ5dBetmgCFBy9QAAArJJREFUeF6l1Plb01gYxfFTwKgD0gpYiaAFR8UqKhRwwKogBXVQlEVU3HBlAGdFcT3dV5Y/2oY+eabc5N4m8fN7v3lv3txCyldX37BP208e0A7+0ljngztNh5r9FPgDh5vgVEurRlttR4Jw4mi7Tin9WAdq6Tx+gkqh+k4odXWzpraTkPv1FB0JnIbEmR46dDYMW+fO07HeC7Bx8RJd6Ou3mSFCVwYGIQgO0SV/UNhFD127/BuqDdODEVS5Qi+iV2HCNY2eaNdhGqVHo2Zh7AQ9CvlQcYqeDWNXi04b8WQilUonMltU0YMw3KBVNp0yJZSRcZTF+ijK5VNVClnKTUwCuGktFFOGdCKfqERUjVsAminanSFfoiFbMBqblLoNQKMgXnlw9UjpHGV+BzooMt7ktnAs+VGiU7hDQcnYAqtslhNFSnXhLgUZy0ONMeQnmUaD3cvMCVHVC72H+xQYi+Qem8rEDGZrJ7LKxBzmKUiWE1ustqNMRKBTsF1OZCxbptQDLFCwZVyLnNDMUzHFPEX5vT8pFZTnoIZeWscwGuYccaOQoNxDcanm5KlCpkTm4pW7upMtUeYRHtMqmbLKUmIRjRSZV9xULCob06ijna2kGUlnmVTO8QRPKRHPlG2XzHPJGtFnQBtryRUVjecAXvCnGiMAlvhTjZcAYq/cNOJC4fUkylrpoiF+p29gCOrOG+JJ9LfYFaCC+p+8HRW+kLNGoiAWFt6hAvX06C5Mncv0ZPkaTPiDXkSXUCVAD+pRbeUsXVuNYY+gny6tvYdgcICu9I3Bor+PLgz9CRt/zdKxuTHYCv9Nh2b+gUTseJQORFtjkLuqsaaJJShdH9WppI+voBbfvyFK/bfeAic+fOymre7xKTi18enzHAVr61824E646+vi6rfuSET7tvp9uisMmR8A02/S/W9HBAAAAABJRU5ErkJggg==');
+          background-position: center;
+          background-repeat: no-repeat;
+          position: absolute;
+          top: 0;
+          left: 0;
+          z-index: 1;
+          opacity: 0;
+          transition: all 0.2s ease-out;
+          background-size: 33px;
+        }
+      }
+
+
                img {
                        //width:100%;
                        //height:auto;
                        display: block;
-                       background-color: #ccc;
-                       margin-top: 13.333333%; // 40/300 - 40px margin at full size
-                       margin-bottom: 10px;
+//                     background-color: #ccc;
                        max-width: 100%;
                        height: auto;
+            transition: transform 0.25s ease-out; // Speed of the hover-out animation
                }
                h2, h3 {
                        white-space: nowrap;
                        line-height: 1.4;
                        height: 18px;
                        color: #545454;
-                       margin: -3px 0 20px;
+                       margin-top: -3px;
 
                }
        }
 
+    a:hover {
+
+      .img-wrapper {
+
+        &:before {
+          opacity: 1;
+          background-size: 66px;
+        }
+      }
+
+      img {
+        //filter: blur(2.4px);
+        transform: scale(1.2);
+        transition-duration: 0.4s; // Speed of the hover animation
+      }
+    }
+
+
        // Styling for related case studies at the bottom of the case study detail page
-       &.related a {
-               margin-right: 3.5%; // 2 gutters
-               width: 31%; // 3 cols
+       &.related {
+      margin-bottom: 50px;
 
-               &:last-of-type {
-                       margin-right: 0;
-               }
+      .title {
+        margin-top: 0;
 
-               h2 {
-                       @media screen and (max-width: 1048px) {
-                               font-size: 28px;
-                       }
+        h1 {
+          margin-bottom: 5px;
+        }
+        h2 {
+          margin-bottom: 15px;
+        }
+      }
 
-                       @media screen and (max-width: 890px) {
-                               font-size: 24px;
-                       }
+      a {
+        //             margin-right: 3.5%; // 2 gutters
+        width: 32.5%; // 3 cols
+        max-width: 318px;
 
-                       @media screen and (max-width: 780px) {
-                               font-size: 20px;
-                       }
-               }
-       }
+        &:last-of-type {
+          margin-right: 0;
+        }
+
+        h2 {
+          @media screen and (max-width: 1048px) {
+            font-size: 28px;
+          }
+
+          @media screen and (max-width: 890px) {
+            font-size: 24px;
+          }
+
+          @media screen and (max-width: 780px) {
+            font-size: 20px;
+          }
+        }
+      }
+    }
 
        .blocmargin {
                margin-right: 40px;
index 05ae9cbb38087a27e788c5b500258d5b19251c4d..b44d3c180f231f05388f0f7ac6fb8bcc1ec305c8 100644 (file)
@@ -23,7 +23,7 @@ img.responsive {
 
 body {
        font-family: @roboto;
-       font-size: 16px;
+       font-size: 18px;
        font-weight: 300;
        color: #1b1b1b;
        opacity: 0;
@@ -41,11 +41,11 @@ body {
 
 h1, h2, h3, h4, h5, h6 {
        font-family: @Klavika;
+//    -webkit-font-smoothing: antialiased;
 }
 
 h1, h2 {
        font-weight: 400;
-       text-transform: uppercase;
 }
 
 h3, h4, h5, h6 {
@@ -57,7 +57,8 @@ strong, b {
 }
 
 a {
-       text-decoration: none;
+    color: #222428;
+    text-decoration: none;
        &:hover,
        &:active {
                color: @yellow;
@@ -91,6 +92,7 @@ a {
        ul {
                list-style: none;
                li {
+            line-height: 1.4;
                        &:before {
                                content: "- ";
                        }
@@ -99,18 +101,17 @@ a {
 }
 
 .title {
-       margin: 0 auto;
-       padding-top: 40px;
+       margin: 50px auto 10px auto;
        h1 {
                text-align: left;
                font-size: 56px;
                line-height: 1;
-        margin-bottom: 10px;
+        margin-bottom: 20px;
        }
        h2 {
                text-align: left;
-               font-size: 22px;
-               line-height: 25px;
+               font-size: 26px;
+               line-height: 1.3;
                white-space: pre-line; // Preserve line breaks from content
         font-family: @roboto;
         text-transform: none;
@@ -123,11 +124,16 @@ a {
 }
 
 .dotclear {
+    a {
+      color: #1b1b1b;
+      text-decoration: underline;
+    }
+
        h3, h4 {
                font-weight: 400;
        }
        p {
-               line-height: 1.56em;
+               line-height: 1.4;
        }
 }
 
index f2fa0d2e22ac6f2070f3e0114fcd7bce2c30e400..c5212c73dab649bf56d406f0d2a6a5339c549d55 100644 (file)
@@ -1,16 +1,30 @@
 @import "00-constants";
 
-blockquote.citation {
-       font-size: 32px;
-       font-style: italic;
-       color: @yellow;
-       line-height: 37px;
-       text-align: center;
-       margin: -20px auto 50px;
-       white-space: pre-line;
+.citation {
+    background-color: #eeeff3;
+    padding: 70px 0;
+    margin-bottom: 50px;
 
-       @media screen and (max-width: 1048px) {
-               white-space: normal;
-               width: 85%;
-       }
+    blockquote {
+      font-size: 32px;
+      font-style: italic;
+      font-family: @Klavika;
+      line-height: 1.2;
+      text-align: center;
+      margin: 0 auto;
+      width: 80%;
+      max-width: 800px;
+
+//      white-space: pre-line;
+
+      @media screen and (max-width: 1048px) {
+//        white-space: normal;
+
+      }
+    }
+}
+
+.citation-author {
+  font-size: 18px;
+  margin-top: 15px;
 }
\ No newline at end of file
index 768842a0491ead6a5d8873dccd33d7ddbf14531f..7634780c0c8229ac203e28a528ef98ab86b518de 100644 (file)
@@ -3,6 +3,7 @@
 #footer {
        a {
                .link(#fff; @yellow);
+        text-decoration: none;
                &.but {
                        .button(#fff, #212327);
                }
index 076d13cd136c6735e7d1d2066956076925799784..b426091b8d1b2a04f445650c887b116659af5af3 100644 (file)
@@ -58,7 +58,7 @@ header {
        }
 
        .navigation {
-               margin: 57px 0 0;
+               margin: 59px 0 0;
                float: right;
                li {
                        margin: 0 20px 0 0;
index 103ce502640ad20004bb12cd994f28a54231e767..fc83aceeb720ab17ad6177c4908bef01390ef6af 100644 (file)
@@ -34,10 +34,10 @@ nav.active[role="navigation"] {
                .slides {
                        .slideshowmixin();
                        .slide {
-                               background-repeat: repeat, no-repeat;
-                               background-size: auto, cover;
-                               background-position: 0 0, 50% 0;
-                               background-blend-mode: multiply;
+                               background-repeat: no-repeat;
+                               background-size: cover;
+                               background-position: 50% 0;
+//                             background-blend-mode: multiply;
                                > div {
 
                                        text-align: center;
@@ -84,11 +84,21 @@ nav.active[role="navigation"] {
   background-color: #222428;
   color: #fff;
   font-size: 22px;
-  padding: 100px 0 77px 0;
+  padding: 10px 0 70px 0;
 
   .title {
     font-size: 56px;
     padding-top: 0;
+    color: #fff;
+    display: inline-block;
+  }
+
+  .intro {
+    margin-bottom: 30px;
+  }
+
+  a:hover .title {
+    color: @yellow;
   }
 
   .casestudies-list {
index 9de73724c9ac34ed4ca71c6e7f16feed999a207c..a65baffefaaa38070aa3ff636f6d31d3508101e9 100644 (file)
@@ -1,25 +1,15 @@
 @import "00-constants";
 
 section.list {
-  padding-top: 100px;
-  padding-bottom: 100px;
+  padding: 60px 0;
+  color: #222428;
 
   &.white {
     background-color: #fff;
-    color: #222428;
-    a {
-      color: #222428;
-      text-decoration: underline;
-    }
   }
 
   &.grey {
     background-color: #eeeff3;
-    color: #222428;
-    a {
-      color: #222428;
-      text-decoration: underline;
-    }
   }
 
   &#expertisehome {
@@ -32,10 +22,16 @@ section.list {
     overflow: hidden;
     h2 {
         font-size: 56px;
+        line-height: 1;
+        display: inline-block;
     }
     h3 {
         font-size: 32px;
-        padding: 0 0 20px 0;
+        line-height: 1;
+        margin-bottom: 10px;
+    }
+    a {
+      text-decoration: none;
     }
     a.but {
         background-color: @yellow;
@@ -46,7 +42,7 @@ section.list {
         overflow: hidden;
 
         &.two {
-            margin-bottom: -50px; // Offset the 50px margins on the .sousbloc
+//            margin-bottom: -50px; // Offset the 50px margins on the .sousbloc
 
             .sousbloc {
                 white-space: normal;
index b2ca8123a8cb716e9a8b8128f36614e514101a13..afc072ab4302f098ef9af3054a90eb9da9d1e080 100644 (file)
@@ -37,6 +37,7 @@
 
                img {
                        display: block;
+            transition: transform 0.25s ease-out; // Speed of the hover-out animation
 
                }
                h2, h3 {
@@ -79,9 +80,9 @@
       }
 
       img {
-        filter: blur(2.4px);
-        transform: scale(1.02); // Scale up a little bit to clean up the edges after blurring
-        transition: filter 0.25s ease-in;
+        //filter: blur(2.4px);
+        transform: scale(1.2);
+        transition-duration: 0.4s; // Speed of the hover animation
       }
     }
 
index bd86b41568eece3713cca016a7cae69db4b86c1c..50b0f15872cc9483af4344a50a2610a92d870dee 100644 (file)
@@ -7,13 +7,15 @@
 
        .dotclear {
                p {
-                       margin: 30px 0 30px 0;
+                       margin: 20px 0;
                }
 
                ul {
-                       margin: 15px 0 30px 0;
+                       margin: 20px 0;
                        list-style: none;
                        li {
+                line-height: 1.4;
+
                                &:before {
                                        content: "- ";
                                }
@@ -22,7 +24,7 @@
        }
 
        .cols {
-               padding-bottom: 50px;
+               padding-bottom: 30px;
                white-space: nowrap;
 
                .col {