Merge pull request #23 from mlegait/rebranding-font

Rebranding font
FroMage · Feb 10, 2025 · dca4f78 · dca4f78
2 parents cab6bff + 47bb698
commit dca4f78
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 14 deletions.
diff --git a/src/main/resources/templates/Application/index.html b/src/main/resources/templates/Application/index.html
@@ -120,7 +120,7 @@ <h2 class="home__title">Riviera DEV 2025</h2>
 
 <div class="aboutUs">
     <div class="aboutUs__item aboutUs__aboutUs">
-            <h2 class="home__title aboutUs__title">{m:views.application.index.aboutUs.title}</h2>
+            <h2 class="home__title aboutUs__title title">{m:views.application.index.aboutUs.title}</h2>
             <p>{m:views.application.index.aboutUs.dna}</p>
             <p>{m:views.application.index.aboutUs.goal}</p>
 
@@ -135,7 +135,7 @@ <h2 class="home__title aboutUs__title">{m:views.application.index.aboutUs.title}
 
 <div class="days">
     <div class="days__container notFullWidth">
-        <h2 class="days__mainTitle home__title">{m:views.application.index.days.title}</h2>
+        <h2 class="days__mainTitle home__title title">{m:views.application.index.days.title}</h2>
 
         <div class="days__contents">
 
@@ -231,7 +231,7 @@ <h2 class="judcon__mainTitle home__title">
 {#if !displayPreviousSpeakers && speakersStar != null && speakersStar.size() > 0}
 <div class="speakers">
     <div class="speakers__container notFullWidth">
-        <h2 class="home__title speakers__title">{m:views.application.index.speakers}</h2>
+        <h2 class="home__title speakers__title title">{m:views.application.index.speakers}</h2>
         {#speakers speakers=speakersStar/}
 
         <div class="speakers__buttonContainer">
@@ -296,7 +296,7 @@ <h2 class="home__title newsletter__title">
 <a id="sponsors" class="underStickyHeader"></a>
 <div class="partenaires">
     <div class="partenaires__container notFullWidth">
-        <h2 class="home__title partenaires__title">
+        <h2 class="home__title partenaires__title title">
             {m:views.application.index.sponsors}
         </h2>
 

diff --git a/src/main/resources/web/app/stylesheets/_mixins.scss b/src/main/resources/web/app/stylesheets/_mixins.scss
@@ -37,3 +37,12 @@
         }
     }
 }
+
+@mixin title {
+    &::before {
+        content: '{ ';
+    }
+    &:after {
+        content: ' }';
+    }
+}
diff --git a/src/main/resources/web/app/stylesheets/_variables.scss b/src/main/resources/web/app/stylesheets/_variables.scss
@@ -66,6 +66,8 @@ $border-radius-sm: 10px;
 $border-radius-md: 16px;
 
 $font-title: 'Humant', sans-serif;
+$font-text: 'Neulis', sans-serif;
+$font-secondary: 'Tomorrow', sans-serif;
 
 $font-xxxl: 4rem; // 40px
 $font-xxl: 3rem; // 30px

diff --git a/src/main/resources/web/app/stylesheets/partials/_common.scss b/src/main/resources/web/app/stylesheets/partials/_common.scss
@@ -1,3 +1,5 @@
+@import '../mixins';
+
 /* Humant font for titles */
 
 @font-face {
@@ -64,7 +66,7 @@ html {
 }
 
 body {
-    font-family: 'Neulis', sans-serif;
+    font-family: $font-text;
     font-size: $font-sm;
     position: relative;
     min-height: 100vh;
@@ -96,9 +98,7 @@ body {
 }
 
 .title {
-    text-align: center;
-    color: $color-blue;
-    font-weight: 300;
+    @include title;
 }
 
 .notFullWidth {
@@ -143,7 +143,6 @@ body {
     display: inline-block;
     white-space: nowrap;
     text-decoration: none;
-    text-transform: uppercase;
     text-align: center;
     font-size: $font-sm;
     font-weight: $semi-bold;
@@ -260,6 +259,8 @@ a {
     }
 
     &__mainTitle {
+        @include title;
+
         font-family: $font-title;
         font-size: $font-xl;
         font-weight: bold;

diff --git a/src/main/resources/web/app/stylesheets/partials/_navbar-animated.scss b/src/main/resources/web/app/stylesheets/partials/_navbar-animated.scss
@@ -209,6 +209,7 @@ body.burgerMenu--open .burgerMenu:before {
 
         padding: $space-sm 2%;
         z-index: 10;
+        font-family: $font-secondary;
         font-size: $font-xs;
         position: fixed;
         right: 0;
@@ -233,8 +234,6 @@ body.burgerMenu--open .burgerMenu:before {
             text-decoration: none;
             cursor: pointer;
             text-transform: uppercase;
-            font-size: $font-xs;
-            font-weight: $bold;
 
             &:hover {
                 color: $color-blue;

diff --git a/src/main/resources/web/app/stylesheets/partials/_parallax.scss b/src/main/resources/web/app/stylesheets/partials/_parallax.scss
@@ -76,7 +76,7 @@
 
     &__info {
         color: white;
-        font-family: 'Tomorrow';
+        font-family: $font-secondary;
         font-size: $font-lg;
         font-weight: $light;
         margin-bottom: 3rem;

diff --git a/src/main/resources/web/app/stylesheets/partials/_person.scss b/src/main/resources/web/app/stylesheets/partials/_person.scss
@@ -44,7 +44,6 @@ $avatar-size-sm: 150px;
     }
 
     &__name {
-        text-transform: uppercase;
         font-weight: $bold;
     }
 
@@ -92,6 +91,7 @@ $avatar-size-sm: 150px;
     &__name {
         line-height: 1.5em;
         font-size: $font-xl;
+        font-weight: $semi-bold;
     }
 
     &__title {

diff --git a/src/main/resources/web/app/stylesheets/partials/_sponsors.scss b/src/main/resources/web/app/stylesheets/partials/_sponsors.scss
@@ -188,6 +188,7 @@ $sponsor-silver-height: 92px;
     &__name {
         font-size: $font-xxl;
         margin: $space-xxs;
+        font-weight: $semi-bold;
     }
 
     &__network {

diff --git a/src/main/resources/web/app/stylesheets/partials/_statistics.scss b/src/main/resources/web/app/stylesheets/partials/_statistics.scss
@@ -51,8 +51,9 @@
     }
 
     &__number {
+        font-family: $font-secondary;
         font-size: $font-xxl;
-        font-weight: bold;
+        font-weight: $bold;
         display: block;
         color: $color-yellow;
         line-height: 1;