wip #7217 @5

diff --git a/framework/application/forms/CMS/Home.php b/framework/application/forms/CMS/Home.php
index f3d3445b3de78fd4ed655c7a86ff22f5e80d0707..52c53615e742ea884b310c88fe06ddd922c892bc 100644 (file)
--- a/framework/application/forms/CMS/Home.php
+++ b/framework/application/forms/CMS/Home.php
@@ -21,9 +21,8 @@ class Cubedesigners_Form_CMS_Home extends Cubedesigners_Form_CMS {
         $clients->setLabel("Our services");
         $this->addSubForm($clients, 'clients');
 
-
         $case_studies = new Cubedesigners_Form_CMS_Sub_Home_CaseStudies();
-               $case_studies->setLabel("Case Studies");
+               $case_studies->setLabel("Portfolio");
                $this->addSubForm($case_studies, 'case_studies');
 
 

diff --git a/framework/application/views/helpers/CaseStudiesSelectGrid.php b/framework/application/views/helpers/CaseStudiesSelectGrid.php
index b5221eb385d1a2fbae88fdee6212d4167ec8a538..a9177c666edfc663203cc3baab414e2defe802ad 100644 (file)
--- a/framework/application/views/helpers/CaseStudiesSelectGrid.php
+++ b/framework/application/views/helpers/CaseStudiesSelectGrid.php
@@ -53,21 +53,10 @@ class Cubedesigners_View_Helper_CaseStudiesSelectGrid extends CubeIT_View_Helper
         $image = $this->view->imageProcess($study->visuel, $study->titre, 615, 615, ['class' => 'responsive casestudies-grid-item-image']);
         $url = Cubedesigners_Util::generateAutoUri($study, $this->_page_data['seourl_stu']);
 
-        /*
-        $tag_names = [];
-        foreach ($study->tags_secondaires as $categoryID) {
-            $tag_names[] = $this->_getTagName($categoryID);
-        }
-        */
-
-        $hover_style = empty($study->hover_color) ? '' : 'background-color:' . CubeIT_Util_Cms::hexToRGBA($study->hover_color, 0.75) . ';';
-
         $c = $image;
-        $c .= '<div class="casestudies-grid-item-label" style="' . $hover_style . '">';
+
         $c .= '<h2 class="casestudies-grid-item-title">' . $study->titre . '</h2>';
-        //$c.= '<h3 class="casestudies-grid-item-tags">' . implode(' / ', $tag_names) . '</h3>';
         $c .= '<h3 class="casestudies-grid-item-tags">' . $study->legende . '</h3>';
-        $c .= '</div>'; // .casestudies-grid-item-label
 
 
         // Create a staggered delay for each row (3 items per row)

diff --git a/framework/application/views/scripts/templates/home.phtml b/framework/application/views/scripts/templates/home.phtml
index 977ebc4707a0aca87ff4b4ffc457d1257332b766..599d5281b16139c9d0f444b98dc6876842404117 100644 (file)
--- a/framework/application/views/scripts/templates/home.phtml
+++ b/framework/application/views/scripts/templates/home.phtml
@@ -4,6 +4,7 @@ $this->headScript()->addScriptAndStyle('home');
 $this->bodyClass .= ' header-light'; // Switch header to light mode (or should this be in the slideshow block?)
 $this->beforeMain = $this->homeSlideshow($this->slideshow);
 echo $this->liste($this->agence, false, array('id' => 'agency', 'class' => 'white'));
+echo $this->liste($this->clients, false, array('id' => 'clients', 'class' => 'blue'));
 
 //-- Case Studies --//
 $case_studies_page_ID = 4;
@@ -25,7 +26,7 @@ if ($this->case_studies['button']['label']) {
 echo $this->markupDotclear($this->case_studies['texte'], array(), array('class' => 'intro'));
 
 echo '<div class="casestudies">';
-echo $this->caseStudiesSelectGrid(explode(',', $this->case_studies['casestudies']), 6);
+echo $this->caseStudiesSelectGrid(explode(',', $this->case_studies['casestudies']), 3);
 echo '</div>';
 
 if ($this->case_studies['button']['label']) {
@@ -34,6 +35,3 @@ if ($this->case_studies['button']['label']) {
 }
 echo '</div>';
 echo '</section>';
-
-echo $this->liste($this->clients, false, array('id' => 'clients', 'class' => 'white'));
-echo $this->liste($this->expertises, false, array('id' => 'expertiseshome', 'class' => 'grey'));

diff --git a/images/logo/Cubedesigners-mini.svg b/images/logo/Cubedesigners-mini.svg
deleted file mode 100644 (file)
index ed06b5c..0000000
--- a/images/logo/Cubedesigners-mini.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.0" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-        viewBox="0 0 38.7 40.5" style="enable-background:new 0 0 38.7 40.5;" xml:space="preserve">
-<style type="text/css">
-       .st0{fill:#FFFFFF;stroke:#FFFFFF;stroke-width:0.5;stroke-miterlimit:10;}
-</style>
-<g>
-       <path class="st0" d="M16.3,0.5c-0.8,0.4-13.1,7.3-15,8.5c-0.9,0.5-1.1,1.2-1.1,2.2c0,0.7,0,16.5,0,18.6c0,1.2,0.6,1.5,1,1.8
-               c3.1,1.9,12.4,7.6,13.8,8.4c1.7,1,3.6-0.3,2.7-2.1c-1-1.9-6.7-12.8-6.7-12.8c2.7-1.6,5.3-3.1,6.1-3.6c1.6-0.9,1.7-1,1.7-3
-               c0-1.4,0-13.5,0-16.2C18.9,0.6,17.5-0.2,16.3,0.5z M16.4,38.5l-0.3,0.2L2.6,30.4c0,0,3.7-2.5,7.1-4.5L16.4,38.5z M1.8,28.9V10.5
-               L17,1.9L17.3,2v17.3L1.8,28.9z"/>
-       <path class="st0" d="M22.4,40c0.8-0.4,13.1-7.3,15-8.5c0.9-0.5,1.1-1.2,1.1-2.2c0-0.7,0-16.5,0-18.6c0-1.2-0.6-1.5-1-1.8
-               c-3.1-1.9-12.4-7.6-13.8-8.4c-1.7-1-3.6,0.3-2.7,2.1c1,1.9,6.7,12.8,6.7,12.8c-2.7,1.6-5.3,3.1-6.1,3.6c-1.6,0.9-1.7,1-1.7,3
-               c0,1.4,0,13.5,0,16.2C19.8,39.9,21.2,40.7,22.4,40z M22.3,2l0.3-0.2l13.5,8.3c0,0-3.7,2.5-7.1,4.5L22.3,2z M36.9,11.6V30l-15.2,8.6
-               l-0.3-0.2V21.2L36.9,11.6z"/>
-</g>
-</svg>

diff --git a/images/logo/Cubedesigners.svg b/images/logo/Cubedesigners.svg
deleted file mode 100644 (file)
index f5e81a7..0000000
--- a/images/logo/Cubedesigners.svg
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.0" id="Isolation_Mode" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-        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">
-<style type="text/css">
-       .st0{fill:#FFFFFF;}
-       .st1{fill:#FFFFFF;stroke:#FFFFFF;stroke-width:0.5;stroke-miterlimit:10;}
-</style>
-<g>
-       <g>
-               <g>
-                       <g>
-                               <g>
-                                       <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
-                                               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"/>
-                                       <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
-                                               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
-                                               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"/>
-                                       <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
-                                               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
-                                               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"/>
-                                       <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
-                                               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
-                                               v7.3c0,1.8,0.6,2.7,2.7,2.7c1.8,0,3.8-1,5-2.1V466.5z"/>
-                                       <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
-                                               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
-                                               c0-2.5-0.8-3.9-3.8-3.9c-2.9,0-3.9,1.4-3.9,3.9V471.2z"/>
-                                       <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
-                                               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
-                                               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"/>
-                                       <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"/>
-                                       <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
-                                               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"/>
-                                       <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
-                                               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
-                                               c0-2.5-0.8-3.9-3.8-3.9c-2.9,0-3.9,1.4-3.9,3.9V471.2z"/>
-                                       <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"/>
-                                       <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
-                                               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
-                                               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"/>
-                                       <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
-                                               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
-                                               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
-                                               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
-                                               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"/>
-                               </g>
-                       </g>
-               </g>
-               <g>
-                       <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
-                               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
-                               C-42.4,481.8-43.8,479.4-43.8,475.3z"/>
-               </g>
-       </g>
-       <g>
-               <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
-                       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
-                       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
-                        M-108.7,483.9v-27.5l22.8-12.9l0.4,0.3v26L-108.7,483.9z"/>
-               <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
-                       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
-                       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
-                        M-56,458.1v27.5l-22.8,12.9l-0.4-0.3v-25.9L-56,458.1z"/>
-       </g>
-</g>
-</svg>

diff --git a/images/logo/Symbol.svg b/images/logo/Symbol.svg
index 023a40ace2907571942880dd7d991bf018e3e720..622ea6937005502454af40d083065f4c4e9e5f8d 100644 (file)
--- a/images/logo/Symbol.svg
+++ b/images/logo/Symbol.svg
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 57 56">
-  <defs>
-    <style>
-      .cls-1, .cls-2 {
-        fill: currentColor;
-      }
-    </style>
-  </defs>
   <g>
     <g id="Calque_1">
       <g>
-        <path class="cls-1" d="M52,2l2.3-1.2c.5-.2,1,.1.9.7l-.4,2.5c0,.2,0,.4.2.6l1.8,1.8c.4.4.2,1-.3,1.1l-2.5.4c-.2,0-.4.2-.5.3l-1.1,2.3c-.2.5-.9.5-1.1,0l-1.1-2.3c0-.2-.3-.3-.5-.3l-2.5-.4c-.5,0-.7-.7-.3-1.1l1.8-1.8c.1-.1.2-.4.2-.6l-.4-2.5c0-.5.4-.9.9-.7l2.3,1.2c.2,0,.4,0,.6,0Z"/>
-        <path class="cls-2" d="M40.1,45.5l-1.9.3c-.1,0-.2,0-.3,0-5.7-2.7-10.2-6.9-13.1-12.2.2-.6.5-1.2.7-1.7.1-.4,0-.8-.4-.9h-.2c-3.2-1.3-6.7,0-8.4,3.1-2.9,5.1-7.3,9.3-13,11.9l-1.9.9c-.8.4-1.1,1.3-.8,2l2.4,5.3c.4.9,1.7,1,2.3.2l1-1.6c0,0,.1-.2.2-.2,5.8-2.7,10.6-6.7,14.1-11.6,3.6,5,8.4,8.9,14.2,11.6l1.8.8c.8.4,1.8,0,2.2-.8l2.4-5.2c.4-.9-.3-1.9-1.3-1.8Z"/>
-        <path class="cls-2" d="M43.3,15.5c1.5,1.5,1.4,4.1-.2,5.5-6.5,5.5-14.4,8.4-22.7,8.4-.4,0-.7-.3-.7-.7v-.2c-.1-3.4,2.3-6.3,5.6-6.9,5.1-.9,11.8-4,16.3-8,.7-.6,1.7-.2,1.8.7v1.3Z"/>
-        <path class="cls-2" d="M30.8,15.6c0,2.6-2.1,4.8-4.8,4.8s-4.8-2.1-4.8-4.8,2.1-4.8,4.8-4.8,4.8,2.1,4.8,4.8Z"/>
+        <path class="star" d="M52,2l2.3-1.2c.5-.2,1,.1.9.7l-.4,2.5c0,.2,0,.4.2.6l1.8,1.8c.4.4.2,1-.3,1.1l-2.5.4c-.2,0-.4.2-.5.3l-1.1,2.3c-.2.5-.9.5-1.1,0l-1.1-2.3c0-.2-.3-.3-.5-.3l-2.5-.4c-.5,0-.7-.7-.3-1.1l1.8-1.8c.1-.1.2-.4.2-.6l-.4-2.5c0-.5.4-.9.9-.7l2.3,1.2c.2,0,.4,0,.6,0Z"/>
+        <path class="perso" d="M40.1,45.5l-1.9.3c-.1,0-.2,0-.3,0-5.7-2.7-10.2-6.9-13.1-12.2.2-.6.5-1.2.7-1.7.1-.4,0-.8-.4-.9h-.2c-3.2-1.3-6.7,0-8.4,3.1-2.9,5.1-7.3,9.3-13,11.9l-1.9.9c-.8.4-1.1,1.3-.8,2l2.4,5.3c.4.9,1.7,1,2.3.2l1-1.6c0,0,.1-.2.2-.2,5.8-2.7,10.6-6.7,14.1-11.6,3.6,5,8.4,8.9,14.2,11.6l1.8.8c.8.4,1.8,0,2.2-.8l2.4-5.2c.4-.9-.3-1.9-1.3-1.8Z"/>
+        <path class="perso" d="M43.3,15.5c1.5,1.5,1.4,4.1-.2,5.5-6.5,5.5-14.4,8.4-22.7,8.4-.4,0-.7-.3-.7-.7v-.2c-.1-3.4,2.3-6.3,5.6-6.9,5.1-.9,11.8-4,16.3-8,.7-.6,1.7-.2,1.8.7v1.3Z"/>
+        <path class="perso" d="M30.8,15.6c0,2.6-2.1,4.8-4.8,4.8s-4.8-2.1-4.8-4.8,2.1-4.8,4.8-4.8,4.8,2.1,4.8,4.8Z"/>
       </g>
     </g>
   </g>

diff --git a/js/casestudies.js b/js/casestudies.js
index 2a5f7a4288d99ccc8deb19e1bd821e4b9ac3587a..4d0e45a13c25d6ad10218cbbdd3cc45609887156 100644 (file)
--- a/js/casestudies.js
+++ b/js/casestudies.js
@@ -10,68 +10,3 @@ function load_casestudies() {
         },
     });
 }
-
-
-//
-// var showIds = new Array();
-//
-// function load_casestudies() {
-//     initTagsLink();
-//
-//     // Check referrer and if it is a cubedesigners page, switch to a history.back() link instead of a standard link to speed things up
-//     if(document.referrer.indexOf("cubedesigners.") > -1) {
-//         $("#closeButton").on('click',function(){
-//             console.log('using back button...');
-//             history.back();
-//             return false;
-//         });
-//     }
-//
-// }
-//
-// function initTagsLink() {
-//     $(".tag").click(function () {
-//             $(this).toggleClass('active');
-//
-//             if ($(this).hasClass('active')) {
-//                     if ($(this).attr("data-id") != 0) {
-//                             showIds.push($(this).attr("data-id"));
-//                     } else {
-//                             showIds = new Array();
-//                             $(".tag").removeClass('active');
-//                     }
-//             } else {
-//                     var index = $.inArray($(this).attr("data-id"), showIds);
-//                     showIds.splice(index, 1);
-//             }
-//
-//             if (showIds.length > 0) {
-//                     $(".tag:first").removeClass('active');
-//             } else {
-//                     $(".tag:first").addClass('active');
-//             }
-//
-//             displayStudies();
-//     });
-//
-// }
-//
-// function displayStudies() {
-//
-//     if (showIds.length) {
-//             $('#casestudies-list .bloc').each(function () {
-//                     var categories = $(this).attr("data-categories");
-//                     if ($.inArray(categories, showIds) == -1) {
-//                             $(this).fadeOut(500, function () {
-//                             });
-//                     } else {
-//                             $(this).fadeIn(500, function () {
-//                             });
-//                     }
-//             });
-//     } else {
-//             $('#casestudies-list .bloc').fadeIn(500, function () {
-//             });
-//     }
-// }
-

diff --git a/js/header.js b/js/header.js
index c6e914857d5975845f54018c82c306dbe788e417..b904f8ca7d0f0d2d645c10159d1db02c600227b3 100644 (file)
--- a/js/header.js
+++ b/js/header.js
@@ -14,6 +14,11 @@ function load_header() {
     // Background-color & height - starts transparent and then fades in
     htl.add(TweenMax.fromTo(h, 1, {color: headerColor, backgroundColor: 'rgba(255,255,255,0)', height: 130},
         {color: '#000', backgroundColor: 'rgba(255,255,255,1)', height: 68}), 0);
+    htl.add(TweenMax.fromTo($(h).find('.star'), 1, {fill: headerColor==='#fff'?'#fff':'#f7d051'},
+        {fill: '#f7d051'}), 0);
+    htl.add(TweenMax.fromTo($(h).find('.perso'), 1, {fill: headerColor==='#fff'?'#fff':'#05488b'},
+        {fill: '#05488b'}), 0);
+
     // Navigation
     var nav = $(h).find('.navigation');
     htl.add(TweenMax.fromTo(nav, 1, {marginTop: 59}, {marginTop: 24}), 0);

diff --git a/less/casestudies.less b/less/casestudies.less
index 3445ee352dde8e9054bdbbdecb854035e8e50146..2dfc0784b0cff1c0570b1074c7d38393e9edecd1 100644 (file)
--- a/less/casestudies.less
+++ b/less/casestudies.less
@@ -78,14 +78,14 @@
                h2 {
                        font-size: 32px;
                        line-height: 1.3em; // 38px/32px
-                       color: #000;
+                       color: @black;
             font-weight: 300;
             margin-top: 0.7em;
                }
                h3 {
                        font-size: 14px;
                        line-height: 1.4;
-                       color: #545454;
+                       color: @black;
                        margin-top: -3px;
 
                }

diff --git a/less/casestudies_grid.less b/less/casestudies_grid.less
index 860db0eb8399df780d5434c2951898c0f8e9833d..9471bfec5514bae7e262d6e71660a627273fa6a3 100644 (file)
--- a/less/casestudies_grid.less
+++ b/less/casestudies_grid.less
@@ -49,24 +49,16 @@
     }
 
     &-title, h2 {
-      font-size: 50px;
+      font-size: 24px;
       line-height: 1;
-
-      @media screen and (max-width: 1400px) {
-        font-size: 3.5vw;
-      }
-      @media screen and (max-width: 1400px) {
-        font-size: 24px;
-      }
+      font-weight: 300;
+      margin-top: 0.5em;
     }
 
     &-tags, h3 {
-      font-size: 18px;
+      font-size: 16px;
       margin-top: 0.5em;
-
-      @media screen and (max-width: 1000px) {
-        font-size: 15px;
-      }
+      font-weight: 300;
     }
   }
 }

diff --git a/less/header.less b/less/header.less
index b58bf29f3afd98e518f707f9476fcabe7f14f0e1..730f3c85f15edbe84a260282fb24d19b896bd4b8 100644 (file)
--- a/less/header.less
+++ b/less/header.less
@@ -17,10 +17,6 @@ header {
                color: currentColor; // Pass colour down so SVG can use currentColor
        }
 
-       svg {
-               fill: currentColor;
-       }
-
        ul {
                font-family: @Klavika;
                font-weight: 300;

diff --git a/less/home.less b/less/home.less
index b279127dd9a7a212fec1014ed1d7da0d2aeed5b6..6d8da196bbde3d053de88ded3cf7e9de1336e909 100644 (file)
--- a/less/home.less
+++ b/less/home.less
@@ -137,15 +137,15 @@ nav.active[role="navigation"] {
 }
 
 #casestudies {
-       background-color: @black;
-       color: #fff;
+       background-color: #fff;
+       color: @black;
        font-size: 22px;
        padding: 10px 0 70px 0;
 
        .title {
                font-size: 56px;
                padding-top: 0;
-               color: #fff;
+               color: @black;
                display: inline-block;
        }
 
@@ -165,12 +165,14 @@ nav.active[role="navigation"] {
                h2 {
                        font-size: 32px;
                        text-transform: none;
+                       margin-top: 15px ;
                        @media screen and (max-width: 1000px) {
                                font-size: 24px;
                        }
                }
                h3 {
                        font-size: 16px;
+                       margin-top: 7px;
                }
 
                a {