add content + modif html

This commit is contained in:
2019-01-30 12:24:08 +01:00
parent 858bff0f81
commit fd2eac3dc4
46 changed files with 454 additions and 205 deletions
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -1 +1 @@
@font-face{font-family:Montserrat-Regular;src:url(../fonts/montserrat/Montserrat-Regular.eot);src:url(../fonts/montserrat/Montserrat-Regular.eot?#iefix) format('embedded-opentype'),url(../fonts/montserrat/Montserrat-Regular.woff) format('woff'),url(../fonts/montserrat/Montserrat-Regular.ttf) format('truetype'),url(../fonts/montserrat/Montserrat-Regular.svg#Montserrat-Regular) format('svg')}a,h1,h2,h3,li,p,ul{font-family:Montserrat-Regular;font-weight:400}h1{font-size:1.2rem!important}p{font-size:8rem;line-height:8rem}ul{font-size:.8rem;line-height:1.2rem}header{position:fixed;top:0}header h1{margin:30px 0 0 30px}#start{width:70%;margin:auto}.sidebar-right{position:fixed;top:0;right:0;display:-ms-flexbox;display:flex;width:20%;height:100%}.sidebar-right ul{margin:auto;margin-right:20px;text-align:right}.sidebar-right ul a{color:grey}.sidebar-right ul a:hover::after{content:'D'}
@font-face{font-family:Montserrat-Regular;src:url(../fonts/montserrat/Montserrat-Regular.eot);src:url(../fonts/montserrat/Montserrat-Regular.eot?#iefix) format('embedded-opentype'),url(../fonts/montserrat/Montserrat-Regular.woff) format('woff'),url(../fonts/montserrat/Montserrat-Regular.ttf) format('truetype'),url(../fonts/montserrat/Montserrat-Regular.svg#Montserrat-Regular) format('svg')}@font-face{font-family:Montserrat-medium;src:url(../fonts/montserrat/Montserrat-Medium.eot);src:url(../fonts/montserrat/Montserrat-Medium.eot?#iefix) format('embedded-opentype'),url(../fonts/montserrat/Montserrat-Medium.woff) format('woff'),url(../fonts/montserrat/Montserrat-Medium.ttf) format('truetype'),url(../fonts/montserrat/Montserrat-Medium.svg#Montserrat-medium) format('svg')}a,h1,h2,h3,li,p,ul{font-family:Montserrat-Regular;font-weight:400}h1{font-size:1.2rem!important}p{font-family:Montserrat-Medium!important;font-size:8rem;line-height:8rem}ul{font-size:.8rem;line-height:1.2rem}header{position:fixed;top:0}header h1{margin:30px 0 0 30px}#start{width:70%;margin:auto auto auto 10%}.sidebar-right{position:fixed;top:0;right:0;display:-ms-flexbox;display:flex;width:20%;height:100%}.sidebar-right ul{margin:auto;margin-right:20px;text-align:right}.sidebar-right ul a{position:relative;color:grey}.sidebar-right ul a:hover li{position:relative}.sidebar-right ul a:hover li::after{position:absolute;top:7px;right:-13px;display:block;width:7px;height:7px;content:' ';border-radius:5px;background-color:grey}
+14
View File
@@ -0,0 +1,14 @@
var $Sba = $('.sidebar-right a');
var $Sbsvg = $('.sidebar-right svg');
function addclass() {
$Sba.hover(function() {
$(this).addClass("hover");
}, function() {
$(this).removeClass("hover");
});
}
jQuery(document).ready(function($){
addclass();
});
@@ -33,3 +33,30 @@ $category: "sans-serif";
}
}
}
$Medium: "Montserrat-medium";
$file-Medium: "Montserrat-Medium";
@mixin font-face($Medium, $file-Medium, $family, $category:"") {
$filepath: "../fonts/" + $family + "/" + $file-Medium;
@font-face {
font-family: "#{$Medium}";
src: url($filepath + ".eot");
src: url($filepath + ".eot?#iefix") format('embedded-opentype'),
url($filepath + ".woff") format('woff'),
url($filepath + ".ttf") format('truetype'),
url($filepath + ".svg#" + $Medium + "") format('svg');
}
%#{$Medium} {
font: {
@if $category != "" {
family: "#{$Medium}", #{$category};
}
@else {
family: "#{$Medium}";
weight: normal;
}
}
}
}
@@ -1 +1,2 @@
@include font-face($Regular, $file-regular, $family, $category);//1
@include font-face($Medium, $file-Medium, $family, $category);//1
@@ -11,9 +11,21 @@
margin-right: 20px;
a{
color: grey;
position: relative;
&:hover{
&::after{
content: "D";
li{
position: relative;
&::after{
content: " ";
top: 7px;
right: -13px;
display: block;
position: absolute;
background-color: grey;
border-radius: 5px;
width: 7px;
height: 7px;
}
}
}
}
@@ -1,4 +1,4 @@
#start{
width: 70%;
margin: auto;
margin: auto auto auto 10%;
}
@@ -8,6 +8,7 @@ h1{
}
p{
font-family: 'Montserrat-Medium'!important;
font-size: 8rem;
line-height: 8rem;
}
@@ -23,10 +23,8 @@
{% endblock %}
{% block body %}
<section id="body-wrapper" class="section blog-listing">
<section class="container {{ grid_size }}">
<section id="body-wrapper">
{% embed 'partials/layout.html.twig' with {blog: page} %}
{% block item %}
<div class="bricklayer">
@@ -43,9 +41,6 @@
{% endblock %}
{% endembed %}
</section>
</section>
<script>
//Bricklayer
@@ -23,31 +23,25 @@
{% block javascripts %}
{% do assets.addJs('jquery', 101) %}
{% do assets.addJs('theme://js/jquery.treemenu.js', {group:'bottom'}) %}
{% do assets.addJs('theme://js/site.js', {group:'bottom'}) %}
{% do assets.addJs('theme://js/script_k.js', {group:'bottom'}) %}
{% endblock %}
{{ assets.js()|raw }}
{% endblock head %}
</head>
<body id="top" class="{% block body_classes %}{{ body_classes }}{% endblock %}">
<body id="top">
{% block header %}
<header class="section">
<h1>{{ site.title }}</h1>
<nav class="dropmenu animated">
{% block header_navigation %}
{% include 'partials/navigation.html.twig' %}
{% endblock %}
</nav>
<header>
<a href="/"><h1>{{ site.title }}</h1></a>
</header>
{% endblock %}
<section id="start">
{% block body %}
<section class="container {{ grid_size }}">
<section>
{% block content %}{% endblock %}
</section>
@@ -55,10 +49,6 @@
{% include 'partials/sidebar.html.twig' %}
{% endblock %}
{% block footer %}
{% include 'partials/footer.html.twig' %}
{% endblock %}
{% endblock %}
</section>
@@ -1,6 +1,4 @@
<div class="content-item h-entry">
<div>
{% if not hero_image_name %}
<div class="content-title text-center">
@@ -21,13 +19,9 @@
{{ image.html }}
{% endfor %}
</div>
</div>
<p class="prev-next text-center">
{% if not page.isLast %}
<a class="btn" href="{{ page.prevSibling.url }}"><i class="fa fa-angle-left"></i> {{ 'THEME_QUARK.BLOG.ITEM.PREV_POST'|t }}</a>
{% endif %}
@@ -1,17 +1,16 @@
<div class="card">
{% set image = page.media.images|first %}
{% if image %}
<div class="card-image">
<a href="{{ page.url }}">{{ image.cropZoom(800,400).html }}</a>
</div>
{% endif %}
<div class="card-header">
<div class="card-image">
<a href="{{ page.url }}">{{ image.cropZoom(800,400).html }}</a>
</div>
<div class="card-title">
{% include 'partials/blog/title.html.twig' with {title_level: 'h5'} %}
</div>
</div>
<div class="card-footer">
{% include 'partials/blog/taxonomy.html.twig' %}
</div>
{% endif %}
<div class="card-header">
{% include 'partials/blog/title.html.twig' with {title_level: 'h5'} %}
</div>
<div class="card-footer">
{% include 'partials/blog/taxonomy.html.twig' %}
</div>
</div>
@@ -1,11 +1,11 @@
{% set title_level = title_level ?: 'h2' %}
{% if page.header.link %}
<{{ title_level }} class="p-name mt-1">
<{{ title_level }}>
{% if page.header.continue_link is not same as(false) %}
<a href="{{ page.url }}"><i class="fa fa-angle-double-right u-url"></i></a>
<a href="{{ page.url }}"><i></i></a>
{% endif %}
<a href="{{ page.header.link }}" class="u-url">{{ page.title }}</a>
<a href="{{ page.header.link }}">{{ page.title }}</a>
</{{ title_level }}>
{% else %}
<{{ title_level }} class="p-name mt-1"><a href="{{ page.url }}" class="u-url">{{ page.title }}</a></{{ title_level }}>
<{{ title_level }}><a href="{{ page.url }}">{{ page.title }}</a></{{ title_level }}>
{% endif %}
@@ -11,4 +11,3 @@
</div>
{% endif %}
</div>
@@ -43,12 +43,18 @@
{% endif %}
<div class="sidebar-left">
</div>
<div class="sidebar-right">
{% set options = { items: {'@page': '/projets' } } %}
{% set options = { items: {'@page': '/contact' } } %}
{% set my_collection = page.collection(options) %}
<ul>
{% for p in my_collection %}
<a href="{{p.url}}"><li>{{ p.title }}</li></a>
{% endfor %}
</ul>
</div>
<div class="sidebar-right">
{% set options = { items: {'@page': '/projets' } } %}
{% set my_collection = page.collection(options) %}
<ul>
{% for p in my_collection %}
<a href="{{p.url}}"><li>{{ p.title }}</li></a>
@@ -1,10 +1,8 @@
{% set taxlist = children_only is defined ? taxonomylist.getChildPagesTags() : taxonomylist.get() %}
{% if taxlist %}
<span class="tags">
{% for tax,value in taxlist[taxonomy] %}
{% set label_class = uri.param(taxonomy) == tax ? 'label-primary' : 'label-secondary' %}
<a class="label label-rounded {{ label_class }}" href="{{ base_url }}/{{ taxonomy }}{{ config.system.param_sep }}{{ tax }}">{{ tax }}</a>
<a class="label {{ label_class }}" href="{{ base_url }}/{{ taxonomy }}{{ config.system.param_sep }}{{ tax }}">{{ tax }}</a>
{% endfor %}
</span>
{% endif %}