]> _ Git - cubedesigners-v7.git/commitdiff
Branding updates and new features (work in progress..)
authorstephen@cubedesigners.com <stephen@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Fri, 14 Aug 2015 17:26:14 +0000 (17:26 +0000)
committerstephen@cubedesigners.com <stephen@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Fri, 14 Aug 2015 17:26:14 +0000 (17:26 +0000)
29 files changed:
framework/application/forms/CMS/Home.php
framework/application/forms/CMS/Sub/ExpertiseCategories.php [new file with mode: 0644]
framework/application/forms/CMS/Sub/Home/CaseStudies.php [new file with mode: 0644]
framework/application/forms/CMS/Sub/Home/Clients.php [new file with mode: 0644]
framework/application/forms/CMS/Sub/Home/Clients/Bloc.php [new file with mode: 0755]
framework/application/forms/CMS/Sub/Home/Clients/Blocs.php [new file with mode: 0755]
framework/application/forms/CMS/Sub/Home/Expertises.php
framework/application/forms/CMS/Sub/Realisations/Realisations.php
framework/application/forms/Categories.php
framework/application/forms/Element/CategoriesCheckboxes.php [new file with mode: 0644]
framework/application/models/Categorie.php
framework/application/views/helpers/CasestudiesDetail.php
framework/application/views/helpers/CasestudiesList.php
framework/application/views/helpers/CategoriesList.php
framework/application/views/helpers/Realisation.php
framework/application/views/helpers/RealisationsList.php
framework/application/views/scripts/studies/index.phtml
framework/application/views/scripts/templates/expertise.phtml
framework/application/views/scripts/templates/home.phtml
framework/application/views/scripts/templates/realisations.phtml
less/01-mixins.less
less/admin.less
less/agence.less
less/casestudies_detail.less
less/common.less
less/header.less
less/home.less
less/list.less
less/taglist.less

index bd7d3cdbaabd7d643850d90eea9fd48a4135e28a..2c5feb9289d9e15692d8a6780e12b1b42140e050 100644 (file)
@@ -17,11 +17,17 @@ class Cubedesigners_Form_CMS_Home extends Cubedesigners_Form_CMS {
                $agence->setLabel("L'agence");
                $this->addSubForm($agence, 'agence');
 
+               $case_studies = new Cubedesigners_Form_CMS_Sub_Home_CaseStudies();
+               $case_studies->setLabel("Case Studies");
+               $this->addSubForm($case_studies, 'case_studies');
+
+               $clients = new Cubedesigners_Form_CMS_Sub_Home_Clients();
+               $clients->setLabel("Clients");
+               $this->addSubForm($clients, 'clients');
+
                $expertises = new Cubedesigners_Form_CMS_Sub_Home_Expertises();
                $expertises->setLabel(' Expertises');
                $this->addSubForm($expertises, 'expertises');
        }
 
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/framework/application/forms/CMS/Sub/ExpertiseCategories.php b/framework/application/forms/CMS/Sub/ExpertiseCategories.php
new file mode 100644 (file)
index 0000000..837ddcd
--- /dev/null
@@ -0,0 +1,16 @@
+<?php
+
+class Cubedesigners_Form_CMS_Sub_ExpertiseCategories extends CubeIT_Form_SubForm
+{
+    public function init() {
+        parent::init();
+
+        $titre = new Zend_Form_Element_Text('title');
+        $titre->setLabel('Expertise Titre');
+        $this->addElementLocalized($titre);
+
+        $categories = new Cubedesigners_Form_Element_CategoriesCheckboxes('categories');
+        $categories->setLabel('Categories');
+        $this->addElement($categories);
+    }
+}
\ No newline at end of file
diff --git a/framework/application/forms/CMS/Sub/Home/CaseStudies.php b/framework/application/forms/CMS/Sub/Home/CaseStudies.php
new file mode 100644 (file)
index 0000000..63719ce
--- /dev/null
@@ -0,0 +1,26 @@
+<?php
+
+class Cubedesigners_Form_CMS_Sub_Home_CaseStudies extends CubeIT_Form_SubForm {
+
+    public function init() {
+        parent::init();
+
+        $titre = new Zend_Form_Element_Text('titre');
+        $titre->setLabel('Titre');
+        $this->addElement($titre);
+
+        $texte = new CubeIT_Form_Element_Markitup_Basic('texte');
+        $texte->setLabel('Texte');
+        $this->addElement($texte);
+
+        $display_count = new CubeIT_Form_Element_Number('display_count');
+        $display_count->setLabel('Number of Case Studies to display');
+        $this->addElement($display_count);
+
+        $lien = new CubeIT_Form_Element_Link();
+        $lien->urlEnabled(false)->fileEnabled(false);
+        $lien->setLegend('Bouton');
+        $this->addSubForm($lien, 'button');
+    }
+
+}
\ No newline at end of file
diff --git a/framework/application/forms/CMS/Sub/Home/Clients.php b/framework/application/forms/CMS/Sub/Home/Clients.php
new file mode 100644 (file)
index 0000000..0178d95
--- /dev/null
@@ -0,0 +1,22 @@
+<?php
+
+class Cubedesigners_Form_CMS_Sub_Home_Clients extends CubeIT_Form_SubForm {
+
+       public function init() {
+               parent::init();
+
+               $titre = new Zend_Form_Element_Text('titre');
+               $titre->setLabel('Titre');
+               $this->addElement($titre);
+
+               $blocs = new Cubedesigners_Form_CMS_Sub_Home_Clients_Blocs('blocs');
+               $blocs->setLegend('Blocs');
+               $this->addSubForm($blocs, 'blocs');
+
+               $lien = new CubeIT_Form_Element_Link();
+               $lien->urlEnabled(false)->fileEnabled(false);
+               $lien->setLegend('Bouton');
+               $this->addSubForm($lien, 'button');
+       }
+
+}
\ No newline at end of file
diff --git a/framework/application/forms/CMS/Sub/Home/Clients/Bloc.php b/framework/application/forms/CMS/Sub/Home/Clients/Bloc.php
new file mode 100755 (executable)
index 0000000..ca99f4e
--- /dev/null
@@ -0,0 +1,24 @@
+<?php
+
+class Cubedesigners_Form_CMS_Sub_Home_Clients_Bloc extends CubeIT_Form_SubForm {
+
+    public function init() {
+        parent::init();
+
+        $titre = new Zend_Form_Element_Text('titre');
+        $titre->setLabel('Titre du bloc');
+        $this->addElement($titre);
+
+        $texte = new CubeIT_Form_Element_Markitup_Basic('texte');
+        $texte->setLabel('Texte');
+        $this->addElement($texte);
+
+        $picto = new CubeIT_Form_Element_File_Image('picto');
+        $picto->setLabel('Pictogramme');
+        $picto->setMaxItems(1);
+        $this->addElement($picto);
+    }
+
+}
+
+?>
diff --git a/framework/application/forms/CMS/Sub/Home/Clients/Blocs.php b/framework/application/forms/CMS/Sub/Home/Clients/Blocs.php
new file mode 100755 (executable)
index 0000000..ecbb3dc
--- /dev/null
@@ -0,0 +1,16 @@
+<?php
+
+class Cubedesigners_Form_CMS_Sub_Home_Clients_Blocs extends CubeIT_Form_Multi_SubForm {
+
+    public function init() {
+        parent::init();
+
+        $bloc = new Cubedesigners_Form_CMS_Sub_Home_Clients_Bloc();
+        $this->setBaseSubForm($bloc);
+        $this->setBaseLegend('Edition du bloc « $titre »');
+        $this->setNewLegend('Nouveau bloc');
+    }
+
+}
+
+?>
index fea8749fd8a4f7c244c6a4ca4c6e6ffd4e989a3c..4fb7b403eba27f67f4f8e81dd7cf1dbc4c4a9f2b 100644 (file)
@@ -17,6 +17,10 @@ class Cubedesigners_Form_CMS_Sub_Home_Expertises extends CubeIT_Form_SubForm {
                $lien->urlEnabled(false)->fileEnabled(false);
                $lien->setLegend('Bouton');
                $this->addSubForm($lien, 'button');
+
+        $related_categories = new Cubedesigners_Form_CMS_Sub_ExpertiseCategories();
+        $related_categories->setLegend('Related Categories (for Case Studies)');
+        $this->addSubForm($related_categories, 'related_categories');
        }
 
 }
index cce7b043589938f6f86de3911464ba81cf1b04ac..f96ad8d92e6e12a7b081e2f365f01bb0af66460f 100644 (file)
@@ -71,7 +71,7 @@ class Cubedesigners_Form_CMS_Sub_Realisations_Realisations extends CubeIT_Form_L
                        ->setEditTitle('Edition de la réalisation « $titre »')
                        ->setModel('Cubedesigners_Model_Realisation')
                        ->setTitleColumn("titre")
-                       ->setAdditionnalColumns(array('titre', 'agence', 'date', 'categories', 'online'))
+                       ->setAdditionnalColumns(array('agence', 'date', 'categories', 'online'))
                        ->setSearchColumns(array('titre', 'agence', 'date'));
        }
 
index 7ce372b75dbb5a8af473201c81134c9b9d790d8d..85890a7686f67b09fd71364e4ae028d3ebca94c1 100644 (file)
@@ -13,10 +13,15 @@ class Cubedesigners_Form_Categories extends CubeIT_Form_List_Model {
                $name->setLabel(__('Nom'));
                $this->addElementLocalized($name, false);
 
+        $order = new Zend_Form_Element_Text('sort_order');
+        $order->setLabel('Sort Order');
+        $this->addElement($order);
+
                $this->setListTitle(__('Categories'))
                        ->setNewTitle(__('Créer une catégorie'))
                        ->setEditTitle(sprintf(__("Edition de la catégorie « %s »"), '$name'))
                        ->setTitleColumn('name')
+            ->setAdditionnalColumns(array('sort_order'))
                        ->setModel("Cubedesigners_Model_Categorie");
        }
 
diff --git a/framework/application/forms/Element/CategoriesCheckboxes.php b/framework/application/forms/Element/CategoriesCheckboxes.php
new file mode 100644 (file)
index 0000000..05b2cb1
--- /dev/null
@@ -0,0 +1,9 @@
+<?php\r
+\r
+class Cubedesigners_Form_Element_CategoriesCheckboxes extends CubeIT_Form_Element_MultiCheckboxList {\r
+\r
+       public function init() {\r
+               $this->setBaseForm('Cubedesigners_Form_Categories');\r
+       }\r
+\r
+}
\ No newline at end of file
index 856ae958d56d910d222e3b5d262caf58f13d1dbf..3741ae0c06fdd27e28752c6d35872ba476a3db73 100644 (file)
@@ -3,11 +3,13 @@
 class Cubedesigners_Model_Categorie extends CubeIT_Model_Data_Table {
 
        protected static $_table = 'categories';
-       protected $name;
+    protected $name;
+       protected $sort_order;
 
        public static function getSchema($schema) {
                $table = parent::getSchema($schema);
                $table->addColumn('name', 'string', array('length' => 64));
+               $table->addColumn('sort_order', 'smallint', array('unsigned' => true));
        }
 
 }
index 4e07e9cf2f043348f383471185dd92aeb264f6fc..e83e5eef4ff2e76603fbf10fe2947b1722c3abf5 100644 (file)
@@ -10,7 +10,6 @@ class Cubedesigners_View_Helper_CasestudiesDetail extends CubeIT_View_Helper_Abs
                $res.='<div class="content">';
                $res.='<h1>' . $studie->titre . '</h1>';
                $res.='<h2>' . $studie->description . '</h2>';
-        $res.= $this->view->link(__('Fermer'), $this->currentPage->getParent()->getHref(), array('class' => 'close', 'id' => 'closeButton'));
                $res.='</div>';
 
                $res .= '<div class="casestudies-detail-visuel">';
@@ -84,7 +83,7 @@ class Cubedesigners_View_Helper_CasestudiesDetail extends CubeIT_View_Helper_Abs
                        if ($bloc->selectedtype == "video") {
 
                                $res .= '<div class="detail-video" style="' . $margin . '' . $zindex . '" >';
-                               $video = $this->view->videoWeb($bloc->video, 980);
+                               $video = $this->view->videoWeb($bloc->video, '100%', 'auto', array(), array('class' => 'resize-ratio'));
 
                                if ($addVideoBackground) {
                                        $background = $this->view->imageProcess()->imageProcessGetUrl($bloc->video_background, '', 1200, null);
@@ -108,6 +107,4 @@ class Cubedesigners_View_Helper_CasestudiesDetail extends CubeIT_View_Helper_Abs
                return $res;
        }
 
-}
-
-?>
+}
\ No newline at end of file
index 1536b8a7ce250c1530cdd0313026dcf2087bad7c..09b5ce8afc4d4a5249e1fdd08f915c9004eb0183 100644 (file)
@@ -4,7 +4,8 @@ class Cubedesigners_View_Helper_CasestudiesList extends CubeIT_View_Helper_Abstr
 
        protected $_datas;
 
-       public function CasestudiesList($datas, $currentStudie = null) {
+       public function CasestudiesList($datas, $currentStudie = null, $categories = null, $limit = null) {
+
                $this->addScriptAndStyle('casestudies');
                $this->_datas = $datas;
                $listStudies = array();
@@ -25,6 +26,14 @@ class Cubedesigners_View_Helper_CasestudiesList extends CubeIT_View_Helper_Abstr
                $s = $db->select()->from('casestudies')
                                ->order('annee DESC');
 
+        if(is_array($categories)) {
+            $s->where('categories IN (?)', $categories);
+        }
+
+        if($limit) {
+            $s->limit($limit);
+        }
+
                if (!$acl) {
                        $s->where('online = ?', 1);
                }
@@ -143,14 +152,14 @@ class Cubedesigners_View_Helper_CasestudiesList extends CubeIT_View_Helper_Abstr
                  $addOffline = 'data-offline="1"';
                  } */
 
-               $image = $this->view->imageProcess($s->visuel, $s->titre, 300, 225);
+               $image = $this->view->imageProcess($s->visuel, $s->titre, 318, 318);
                $url = Cubedesigners_Util::generateAutoUri($s, $this->_datas['seourl_stu']);
 
                $c = $image;
                $c.= '<h2>' . $s->titre . '</h2>';
                $c.='<h3>' . $s->description . '</h3>';
 
-               return $this->link($c, $url, array('data-cat' => $s->categories));
+               return $this->link($c, $url, array('data-cat' => $s->categories)) . ' '; // Space needed between elements for justified alignment
        }
 
 }
index 2e18f4eedbe994fddb65c2f84d4bece58f9fc3af..450b7b101ed3c4d6876b8b69f1cf0b39faa85e6c 100644 (file)
@@ -26,7 +26,7 @@ class Cubedesigners_View_Helper_CategoriesList extends Zend_View_Helper_Abstract
 
                $db = Zend_Db_Table::getDefaultAdapter();
                $s = $db->select()->from('categories')
-                               ->order('id ASC');
+                               ->order('sort_order ASC');
                $q = $s->query();
 
 
index 4c4a8ddf69da68fb31cfcbdaaac242dd4a2e5262..02de4b4de575dbb8d4eaf3cb35265266bb66a573 100644 (file)
@@ -2,16 +2,14 @@
 
 class Cubedesigners_View_Helper_Realisation extends CubeIT_View_Helper_Abstract {
 
-       public function realisation($r) {
+       public function realisation($realisation) {
 
                $this->addScriptAndStyle('realisation');
-               $r = CubeIT_Util_Cms::unserialize($r);
+               $r = CubeIT_Util_Cms::unserialize($realisation);
 
                $res = '';
                $res .= '<article class="realisation">';
-               $res .= '<div class="content">';
-               $res .= '<h1>' . $r->titre . '</h1>';
-               $res .= '<h2>' . Cubedesigners_Util::getCategoryById($r->categories, $this->localeDefault()) . '</h2>';
+               $res .= '<div class="content close-holder">';
                $res .= $this->view->link(__('Fermer'), $this->currentPage->getParent()->getHref(), array('class' => 'close', 'id' => 'closeButton'));
                $res .= '</div>';
 
@@ -32,13 +30,19 @@ class Cubedesigners_View_Helper_Realisation extends CubeIT_View_Helper_Abstract
 
                $res .= $this->imageSlideshowScroll($slides, 439, array(), array('shortcuts' => false));
                $res .= '<div class="content">';
+        $res .= '<h1>' . $r->titre . '</h1>';
+        $res .= '<ul class="tags">';
+        $res .= '<li>' . $this->dateTime($realisation->date, Zend_Date::YEAR) . '</li>';
+        $res .= '<li>' . Cubedesigners_Util::getCategoryById($r->categories, $this->localeDefault()) . '</li>';
+        $res .= '</ul>';
 
-               if (!empty($r->url->url)) {
-                       $res .= $this->_button($r->url);
-               }
+        $res .= $this->markupDotclear($r->description);
 
-               $res .= $this->markupDotclear($r->description);
-               $res .= '</div>';
+        if (!empty($r->url->url)) {
+            $res .= $this->_button($r->url);
+        }
+
+        $res .= '</div>';
                $res .= '</article>';
 
                return $res;
index bc50b51f94c74df777edd582129acc061e917c03..161962c3485b21a67aa592260247839bf2c7ef75 100644 (file)
@@ -28,11 +28,19 @@ class Cubedesigners_View_Helper_RealisationsList extends CubeIT_View_Helper_Abst
                                $addOffline = 'data-offline="1"';
                        }
 
-                       $visuel = $this->view->imageProcess($r->visuel_detail, '', null, 440);
-
-                       $rea = $this->view->imageProcess($r->visuel, $r->titre, 170, 127);
-                       $rea .= '<h2>' . $r->titre . '</h2>';
-                       $rea .= '<h3>' . Cubedesigners_Util::getCategoryById($r->categories, $this->localeDefault()) . ' / ' . $this->dateTime($r->date, Zend_Date::YEAR) . '</h3>';
+                       //$visuel = $this->view->imageProcess($r->visuel_detail, '', null, 440);
+
+            $rea = $this->view->imageProcess($r->visuel, $r->titre, 236, 236);
+//            fb($r, 'r');
+            $rea.= '<div class="details-positioner">';
+            $rea.= '<div class="details-holder">';
+            $rea.= '<div class="details">';
+            $rea.='<h2>' . $r->titre . '</h2>';
+            // replace last occurrence of space with nbsp; to prevent orphans (http://stackoverflow.com/a/18113904)
+            $rea.='<h3>' . strrev(implode(strrev('&nbsp;'), explode(' ', strrev($r->legende), 2)))  . '</h3>';
+            $rea.= '</div>'; // .details (display: table-cell)
+            $rea.= '</div>'; // .details-holder (display: table)
+            $rea.= '</div>'; // .details-positioner (display: block; position: absolute)
 
                        $url = Cubedesigners_Util::generateAutoUri($r, $datas['seourl_rea'], $this->localeDefault());
 
index 911d40d86e907b24665ba4a0a74597e4a09e68f0..7af939a7424c5e5d603878aeaa81561a8f074c09 100644 (file)
@@ -6,9 +6,10 @@ $this->headScript()->addScriptAndStyle('casestudies_detail');
 
 echo $this->CasestudiesDetail($this->studie);
 ?>
-
-<div class="title content"><?php echo $this->markupDotclear($this->casestudies_titre); ?></div>
-
 <div class="casestudies-list related content">
-       <?php echo $this->CasestudiesList($this->datas, $this->studie); ?>
+    <div class="title">
+        <?php echo $this->markupDotclear($this->casestudies_titre); ?>
+    </div>
+
+    <?php echo $this->CasestudiesList($this->datas, $this->studie); ?>
 </div>
\ No newline at end of file
index 7f19282db8f56051853978a280fc82c5bc23e3bd..73a441cffc0016c7d3a0d9a122b5e00cc5895532 100644 (file)
@@ -4,3 +4,17 @@ $this->headScript()->addScriptAndStyle('expertises');
 echo $this->twocols();
 echo $this->htmlElement($this->citation, 'blockquote', array('class' => 'citation content'));
 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="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 '</div>'; // .title
+
+$limit_results = 3; // How many case studies to return
+echo $this->CasestudiesList($casestudy_page_data, null, $expertise['related_categories']['categories'], $limit_results);
+echo '</div>'; // .casestudies-list
index acf4c447d36b3319a29c4c97fdb709edb2d60baf..3d467c1ebc8660c4431f038714e0bc5ec1a4dbdc 100644 (file)
@@ -3,4 +3,25 @@
 $this->headScript()->addScriptAndStyle('home');
 $this->beforeMain = $this->homeSlideshow($this->slideshow);
 echo $this->liste($this->agence, false, array('id' => 'agency', 'class' => 'white'));
+
+//-- Case Studies --//
+$case_studies_page_ID = 4;
+$case_studies_data = Bootstrap::getInstance()->getCMSDatasOfPage($case_studies_page_ID);
+
+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']);
+
+echo '<div class="casestudies-list jgroup">';
+echo $this->CasestudiesList($case_studies_data, null, null, $this->case_studies['display_count']);
+echo '</div>';
+
+if ($this->case_studies['button']['label']) {
+    echo $this->linkCMS($this->case_studies['button'], array('class' => 'but'));
+}
+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'));
index 510a9380697836a7020595e6de40f1199fe112bd..5ab73b37cfd9f428b1ab774eac7241327a4065ae 100644 (file)
@@ -6,7 +6,7 @@ $this->headScript()->addScriptAndStyle('realisations');
 
        <div id="realisations-tagslist">
                <?php
-               echo $this->CategoriesList("realisations", 'realisations-list', 170, 32);
+               echo $this->CategoriesList("realisations", 'realisations-list', 236, 12);
                ?>
        </div>
 
index b85f85906e33d96bd2ffd8f46a7286f013d0397e..474965b368058eecd55ff2f4b6f90904e1f1fc37 100644 (file)
                        }\r
                }\r
        }\r
+}\r
+\r
+\r
+// Justified group (evenly space inline-block elements in a grid without specifying margins)\r
+// From: https://gist.github.com/interactivellama/5699885\r
+// Note: elements *must* have whitespace between them or this won't work. No minified HTML.\r
+.jgroup {\r
+  text-align: justify;\r
+  font-size: 0.1px;\r
+\r
+  &:after{\r
+    content: '';\r
+    display: inline-block;\r
+    width: 100%;\r
+  }\r
 }
\ No newline at end of file
index ba9bc26966bfd9241f661b6257f3b1d16eaacaed..9f1502486c7215cf54b50c15768acf2e88a1cf56 100644 (file)
@@ -7,6 +7,9 @@
 
        background: #f6ae01;
        padding: 3px 0 3px;
+    position: absolute; // Needed to make it sit above header. Could also be 'fixed'...
+    width: 100%;
+    z-index: 10;
 
        .bar {
                color: #fff;
index bb51c7aec96dd3b2dff0fe3e577bceca1ff59181..e0d9ddad99d2c142bb8448178ff4747700e8d1bc 100644 (file)
@@ -74,8 +74,8 @@
 
 /* Agence equipe */
 .agency-persons {
-       background-color: @yellow;
-       color: #fff;
+       background-color: #fff;
+       color: #222428;
        .bloc-holder {
                padding-top: 50px;
                padding-bottom: 25px;
index 2e02ef1c24b7d879bbec6c79e3eafb74d26c550d..1d1ae6c09025783efd137ec0f6c46f71049b7657 100644 (file)
                }
 
                .detail-video {
-                       padding: 0px 0 50px 0;
+                       padding: 0 34px 50px 34px;
+            margin: 0 auto;
                        position: relative;
                        z-index: 5;
                        text-align: center;
                        /* vertical-align: middle;
                         display: table-cell; */
+            max-width: 1048px; /* 980px + left padding + right padding */
+            min-width: 530px;
                }
 
                .detail-visuel {
index 25f0f15fcf67ac42abe14c8b1309996a200153f8..1f068e5ad885733f0c6b75a6c24cae30d125da11 100644 (file)
@@ -44,7 +44,7 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 h1, h2 {
-       font-weight: 500;
+       font-weight: 400;
        text-transform: uppercase;
 }
 
index f7a86e793b17cd0e60f97643e0d83cdd62de908d..076d13cd136c6735e7d1d2066956076925799784 100644 (file)
@@ -85,7 +85,8 @@ header {
        max-height: none;
 }
 
-@media screen and (max-width: 890px) {
+// Breakpoint for mobile menu
+@media screen and (max-width: 1020px) {
 
        .logo {
                top: 30px;
index f157f3b83f3d69bb0bb2fae91dabf377bcb8cf5a..103ce502640ad20004bb12cd994f28a54231e767 100644 (file)
@@ -78,4 +78,45 @@ nav.active[role="navigation"] {
                        }
                }
        }
+}
+
+#casestudies {
+  background-color: #222428;
+  color: #fff;
+  font-size: 22px;
+  padding: 100px 0 77px 0;
+
+  .title {
+    font-size: 56px;
+    padding-top: 0;
+  }
+
+  .casestudies-list {
+    h2, h3 {
+      color: #fff;
+      font-weight: 300;
+    }
+    h2 {
+      font-size: 32px;
+      text-transform: none;
+      @media screen and (max-width: 1000px) {
+        font-size: 24px;
+      }
+    }
+    h3 {
+      font-size: 16px;
+    }
+    
+    a {
+      width: 32.5%;
+      max-width: 318px;
+      height: auto;
+
+      @media screen and (max-width: 768px) { // Switch to 2 columns
+        width: 49%;
+      }
+
+    }
+  }
+
 }
\ No newline at end of file
index fc55d85f52cc70833def5b4bf9aeabb0a9c59986..9de73724c9ac34ed4ca71c6e7f16feed999a207c 100644 (file)
@@ -1,88 +1,88 @@
 @import "00-constants";
 
 section.list {
+  padding-top: 100px;
+  padding-bottom: 100px;
 
-       &.white {
-               background-color: #fff;
-               color: #222428;
-               a {
-                       color: #222428;
-                       text-decoration: underline;
-               }
-       }
+  &.white {
+    background-color: #fff;
+    color: #222428;
+    a {
+      color: #222428;
+      text-decoration: underline;
+    }
+  }
 
-       &.grey {
-               background-color: #eeeff3;
-               color: #222428;
-               a {
-                       color: #222428;
-                       text-decoration: underline;
-               }
-       }
+  &.grey {
+    background-color: #eeeff3;
+    color: #222428;
+    a {
+      color: #222428;
+      text-decoration: underline;
+    }
+  }
 
-       &#expertisehome {
-               background-color: #fff;
-               color: #1b1b1b;
-       }
+  &#expertisehome {
+    background-color: #fff;
+    color: #1b1b1b;
+  }
+}
 
-       .bloc-holder {
-               padding-top: 50px;
-               padding-bottom: 50px;
-               overflow: hidden;
-               h2 {
-                       font-size: 56px;
-               }
-               h3 {
-                       font-size: 32px;
-                       padding: 0 0 20px 0;
-               }
-               a.but {
-                       background-color: @yellow;
-               }
+.bloc-holder {
+    overflow: hidden;
+    h2 {
+        font-size: 56px;
+    }
+    h3 {
+        font-size: 32px;
+        padding: 0 0 20px 0;
+    }
+    a.but {
+        background-color: @yellow;
+    }
 
-               .blocs {
-                       padding: 40px 0;
-                       overflow: hidden;
+    .blocs {
+        padding: 40px 0;
+        overflow: hidden;
 
-                       &.two {
-                               margin-bottom: -50px; // Offset the 50px margins on the .sousbloc
+        &.two {
+            margin-bottom: -50px; // Offset the 50px margins on the .sousbloc
 
-                               .sousbloc {
-                                       white-space: normal;
-                                       width: 50%;
-                                       padding-right: 20px;
-                                       margin-bottom: 50px;
+            .sousbloc {
+                white-space: normal;
+                width: 50%;
+                padding-right: 20px;
+                margin-bottom: 50px;
 
-                                       &:nth-of-type(2n) {
-                                               padding-right: 0;
-                                               padding-left: 20px;
-                                       }
+                &:nth-of-type(2n) {
+                    padding-right: 0;
+                    padding-left: 20px;
+                }
 
-                                       @media screen and (max-width: 990px) {
-                                               display: block;
-                                               width: 100%;
+                @media screen and (max-width: 990px) {
+                    display: block;
+                    width: 100%;
 
-                                               &:nth-of-type(2n) {
-                                                       padding: 0;
-                                               }
-                                       }
-                               }
-                       }
+                    &:nth-of-type(2n) {
+                        padding: 0;
+                    }
+                }
+            }
+        }
 
-                       .sousbloc {
-                               display: inline-block;
-                               vertical-align: top;
-                               margin: 0 0 50px 0;
-                               &:extend(.media);
+        .sousbloc {
+            display: inline-block;
+            vertical-align: top;
+            margin: 0 0 50px 0;
+            &:extend(.media);
 
-                               .text {
-                                       &:extend(.media--body);
-                               }
-                               img {
-                                       &:extend(.media--item);
-                               }
-                       }
-               }
+            .text {
+                &:extend(.media--body);
+            }
+            img {
+                &:extend(.media--item);
+            }
+        }
+    }
 
-       }
 }
\ No newline at end of file
index 0e72fa31e00cf016c440d72f123fed9912da0a77..c2105360e8895a685b39979dc8d41cb7fb97ab80 100644 (file)
@@ -17,7 +17,7 @@ ul.tags {
                &:hover, &.active {
                        cursor: pointer;
                        color: #fff;
-                       background-color: #84ae1e;
+                       background-color: #f6ae01;
                }
        }
 }
\ No newline at end of file