Skip to content

Commit 4fcb54b

Browse files
noemie-uinoemie-ui
committed
Correction graphique globale
1 parent 91e2b1f commit 4fcb54b

26 files changed

+378
-197
lines changed

‎_includes/blogs.html‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,23 @@
1111
</div>
1212
<div class="post-content">
1313
<h2>{{ post.title }}</h2>
14-
<ul class="post-categories">
15-
{% for category in post.categories %}
16-
<li><a class="category-link" href="/blog/category/{{category|slugify}}">{{ category }}</a></li>
17-
{% endfor %}
18-
</ul>
1914
<p class="post-meta">
2015
<span class="published">Publié le <time datetime="{{ post.date }}">{{ post.date | date: "%d/%m/%Y"
2116
}}</time></span>
2217
par <span class="author">{{ post.author }}</span>
2318
</p>
19+
{% if post.categories and post.categories != empty %}
20+
<ul class="post-categories">
21+
{% for category in post.categories %}
22+
<li>
23+
<a class="category-link" href="/blog/category/{{ category | slugify }}">
24+
{{ category }}
25+
</a>
26+
</li>
27+
{% endfor %}
28+
</ul>
29+
{% endif %}
30+
2431
</div>
2532
</div>
2633
</a>
@@ -34,37 +41,39 @@ <h2>{{ post.title }}</h2>
3441

3542
{% if paginator.previous_page %}
3643
<li class="previous">
37-
<a href="{{ paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/' }}">&larr;</a>
44+
<a href="{{ paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/' }}">&larr;</a>
3845
</li>
3946
{% endif %}
4047

4148
{% if paginator.first_page %}
4249
<li class="previous{% if current_url == paginator.first_page_path %} selected{% endif %}">
43-
<a href="{{ paginator.first_page_path | prepend: site.baseurl | replace: '//', '/' }}">1</a>
50+
<a href="{{ paginator.first_page_path | prepend: site.baseurl | replace: '//', '/' }}">1</a>
4451
</li>
4552
{% endif %}
4653

4754
{% if paginator.page_trail %}
48-
{% for trail in paginator.page_trail %}
49-
{% if trail.num != paginator.first_page and trail.num != paginator.last_page %}
50-
<li{% if page.url == trail.path %} class="selected"{% endif %}>
51-
<a href="{{ trail.path | prepend: site.baseurl | replace: 'index.html', '' }}" title="{{trail.title}}">{{ trail.num }}</a>
52-
</li>
53-
{% endif %}
54-
{% endfor %}
55+
{% for trail in paginator.page_trail %}
56+
{% if trail.num != paginator.first_page and trail.num != paginator.last_page %}
57+
<li
58+
{% if page.url == trail.path %} class="selected"{% endif %}>
59+
<a href="{{ trail.path | prepend: site.baseurl | replace: 'index.html', '' }}" title="{{trail.title}}">{{ trail.num
60+
}}</a>
61+
</li>
62+
{% endif %}
63+
{% endfor %}
5564
{% endif %}
5665

5766
{% if paginator.last_page %}
5867
<li class="previous{% if current_url == paginator.last_page_path %} selected{% endif %}">
59-
<a href="{{ paginator.last_page_path | prepend: site.baseurl | replace: '//', '/' }}">{{ paginator.last_page }}</a>
68+
<a href="{{ paginator.last_page_path | prepend: site.baseurl | replace: '//', '/' }}">{{ paginator.last_page }}</a>
6069
</li>
6170
{% endif %}
6271

6372
{% if paginator.next_page %}
6473
<li class="next">
65-
<a href="{{ paginator.next_page_path | prepend: site.baseurl | replace: '//', '/' }}">&rarr;</a>
74+
<a href="{{ paginator.next_page_path | prepend: site.baseurl | replace: '//', '/' }}">&rarr;</a>
6675
</li>
6776
{% endif %}
6877

6978
</ul>
70-
{% endif %}
79+
{% endif %}

‎_includes/footer.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<footer>
2-
<div class="contact">
2+
<div class="adresse">
33
<ul>
44
<li>9 quai André Lassagne</li>
55
<li>69001 Lyon</li>

‎_includes/head.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<!-- Fonts -->
2020
<link rel="preconnect" href="//fonts.googleapis.com">
2121
<link rel="preconnect" href="//fonts.gstatic.com" crossorigin>
22-
<link href="//fonts.googleapis.com/css2?family=Lato:wght@100;300;400;600&family=Sofia&display=swap" rel="stylesheet">
22+
<link href="//fonts.googleapis.com/css2?family=Inter:wght@200;300;400;600&family=Sofia&display=swap" rel="stylesheet">
2323
<link href="//maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" rel="stylesheet">
2424

2525
{% favicon %}

‎_includes/header.html‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,21 @@
44
<a class="logo" href="{{ "/" | relative_url }}">
55
<img src="{{ "/assets/logo_without_baseline.svg" | relative_url }}" alt="{{ site.title }}" />
66
</a>
7-
{% for item in site.data.navigation.menu %}
8-
<a class="nav-{% if page.title == item.title %}active{% else %}link{% endif %}"
9-
href="{{ item.url | relative_url | replace: 'index.html', '' }}">{{ item.title | escape }}</a>
10-
{% endfor %}
7+
<div class="nav">
8+
{% for item in site.data.navigation.menu %}
9+
{% assign item_url = item.url | relative_url | replace: 'index.html', '' %}
10+
{% assign page_url = page.url | relative_url | replace: 'index.html', '' %}
11+
<a class="nav-{% if page_url == item_url %}active{% else %}link{% endif %}"
12+
href="{{ item_url }}" title="{{ item.title }}">
13+
{{ item.title | escape }}
14+
</a>
15+
{% endfor %}
16+
17+
</div>
1118
<div class="social-icons">
1219
<a class="fa fa-linkedin" href="https://www.linkedin.com/company/{{ site.linkedin.page }}" target="_blank"></a>
1320
<a class="fa fa-facebook" href="https://www.facebook.com/{{ site.facebook.page }}" target="_blank"></a>
14-
<a class="fa fa-twitter" href="https://twitter.com/{{ site.twitter.username }}" target="_blank"></a>
21+
<!-- <a class="fa fa-twitter" href="https://twitter.com/{{ site.twitter.username }}" target="_blank"></a>-->
1522
<a class="fa fa-instagram" href="https://www.instagram.com/{{ site.instagram.username }}" target="_blank"></a>
1623
<a class="fa fa-user" href="https://app.atelier-medias.org" target="_blank"></a>
1724
</div>

‎_includes/video.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<section class="big-video">
2-
<video autoplay muted loop playsinline poster="{{ "/assets/clip.jpeg" | relative_url }}">
2+
<video autoplay muted loop playsinline onpause poster="{{ "/assets/clip.jpeg" | relative_url }}">
33
<!-- MP4 for Safari, IE9, iPhone, iPad, Android, and Windows Phone 7 -->
44
<source type="video/mp4" src="{{ "/assets/clip.mp4" | relative_url }}" />
55
<!-- WebM/VP8 for Firefox4, Opera, and Chrome -->

‎_layouts/blog.html‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<!DOCTYPE html>
22
<html lang="{{ page.lang | default: site.lang | default: 'en' }}">
3-
{% include head.html %}
4-
5-
<body>
6-
{% include header.html %}
7-
<div class="content">
8-
{{ content }}
9-
</div>
10-
{% include footer.html %}
11-
</body>
3+
{% include head.html %}
4+
<body>
5+
{% include header.html %}
6+
<div class="content">
7+
{{ content }}
8+
</div>
9+
{% include footer.html %}
10+
</body>
1211

1312
</html>

‎_layouts/contact.html‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,21 @@
99
<section class="contact">
1010
<form action="https://formspree.io/f/mzboqawe" method="POST">
1111
<label id="decription-label" for="description-textarea">
12-
<h4>Votre message</h4>
12+
Votre message
1313
</label>
1414
<textarea name="Description" id="description-textarea"></textarea>
1515
<label id="contact-label" for="name-input">
16-
<h4>Contact</h4>
16+
Contact
1717
</label>
1818
<input id="name-input" placeholder="Prénom Nom" name="Prénom Nom">
1919
<input id="email-input" type="Email" placeholder="Email" name="_replyto">
2020
<input type="hidden" name="_language" value="fr" />
2121
<button type="submit">Envoyer</button>
2222
</form>
2323
</section>
24+
<section class="map">
25+
<iframe
26+
src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2783.001972788671!2d4.835083776565785!3d45.77115071290574!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x47f4eafb0eaa356f%3A0x13a2a8fbb825220!2sAtelier%20des%20M%C3%A9dias!5e0!3m2!1sfr!2sfr!4v1768990774718!5m2!1sfr!2sfr"
27+
width="100%" height="100%" style="border:0;" allowfullscreen="" loading="lazy"
28+
referrerpolicy="no-referrer-when-downgrade"></iframe>
29+
</section>

‎_layouts/coworker.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
<h3 class="coworker-page_infos_name">{{ page.name }}</h3>
1414
{% if page.metier %} <div class="coworker-page_infos_metier"> {{ page.metier }}</div> {%endif %}
1515
<div class="coworker-page_infos_social">
16+
{% if page.web %}
17+
<a class="coworker-page_infos_social_link fa fa-laptop" href="{{ page.web }}"></a>
18+
{% endif %}
1619
{% if page.facebook %}
1720
<a class="coworker-page_infos_social_link fa fa-facebook" href="{{ page.facebook }}"></a>
1821
{% endif %}
@@ -31,6 +34,9 @@ <h3 class="coworker-page_infos_name">{{ page.name }}</h3>
3134
{% if page.emailpro %}
3235
<a class="coworker-page_infos_social_link fa fa-envelope" href="mailto:{{ page.emailpro }}"></a>
3336
{% endif %}
37+
{% if page.siteweb %}
38+
<a class="coworker-page_infos_social_link fa fa-envelope" href="mailto:{{ page.siteweb }}"></a>
39+
{% endif %}
3440
</div>
3541
</div>
3642
{% if page.tags %}

‎_layouts/events.html‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,29 @@
22
layout: default
33
---
44

5-
<h2>Les Événements</h2>
65

7-
<section class="organize">
6+
7+
<section class="normal">
8+
<h1 class="h2">Les Événements</h1>
89
{{ content }}
10+
{% include icons.html icons=site.data.event_features display="flex" %}
911
</section>
1012

11-
{% include icons.html icons=site.data.event_features display="flex" %}
1213

1314
<section class="contact">
1415
<form action="https://formspree.io/f/mrgjznyn" method="POST">
1516
<label id="decription-label" for="description-textarea">
16-
<h4>Décrivez votre événement</h4>
17+
Décrivez votre événement
1718
<small>(en 500 signes), ce paragraphe sera utilisé pour promouvoir votre événement</small>
1819
</label>
1920
<textarea name="Description" id="description-textarea"></textarea>
2021
<label id="date-label" for="date-textarea">
21-
<h4>Date souhaitée</h4>
22+
Date souhaitée
2223
<small>(sous réserve de validation par l'Atelier des Médias)</small>
2324
</label>
2425
<textarea name="Date souhaitée" id="date-textarea"></textarea>
2526
<label id="contact-label" for="name-input">
26-
<h4>Contact</h4>
27+
Contact
2728
</label>
2829
<input id="name-input" placeholder="Prénom Nom" name="Prénom Nom">
2930
<input id="email-input" type="Email" placeholder="Email" name="_replyto">

‎_layouts/home.html‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@
44

55
{% include video.html %}
66

7-
{% include icons.html icons=site.data.features display="grid" %}
8-
97
<section class="normal">
8+
{% include icons.html icons=site.data.features display="grid" %}
109
{{ content }}
1110
</section>
11+
<section class="map">
12+
<iframe
13+
src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2783.001972788671!2d4.835083776565785!3d45.77115071290574!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x47f4eafb0eaa356f%3A0x13a2a8fbb825220!2sAtelier%20des%20M%C3%A9dias!5e0!3m2!1sfr!2sfr!4v1768990774718!5m2!1sfr!2sfr"
14+
width="100%" height="100%" style="border:0;" allowfullscreen="" loading="lazy"
15+
referrerpolicy="no-referrer-when-downgrade"></iframe>
16+
</section>

0 commit comments

Comments
 (0)