Noemie2

.gitignore

@@ -8,3 +8,4 @@ _data/coworker_tags.yml
 .DS_Store
 _proof
 Gemfile.lock
+.idea

_includes/blogs.html

@@ -11,16 +11,23 @@
         </div>
         <div class="post-content">
           <h2>{{ post.title }}</h2>
-          <ul class="post-categories">
-            {% for category in post.categories %}
-            <li><a class="category-link" href="/blog/category/{{category|slugify}}">{{ category }}</a></li>
-            {% endfor %}
-          </ul>
           <p class="post-meta">
             <span class="published">Publié le <time datetime="{{ post.date }}">{{ post.date | date: "%d/%m/%Y"
                 }}</time></span>
             par <span class="author">{{ post.author }}</span>
           </p>
+          {% if post.categories and post.categories != empty %}
+          <ul class="post-categories">
+            {% for category in post.categories %}
+            <li>
+              <a class="category-link" href="/blog/category/{{ category | slugify }}">
+                {{ category }}
+              </a>
+            </li>
+            {% endfor %}
+          </ul>
+          {% endif %}
+
         </div>
       </div>
     </a>
@@ -34,37 +41,39 @@ <h2>{{ post.title }}</h2>
 
   {% if paginator.previous_page %}
   <li class="previous">
-      <a href="{{ paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/' }}">&larr;</a>
+    <a href="{{ paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/' }}">&larr;</a>
   </li>
   {% endif %}
 
   {% if paginator.first_page %}
   <li class="previous{% if current_url == paginator.first_page_path %} selected{% endif %}">
-      <a href="{{ paginator.first_page_path | prepend: site.baseurl | replace: '//', '/' }}">1</a>
+    <a href="{{ paginator.first_page_path | prepend: site.baseurl | replace: '//', '/' }}">1</a>
   </li>
   {% endif %}
 
   {% if paginator.page_trail %}
-    {% for trail in paginator.page_trail %}
-      {% if trail.num != paginator.first_page and trail.num != paginator.last_page %}
-        <li{% if page.url == trail.path %} class="selected"{% endif %}>
-            <a href="{{ trail.path | prepend: site.baseurl | replace: 'index.html', '' }}" title="{{trail.title}}">{{ trail.num }}</a>
-        </li>
-      {% endif %}
-    {% endfor %}
+  {% for trail in paginator.page_trail %}
+  {% if trail.num != paginator.first_page and trail.num != paginator.last_page %}
+  <li
+  {% if page.url == trail.path %} class="selected"{% endif %}>
+  <a href="{{ trail.path | prepend: site.baseurl | replace: 'index.html', '' }}" title="{{trail.title}}">{{ trail.num
+    }}</a>
+  </li>
+  {% endif %}
+  {% endfor %}
   {% endif %}
 
   {% if paginator.last_page %}
   <li class="previous{% if current_url == paginator.last_page_path %} selected{% endif %}">
-      <a href="{{ paginator.last_page_path | prepend: site.baseurl | replace: '//', '/' }}">{{ paginator.last_page }}</a>
+    <a href="{{ paginator.last_page_path | prepend: site.baseurl | replace: '//', '/' }}">{{ paginator.last_page }}</a>
   </li>
   {% endif %}
 
   {% if paginator.next_page %}
   <li class="next">
-      <a href="{{ paginator.next_page_path | prepend: site.baseurl | replace: '//', '/' }}">&rarr;</a>
+    <a href="{{ paginator.next_page_path | prepend: site.baseurl | replace: '//', '/' }}">&rarr;</a>
   </li>
   {% endif %}
 
 </ul>
-{% endif %}
+{% endif %}

_includes/footer.html

@@ -1,5 +1,5 @@
 <footer>
-  <div class="contact">
+  <div class="adresse">
     <ul>
       <li>9 quai André Lassagne</li>
       <li>69001 Lyon</li>

_includes/head.html

@@ -19,7 +19,7 @@
   <!-- Fonts -->
   <link rel="preconnect" href="//fonts.googleapis.com">
   <link rel="preconnect" href="//fonts.gstatic.com" crossorigin>
-  <link href="//fonts.googleapis.com/css2?family=Lato:wght@100;300;400;600&family=Sofia&display=swap" rel="stylesheet">
+  <link href="//fonts.googleapis.com/css2?family=Inter:wght@200;300;400;600&family=Sofia&display=swap" rel="stylesheet">
   <link href="//maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" rel="stylesheet">
 
   {% favicon %}

_includes/header.html

@@ -4,14 +4,21 @@
     <a class="logo" href="{{ "/" | relative_url }}">
       <img src="{{ "/assets/logo_without_baseline.svg" | relative_url }}" alt="{{ site.title }}" />
     </a>
-    {% for item in site.data.navigation.menu %}
-      <a class="nav-{% if page.title == item.title %}active{% else %}link{% endif %}"
-         href="{{ item.url | relative_url | replace: 'index.html', '' }}">{{ item.title | escape }}</a>
-    {% endfor %}
+    <div class="nav">
+      {% for item in site.data.navigation.menu %}
+      {% assign item_url = item.url | relative_url | replace: 'index.html', '' %}
+      {% assign page_url = page.url | relative_url | replace: 'index.html', '' %}
+      <a class="nav-{% if page_url == item_url %}active{% else %}link{% endif %}"
+         href="{{ item_url }}" title="{{ item.title }}">
+        {{ item.title | escape }}
+      </a>
+      {% endfor %}
+
+    </div>
     <div class="social-icons">
       <a class="fa fa-linkedin" href="https://www.linkedin.com/company/{{ site.linkedin.page }}" target="_blank"></a>
       <a class="fa fa-facebook" href="https://www.facebook.com/{{ site.facebook.page }}" target="_blank"></a>
-      <a class="fa fa-twitter" href="https://twitter.com/{{ site.twitter.username }}" target="_blank"></a>
+<!--      <a class="fa fa-twitter" href="https://twitter.com/{{ site.twitter.username }}" target="_blank"></a>-->
       <a class="fa fa-instagram" href="https://www.instagram.com/{{ site.instagram.username }}" target="_blank"></a>
       <a class="fa fa-user" href="https://app.atelier-medias.org" target="_blank"></a>
     </div>

_includes/video.html

@@ -1,5 +1,5 @@
 <section class="big-video">
-  <video autoplay muted loop playsinline poster="{{ "/assets/clip.jpeg" | relative_url }}">
+  <video autoplay muted loop playsinline onpause poster="{{ "/assets/clip.jpeg" | relative_url }}">
     <!-- MP4 for Safari, IE9, iPhone, iPad, Android, and Windows Phone 7 -->
     <source type="video/mp4" src="{{ "/assets/clip.mp4" | relative_url }}" />
     <!-- WebM/VP8 for Firefox4, Opera, and Chrome -->

_layouts/blog.html

@@ -1,13 +1,12 @@
 <!DOCTYPE html>
 <html lang="{{ page.lang | default: site.lang | default: 'en' }}">
-  {% include head.html %}
-
-  <body>
-    {% include header.html %}
-    <div class="content">
-      {{ content }}
-    </div>
-    {% include footer.html %}
-  </body>
+{% include head.html %}
+<body>
+{% include header.html %}
+<div class="content">
+  {{ content }}
+</div>
+{% include footer.html %}
+</body>
 
 </html>

_layouts/contact.html

@@ -9,15 +9,21 @@
 <section class="contact">
   <form action="https://formspree.io/f/mzboqawe" method="POST">
     <label id="decription-label" for="description-textarea">
-      <h4>Votre message</h4>
+      Votre message
     </label>
     <textarea name="Description" id="description-textarea"></textarea>
     <label id="contact-label" for="name-input">
-      <h4>Contact</h4>
+      Contact
     </label>
     <input id="name-input" placeholder="Prénom Nom" name="Prénom Nom">
     <input id="email-input" type="Email" placeholder="Email" name="_replyto">
     <input type="hidden" name="_language" value="fr" />
     <button type="submit">Envoyer</button>
   </form>
 </section>
+<section class="map">
+  <iframe
+    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"
+    width="100%" height="100%" style="border:0;" allowfullscreen="" loading="lazy"
+    referrerpolicy="no-referrer-when-downgrade"></iframe>
+</section>

_layouts/coworker.html

@@ -13,6 +13,9 @@
     <h3 class="coworker-page_infos_name">{{ page.name }}</h3>
     {% if page.metier %} <div class="coworker-page_infos_metier"> {{ page.metier }}</div> {%endif %}
     <div class="coworker-page_infos_social">
+      {% if page.web %}
+        <a class="coworker-page_infos_social_link fa fa-laptop" href="{{ page.web }}"></a>
+      {% endif %}
       {% if page.facebook %}
         <a class="coworker-page_infos_social_link fa fa-facebook" href="{{ page.facebook }}"></a>
       {% endif %}
@@ -31,6 +34,9 @@ <h3 class="coworker-page_infos_name">{{ page.name }}</h3>
       {% if page.emailpro %}
         <a class="coworker-page_infos_social_link fa fa-envelope" href="mailto:{{ page.emailpro }}"></a>
       {% endif %}
+      {% if page.siteweb %}
+        <a class="coworker-page_infos_social_link fa fa-envelope" href="mailto:{{ page.siteweb }}"></a>
+      {% endif %}
     </div>
   </div>
   {% if page.tags %}

_layouts/events.html

@@ -2,28 +2,29 @@
 layout: default
 ---
 
-<h2>Les Événements</h2>
 
-<section class="organize">
+
+<section class="normal">
+  <h1 class="h2">Les Événements</h1>
   {{ content }}
+  {% include icons.html icons=site.data.event_features display="flex" %}
 </section>
 
-{% include icons.html icons=site.data.event_features display="flex" %}
 
 <section class="contact">
   <form action="https://formspree.io/f/mrgjznyn" method="POST">
     <label id="decription-label" for="description-textarea">
-      <h4>Décrivez votre événement</h4>
+      Décrivez votre événement
       <small>(en 500 signes), ce paragraphe sera utilisé pour promouvoir votre événement</small>
     </label>
     <textarea name="Description" id="description-textarea"></textarea>
     <label id="date-label" for="date-textarea">
-      <h4>Date souhaitée</h4>
+      Date souhaitée
       <small>(sous réserve de validation par l'Atelier des Médias)</small>
     </label>
     <textarea name="Date souhaitée" id="date-textarea"></textarea>
     <label id="contact-label" for="name-input">
-      <h4>Contact</h4>
+      Contact
     </label>
     <input id="name-input" placeholder="Prénom Nom" name="Prénom Nom">
     <input id="email-input" type="Email" placeholder="Email" name="_replyto">

_layouts/home.html

@@ -4,8 +4,13 @@
 
 {% include video.html %}
 
-{% include icons.html icons=site.data.features display="grid" %}
-
 <section class="normal">
+  {% include icons.html icons=site.data.features display="grid" %}
   {{ content }}
 </section>
+<section class="map">
+  <iframe
+    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"
+    width="100%" height="100%" style="border:0;" allowfullscreen="" loading="lazy"
+    referrerpolicy="no-referrer-when-downgrade"></iframe>
+</section>

_layouts/post.html

@@ -3,26 +3,31 @@
 {% include head.html %}
 
 <body>
-    {% include header.html %}
-    <div class="post">
-        <h1>{{ page.title }}</h1>
-        <ul class="post-categories">
-            {% for category in page.categories %}
-                <li>{{ category }}</li>
-            {% endfor %}
-        </ul>
-        <p class="post-meta">
-            <span class="published">Publié le <time datetime="{{ page.date }}">{{ page.date | date: "%d/%m/%Y" }}</time></span>
-            par <span class="author">{{ page.author }}</span>
-        </p>
-        {% if page.show_image and page.image %}
-            <img src="{{ page.image }}" alt="{{ page.title }}" class="featured">
-        {% endif %}
-        <div class="normal post-content">
-            {{ content }}
-        </div>
+{% include header.html %}
+<div class="content">
+  <div class="post">
+    <h1>{{ page.title }}</h1>
+    <p class="post-meta">
+      <span class="published">Publié le <time
+        datetime="{{ page.date }}">{{ page.date | date: "%d/%m/%Y" }}</time></span>
+      par <span class="author">{{ page.author }}</span>
+    </p>
+    {% if page.categories != empty %}
+    <ul class="post-categories">
+      {% for category in page.categories %}
+      <li>{{ category }}</li>
+      {% endfor %}
+    </ul>
+    {% endif %}
+    {% if page.show_image and page.image %}
+    <img src="{{ page.image }}" alt="{{ page.title }}" class="featured">
+    {% endif %}
+    <div class="normal post-content">
+      {{ content }}
     </div>
-    {% include footer.html %}
+  </div>
+</div>
+{% include footer.html %}
 </body>
 
 </html>

_sass/_base.scss

@@ -19,6 +19,7 @@ body {
 body {
   display: flex;
   flex-direction: column;
+  line-height: 1.4;
 }
 
 .content {
@@ -30,12 +31,21 @@ body {
   align-items: center;
 
   width: 100%;
+
+  margin-top: 80px;
+  padding-top: 40px;
 }
 
 .normal {
-  max-width: 65ch;
+  max-width: 800px;
   margin: 2rem auto;
-  padding: 0 1rem;
+}
+
+.map {
+  max-width: 800px;
+  margin: 0 auto 2rem;
+  height: 450px;
+  border-radius: 5px;
 }
 
 section {