From: stephen@cubedesigners.com Date: Fri, 14 Aug 2015 17:26:14 +0000 (+0000) Subject: Branding updates and new features (work in progress..) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=13e4ba20bc936b57da9d9afba76cdf4141b89e80;p=cubedesigners-v7.git Branding updates and new features (work in progress..) --- diff --git a/framework/application/forms/CMS/Home.php b/framework/application/forms/CMS/Home.php index bd7d3cd..2c5feb9 100644 --- a/framework/application/forms/CMS/Home.php +++ b/framework/application/forms/CMS/Home.php @@ -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 index 0000000..837ddcd --- /dev/null +++ b/framework/application/forms/CMS/Sub/ExpertiseCategories.php @@ -0,0 +1,16 @@ +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 index 0000000..63719ce --- /dev/null +++ b/framework/application/forms/CMS/Sub/Home/CaseStudies.php @@ -0,0 +1,26 @@ +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 index 0000000..0178d95 --- /dev/null +++ b/framework/application/forms/CMS/Sub/Home/Clients.php @@ -0,0 +1,22 @@ +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 index 0000000..ca99f4e --- /dev/null +++ b/framework/application/forms/CMS/Sub/Home/Clients/Bloc.php @@ -0,0 +1,24 @@ +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 index 0000000..ecbb3dc --- /dev/null +++ b/framework/application/forms/CMS/Sub/Home/Clients/Blocs.php @@ -0,0 +1,16 @@ +setBaseSubForm($bloc); + $this->setBaseLegend('Edition du bloc « $titre »'); + $this->setNewLegend('Nouveau bloc'); + } + +} + +?> diff --git a/framework/application/forms/CMS/Sub/Home/Expertises.php b/framework/application/forms/CMS/Sub/Home/Expertises.php index fea8749..4fb7b40 100644 --- a/framework/application/forms/CMS/Sub/Home/Expertises.php +++ b/framework/application/forms/CMS/Sub/Home/Expertises.php @@ -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'); } } diff --git a/framework/application/forms/CMS/Sub/Realisations/Realisations.php b/framework/application/forms/CMS/Sub/Realisations/Realisations.php index cce7b04..f96ad8d 100644 --- a/framework/application/forms/CMS/Sub/Realisations/Realisations.php +++ b/framework/application/forms/CMS/Sub/Realisations/Realisations.php @@ -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')); } diff --git a/framework/application/forms/Categories.php b/framework/application/forms/Categories.php index 7ce372b..85890a7 100644 --- a/framework/application/forms/Categories.php +++ b/framework/application/forms/Categories.php @@ -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 index 0000000..05b2cb1 --- /dev/null +++ b/framework/application/forms/Element/CategoriesCheckboxes.php @@ -0,0 +1,9 @@ +setBaseForm('Cubedesigners_Form_Categories'); + } + +} \ No newline at end of file diff --git a/framework/application/models/Categorie.php b/framework/application/models/Categorie.php index 856ae95..3741ae0 100644 --- a/framework/application/models/Categorie.php +++ b/framework/application/models/Categorie.php @@ -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)); } } diff --git a/framework/application/views/helpers/CasestudiesDetail.php b/framework/application/views/helpers/CasestudiesDetail.php index 4e07e9c..e83e5ee 100644 --- a/framework/application/views/helpers/CasestudiesDetail.php +++ b/framework/application/views/helpers/CasestudiesDetail.php @@ -10,7 +10,6 @@ class Cubedesigners_View_Helper_CasestudiesDetail extends CubeIT_View_Helper_Abs $res.='
'; $res.='

' . $studie->titre . '

'; $res.='

' . $studie->description . '

'; - $res.= $this->view->link(__('Fermer'), $this->currentPage->getParent()->getHref(), array('class' => 'close', 'id' => 'closeButton')); $res.='
'; $res .= '
'; @@ -84,7 +83,7 @@ class Cubedesigners_View_Helper_CasestudiesDetail extends CubeIT_View_Helper_Abs if ($bloc->selectedtype == "video") { $res .= '
'; - $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 diff --git a/framework/application/views/helpers/CasestudiesList.php b/framework/application/views/helpers/CasestudiesList.php index 1536b8a..09b5ce8 100644 --- a/framework/application/views/helpers/CasestudiesList.php +++ b/framework/application/views/helpers/CasestudiesList.php @@ -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.= '

' . $s->titre . '

'; $c.='

' . $s->description . '

'; - 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 } } diff --git a/framework/application/views/helpers/CategoriesList.php b/framework/application/views/helpers/CategoriesList.php index 2e18f4e..450b7b1 100644 --- a/framework/application/views/helpers/CategoriesList.php +++ b/framework/application/views/helpers/CategoriesList.php @@ -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(); diff --git a/framework/application/views/helpers/Realisation.php b/framework/application/views/helpers/Realisation.php index 4c4a8dd..02de4b4 100644 --- a/framework/application/views/helpers/Realisation.php +++ b/framework/application/views/helpers/Realisation.php @@ -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 .= '
'; - $res .= '
'; - $res .= '

' . $r->titre . '

'; - $res .= '

' . Cubedesigners_Util::getCategoryById($r->categories, $this->localeDefault()) . '

'; + $res .= '
'; $res .= $this->view->link(__('Fermer'), $this->currentPage->getParent()->getHref(), array('class' => 'close', 'id' => 'closeButton')); $res .= '
'; @@ -32,13 +30,19 @@ class Cubedesigners_View_Helper_Realisation extends CubeIT_View_Helper_Abstract $res .= $this->imageSlideshowScroll($slides, 439, array(), array('shortcuts' => false)); $res .= '
'; + $res .= '

' . $r->titre . '

'; + $res .= '
    '; + $res .= '
  • ' . $this->dateTime($realisation->date, Zend_Date::YEAR) . '
  • '; + $res .= '
  • ' . Cubedesigners_Util::getCategoryById($r->categories, $this->localeDefault()) . '
  • '; + $res .= '
'; - if (!empty($r->url->url)) { - $res .= $this->_button($r->url); - } + $res .= $this->markupDotclear($r->description); - $res .= $this->markupDotclear($r->description); - $res .= '
'; + if (!empty($r->url->url)) { + $res .= $this->_button($r->url); + } + + $res .= '
'; $res .= '
'; return $res; diff --git a/framework/application/views/helpers/RealisationsList.php b/framework/application/views/helpers/RealisationsList.php index bc50b51..161962c 100644 --- a/framework/application/views/helpers/RealisationsList.php +++ b/framework/application/views/helpers/RealisationsList.php @@ -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 .= '

' . $r->titre . '

'; - $rea .= '

' . Cubedesigners_Util::getCategoryById($r->categories, $this->localeDefault()) . ' / ' . $this->dateTime($r->date, Zend_Date::YEAR) . '

'; + //$visuel = $this->view->imageProcess($r->visuel_detail, '', null, 440); + + $rea = $this->view->imageProcess($r->visuel, $r->titre, 236, 236); +// fb($r, 'r'); + $rea.= '
'; + $rea.= '
'; + $rea.= '
'; + $rea.='

' . $r->titre . '

'; + // replace last occurrence of space with nbsp; to prevent orphans (http://stackoverflow.com/a/18113904) + $rea.='

' . strrev(implode(strrev(' '), explode(' ', strrev($r->legende), 2))) . '

'; + $rea.= '
'; // .details (display: table-cell) + $rea.= '
'; // .details-holder (display: table) + $rea.= '
'; // .details-positioner (display: block; position: absolute) $url = Cubedesigners_Util::generateAutoUri($r, $datas['seourl_rea'], $this->localeDefault()); diff --git a/framework/application/views/scripts/studies/index.phtml b/framework/application/views/scripts/studies/index.phtml index 911d40d..7af939a 100644 --- a/framework/application/views/scripts/studies/index.phtml +++ b/framework/application/views/scripts/studies/index.phtml @@ -6,9 +6,10 @@ $this->headScript()->addScriptAndStyle('casestudies_detail'); echo $this->CasestudiesDetail($this->studie); ?> - -
markupDotclear($this->casestudies_titre); ?>
- \ No newline at end of file diff --git a/framework/application/views/scripts/templates/expertise.phtml b/framework/application/views/scripts/templates/expertise.phtml index 7f19282..73a441c 100644 --- a/framework/application/views/scripts/templates/expertise.phtml +++ b/framework/application/views/scripts/templates/expertise.phtml @@ -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 ''; // .casestudies-list diff --git a/framework/application/views/scripts/templates/home.phtml b/framework/application/views/scripts/templates/home.phtml index acf4c44..3d467c1 100644 --- a/framework/application/views/scripts/templates/home.phtml +++ b/framework/application/views/scripts/templates/home.phtml @@ -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 '
'; +echo '
'; +echo '

'. $this->case_studies['titre'] .'

'; +echo $this->markupDotclear($this->case_studies['texte']); + +echo '
'; +echo $this->CasestudiesList($case_studies_data, null, null, $this->case_studies['display_count']); +echo '
'; + +if ($this->case_studies['button']['label']) { + echo $this->linkCMS($this->case_studies['button'], array('class' => 'but')); +} +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/framework/application/views/scripts/templates/realisations.phtml b/framework/application/views/scripts/templates/realisations.phtml index 510a938..5ab73b3 100644 --- a/framework/application/views/scripts/templates/realisations.phtml +++ b/framework/application/views/scripts/templates/realisations.phtml @@ -6,7 +6,7 @@ $this->headScript()->addScriptAndStyle('realisations');
CategoriesList("realisations", 'realisations-list', 170, 32); + echo $this->CategoriesList("realisations", 'realisations-list', 236, 12); ?>
diff --git a/less/01-mixins.less b/less/01-mixins.less index b85f859..474965b 100644 --- a/less/01-mixins.less +++ b/less/01-mixins.less @@ -111,4 +111,19 @@ } } } +} + + +// Justified group (evenly space inline-block elements in a grid without specifying margins) +// From: https://gist.github.com/interactivellama/5699885 +// Note: elements *must* have whitespace between them or this won't work. No minified HTML. +.jgroup { + text-align: justify; + font-size: 0.1px; + + &:after{ + content: ''; + display: inline-block; + width: 100%; + } } \ No newline at end of file diff --git a/less/admin.less b/less/admin.less index ba9bc26..9f15024 100644 --- a/less/admin.less +++ b/less/admin.less @@ -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; diff --git a/less/agence.less b/less/agence.less index bb51c7a..e0d9dda 100644 --- a/less/agence.less +++ b/less/agence.less @@ -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; diff --git a/less/casestudies_detail.less b/less/casestudies_detail.less index 2e02ef1..1d1ae6c 100644 --- a/less/casestudies_detail.less +++ b/less/casestudies_detail.less @@ -102,12 +102,15 @@ } .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 { diff --git a/less/common.less b/less/common.less index 25f0f15..1f068e5 100644 --- a/less/common.less +++ b/less/common.less @@ -44,7 +44,7 @@ h1, h2, h3, h4, h5, h6 { } h1, h2 { - font-weight: 500; + font-weight: 400; text-transform: uppercase; } diff --git a/less/header.less b/less/header.less index f7a86e7..076d13c 100644 --- a/less/header.less +++ b/less/header.less @@ -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; diff --git a/less/home.less b/less/home.less index f157f3b..103ce50 100644 --- a/less/home.less +++ b/less/home.less @@ -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 diff --git a/less/list.less b/less/list.less index fc55d85..9de7372 100644 --- a/less/list.less +++ b/less/list.less @@ -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 diff --git a/less/taglist.less b/less/taglist.less index 0e72fa3..c210536 100644 --- a/less/taglist.less +++ b/less/taglist.less @@ -17,7 +17,7 @@ ul.tags { &:hover, &.active { cursor: pointer; color: #fff; - background-color: #84ae1e; + background-color: #f6ae01; } } } \ No newline at end of file