Merge pull request #75 from atelierdesmedias/improve-logo

Replace logo

Gemfile

@@ -8,7 +8,7 @@ gem 'mini_magick', '~> 4.11.0'
 gem 'octokit', '~> 6.0'
 gem 'rake', '~> 13.0.6'
 gem 'rbnacl', '~> 7.1.1'
-gem 'rubocop', '~> 1.45.1'
+gem 'rubocop', '~> 1.48'
 gem 'stringex', '~> 2.8.5'
 
 group :jekyll_plugins do

_formulas/adherent.md

@@ -1,5 +1,6 @@
 ---
-name: Adhésion
+verb: Devenir
+name: adhérent
 price: 15
 period: an
 ---

_formulas/fixe.md

@@ -1,5 +1,6 @@
 ---
-name: Formule fixe
+verb: Devenir
+name: fixe
 price: "178,50"
 period: mois
 ---

_formulas/nomade.md

@@ -1,5 +1,6 @@
 ---
-name: Formule nomade
+verb: Devenir
+name: nomade
 price: 102
 period: mois
 ---

_includes/formulas.html

@@ -1,7 +1,8 @@
 <section class="formulas">
   {% for formula in site.formulas %}
     <div class="formula {{ formula.slug }}">
-      <h2>{{ formula.name }}</h2>
+      <h3>{{ formula.verb }} <div>{{ formula.name }}</div>
+      </h3>
       {{ formula.content }}
       <div class="tarif"><span>{{ formula.price }} €</span>TTC/{{ formula.period }}</div>
       {% if formula.slug != "adherent" %}

_includes/head.html

@@ -18,8 +18,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&display=swap" rel="stylesheet">
+  <link href="//fonts.googleapis.com/css2?family=Lato:wght@100;300;400;600&family=Sofia&display=swap" rel="stylesheet">
   <link href="//maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" rel="stylesheet">
-
-  <link rel="icon" href="{{ "/assets/logo.svg" | relative_url }}">
+  <link rel="icon" href="{{ "/assets/logo_without_baseline.svg" | relative_url }}">
 </head>

_includes/header.html

@@ -2,7 +2,7 @@
   <input type="checkbox" id="nav-toggle" class="nav-toggle"/>
   <nav>
     <a class="logo" href="{{ "/" | relative_url }}">
-      <img src="{{ "/assets/logo.svg" | relative_url }}" alt="{{ site.title }}" />
+      <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 %}"

_includes/video.html

@@ -9,5 +9,5 @@
     <!-- Ogg/Vorbis for older Firefox and Opera versions -->
     <source type="video/ogg" src="{{ "/assets/clip.ogg" | relative_url }}" />
   </video>
-  <a class="button" href="/nous-rejoindre">Nous rejoindre</a>
+  <img src="{{ "/assets/logo.svg" | relative_url }}" alt="{{ site.title }}" />
 </section>

_sass/_formulas.scss

@@ -2,14 +2,26 @@
   .formula {
     width: 100%;
     padding: 2em;
-    color: white;
 
-    p {
+    h3,
+    p,
+    .tarif,
+    small {
       color: white;
     }
 
     h3 {
       margin-bottom: 1em;
+
+      font-family: lato, sans-serif;
+      font-size: 1.5rem;
+      font-weight: 100;
+
+      div {
+        margin-left: 10px;
+        font-family: Sofia, cursive;
+        font-size: 2.5rem;
+      }
     }
 
     ul {
@@ -55,17 +67,18 @@
   }
 
   .adherent {
-    border-radius: 0 0 0 60px;
     background-color: #4d4d4d;
+
+    li {
+      color: white;
+    }
   }
 
   .fixe {
-    border-radius: 0 0 60px;
     background-color: #cbd301;
   }
 
   .nomade {
-    border-radius: 0 60px 0 0;
     background-color: #84cbd5;
   }
 

_sass/_home.scss

@@ -1,6 +1,6 @@
 .big-video {
   position: relative;
-  height: 75vh;
+  height: 100vh;
   overflow: hidden;
 
   video {
@@ -9,17 +9,15 @@
     object-fit: cover;
   }
 
-  a {
+  img {
     position: absolute;
-    right: 30%;
-    bottom: 30%;
+    top: 50%;
+    left: 50%;
 
-    border-color: white;
-
-    color: white;
+    transform: translate(-50%, -50%);
   }
 
   @media screen and (min-width: 800px) {
-    height: calc(75vh - 80px);
+    height: calc(100vh - 80px);
   }
 }

_sass/_typography.scss

@@ -4,17 +4,21 @@ html {
   font-family: Lato, sans-serif;
   font-size: 16px;
   font-weight: 400;
-  letter-spacing: .03em;
 }
 
 h1,
-h2,
 h3,
 h4 {
   font-weight: 600;
   text-transform: uppercase;
 }
 
+h2 {
+  font-family: Sofia, sans-serif;
+  font-size: 2.5rem;
+  font-weight: 400;
+}
+
 p {
   padding-top: 1em;
   color: #333;