Release Candidate 0.1

This commit is contained in:
Bachir Soussi Chiadmi
2015-11-11 13:27:05 +01:00
parent 2abb12981c
commit 333ee13a91
110 changed files with 563 additions and 102 deletions
+49
View File
@@ -0,0 +1,49 @@
/**
* @license
* MyFonts Webfont Build ID 3101542, 2015-10-02T04:13:40-0400
*
* The fonts listed in this notice are subject to the End User License
* Agreement(s) entered into by the website owner. All other parties are
* explicitly restricted from using the Licensed Webfonts(s).
*
* You may obtain a valid license at the URLs below.
*
* Webfont: CiutadellaRounded-Medium by Emtype Foundry
* URL: http://www.myfonts.com/fonts/emtype/ciutadella-rounded/medium/
*
* Webfont: CiutadellaRounded-Light by Emtype Foundry
* URL: http://www.myfonts.com/fonts/emtype/ciutadella-rounded/light/
*
*
* License: http://www.myfonts.com/viewlicense?type=web&buildid=3101542
* Licensed pageviews: 10,000
* Webfonts copyright: Copyright (c) 2015 by Eduardo Manso. All rights reserved.
*
* © 2015 MyFonts Inc
*/
/* @import must be at top of file, otherwise CSS will not work */
/*@import url("//hello.myfonts.net/count/2f5366");*/
@font-face {
font-family:'CiutadellaRounded';
src: url('webfonts/2F5366_0_0.eot');
src: url('webfonts/2F5366_0_0.eot?#iefix') format('embedded-opentype'),
url('webfonts/2F5366_0_0.woff2') format('woff2'),
url('webfonts/2F5366_0_0.woff') format('woff'),
url('webfonts/2F5366_0_0.ttf') format('truetype');
font-weight: bold;
}
@font-face {
font-family:'CiutadellaRounded';
src: url('webfonts/2F5366_1_0.eot');
src: url('webfonts/2F5366_1_0.eot?#iefix') format('embedded-opentype'),
url('webfonts/2F5366_1_0.woff2') format('woff2'),
url('webfonts/2F5366_1_0.woff') format('woff'),
url('webfonts/2F5366_1_0.ttf') format('truetype');
font-weight: normal;
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1 -1
View File
@@ -11,7 +11,7 @@ gulp.task('scripts', function () {
gulp.src('./js/*.js')
.pipe(jsmin())
.pipe(rename({suffix: '.min'}))
.pipe(gulp.dest('./js/'));
.pipe(gulp.dest('./js/dist/'));
});
gulp.task('styles', function () {
Binary file not shown.

After

Width:  |  Height:  |  Size: 285 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 KiB

+3
View File
@@ -0,0 +1,3 @@
jQuery(document).ready(function($){if($('body').is('.categories')){var $diapo=$('<div id="diaporama"></div>');$("#categories-content").before($diapo).children('section.projet-block').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'});});
+25 -1
View File
@@ -1,8 +1,31 @@
jQuery(document).ready(function($) {
// init categories content images behaviour
if($('body').is('.categories')){
var $diapo = $('<div id="diaporama"></div>');
$("#categories-content")
.before($diapo)
.children('section.projet-block').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');
}
// init Masonry
var $grid = $('.grid').masonry({
itemSelector: '.projet'
itemSelector: '.grid-block'
// columnWidth: 200
});
// layout Masonry after each image loads
@@ -11,4 +34,5 @@ jQuery(document).ready(function($) {
// });
});
-2
View File
@@ -1,2 +0,0 @@
jQuery(document).ready(function($){var $grid=$('.grid').masonry({itemSelector:'.projet'});});
-2
View File
@@ -1,2 +0,0 @@
jQuery(document).ready(function($){var $grid=$('.grid').masonry({itemSelector:'.projet'});});
-2
View File
@@ -1,2 +0,0 @@
jQuery(document).ready(function($){var $grid=$('.grid').masonry({itemSelector:'.projet',columnWidth:200});});
@@ -1,2 +0,0 @@
jQuery(document).ready(function($){var $grid=$('.grid').masonry({itemSelector:'.projet',columnWidth:200});});
@@ -1,2 +0,0 @@
jQuery(document).ready(function($){var $grid=$('.grid').masonry({itemSelector:'.projet',columnWidth:200});$grid.imagesLoaded().progress(function(){$grid.masonry('layout');});});
@@ -1,2 +0,0 @@
jQuery(document).ready(function($){var $grid=$('.grid').masonry({itemSelector:'.projet',columnWidth:200});$grid.imagesLoaded().progress(function(){$grid.masonry('layout');});});
@@ -1,2 +0,0 @@
jQuery(document).ready(function($){var $grid=$('.grid').masonry({});$grid.imagesLoaded().progress(function(){$grid.masonry('layout');});});
@@ -1 +0,0 @@
@@ -70,7 +70,7 @@
// We use this to control whether or not CSS classes come through in the gem files.
$include-html-classes: true;
// $include-print-styles: true;
$include-print-styles: true;
$include-html-global-classes: $include-html-classes;
// b. Grid
@@ -79,7 +79,7 @@ $include-html-global-classes: $include-html-classes;
// $include-html-grid-classes: $include-html-classes;
// $include-xl-html-grid-classes: false;
// $row-width: rem-calc(1000);
//$row-width: rem-calc(2000);
// $total-columns: 12;
// $column-gutter: rem-calc(30);
@@ -88,7 +88,7 @@ $include-html-global-classes: $include-html-classes;
// We use these to define default font stacks
// $font-family-sans-serif: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
$font-family-serif: Georgia, Cambria, "Times New Roman", Times, serif;
// $font-family-serif: Georgia, Cambria, "Times New Roman", Times, serif;
// $font-family-monospace: Consolas, "Liberation Mono", Courier, monospace;
// We use these to define default font weights
+211 -12
View File
@@ -3,7 +3,17 @@
@import "settings";
$green: #31cd11;
$green: rgb(0, 255, 0);
$font: "CiutadellaRounded", "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
body{font-family: $font;}
h1,h2,h3,h4,h5,h6{font-family: $font;}
a, a:hover{color:inherit;}
.row.fullwidth{max-width:80vw;}
/*
_ _ _
@@ -13,26 +23,89 @@ $green: #31cd11;
| | | | __/ (_| | (_| | __/ |
|_| |_|\___|\__,_|\__,_|\___|_|
*/
$headerborderH: 0.3em;
$headerpaddingtopH:2em;
$titleareaH: 10em;
$centerpaddingtop: $headerborderH+$headerpaddingtopH+$titleareaH;
header#top-bar{
position: fixed;
width:100%; top:0;
background-color: rgba(250, 250, 250, 0.8);
position: fixed; top:0;
width:100%;
// TODO: flou sous le haeder
z-index: 10;
h1{
z-index: 9;
&:before{
content:"";
border-top: $headerborderH solid $green;
display: block;
padding-bottom: $headerpaddingtopH;
background: transparent!important;
}
>.row{
background-color: rgba(255, 255, 255, 0.9);
position:relative; display:block;
}
#title-area{
overflow: hidden;
position:relative;
height:$titleareaH;
h1{
height:100%;
a{display: block; height:100%;
background: transparent url("../images/logo.png") no-repeat center center;
background-size: contain;}
}
h1 span, h2{
position:absolute; margin-left:-3000px;
}
}
h1, h2{
text-align: center;
a{
color: #000;
}}
#right-nav{
.nav{
position:relative;
height:100%;
ul{padding: 0; margin: 0;}
li{list-style: none;}
.wrapper{padding-top: $titleareaH/2-1.5em;}
}
#left-nav{
ul{padding: 0; margin: 0;}
}
#right-nav{
text-align: right;
h4{font-size: 1em; margin:0; }
ul{background-color: #fff;}
li{
list-style: none;
line-height: 1;
// &:not(.active){
overflow: hidden; height:1px; transition: height 0.3s ease-in;
// }
a{display:block;}
// &.active span{
// display:inline-block;
// position:relative;
// &:after{
// content: ""; height:0;
// display: block; margin-top:-.7em; margin-bottom:.7em;
// border-top:0.5em solid $green;}
// }
}
&:hover{
li{
height:1.1em; transition: height 0.5s ease-out;
&:hover span{
// border-bottom: 1px solid #000;
text-decoration: underline;
}
}
}
}
}
@@ -46,12 +119,126 @@ header#top-bar{
\_____\___|_| |_|\__\___|_|
*/
div#center{
padding-top:10em;
padding-top:$centerpaddingtop;
.columns{
padding: 0;
}
.projet{
/*
* LIST PROJET
*/
.projet-block{
padding:1em;
text-align: center;
a{display: block;}
header{
position:relative;
// margin-top:0;padding-top:0;
margin-top: -3em; padding-top: 3.5em;
transition:background-color 0.5s ease-in;}
header>*{
font-family: $font; text-align: center;
padding:0; margin:0;}
h1{
font-size: 1.3em;font-weight: bold; margin:0; line-height: 1; height:auto;
display:inline-block; position:relative;
&:after{
content: ""; height:0;
display: block; margin-top:-.7em; margin-bottom:.7em;
border-top:0.5em solid $green;
transition:border-color 0.3s ease-in;}
}
h2{font-size: 1em;font-weight: normal; margin:-0.7em 0 0; line-height: 1;}
&.projet-block-text{
text-align: left;
h1{margin-bottom: 0.3em;}
h2{font-weight:bold;margin-bottom: 0.3em;}
}
&:hover{
header{
background-color: rgba($green, 0.7); transition-timing-function: ease-out;
h1:after{border-top:0.5em solid #FFF;transition-timing-function: ease-out;}
}
}
}
/*
* PAGE PROJET
*/
.projet{
h1{
font-family: $font; font-size: 1.3em;font-weight: bold;line-height:1;
display:inline-block; position:relative;
margin:0; padding:0;
// $green overline
&:after{
content: "";
display: block; margin-top:-.7em; margin-bottom:.7em;
border-top:0.5em solid $green;
transition:border-color 0.3s ease-in;}
}
h2{font-family: $font;font-size: 1em;font-weight: bold; margin:0; padding:0;}
// .block{
// display: inline-block;
// }
#images{
// .row{margin:0;}
.block{margin-bottom: 1.2em;}
}
img{
width:100%; max-width:100%;
}
}
/*
* Catégories
*/
nav.categories{
margin: 1em 0;
ul.tags{
margin:0; padding:0; text-align:center;
li{
list-style: none; display:inline-block;
margin:0 1em;
a{display:block;}
span{font-size: 1.3em;}
&.active span{
display:inline-block;
position:relative;
font-weight: bold;
border-bottom: 1px solid #000;
line-height: 0.2;
&:after{
content: ""; height:0;
display: block; margin-top:-0.2em; margin-bottom:0.2em;
border-top:0.5em solid $green;}
}
}
}
}
#diaporama{
position:relative;
height:20vw;
>*{
position:absolute; top:0; left:0;
height:100%; width:100%;
text-align: center;
opacity:0;
transition: opacity 0.2s ease-in;
&.visible{opacity:1;}
img{height:100%;}
}
}
}
@@ -67,4 +254,16 @@ footer#bottom-bar{
background-color: $green;
text-align: center;
padding: 1em 0;
h1{
font-size: 1.3em;font-weight: bold; margin:0; line-height: 1; height:auto;
display:inline-block; position:relative;
&:after{
content: ""; height:0;
display: block; margin-top:-.7em; margin-bottom:.7em;
border-top:0.5em solid #fff;
transition:border-color 0.3s ease-in;}
}
address, a{font-size: 0.9em;font-weight: normal; margin:-0.7em 0 0; line-height: 1;}
}
@@ -0,0 +1,19 @@
{% extends 'partials/base.html.twig' %}
{% set bodyclass = "categories" %}
{% block content %}
<nav class="categories">
{% include 'partials/tagslist.html.twig' with {'base_url':"/categories/", 'taxonomy':'tag', 'display':'inline'} %}
</nav>
<div id="categories-content" class="grid">
{% for child in page.collection %}
<section class="projet-block projet-block-text grid-block columns large-3 medium-6 small-12">
{% include 'partials/projet-block.html.twig' with {'page':child, 'display':'text'} %}
</section>
{% endfor %}
</div>
{% endblock %}
@@ -1,9 +1,15 @@
{% extends 'partials/base.html.twig' %}
{% set bodyclass = "home" %}
{% block content %}
{% for child in page.collection %}
<section class="projet columns large-4">
{% include 'partials/projet.html.twig' with {'page':child} %}
</section>
{% endfor %}
<div class="grid">
{% for child in page.collection %}
{% if child.header.home == true %}
<section class="projet-block projet-block-img grid-block columns large-3 medium-6 small-12">
{% include 'partials/projet-block.html.twig' with {'page':child,'display':'img'} %}
</section>
{% endif %}
{% endfor %}
</div>
{% endblock %}
@@ -20,29 +20,33 @@
<title>{% if header.title %}{{ header.title|e('html') }} | {% endif %}{{ site.title|e('html') }}</title>
{% block stylesheets %}
{# Bootstrap core CSS #}
{% do assets.add('theme://app/bower_components/foundation/css/foundation.min.css',101) %}
{# Bootstrap core CSS #}
{# % do assets.add('theme://app/bower_components/foundation/css/foundation.min.css',101) % #}
{# Custom styles for this theme #}
{% do assets.add('theme://css/styles.css',100) %}
{# Custom font for this theme #}
{% do assets.add('theme://font/fontwebkit.css',100) %}
{{ assets.css() }}
{# Custom styles for this theme #}
{% do assets.add('theme://css/styles.css',100) %}
{{ assets.css() }}
{% endblock %}
{% endblock head %}
</head>
<body>
<body class="{{bodyclass}}">
{# include the header + navigation #}
{% include 'partials/header.html.twig' %}
<div id="center" class="row">
<div class="large-12 columns grid">
<div id="center" class="row fullwidth">
<div class="large-12 columns">
{% block content %}{% endblock %}
</div>
</div>
<!-- {% block bottom %}{% endblock %} -->
{% block bottom %}{% endblock %}
{# include the footer#}
@@ -53,7 +57,7 @@
{% do assets.add('theme://bower_components/jquery/dist/jquery.min.js', 101) %}
{% do assets.add('theme://bower_components/foundation/js/foundation.min.js') %}
{% do assets.add('theme://bower_components/masonry/dist/masonry.pkgd.min.js') %}
{% do assets.add('theme://js/script.min.js') %}
{% do assets.add('theme://js/dist/script.min.js') %}
{{ assets.js() }}
{% endblock %}
@@ -1,7 +1,11 @@
<footer id="bottom-bar">
<div class="row">
<div class="row fullwidth">
<section class="large-12 columns">
<h1><a href="#">{{ site.title|e('html') }}</a></h1>
<h1><a href="/">- {{ site.title|e('html') }} -</a></h1>
<address>
{{ site.adresse|e('html') }}<br />
<a href="mailto:{{site.email}}">{{ site.email|e('html') }}</a>
</address>
</section>
</div>
</header>
@@ -1,24 +1,29 @@
<header id="top-bar">
<div class="row">
<section id="title-area" class="large-6 large-push-3 columns">
<h1><a href="#">{{ site.title|e('html') }}</a></h1>
<div class="row fullwidth">
<section id="title-area" class="small-8 small-push-2 columns">
<h1><a href="/"><span>{{ site.title|e('html') }}</span></a></h1>
<h2>{{ site.subtitle|e('html') }}</h2>
</section>
<nav id="right-nav" class="large-3 large-pull-6 columns">
<!-- Right Nav Section -->
<ul class="left">
{% for page in pages.children %}
<li><a href="{{ page.url }}">{{ page.menu }}</a></li>
{% endfor %}
</ul>
<nav id="left-nav" class="nav small-2 small-pull-8 columns">
<div class="wrapper">
<ul class="left">
{% for page in pages.children %}
{% if page.menu != "home" and page.menu != "Catégories" %}
<li><a href="{{ page.url }}">{{ page.menu }}</a></li>
{% endif %}
{% endfor %}
</ul>
</div>
</nav>
<nav id="left-nav" class="large-3 columns">
<nav id="right-nav" class="nav small-2 columns">
{% if config.plugins.taxonomylist.enabled %}
<div class="right">
<h4>Catégoris</h4>
{% include 'partials/tagslist.html.twig' with {'base_url':"/", 'taxonomy':'tag'} %}
</div>
<div class="wrapper">
<h4><a href="/categories">Catégories</a></h4>
{% include 'partials/tagslist.html.twig' with {'base_url':"/categories/", 'taxonomy':'tag'} %}
</div>
{% endif %}
</nav>
</div>
@@ -0,0 +1,20 @@
{% if display == 'img' %}
{% set image = page.media.images|first %}
<a href="{{ page.url }}">{{ image.html }}</a>
<header>
<h1><a href="{{ page.url }}">{{page.title}}</a></h1>
<h2><a href="{{ page.url }}">{{page.header.subtitle}}</a></h2>
</header>
{% endif %}
{% if display == 'text' %}
<h1><a href="{{ page.url }}">{{page.title}}</a></h1>
<h2>{{page.header.subtitle}}</h2>
{{ page.summary() }}
{% set image = page.media.images|first %}
<a class="projet-img" href="{{ page.url }}">{{ image.html }}</a>
{% endif %}
@@ -1,2 +0,0 @@
<h1>{{page.title}}</h1>
{{ page.content }}
@@ -4,8 +4,15 @@
<ul class="tags">
{% for tax,value in taxlist[taxonomy] %}
{% set active = uri.param(taxonomy) == tax ? 'active' : '' %}
<li>
<a class="{{ active }}" href="{{ base_url }}/{{ taxonomy }}{{ config.system.param_sep }}{{ tax|e('url') }}">{{ tax }}</a>
{% if not loop.first and display == "inline" %}
<span>-</span>
{% endif %}
<li class="{{ active }}">
<a
class="{{ active }}"
href="{{ base_url }}{{ taxonomy }}{{ config.system.param_sep }}{{ tax|e('url') }}">
<span>{{ tax }}</sapn>
</a>
</li>
{% endfor %}
</ul>
@@ -0,0 +1,67 @@
{% extends 'partials/base.html.twig' %}
{% set bodyclass = "projet" %}
{% set images = page.media.images %}
{% block content %}
<section class="projet">
<h1>{{page.title}}</h1>
<h2>{{ page.header.subtitle}}</h2>
{{ page.content }}
<div id="images" class="">
{{ dump(images) }}
{# set temporary array to be able to look trough images with index #}
{% set numberedKeys = {} %}
{% for key,value in images %}
{% set numberedKeys = numberedKeys|merge({(loop.index):(key)}) %}
{% endfor %}
{{dump(numberedKeys)}}
{# display images #}
{% set continue = false %}
{% for image in images %}
{% if not continue %}
<div class="row">
{% if image.meta.size == 1 %}
<div class="block block-{{loop.index}} column large-12">
{{ image.html }}
</div>
{% else %}
{% set nextimage = images[numberedKeys[loop.index]] %}
{{ dump(nextimage) }}
{% if nextimage.meta.size != 1 %}
{% set continue = true %}
<div class="block block-{{loop.index}} column large-6">
{{ image.html }}
</div>
<div class="block block-{{loop.index+1}} column large-6">
{{ nextimage.html }}
</div>
{% else %}
<div class="block block-{{loop.index}} column large-6">
{{ image.html }}
</div>
<div class="block empty column large-6"></div>
{% endif %}
{% endif %}
</div>
{% else %}
{% set continue = false %}
{% endif %}
{% endfor %}
</div>
</section>
<nav class="categories">
{% include 'partials/tagslist.html.twig' with {'base_url':"/categories/", 'taxonomy':'tag', 'display':'inline'} %}
</nav>
{% endblock %}