...
 
Commits (2)
......@@ -9,7 +9,7 @@
<li><sup><?= $agendaItem->lieu ?></sup></li>
<li class="btnPlus"><sup class="down"></sup><sup class="up"></sup></li>
<li><?= $agendaItem->texte ?></li>
<li><img src="<?= $agendaItem->images->first->url ?>" alt="" /></li>
<li><img data-src="<?= $agendaItem->images->first->url ?>" alt="" /></li>
</ul>
<br>
<?php
......
......@@ -38,7 +38,7 @@
<article class="blog <?php echo $blogPost->name; foreach($categorieItems as $item) echo ' '.$item; ?>">
<h1><a href="<?= $blogPost->url ?>"><?= $blogPost->title ?></a></h1>
<h2 class="date"><?php echo date("j/m/y", $blogPost->created); ?></h2>
<h2 class="date"><?php echo $blogPost->date ? $blogPost->date : date("j/m/y", $blogPost->created); ?></h2>
<img class="vignette" src="<?= $imageFirst->url ?>"/>
</article>
......
......@@ -33,7 +33,7 @@
<article class="letexte" data-simplebar data-simplebar-auto-hide="false">
<div class="article">
<h1><?= $page->title ?></h1>
<h2 class="date"><?php echo date("j/m/y", $page->created); ?></h2>
<h2 class="date"><?php echo $page->date ? $page->date : date("j/m/y", $page->created); ?></h2>
<?= $page->texte ?>
<span class="language">fr</span>
<span class="language">en</span>
......
......@@ -7,12 +7,18 @@
<link rel="stylesheet" type="text/css" href="<?php echo $config->urls->templates ?>style/reset.css" />
<link rel="shortcut icon" type="image/x-icon" href="<?php echo $config->urls->templates ?>style/faviconok.ico"/>
<link rel="stylesheet" type="text/css" href="<?php echo $config->urls->templates ?>style/main.css" />
<link rel="stylesheet/less" type="text/css" href="<?php echo $config->urls->templates ?>style/main.less" />
<!-- <link rel="stylesheet/less" type="text/css" href="<?php echo $config->urls->templates ?>style/main.less" /> -->
<link rel="stylesheet/less" type="text/css" href="<?php echo $config->urls->templates?>style/responsive.less" />
<script type="text/javascript" src="<?php echo $config->urls->templates ?>js/lib/jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="<?php echo $config->urls->templates ?>js/lib/less.min.js"></script>
<script type="text/javascript" src="<?php echo $config->urls->templates ?>js/lib/masonry.pkgd.min.js"></script>
<script type="text/javascript" src="<?php echo $config->urls->templates ?>js/lib/simplebar.js"></script>
<noscript>
<style>
[data-simplebar] {
overflow: auto;
}
</style>
</noscript>
</head>
<body>
......@@ -152,8 +152,6 @@ function removeCategorie(nav){
})
}
function goGoMaso(){
$('.grid').masonry({
// set itemSelector so .grid-sizer is not used in layout
......@@ -164,6 +162,13 @@ function goGoMaso(){
})
}
function masoFallback(article){
if (article.last().css('top') == '0px') {
console.log('neinnein');
goGoMaso();
}
}
function hoverBlogTitle(blog){
$('.vignette').hide();
......@@ -210,6 +215,9 @@ function escalier(nav, tagList) {
}
if(i == 0){
widthMono = $('span.mono').width();
if (widthMono == 0) {
widthMono = 17;
}
$('span.mono').css({'width': widthMono});
}
count = count + 1;
......@@ -231,14 +239,6 @@ function escalier(nav, tagList) {
})
}
// function showImg(){
// var imgs = actualLang.find('img');
// $('section:not(.onward)').find('.accroche').children('.lang:visible').children('p').hide();
// links.parents('p').show().addClass('min');
// links.parents('p').children('img').hide();
// sections.not('.onward').find('article:not(:nth-of-type(1))').css({paddingTop: 0});
// }
function openAgendaOnLoad(actu){
var hash = window.location.hash;
if (hash) {
......@@ -249,6 +249,9 @@ function openAgendaOnLoad(actu){
agendaMargin(actu);
agendaItem.addClass('open');
agendaItem.find('p, img').show();
var img = agendaItem.find('img');
var imgSrc = img.attr('data-src');
img.attr('src', imgSrc);
var styleAttr = agendaItem.attr('style');
agendaItem.attr('data-style', styleAttr);
agendaItem.removeAttr('style');
......@@ -304,6 +307,9 @@ function openAgendaItem(actu){
actu.find('ul').click(function(){
if (!$(this).hasClass('open')) {
var title = $(this).attr('class').split(' ')[0];
var img = $(this).find('img');
var imgSrc = img.attr('data-src');
img.attr('src', imgSrc);
window.location.hash = title;
$(this).addClass('open');
$(this).find('p, img').show();
......@@ -335,12 +341,6 @@ function changeLang(article){
})
}
function activeGlitch(article){
$('.goAfter').click(function(){
article.addClass('active');
})
}
function whiteSpaceHeight(nav){
nav.find('span').each(function(){
if ($(this).text() == ' ' && $(this).next().length > 0){
......@@ -406,37 +406,6 @@ function rndm(min, max){
var x = x * npx;
return x;
}
//
// function docListImages() {
// var blocs = $('#docs article').find('.bloc-vignettes');
// blocs.each(function(){
// var imgsBloc = $(this).find('img');
// imgsBloc.each(function(){
// var wdth = Math.abs(rndm(108, 250));
// //
// function docListImages() {
// var blocs = $('#docs article').find('.bloc-vignettes');
// blocs.each(function(){
// var imgsBloc = $(this).find('img');
// imgsBloc.each(function(){
// var wdth = Math.abs(rndm(108, 250));
// $(this).css({
// 'margin-left': rndm(1, 100) + 'px',
// 'margin-top': rndm(1, 100) + 'px',
// 'width': wdth + 'px',
// 'height': (wdth / 1.5) + 'px',
// });
// })
// })
// } $(this).css({
// 'margin-left': rndm(1, 100) + 'px',
// 'margin-top': rndm(1, 100) + 'px',
// 'width': wdth + 'px',
// 'height': (wdth / 1.5) + 'px',
// });
// })
// })
// }
function addPreToCode(){
$('code').each(function(){
......
......@@ -4,52 +4,58 @@ $(document).ready(function() {
var articles = $('.content').find('article');
var articleProjets = $('#projets').find('article');
var articleBlog = $('#blogPost').find('article');
var documentations = $('#docs');
var documentation = $('#documentation');
var articleProjet = $('#projet, #documentation').find('article');
var articleDocs = $('#docs').find('article');
var apropos = $('#apropos').find('article');
var actu = $('#actu');
var blog = $('#blog');
// if ($('#projets').length > 0 || $('#docs').length > 0 || $('#blog').length > 0) {
hoverProjet(articles, nav);
listStates(nav);
// }
hoverGoAfter();
openAgenda(nav, actu);
closeAgenda(actu);
loadIframe($('#blogPost article'));
loadIframe($('#projet article'));
ImgLegend($('#blogPost article'));
ImgLegend($('#projet article'));
ImgLegend($('#documentation article'));
if (articleProjet.length > 0) {
changeLang(articleProjet);
} else {
changeLang(apropos);
}
activeGlitch('article');
activeGlitch(articleBlog);
removeCategorie(nav);
hideClaire(apropos);
docListTitre('#docs article', 30);
docListTitre('section#documentation', 10);
// docListImages();
// cloneImg();
listStates(nav);
imgOriginalSize(articleProjet);
imgOriginalSize(articleBlog);
if (apropos.length > 0) {
changeLang(apropos);
hideClaire(apropos);
}
resizeImgOnClick(articleProjet);
if (documentations.length != 0) {
docListTitre('#docs article', 30);
}
removeLegendArrow(articleProjet);
removeLegendArrow(articleBlog);
if (documentation.length != 0) {
docListTitre('section#documentation', 10);
ImgLegend($('#documentation article'));
}
hoverBlogTitle(blog);
if (articleProjet.length != 0) {
removeLegendArrow(articleProjet);
resizeImgOnClick(articleProjet);
imgOriginalSize(articleProjet);
changeLang(articleProjet);
ImgLegend($('#projet article'));
loadIframe($('#projet article'));
}
addPreToCode();
if (articleBlog.length != 0) {
removeLegendArrow(articleBlog);
imgOriginalSize(articleBlog);
ImgLegend(articleBlog);
loadIframe(articleBlog);
}
if (blog.length != 0) {
hoverBlogTitle(blog);
}
// nav.find('#menu').find('.contact').children('a').attr('href', 'mailto:clairewiwi@gmail.com');
addPreToCode();
})
......@@ -59,8 +65,10 @@ $(window).on('load', function() {
var tagListCats = nav.find('.categories ul li:not(:nth-of-type(1))');
var tagListMenu = nav.find('#menu ul li:not(:nth-of-type(1)) a');
var tagListTitle = nav.find('.categories ul li.title h1');
var article = $('article');
goGoMaso();
setTimeout(function(){ masoFallback(article) }, 3000);
openAgendaOnLoad(actu)
whiteSpaceHeight(nav);
escalier(nav, tagListMenu);
......
This diff is collapsed.
......@@ -72,7 +72,9 @@ body{
.menuMobile{
display: none;
}
display: flex;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
padding: 0px;
background: white;
h1{
......@@ -191,8 +193,11 @@ body{
section{
width: 0;
padding: @unit;
-webkit-box-flex: 10;
-ms-flex-positive: 10;
flex-grow: 10;
flex-basis: auto;
-ms-flex-preferred-size: auto;
flex-basis: auto;
}
section#blog{
......@@ -215,8 +220,6 @@ body{
}
section#projets{
// section#docs
// section#blog{
article.behind{
opacity: 1;
position: fixed;
......@@ -290,8 +293,11 @@ body{
}
}
.grid{
display: -webkit-box;
display: -ms-flexbox;
display: flex;
flex-wrap: wrap;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
width: calc(100% ~'- 20px');
.grid_item,
.grid_sizer{
......@@ -329,6 +335,12 @@ body{
}
}
}
.grid_item[class^="projet workshops"]{
h1{
transform: skewX(40deg);
}
}
}
article.focus{
width: calc(100% ~'-' @unit*2);
......@@ -340,12 +352,9 @@ body{
// background: @color2;
padding-bottom: @unit*2;
.grid{
// display: flex;
// flex-wrap: wrap;
// grid_sizer{
// width: 30%;
// }
display: -webkit-box;
display: -ms-flexbox;
display: flex;
article:nth-of-type(odd){
h1 {
font-size: 38px;
......@@ -467,17 +476,27 @@ body{
section#documentation,
section#blogPost,
section#doc{
display: -webkit-box;
display: -ms-flexbox;
display: flex;
// height: 100vh;
-ms-flex-wrap: no-wrap;
flex-wrap: no-wrap;
padding: 0;
article{
margin: 0px;
-webkit-box-flex: 14;
-ms-flex-positive: 14;
flex-grow: 14;
width: 0;
div.fr,
div.en{
margin-bottom: 50px;
}
}
.goBefore,
.goAfter{
-webkit-box-flex: 1;
-ms-flex-positive: 1;
flex-grow: 1;
width: 0;
}
......@@ -491,11 +510,21 @@ body{
border-right: 1px solid blue;
text-transform: uppercase;
text-align: center;
flex-direction: column;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
a{
display: -webkit-box;
display: -ms-flexbox;
display: flex;
flex-direction: row;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-ms-flex-direction: row;
flex-direction: row;
padding: @unit;
height: 10000px;
width: auto;
......@@ -503,6 +532,8 @@ body{
cursor: url(fleche_gauche.svg),auto;
overflow-y: hidden;
span{
-webkit-box-flex: 2;
-ms-flex-positive: 2;
flex-grow: 2;
}
}
......@@ -532,7 +563,9 @@ body{
.titleHover{
img{
margin-left: @unit*4;
flex-grow:4;
-webkit-box-flex: 4;
-ms-flex-positive: 4;
flex-grow: 4;
width:@unit*8;
height: auto;
-webkit-filter: grayscale(100%);
......@@ -548,17 +581,29 @@ body{
font-size: 15px;
text-transform: uppercase;
text-align: center;
flex-direction: column;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
a{
display: flex;
flex-direction: row;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-ms-flex-direction: row;
flex-direction: row;
padding: @unit;
height: 10000px;
width: auto;
cursor: url(fleche_droite.svg),auto;
overflow-y: hidden;
span{
-webkit-box-flex: 2;
-ms-flex-positive: 2;
flex-grow: 2;
}
}
......@@ -601,6 +646,8 @@ body{
img{
position: fixed;
z-index: 2;
-webkit-box-flex: 2;
-ms-flex-positive: 2;
flex-grow: 2;
width: @unit*8 !important;
height: auto;
......@@ -1191,9 +1238,11 @@ section#projet {
section#nav{
text-decoration: none;
line-height: @unit*1.7;
line-height: @unit*1.5;
padding: 10px 10px;
background: white;
-webkit-box-flex: 4;
-ms-flex-positive: 4;
flex-grow: 4;
@font-size: 12px;
a{
......@@ -1469,7 +1518,8 @@ section#projet {
position:absolute;
right:0;
bottom:0;
width:@unit*1.5
width:@unit*1.5;
visibility: visible;
}
.simplebar-scrollbar {
......
This diff is collapsed.