From 85f94dee01a30236daa60336a85ff24cd1f7feea Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 18 Nov 2014 16:33:33 +0000 Subject: [PATCH] --- .../forms/CMS/Sub/Followus/SocialNetwork.php | 36 +- framework/application/forms/Settings.php | 79 +-- .../views/helpers/CasestudiesTagsList.php | 2 +- .../views/helpers/FooterSocials.php | 46 +- .../views/helpers/RealisationsList.php | 114 ++-- .../application/views/helpers/TagList.php | 11 + framework/application/views/helpers/Tags.php | 4 + .../views/scripts/common/footer.phtml | 2 +- js/footer.js | 9 + js/realisations.js | 605 +++++++++--------- less/casestudies.less | 38 +- less/common.less | 7 +- less/footer.less | 7 +- less/header.less | 2 +- less/home.less | 4 + less/realisations.less | 70 +- less/taglist.less | 2 +- 17 files changed, 523 insertions(+), 515 deletions(-) create mode 100644 framework/application/views/helpers/TagList.php create mode 100644 js/footer.js diff --git a/framework/application/forms/CMS/Sub/Followus/SocialNetwork.php b/framework/application/forms/CMS/Sub/Followus/SocialNetwork.php index e6b85a8..cbcdd6a 100644 --- a/framework/application/forms/CMS/Sub/Followus/SocialNetwork.php +++ b/framework/application/forms/CMS/Sub/Followus/SocialNetwork.php @@ -2,22 +2,26 @@ class Cubedesigners_Form_CMS_Sub_Followus_SocialNetwork extends CubeIT_Form_SubForm { - public function init() { - parent::init(); - - $titre = new Zend_Form_Element_Text('titre'); - $titre->setLabel('Titre du réseau social'); - $this->addElement($titre); - - $url = new CubeIT_Form_Element_Url('url'); - $url->setLabel('Url'); - $this->addElement($url); - - $picto = new CubeIT_Form_Element_File_Image('picto'); - $picto->setLabel('Pictogramme'); - $picto->setMaxItems(1); - $this->addElement($picto); - } + public function init() { + parent::init(); + + $titre = new Zend_Form_Element_Text('titre'); + $titre->setLabel('Titre du réseau social'); + $this->addElement($titre); + + $url = new CubeIT_Form_Element_Url('url'); + $url->setLabel('Url'); + $this->addElement($url); + + $couleur = new CubeIT_Form_Element_Color('color'); + $couleur->setLabel('Couleur'); + $this->addElement($couleur); + + $picto = new CubeIT_Form_Element_File_Image('picto'); + $picto->setLabel('Pictogramme'); + $picto->setMaxItems(1); + $this->addElement($picto); + } } diff --git a/framework/application/forms/Settings.php b/framework/application/forms/Settings.php index a14c418..2275cd4 100644 --- a/framework/application/forms/Settings.php +++ b/framework/application/forms/Settings.php @@ -2,44 +2,47 @@ class Cubedesigners_Form_Settings extends CubeIT_Form_Settings { - public function init() { - parent::init(); - - $this->setTitle('Edition des paramètres du site'); - - $longTitle = new Zend_Form_Element_Text('longTitle'); - $longTitle->setLabel('Titre long par défaut'); - $this->addElementLocalized($longTitle); - - $description = new CubeIT_Form_Element_Textarea('description'); - $description->setLabel('Description de la page par défaut'); - $this->addElementLocalized($description); - - /* BLOC CONTACT */ - $contact = new Cubedesigners_Form_CMS_Sub_Contact(); - $contact->setLabel('Informations de contact'); - $this->addSubFormLocalized($contact, 'contact'); - - - /* BLOC ACTUALITES */ - $actus = new Cubedesigners_Form_CMS_Sub_News(); - $actus->setLabel('Bloc Actualités'); - $this->addSubFormLocalized($actus, 'actus'); - - /* BLOC SUIVEZ-NOUS */ - $followus = new Cubedesigners_Form_CMS_Sub_Followus(); - $followus->setLabel('Bloc Suivez-nous'); - $this->addSubFormLocalized($followus, 'followus'); - - /* COPYRIGHT */ - $copyright = new Zend_Form_Element_Text('copyright'); - $copyright->setLabel('Copyright du bas de page'); - $this->addElementLocalized($copyright); - - $tags = new Cubedesigners_Form_Element_Tags('tags'); - $tags->setLabel(__('Tags')); - $this->addElement($tags); - } + public function init() { + parent::init(); + + $this->setTitle('Edition des paramètres du site'); + + $longTitle = new Zend_Form_Element_Text('longTitle'); + $longTitle->setLabel('Titre long par défaut (limité à 65 caractères)'); + $longTitle->setAttrib('maxlength', 65); + $this->addElementLocalized($longTitle); + + $description = new CubeIT_Form_Element_Textarea('description'); + $description->setLabel('Description de la page par défaut (limité à 160 caractères)'); + $description->setAttrib('maxlength', 160); + $description->setAttrib('rows', 2); + $this->addElementLocalized($description); + + /* BLOC CONTACT */ + $contact = new Cubedesigners_Form_CMS_Sub_Contact(); + $contact->setLabel('Informations de contact'); + $this->addSubFormLocalized($contact, 'contact'); + + + /* BLOC ACTUALITES */ + $actus = new Cubedesigners_Form_CMS_Sub_News(); + $actus->setLabel('Bloc Actualités'); + $this->addSubFormLocalized($actus, 'actus'); + + /* BLOC SUIVEZ-NOUS */ + $followus = new Cubedesigners_Form_CMS_Sub_Followus(); + $followus->setLabel('Bloc Suivez-nous'); + $this->addSubFormLocalized($followus, 'followus'); + + /* COPYRIGHT */ + $copyright = new Zend_Form_Element_Text('copyright'); + $copyright->setLabel('Copyright du bas de page'); + $this->addElementLocalized($copyright); + + $tags = new Cubedesigners_Form_Element_Tags('tags'); + $tags->setLabel(__('Tags')); + $this->addElement($tags); + } } diff --git a/framework/application/views/helpers/CasestudiesTagsList.php b/framework/application/views/helpers/CasestudiesTagsList.php index 7f4c3d1..64ff070 100644 --- a/framework/application/views/helpers/CasestudiesTagsList.php +++ b/framework/application/views/helpers/CasestudiesTagsList.php @@ -1,6 +1,6 @@ '; - foreach ($socials as $id => $social) { - $image = $this->view->imageCms($social['picto'], $social['titre'], 25, 25); - $res.=''; - } - $res.= ''; - - return $res; - } - -} - -?> +'; + foreach ($socials as $id => $social) { + $image = $this->view->imageCms($social['picto'], $social['titre'], 25, 25); + $res.=$this->link($image, $social['url'], array('class' => 'social', 'data-color' => $social['color'])); + } + $res.= ''; + + return $res; + } + +} + +?> diff --git a/framework/application/views/helpers/RealisationsList.php b/framework/application/views/helpers/RealisationsList.php index 42e9fad..66a6321 100644 --- a/framework/application/views/helpers/RealisationsList.php +++ b/framework/application/views/helpers/RealisationsList.php @@ -1,59 +1,55 @@ -isAllowed("edition"); - - $db = Zend_Db_Table::getDefaultAdapter(); - $s = $db->select()->from('realisations') - ->order('id ASC'); - if (!$acl) { - $s->where('online = ?', 1); - } - - $q = $s->query(); - - $count = 1; - - $res = ''; - - $test = 0; - while ($r = $q->fetch()) { - - $r = CubeIT_Util_Cms::unserialize($r); - - $addSpacer = false; - - $addClass = ' blocmargin'; - - - $addOffline = ''; - if ($acl && $r->online == 0) { - $addOffline = 'data-offline="1"'; - } - - - $visuel = $this->view->imageProcess($r->visuel_detail, '', null, 440); - - - $image = $this->view->imageProcess($r->visuel, $r->titre, 230, 230); - $url = CubeIT_Navigation_Page::generateAutoUri($r, $datas['seourl_rea']); - - $res .= ''; - $res .= '
'; - $res .= '
' . $image . '
'; - $res .= '
'; - $res .= ''; - $test++; - - $count++; - } - - return $res; - } - -} - -?> +isAllowed("edition"); + + $db = Zend_Db_Table::getDefaultAdapter(); + $s = $db->select()->from('realisations') + ->order('date DESC'); + if (!$acl) { + $s->where('online = ?', 1); + } + + $q = $s->query(); + + $count = 1; + + $res = ''; + + $test = 0; + while ($r = $q->fetch()) { + + $r = CubeIT_Util_Cms::unserialize($r); + + $addSpacer = false; + + $addClass = ' blocmargin'; + + + $addOffline = ''; + if ($acl && $r->online == 0) { + $addOffline = 'data-offline="1"'; + } + + + $visuel = $this->view->imageProcess($r->visuel_detail, '', null, 440); + + + $image = $this->view->imageProcess($r->visuel, $r->titre, 127, 127); + $url = CubeIT_Navigation_Page::generateAutoUri($r, $datas['seourl_rea']); + + $res .= $this->link($image, $url, array('data-id' => $r->id, 'data-categorie' => $r->categories)); + $test++; + + $count++; + } + + return $res; + } + +} + +?> diff --git a/framework/application/views/helpers/TagList.php b/framework/application/views/helpers/TagList.php new file mode 100644 index 0000000..ecd9886 --- /dev/null +++ b/framework/application/views/helpers/TagList.php @@ -0,0 +1,11 @@ +view->headLink()->appendStylesheet('/less/taglist.less'); if (isset($attrs['class'])) { $attrs['class'].=" tags"; @@ -12,6 +14,8 @@ class Cubedesigners_View_Helper_Tags extends CubeIT_View_Helper_ListUnordered { $items[] = array('content' => __('TOUT VOIR'), 'class' => 'active', 'data-id' => 0); foreach ($tags as $id => $name) { + + $items[] = array('content' => $name, 'data-id' => $id); } return $this->listUnordered($items, $attrs); diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml index d6162c9..d0532a8 100644 --- a/framework/application/views/scripts/common/footer.phtml +++ b/framework/application/views/scripts/common/footer.phtml @@ -1,5 +1,5 @@ headLink()->appendStylesheet('/less/footer.less'); +$this->headScript()->addScriptAndStyle('footer'); $mentions_page = $this->navigation()->getContainer()->findOneById($this->localeDefault() . '/7'); $mentions = '/'; diff --git a/js/footer.js b/js/footer.js new file mode 100644 index 0000000..fcf09ff --- /dev/null +++ b/js/footer.js @@ -0,0 +1,9 @@ +registerLoader(load_footer); + +function load_footer() { + $('a.social').on('mouseenter', function () { + $(this).css('background-color', $(this).data('color')); + }).on('mouseleave', function () { + $(this).css('background-color', ''); + }); +} \ No newline at end of file diff --git a/js/realisations.js b/js/realisations.js index a68320e..fd14ecb 100644 --- a/js/realisations.js +++ b/js/realisations.js @@ -1,303 +1,304 @@ -TO_LOAD_ONCE[TO_LOAD_ONCE.length]='load_realisations();'; - -var showIds = new Array(); -var isAnim = false; -var currentOpen = 0; -var currentOpenValues; -var detail = ""; -var currentSlide = 1; -var autoSlide = false; -var totalWidth; -var lastWidth; -var showIds = new Array(); - -function load_realisations() { - initTagsLink(); - - $("#main").css('height', 1500); - - $(".bloc").click( function () { - - var currentRea = $(this).attr("data-pos"); - - if( !isAnim && currentRea != currentOpen ) { - - isAnim = true; - - var reaWidth = $(this).width() + parseInt($(this).css("margin-right").split("px")[0]); - var reaId = $(this).parent().attr("data-id"); - var reaPerRow = $(this).parent().parent().width() / reaWidth; - - var nbReas = $('.project-photo').length; - - var nbRow = Math.ceil(nbReas / reaPerRow ); - - var reaPos = 1; - var count = 0; - - var cible = $("#realisations-list").find("[data-pos='1']"); - - while( count < currentRea) { - count++; - if( (count % (reaPerRow+1)) == 0 ) { - reaPos++; - cible = $("#realisations-list").find("[data-pos='" + count + "']"); - } - } - - detail = ""; - - $.ajax({ - url : '/ajax/displayrealisation', - type : 'GET', - data: 'realisation_id=' + reaId, - complete: function(ret) { - - var response = JSON.parse(ret.responseText); - var rea = response.vars.rea; - - currentOpenValues = rea; - - detail += '
'; - detail += '
'; - detail += '
'+rea.titre+'
'; - - if( rea.legende != '') { - detail += '
'+rea.legende+'
'; - } - - if( rea.agence != '') { - detail += '
Agence : '+rea.agence+'
'; - } - - - detail += '
    '; - detail += '
  • ' + rea.annee +'
    • '; - - for( var i=0; i'; - } - - detail += '
'; - - - detail += '
'+rea.description+'
'; - detail += 'Voir le site'; - detail += '
'; - detail += '
    '; - - totalWidth = 0; - for( var i=0; i'; - } - - detail += '
'; - detail += '
'; - - if( $( "#detail" ).length > 0) { - $( "#detail" ).slideUp( 500, function() { - - $('#detailContent').remove(); - - $(cible.parent()).before(detail); - - $("html, body").animate({ scrollTop: $('#detailContent').offset().top-100 }, 1000); - $('.close').css("top", $('#detailContent').offset().top); - - $( "#detail" ).slideDown( "slow", function() { - isAnim = false; - addCloseAction(); - currentSlide = 1; - autoSlide = true; - initSlideShow(); - - }).animate( - { opacity: 1 }, - { queue: true, duration: 'slow' } - ); - - }).animate( - { opacity: 1 }, - { queue: true, duration: 'slow' } - ); - }else{ - $(cible.parent()).before(detail); - - $("html, body").animate({ scrollTop: $('#detailContent').offset().top-100 }, 1000); - $('.close').css("top", $('#detailContent').offset().top); - /* - $( "#detail" ).slideDown( "slow", function() { - - isAnim = false; - addCloseAction(); - currentSlide = 1; - autoSlide = true; - initSlideShow(); - - }).animate( - { opacity: 1 }, - { queue: true, duration: 'slow' } - );*/ - - - $( "#detail" ).addClass("showDown"); - $('#detail').one("webkitTransitionEnd transitionend oTransitionEnd msTransitionEnd transitionEnd", function(e) { - isAnim = false; - addCloseAction(); - currentSlide = 1; - autoSlide = true; - initSlideShow(); - }); - - } - - /*$(".project-photo").each( function() { - var id = $(this).parent().attr("data-pos"); - if( id != currentRea ) { - $(this).addClass("gray"); - }else{ - $(this).removeClass("gray"); - } - });*/ - } - - }); - - - } - - currentOpen = currentRea; - }); -} - -function addCloseAction() { - $(".close").click(function() { - $("html, body").animate({ scrollTop: 0 }, 1000); - - /* $( "#detail" ).slideUp( "slow", function() { - $('#detailContent').remove(); - currentOpen = 0; - $(".project-photo").each( function() { - $(this).removeClass("gray"); - }); - }).animate( - { opacity: 1 }, - { queue: false, duration: 'slow' } - );*/ - - $( "#detail" ).addClass("showUp"); - $('#detail').one("webkitTransitionEnd transitionend oTransitionEnd msTransitionEnd transitionEnd", function(e) { - currentOpen = 0; - $(".project-photo").each( function() { - $(this).removeClass("gray"); - }); - }); - - }); -} - -function initTagsLink() { - - $(".tag").click(function() { - - $(".close").click(); - - $(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'); - } - - displayRealisations(); - }); - -} - -function displayRealisations() { - - if( showIds.length ) { - $('#realisations-list .bloc').each(function(){ - var categories = $(this).attr("data-categories"); - if( $.inArray( categories, showIds ) == -1 ) { - $(this).parent().fadeOut( 500, function() {}); - }else{ - $(this).parent().fadeIn( 500, function() {}); - } - }); - }else{ - $( '#realisations-list .bloc' ).parent().fadeIn( 500, function() {}); - } - -} - -function initSlideShow() { - - var mouse_move=false; - function move(e) { - if(mouse_move) { - if(document.documentElement.clientWidth>0) { - - position = e.pageX-document.documentElement.scrollLeft; - } else { - position = e.pageX-document.body.scrollLeft; - } - } - } - document.onmousemove=move; - - $(".slides").mouseover(function(e){ - - mouse_move = true; - le_div = '.' + 'slides'; - - if($(le_div + " ul li").length > 1){ - - var total_lenght = totalWidth; - - var t= setInterval(function(){ - - var offset = $(le_div).offset(); - - if((position - offset.left) < ($("#detailContent").width()/2) ){ - if($(le_div + " ul").css('marginLeft').replace("px", "") > - (total_lenght - lastWidth)){ - $(le_div + " ul").animate({marginLeft:"-=2px"},0); - } - }else{ - if($(le_div + " ul").css('marginLeft').replace("px", "") <= 0){ - $(le_div + " ul").animate({marginLeft:"+=2px"},0); - } - } - - },5); - - $(le_div).mouseout(function(){ - clearInterval(t); - mouse_move=false; - }); - } - }); - +TO_LOAD_ONCE[TO_LOAD_ONCE.length] = 'load_realisations();'; + +var showIds = new Array(); +var isAnim = false; +var currentOpen = 0; +var currentOpenValues; +var detail = ""; +var currentSlide = 1; +var autoSlide = false; +var totalWidth; +var lastWidth; +var showIds = new Array(); + +function load_realisations() { + initTagsLink(); + + $(".bloc").click(function () { + + var currentRea = $(this).attr("data-pos"); + + if (!isAnim && currentRea != currentOpen) { + + isAnim = true; + + var reaWidth = $(this).width() + parseInt($(this).css("margin-right").split("px")[0]); + var reaId = $(this).parent().attr("data-id"); + var reaPerRow = $(this).parent().parent().width() / reaWidth; + + var nbReas = $('.project-photo').length; + + var nbRow = Math.ceil(nbReas / reaPerRow); + + var reaPos = 1; + var count = 0; + + var cible = $("#realisations-list").find("[data-pos='1']"); + + while (count < currentRea) { + count++; + if ((count % (reaPerRow + 1)) == 0) { + reaPos++; + cible = $("#realisations-list").find("[data-pos='" + count + "']"); + } + } + + detail = ""; + + $.ajax({ + url: '/ajax/displayrealisation', + type: 'GET', + data: 'realisation_id=' + reaId, + complete: function (ret) { + + var response = JSON.parse(ret.responseText); + var rea = response.vars.rea; + + currentOpenValues = rea; + + detail += '
'; + detail += '
'; + detail += '
' + rea.titre + '
'; + + if (rea.legende != '') { + detail += '
' + rea.legende + '
'; + } + + if (rea.agence != '') { + detail += '
Agence : ' + rea.agence + '
'; + } + + + detail += '
    '; + detail += '
  • ' + rea.annee + '
    • '; + + for (var i = 0; i < rea.tags_secondaires.length; i++) { + detail += '
  • ' + rea.tags_secondaires[i] + '
    • '; + } + + detail += '
'; + + + detail += '
' + rea.description + '
'; + detail += 'Voir le site'; + detail += '
'; + detail += '
    '; + + totalWidth = 0; + for (var i = 0; i < rea.visuel_detail.length; i++) { + + var image = new Image(); + image.src = rea.visuel_detail[i]; + totalWidth += image.width; + + if (i == (rea.visuel_detail.length - 1)) { + lastWidth = image.width; + } + + detail += '
    • '; + } + + detail += '
'; + detail += '
'; + + if ($("#detail").length > 0) { + $("#detail").slideUp(500, function () { + + $('#detailContent').remove(); + + $(cible.parent()).before(detail); + + $("html, body").animate({scrollTop: $('#detailContent').offset().top - 100}, 1000); + $('.close').css("top", $('#detailContent').offset().top); + + $("#detail").slideDown("slow", function () { + isAnim = false; + addCloseAction(); + currentSlide = 1; + autoSlide = true; + initSlideShow(); + + }).animate( + {opacity: 1}, + {queue: true, duration: 'slow'} + ); + + }).animate( + {opacity: 1}, + {queue: true, duration: 'slow'} + ); + } else { + $(cible.parent()).before(detail); + + $("html, body").animate({scrollTop: $('#detailContent').offset().top - 100}, 1000); + $('.close').css("top", $('#detailContent').offset().top); + /* + $( "#detail" ).slideDown( "slow", function() { + + isAnim = false; + addCloseAction(); + currentSlide = 1; + autoSlide = true; + initSlideShow(); + + }).animate( + { opacity: 1 }, + { queue: true, duration: 'slow' } + );*/ + + + $("#detail").addClass("showDown"); + $('#detail').one("webkitTransitionEnd transitionend oTransitionEnd msTransitionEnd transitionEnd", function (e) { + isAnim = false; + addCloseAction(); + currentSlide = 1; + autoSlide = true; + initSlideShow(); + }); + + } + + /*$(".project-photo").each( function() { + var id = $(this).parent().attr("data-pos"); + if( id != currentRea ) { + $(this).addClass("gray"); + }else{ + $(this).removeClass("gray"); + } + });*/ + } + + }); + + + } + + currentOpen = currentRea; + }); +} + +function addCloseAction() { + $(".close").click(function () { + $("html, body").animate({scrollTop: 0}, 1000); + + /* $( "#detail" ).slideUp( "slow", function() { + $('#detailContent').remove(); + currentOpen = 0; + $(".project-photo").each( function() { + $(this).removeClass("gray"); + }); + }).animate( + { opacity: 1 }, + { queue: false, duration: 'slow' } + );*/ + + $("#detail").addClass("showUp"); + $('#detail').one("webkitTransitionEnd transitionend oTransitionEnd msTransitionEnd transitionEnd", function (e) { + currentOpen = 0; + $(".project-photo").each(function () { + $(this).removeClass("gray"); + }); + }); + + }); +} + +function initTagsLink() { + + $(".tag").click(function () { + + $(".close").click(); + + $(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'); + } + + displayRealisations(); + }); + +} + +function displayRealisations() { + + if (showIds.length) { + $('#realisations-list .bloc').each(function () { + var categories = $(this).attr("data-categories"); + if ($.inArray(categories, showIds) == -1) { + $(this).parent().fadeOut(500, function () { + }); + } else { + $(this).parent().fadeIn(500, function () { + }); + } + }); + } else { + $('#realisations-list .bloc').parent().fadeIn(500, function () { + }); + } + +} + +function initSlideShow() { + + var mouse_move = false; + function move(e) { + if (mouse_move) { + if (document.documentElement.clientWidth > 0) { + + position = e.pageX - document.documentElement.scrollLeft; + } else { + position = e.pageX - document.body.scrollLeft; + } + } + } + document.onmousemove = move; + + $(".slides").mouseover(function (e) { + + mouse_move = true; + le_div = '.' + 'slides'; + + if ($(le_div + " ul li").length > 1) { + + var total_lenght = totalWidth; + + var t = setInterval(function () { + + var offset = $(le_div).offset(); + + if ((position - offset.left) < ($("#detailContent").width() / 2)) { + if ($(le_div + " ul").css('marginLeft').replace("px", "") > -(total_lenght - lastWidth)) { + $(le_div + " ul").animate({marginLeft: "-=2px"}, 0); + } + } else { + if ($(le_div + " ul").css('marginLeft').replace("px", "") <= 0) { + $(le_div + " ul").animate({marginLeft: "+=2px"}, 0); + } + } + + }, 5); + + $(le_div).mouseout(function () { + clearInterval(t); + mouse_move = false; + }); + } + }); + } \ No newline at end of file diff --git a/less/casestudies.less b/less/casestudies.less index a260a41..5559e13 100644 --- a/less/casestudies.less +++ b/less/casestudies.less @@ -8,26 +8,30 @@ .bloc { width:300px; float:left; + .project-photo { + width:300px; + height:225px; + background-color: #ccc; + margin:0 0 10px 0; + } + .project-title { + font-size: 32px; + line-height: 35px; + color:#1b1b1b; + } + .project-description { + font-size: 14px; + line-height: 16px; + color:#545454; + margin-bottom: 20px; + } + } a,a:hover { color:#000; } - .bloc .project-photo { - width:300px; - height:225px; - background-color: #ccc; - margin:0 0 20px 0; - } - - .bloc .project-title { - font-size: 32px; - } - .bloc .project-description { - font-size: 14px; - margin-bottom: 20px; - } .blocmargin { margin-right:40px; @@ -40,10 +44,4 @@ } #casestudies-detail-content { background-color: #3885E0; -} - -/* max-width pour faibles résolutions */ -@media screen and (max-width: 1009px) { - - } \ No newline at end of file diff --git a/less/common.less b/less/common.less index 5e838c4..ddc9308 100644 --- a/less/common.less +++ b/less/common.less @@ -78,19 +78,16 @@ a.but { } .title { - width: 980px; margin: 0 auto; padding: 40px 0 0 0; h1 { text-align: left; - font-weight: 300; font-size: 56px; - margin:0 0 10px 0; + line-height: 61px; } h2 { text-align: left; - font-weight: 300; font-size: 22px; - padding:0 0 20px 0; + line-height: 25px; } } diff --git a/less/footer.less b/less/footer.less index 61deea9..23c8211 100644 --- a/less/footer.less +++ b/less/footer.less @@ -96,16 +96,15 @@ .reseaux { .social { - float: left; + display:inline-block; width: 42px; height: 42px; + box-sizing: border-box; text-align: center; margin-right: 20px; background-color: #191919; border-radius: 25px; - img { - margin-top: 8px; - } + padding:8px 0 0 0; } .Facebook:hover { diff --git a/less/header.less b/less/header.less index fe67e8f..f6a8723 100644 --- a/less/header.less +++ b/less/header.less @@ -1,5 +1,5 @@ #header { - height:168px; + height:130px; ul{ text-transform: uppercase; diff --git a/less/home.less b/less/home.less index 99a5edf..2e93768 100644 --- a/less/home.less +++ b/less/home.less @@ -12,3 +12,7 @@ font-size: 32px; } } + +#header{ + height:168px !important; +} \ No newline at end of file diff --git a/less/realisations.less b/less/realisations.less index d553ba1..7f3c857 100644 --- a/less/realisations.less +++ b/less/realisations.less @@ -1,31 +1,26 @@ -#realisations-tagslist { - width: 980px; - margin: 0 auto; - padding: 0 0 20px 0; -} - - - #realisations-list { min-width: 980px; max-width: 980px; margin: 0 auto; padding: 0 0 50px 0; - // overflow: hidden; - - .bloc { - width:230px; - //float:left; - display:inline-block; - } a,a:hover { color:#000; + display:inline-block; + margin:0 15px 10px 0; + width:127px; + height:127px; + img{ + display: block; + width:127px; + height:127px; + } + &:nth-child(7n){ + margin-right: 0px; + } } .bloc .project-photo { - width:230px; - height:230px; background-color: #ccc; margin:0; } @@ -182,35 +177,22 @@ //position: absolute; //right: 0; - - - .slides { overflow: hidden; width: 10000px; + ul{ + position:relative; + list-style-type:none; + margin: 0px; + padding: 0px; + width:9999px; + li{ + padding:0px; + margin:0px; + list-style:none; + display: inline-block; + } + } } - - - .slides ul{ - position:relative; - list-style-type:none; - margin: 0px; - padding: 0px; - width:9999px; - } - - .slides li{ - padding:0px; - margin:0px; - list-style:none; - display: inline-block; - } - - - - - } - - - + } } \ No newline at end of file diff --git a/less/taglist.less b/less/taglist.less index 6c5de08..c36a7d3 100644 --- a/less/taglist.less +++ b/less/taglist.less @@ -1,5 +1,5 @@ ul.tags { - margin:0 0 20px; + margin:50px 0 20px; list-style: none; li { font-size: 14px; -- 2.39.5