bachir/grav-labonneadresse.graphics
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

final commit

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2017-06-19 10:25:26 +02:00
parent 67cb64cb6b
commit e40d0ffe99
5 changed files with 81 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/themes/labonneadresse/css/styles.css
+25 -18
View File
@@ -7217,15 +7217,17 @@ header#top-bar {
@media screen and (min-width: 40em) { @media screen and (min-width: 40em) {
header#top-bar .nav .wrapper { header#top-bar .nav .wrapper {
padding-top: 4.55em; } } padding-top: 4.55em; } }
header#top-bar #left-nav a { header#top-bar #left-nav {
font: "CiutadellaRounded", "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif; line-height: 0.5; }
font-size: 0.87em; header#top-bar #left-nav a {
font-weight: bold; } font: "CiutadellaRounded", "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
header#top-bar #left-nav a:hover { font-size: 0.87em;
font: "CiutadellaRounded", "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif; font-weight: bold; }
font-size: 0.87em; header#top-bar #left-nav a:hover {
font-weight: bold; font: "CiutadellaRounded", "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
text-decoration: underline; } font-size: 0.87em;
font-weight: bold;
text-decoration: underline; }
header#top-bar #right-nav { header#top-bar #right-nav {
text-align: right; } text-align: right; }
header#top-bar #right-nav h4 { header#top-bar #right-nav h4 {
@@ -7233,7 +7235,7 @@ header#top-bar {
font-size: 0.87em; font-size: 0.87em;
font-weight: bold; font-weight: bold;
margin: 0; margin: 0;
line-height: 1.6; } line-height: 1.9; }
header#top-bar #right-nav h4 a:hover { header#top-bar #right-nav h4 a:hover {
text-decoration: underline; } text-decoration: underline; }
header#top-bar #right-nav ul { header#top-bar #right-nav ul {
@@ -7435,7 +7437,8 @@ div#center {
div#center #diaporama > * img { div#center #diaporama > * img {
height: 100%; } height: 100%; }
div#center .client-block { div#center .client-block {
margin: 0 0 1em; } margin: 0 0 1em;
padding: 0.7em; }
div#center .client-block h3 { div#center .client-block h3 {
font: "CiutadellaRounded", "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif; font: "CiutadellaRounded", "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
font-size: 0.87em; font-size: 0.87em;
@@ -7474,13 +7477,15 @@ div#center {
header#top-bar:before { header#top-bar:before {
padding-bottom: 0.45em; } padding-bottom: 0.45em; }
header#top-bar #title-area { header#top-bar #title-area {
height: 10.1em -2.1em; } height: 10.1em -3.1em; }
header#top-bar #title-area h1 a { header#top-bar #title-area h1 {
display: block; height: 100%;
height: 6.3em; } min-height: 5.6em; }
header#top-bar #title-area h1 a {
display: block;
height: 6.3em; }
header#top-bar.reduced #title-area { header#top-bar.reduced #title-area {
height: 6.044em; height: 5.2885em; }
overflow: hidden; }
header#top-bar .nav { header#top-bar .nav {
position: absolute; position: absolute;
top: 0.75em; top: 0.75em;
@@ -7491,7 +7496,9 @@ div#center {
right: 0; } right: 0; }
div#center { div#center {
padding-top: 11.2em; padding-top: 11.2em;
padding-bottom: 6em; } } padding-bottom: 6em; }
body.categories a.projet-img {
display: none; } }
/* /*
__ _ __ _
user/themes/labonneadresse/gulpfile.js
+2 -2
View File
@@ -27,8 +27,8 @@ gulp.task('styles', function () {
.pipe(gulp.dest('./css')); .pipe(gulp.dest('./css'));
}); });
gulp.task('default', function () { // gulp.task('default', function () {
}); // });
// default gulp task // default gulp task
gulp.task('default', ['scripts', 'styles'], function() { gulp.task('default', ['scripts', 'styles'], function() {
user/themes/labonneadresse/js/dist/script.min.js
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
jQuery(document).ready(function($){$(window).scroll(function(){var topOfWindow=$(window).scrollTop();if(topOfWindow>100){$("#top-bar").addClass("reduced");} jQuery(document).ready(function($){$(window).scroll(function(){var topOfWindow=$(window).scrollTop();if(topOfWindow>100){$("#top-bar").addClass("reduced");}
else{$("#top-bar").removeClass("reduced");}});if($('body').is('.categories')){var $diapo=$('<div id="diaporama"></div>');$("#categories-content").before($diapo).find('li.project').each(function(index,el){$(this).addClass('projet-'+index).hover(function(e){$diapo.children().removeClass('visible');var c=$(this).attr('class').match('projet-[0-9]+');console.log("class",c[0]);$diapo.children('.'+c[0]).addClass('visible');}).find('.projet-img').addClass('projet-'+index).appendTo($diapo);});$diapo.children('.projet-img').first().addClass('visible');} else{$("#top-bar").removeClass("reduced");}});if($(window).width()>600){if($('body').is('.categories')){var $diapo=$('<div id="diaporama"></div>');$("#categories-content").before($diapo).find('li.project').each(function(index,el){$(this).addClass('projet-'+index).hover(function(e){$diapo.children().removeClass('visible');var c=$(this).attr('class').match('projet-[0-9]+');console.log("class",c[0]);$diapo.children('.'+c[0]).addClass('visible');}).find('.projet-img').addClass('projet-'+index).appendTo($diapo);});$diapo.children('.projet-img').first().addClass('visible');}
var $grid=$('.grid').masonry({itemSelector:'.grid-block',transitionDuration:'0.4s'});$grid.imagesLoaded().progress(function(){$grid.masonry('layout');});}); var $grid=$('.grid').masonry({itemSelector:'.grid-block',transitionDuration:'0.4s'});$grid.imagesLoaded().progress(function(){$grid.masonry('layout');});}});
user/themes/labonneadresse/js/script.js
+32 -29
View File
@@ -13,35 +13,38 @@ jQuery(document).ready(function($) {
}); });
// init categories content images behaviour // init categories content images behaviour
if($('body').is('.categories')){ // console.log($(window).width());
// console.log('hello'); if( $(window).width() > 600 ){
var $diapo = $('<div id="diaporama"></div>'); if($('body').is('.categories')){
$("#categories-content") // console.log('hello');
.before($diapo) var $diapo = $('<div id="diaporama"></div>');
.find('li.project').each(function(index, el) { $("#categories-content")
// console.log(index); .before($diapo)
$(this) .find('li.project').each(function(index, el) {
.addClass('projet-'+index) // console.log(index);
.hover(function (e) { $(this)
$diapo.children().removeClass('visible');
var c = $(this).attr('class').match('projet-[0-9]+');
console.log("class",c[0]);
$diapo.children('.'+c[0]).addClass('visible');
})
.find('.projet-img')
.addClass('projet-'+index) .addClass('projet-'+index)
.appendTo($diapo); .hover(function (e) {
}); $diapo.children().removeClass('visible');
$diapo.children('.projet-img').first().addClass('visible'); var c = $(this).attr('class').match('projet-[0-9]+');
console.log("class",c[0]);
$diapo.children('.'+c[0]).addClass('visible');
})
.find('.projet-img')
.addClass('projet-'+index)
.appendTo($diapo);
});
$diapo.children('.projet-img').first().addClass('visible');
}
// init Masonry
var $grid = $('.grid').masonry({
itemSelector: '.grid-block',
transitionDuration: '0.4s'
});
$grid.imagesLoaded().progress(function(){
$grid.masonry('layout');
});
} }
// init Masonry
var $grid = $('.grid').masonry({
itemSelector: '.grid-block',
transitionDuration: '0.4s'
});
$grid.imagesLoaded().progress(function(){
$grid.masonry('layout');
});
}); });
user/themes/labonneadresse/scss/styles.scss
+20 -4
View File
@@ -68,6 +68,7 @@ $logo_mt:0.3em;
$logo_mb:0.5em; $logo_mb:0.5em;
$titleareaH: $logoH+$logo_mb+$logo_mt; $titleareaH: $logoH+$logo_mb+$logo_mt;
$titleReducedFactor:0.7555; $titleReducedFactor:0.7555;
$titleReducedFactorSmall:0.5;
$centerpaddingtop: $headerborderH+$headerpaddingtopH+$titleareaH+1em; $centerpaddingtop: $headerborderH+$headerpaddingtopH+$titleareaH+1em;
$footerheight: 5em; $footerheight: 5em;
$centerpaddingbottom:$footerheight+1em; $centerpaddingbottom:$footerheight+1em;
@@ -120,6 +121,10 @@ header#top-bar{
&.reduced{ &.reduced{
#title-area{ #title-area{
height:$titleareaH*$titleReducedFactor; height:$titleareaH*$titleReducedFactor;
// @media #{$medium-up}{
// height:$titleareaH*$titleReducedFactorSmall;
// }
} }
} }
@@ -143,6 +148,7 @@ header#top-bar{
#left-nav{ #left-nav{
// margin-left: -0.1rem; // margin-left: -0.1rem;
line-height:0.5;
a{@include fontbold;} a{@include fontbold;}
a:hover{@include fontbold; text-decoration: underline;} a:hover{@include fontbold; text-decoration: underline;}
} }
@@ -151,7 +157,7 @@ header#top-bar{
text-align: right; text-align: right;
h4{ h4{
@include fontbold; margin:0; line-height: 1.6; @include fontbold; margin:0; line-height: 1.9;
a:hover{text-decoration: underline;} a:hover{text-decoration: underline;}
} }
ul{background-color: transparent;} ul{background-color: transparent;}
@@ -320,6 +326,7 @@ div#center{
/* /*
* Catégories * Catégories
*/ */
nav.categories{ nav.categories{
margin: 1em 0; margin: 1em 0;
ul.tags{ ul.tags{
@@ -366,6 +373,7 @@ div#center{
.client-block{ .client-block{
margin:0 0 1em; margin:0 0 1em;
padding:0.7em;
h3{ h3{
@include fontbold; @include fontbold;
line-height:0.6; display:inline-block; position:relative; line-height:0.6; display:inline-block; position:relative;
@@ -404,9 +412,11 @@ div#center{
} }
#title-area{ #title-area{
height:$titleareaH -2.1em; height:$titleareaH -3.1em;
// padding-top: $headerpaddingtopH; // padding-top: $headerpaddingtopH;
h1{ h1{
height:100%;
min-height:($titleareaH - 3.1em)*0.8;
a{display: block; a{display: block;
height:$logoH - 3em; height:$logoH - 3em;
// height:100%; // height:100%;
@@ -416,8 +426,8 @@ div#center{
&.reduced{ &.reduced{
#title-area{ #title-area{
height:($titleareaH - 2.1em)*$titleReducedFactor; height:($titleareaH - 3.1em)*$titleReducedFactor;
overflow: hidden; // overflow: hidden;
} }
} }
@@ -434,6 +444,12 @@ div#center{
padding-top:$centerpaddingtop - 1.1em; padding-top:$centerpaddingtop - 1.1em;
padding-bottom: $centerpaddingbottom; padding-bottom: $centerpaddingbottom;
} }
body.categories{
a.projet-img{
display:none;
}
}
} }
/* /*