This commit is contained in:
2019-01-28 10:10:48 +01:00
parent 762a1ad170
commit 49bd1b7353
126 changed files with 665 additions and 579 deletions
@@ -32,7 +32,7 @@ form:
column1:
type: column
fields:
header.date_start:
header.date:
type: datetime
label: Date-start
help: PLUGIN_ADMIN.DATE_HELP
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+33
View File
@@ -71,8 +71,41 @@ function scrollreveal() {
}
function burger() {
var $col = $('.col');
var $colOpen = $('.navbar ul.open');
$col.click(function(e){
$(this).parents('.navbar').find('ul:first-child').toggleClass('open');
})
}
function deplacement_cat() {
var $cat = $('.navbar .tags');
var $projets = $('.navbar ul li:first-child');
var result = document.getElementById('result');
if (window.matchMedia("(min-width: 700px)").matches) {
/* La largeur minimum de l'affichage est 600 px inclus */
} else {
/* L'affichage est inférieur à 600px de large */
$projets.after($cat);
}
if("matchMedia" in window) { // Détection
if(window.matchMedia("(min-width:700px)").matches) {
} else {
$projets.after($cat);
}
}
}
jQuery(document).ready(function($) {
burger();
scrollreveal();
removeAct();
catprojets();
deplacement_cat();
window.addEventListener('resize', deplacement_cat, false);
});
@@ -1,3 +1,7 @@
*::selection {
background: rgb(0, 255, 0);
}
header{
position: fixed;
width: 100%;
@@ -18,6 +22,9 @@ header{
}
nav{
margin: auto 0;
.burger{
display: none;
}
ul{
display: -webkit-box;
display: -ms-flexbox;
@@ -58,6 +65,8 @@ header{
width: auto;
height: 50px;
padding: 0 20px;
-webkit-transition: padding 0.5s;
transition: padding 0.5s;
& > li{
margin: auto;
position: relative;
@@ -1,30 +1,139 @@
@media screen and (max-width: 700px) {
@media screen and (max-width: 1024px) {
header{
position: fixed;
width: 100%;
height: 40px;
top: 0;
padding: 0 20px;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-pack: justify;
-ms-flex-pack: justify;
justify-content: space-between;
background-color: white;
border-bottom: 2px solid rgb(0,0,0);
z-index: 999;
h1{
margin: auto 0;
.navbar{
li{
margin-right: 20px!important;
}
.tags{
a{
padding: 0 10px;
-webkit-transition: padding 0.5s;
transition: padding 0.5s;
}
}
}
nav{
margin: auto 0;
& > .tags{
& > a {
height: 30px!important;
}
}
@media screen and (max-width: 700px) {
header{
position: fixed;
width: 100%;
height: 40px;
top: 0;
padding: 0 20px;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-pack: justify;
-ms-flex-pack: justify;
justify-content: space-between;
background-color: white;
border-bottom: 2px solid rgb(0,0,0);
z-index: 999;
h1{
margin: auto 0;
}
nav{
ul{
display: none;
&.open{
// height: 100vh;
width: 100vw;
left: 0;
top: 38px;
position: absolute;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
-webkit-box-pack: start;
-ms-flex-pack: start;
justify-content: flex-start;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
border-bottom: 2px solid #000;
background: white;
li{
height: 40px;
text-align: center;
border-bottom: 2px solid black;
width: 100vw;
text-align: center;
-webkit-box-pack: center;
-ms-flex-pack: center;
justify-content: center;
&:first-child{
border-top: 2px solid black;
// flex-direction: column;
.cat{
width: 10px;
position: absolute;
right: 45px;
img{
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
}
}
&:last-child{
margin-right: 20px!important;
border-bottom: 0px solid #000;
}
&.act{
.cat{
img{
-webkit-transform: rotate(180deg);
transform: rotate(180deg);
}
}
}
}
.tags{
position: relative;
border: none;
top:-2px;
border-bottom: 2px solid black;
background: rgb(0, 255, 0);
a{
padding: 0;
margin:0;
height: 40px;
li{
margin: 0;
}
}
}
}
}
& > .tags{
& > a {
height: 30px!important;
li{
position: relative;
z-index: 0;
&::after{
content: " ";
position: absolute;
background: rgb(0, 255, 0);
height: 10px;
margin: auto;
z-index: -1;
-webkit-transition: width 0.5s;
transition: width 0.5s;
width: 0%;
}
}
&:hover{
li{
position: relative;
z-index: 0;
&::after{
content: " ";
position: absolute;
@@ -32,120 +141,101 @@
height: 10px;
margin: auto;
z-index: -1;
width: 100%;
-webkit-transition: width 0.5s;
transition: width 0.5s;
width: 0%;
}
}
&:hover{
li{
&::after{
content: " ";
position: absolute;
background: rgb(0, 255, 0);
height: 10px;
margin: auto;
z-index: -1;
width: 100%;
-webkit-transition: width 0.5s;
transition: width 0.5s;
}
}
}
}
}
& > ul:nth-child(1) {
& > li:nth-child(1){
display: -webkit-box;
display: -ms-flexbox;
display: flex;
position: relative;
margin-right: 10px!important;
& > a{
// pointer-events: none;
}
&:after{
content: " ";
cursor: pointer;
display: block;
width: 25px;
height: 40px;
background-image: url(../images/fleche2.svg);
background-repeat: no-repeat;
background-position: center;
// background-size: 10px;
position: absolute;
right: 0px;
-webkit-transition: all 0.5s;
transition: all 0.5s;
}
&.hover{
&:after{
-webkit-transform: rotate(180deg);
transform: rotate(180deg);
-webkit-transition: all 0.5s;
transition: all 0.5s;
}
}
}
}
}
ul{
.col {
width: auto;
text-align: center;
height: auto;
position: absolute;
top: 10px;
right: 20px;
}
.burger{
cursor: pointer;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
-webkit-box-pack: end;
-ms-flex-pack: end;
justify-content: flex-end;
li{
height: 40px;
margin-right: 20px!important;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
&:last-child{
margin-right: 0px!important;
}
}
}
ul.tags{
display: none;
}
ul.visible, ul.active{
border-left: 2px solid black;
border-bottom: 2px solid black;
background: white;
display: block;
position: absolute;
top: 40px;
right: 0px;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
width: auto;
z-index: 999;
a{
display: -webkit-box;
display: -ms-flexbox;
display: flex;
width: auto;
height: 40px;
padding: 0 20px;
&:first-child{
margin-top: 0px;
margin: 0 auto;
-webkit-transition: all .7s ease;
transition: all .7s ease;
.bar {
display: block;
height: 2px;
width: 20px;
background: black;
margin: 3px auto;
-webkit-transition: all .7s ease;
transition: all .7s ease;
}
.middle {
margin: 0 auto;
}
&:hover{
// .bar{
// background-color: rgb(0, 255, 0);
// }
.top {
-webkit-transform: translateY(5px) rotateZ(45deg);
transform: translateY(5px) rotateZ(45deg);
}
&:last-child{
margin-bottom: 10px;
.middle {
width: 0;
}
li{
margin: auto;
.bottom {
-webkit-transform: translateY(-5px) rotateZ(-45deg);
transform: translateY(-5px) rotateZ(-45deg);
}
}
}
}
ul.tags{
display: none;
}
ul.visible, ul.active{
border-left: 2px solid black;
border-bottom: 2px solid black;
background: white;
display: block;
position: absolute;
top: 40px;
right: 0px;
width: auto;
z-index: 999;
a{
display: -webkit-box;
display: -ms-flexbox;
display: flex;
width: auto;
height: 40px;
padding: 0 20px;
&:first-child{
margin-top: 0px;
}
&:last-child{
margin-bottom: 10px;
}
li{
margin: auto;
}
}
}
}
#start{
margin-top: 40px;
//home
@@ -204,6 +294,7 @@
.content{
width:100%;
min-width: auto!important;
height: auto;
.txt{
position: relative;
right: 0;
@@ -248,6 +339,7 @@
min-width: auto!important;
height: auto;
padding: 10px 20px 10px 20px;
border-bottom: 2px solid black;
&:nth-child(1){
padding-top: 20px;
}
@@ -267,5 +359,4 @@
}
}
}
}
+3 -2
View File
@@ -58,6 +58,9 @@
}
.media{
width: calc((100% / 3) * 2);
img:not(:last-child){
margin-bottom: 5px;
}
}
.content{
width: calc(100% / 3);
@@ -77,12 +80,10 @@
/* Track */
&::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px white;
-webkit-border-radius: 10px;
border-radius: 10px;
}
/* Handle */
&::-webkit-scrollbar-thumb {
-webkit-border-radius: 10px;
border-radius: 10px;
background: white;
-webkit-box-shadow: inset 0 0 0px white;
@@ -85,6 +85,12 @@ p{
}
}
#start{
.card-title{
line-height: 1.25;
}
}
.taxonomy{
a{
font-family:$roboto_regular;
+3 -3
View File
@@ -14,7 +14,7 @@
{{ parent() }}
{% if show_onpage_menu %}
<script>
<!-- <script>
// singlePageNav initialization & configuration
$('ul.navigation').singlePageNav({
offset: $('#header').outerHeight(),
@@ -22,14 +22,14 @@
updateHash: true,
currentClass: 'active'
});
</script>
</script> -->
{% endif %}
{% endblock %}
{% block header_navigation %}
{% include 'partials/navigation.html.twig' %}
{% include 'partials/taxonomylist.html.twig' with { taxonomy: 'tag'} %}
{% include 'partials/taxonomylist.html.twig' with { taxonomy: 'category'} %}
{% endblock %}
{% block hero %}
@@ -40,8 +40,18 @@
{% block header_navigation %}
{% include 'partials/navigation.html.twig' %}
{% include 'partials/taxonomylist.html.twig' with { taxonomy: 'category'} %}
{% endblock %}
<div class="col">
<div class="burger">
<div class="bar top"></div>
<div class="bar middle"></div>
<div class="bar bottom"></div>
</div>
</div>
</nav>
</header>
{% endblock %}
@@ -15,7 +15,11 @@
</div>
<div class="taxonomy">
{% include 'partials/taxonomylist.html.twig' with { taxonomy: 'category'} %}
{% if page.header.taxonomy.category %}
{% include 'partials/blog/taxonomy.html.twig' with { taxonomy: 'category'} %}
{% endif %}
</div>
</div>
@@ -1,10 +1,10 @@
<span class="blog-date">
<time class="dt-published" datetime="{{ page.date|date("c") }}">
<i class="fa fa-calendar"></i> {{ page.header.date_start|date(system.pages.dateformat.short) }}
<i class="fa fa-calendar"></i> {{ page.header.date|date("d-m-y") }}
{% if page.header.date_end %}
- <i class="fa fa-calendar"></i> {{ page.header.date_end|date(system.pages.dateformat.short) }}
- <i class="fa fa-calendar"></i> {{ page.header.date_end|date("d-m-y") }}
{% endif %}
@@ -1,7 +1,7 @@
{% if page.taxonomy.tag %}
{% if page.header.taxonomy.category %}
<span class="tags">
{% for tag in page.taxonomy.tag %}
<a class="label label-rounded {{ label_style ?: 'label-secondary' }} p-category" href="{{ blog.url|rtrim('/') }}/tag{{ config.system.param_sep }}{{ tag }}#body-wrapper">{{ tag }}</a>
{% for category in page.header.taxonomy.category %}
<a class="label label-rounded {{ label_style ?: 'label-secondary' }} p-category" href="{{ blog.url|rtrim('/') }}/category{{ config.system.param_sep }}{{ category }}">{{ category }}</a>
{% endfor %}
</span>
{% endif %}
@@ -6,9 +6,11 @@
<a href="{{ p.url }}" class="{{ active_page }}">
{{ p.menu }}
</a>
<div class="cat">
<img src="/user/themes/hehe/images/fleche2.svg" alt="">
</div>
</li>
{% else %}
<li>
@@ -88,7 +88,7 @@
{% block footer %}
{% include 'partials/footer.html.twig' %}
{% endblock %}
<div class="mobile-container">
<div class="overlay" id="overlay">
<div class="mobile-logo">