From 72455c44a89c9930d5d52c04717f87d9a8ecb67c Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 18 Dec 2024 17:51:52 +0100 Subject: [PATCH] wip #7217 @5 --- framework/application/forms/CMS/Home.php | 3 +- .../views/helpers/CaseStudiesSelectGrid.php | 13 +--- .../views/scripts/templates/home.phtml | 6 +- images/logo/Cubedesigners-mini.svg | 18 ----- images/logo/Cubedesigners.svg | 66 ------------------- images/logo/Symbol.svg | 15 ++--- js/casestudies.js | 65 ------------------ js/header.js | 5 ++ less/casestudies.less | 4 +- less/casestudies_grid.less | 18 ++--- less/header.less | 4 -- less/home.less | 8 ++- 12 files changed, 25 insertions(+), 200 deletions(-) delete mode 100644 images/logo/Cubedesigners-mini.svg delete mode 100644 images/logo/Cubedesigners.svg diff --git a/framework/application/forms/CMS/Home.php b/framework/application/forms/CMS/Home.php index f3d3445..52c5361 100644 --- 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 b5221eb..a9177c6 100644 --- 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 .= '
'; + $c .= '

' . $study->titre . '

'; - //$c.= '

' . implode(' / ', $tag_names) . '

'; $c .= '

' . $study->legende . '

'; - $c .= '
'; // .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 977ebc4..599d528 100644 --- 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 '
'; -echo $this->caseStudiesSelectGrid(explode(',', $this->case_studies['casestudies']), 6); +echo $this->caseStudiesSelectGrid(explode(',', $this->case_studies['casestudies']), 3); echo '
'; if ($this->case_studies['button']['label']) { @@ -34,6 +35,3 @@ if ($this->case_studies['button']['label']) { } echo ''; echo ''; - -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 index ed06b5c..0000000 --- a/images/logo/Cubedesigners-mini.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - diff --git a/images/logo/Cubedesigners.svg b/images/logo/Cubedesigners.svg deleted file mode 100644 index f5e81a7..0000000 --- a/images/logo/Cubedesigners.svg +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/logo/Symbol.svg b/images/logo/Symbol.svg index 023a40a..622ea69 100644 --- a/images/logo/Symbol.svg +++ b/images/logo/Symbol.svg @@ -1,19 +1,12 @@ - - - - - - - + + + + diff --git a/js/casestudies.js b/js/casestudies.js index 2a5f7a4..4d0e45a 100644 --- 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 c6e9148..b904f8c 100644 --- 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 3445ee3..2dfc078 100644 --- 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 860db0e..9471bfe 100644 --- 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 b58bf29..730f3c8 100644 --- 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 b279127..6d8da19 100644 --- 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 { -- 2.39.5