From adb02dfce364f221f5cf4928ccee5029bcde6ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Legait?= Date: Mon, 3 Feb 2025 21:39:57 +0100 Subject: [PATCH 1/7] Declare font family in variables --- src/main/resources/web/app/stylesheets/_variables.scss | 2 ++ src/main/resources/web/app/stylesheets/partials/_common.scss | 2 +- src/main/resources/web/app/stylesheets/partials/_parallax.scss | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/web/app/stylesheets/_variables.scss b/src/main/resources/web/app/stylesheets/_variables.scss index 1649c15..7620fab 100644 --- 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-subtitle: '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 index d690c61..d9f2336 100644 --- a/src/main/resources/web/app/stylesheets/partials/_common.scss +++ b/src/main/resources/web/app/stylesheets/partials/_common.scss @@ -64,7 +64,7 @@ html { } body { - font-family: 'Neulis', sans-serif; + font-family: $font-text; font-size: $font-sm; position: relative; min-height: 100vh; diff --git a/src/main/resources/web/app/stylesheets/partials/_parallax.scss b/src/main/resources/web/app/stylesheets/partials/_parallax.scss index 1cac484..9c6c7f6 100644 --- 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-subtitle; font-size: $font-lg; font-weight: $light; margin-bottom: 3rem; From 0ccec1fa68b679289bd7d99196c12debc92ef38e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Legait?= Date: Mon, 3 Feb 2025 21:40:13 +0100 Subject: [PATCH 2/7] Use subtitle font in menu --- .../web/app/stylesheets/partials/_navbar-animated.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/resources/web/app/stylesheets/partials/_navbar-animated.scss b/src/main/resources/web/app/stylesheets/partials/_navbar-animated.scss index 87ffdf7..5168df3 100644 --- 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-subtitle; 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; From acbf5a002236a8462dee19c03f10c326e9819588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Legait?= Date: Sat, 8 Feb 2025 09:46:11 +0100 Subject: [PATCH 3/7] Rename $font-subtitle to $font-secondary --- src/main/resources/web/app/stylesheets/_variables.scss | 2 +- .../web/app/stylesheets/partials/_navbar-animated.scss | 2 +- src/main/resources/web/app/stylesheets/partials/_parallax.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/web/app/stylesheets/_variables.scss b/src/main/resources/web/app/stylesheets/_variables.scss index 7620fab..649f586 100644 --- a/src/main/resources/web/app/stylesheets/_variables.scss +++ b/src/main/resources/web/app/stylesheets/_variables.scss @@ -67,7 +67,7 @@ $border-radius-md: 16px; $font-title: 'Humant', sans-serif; $font-text: 'Neulis', sans-serif; -$font-subtitle: 'Tomorrow', 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/_navbar-animated.scss b/src/main/resources/web/app/stylesheets/partials/_navbar-animated.scss index 5168df3..d8db759 100644 --- a/src/main/resources/web/app/stylesheets/partials/_navbar-animated.scss +++ b/src/main/resources/web/app/stylesheets/partials/_navbar-animated.scss @@ -209,7 +209,7 @@ body.burgerMenu--open .burgerMenu:before { padding: $space-sm 2%; z-index: 10; - font-family: $font-subtitle; + font-family: $font-secondary; font-size: $font-xs; position: fixed; right: 0; diff --git a/src/main/resources/web/app/stylesheets/partials/_parallax.scss b/src/main/resources/web/app/stylesheets/partials/_parallax.scss index 9c6c7f6..e99c9e5 100644 --- 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: $font-subtitle; + font-family: $font-secondary; font-size: $font-lg; font-weight: $light; margin-bottom: 3rem; From 5feaaae69d7214c06cf66028447620f70f3410aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Legait?= Date: Sat, 8 Feb 2025 09:58:11 +0100 Subject: [PATCH 4/7] Use secondary font for statistics --- .../resources/web/app/stylesheets/partials/_statistics.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/web/app/stylesheets/partials/_statistics.scss b/src/main/resources/web/app/stylesheets/partials/_statistics.scss index d4ffd7a..61259c5 100644 --- 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; From 8f281568cfc0a1a1877853ded3ddc904bc718fa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Legait?= Date: Sat, 8 Feb 2025 09:58:49 +0100 Subject: [PATCH 5/7] Add curly braces around titles --- src/main/resources/templates/Application/index.html | 8 ++++---- src/main/resources/web/app/stylesheets/_mixins.scss | 9 +++++++++ .../resources/web/app/stylesheets/partials/_common.scss | 8 +++++--- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/main/resources/templates/Application/index.html b/src/main/resources/templates/Application/index.html index c8b3194..71693e3 100644 --- a/src/main/resources/templates/Application/index.html +++ b/src/main/resources/templates/Application/index.html @@ -120,7 +120,7 @@

Riviera DEV 2025

-

{m:views.application.index.aboutUs.title}

+

{m:views.application.index.aboutUs.title}

{m:views.application.index.aboutUs.dna}

{m:views.application.index.aboutUs.goal}

@@ -135,7 +135,7 @@

{m:views.application.index.aboutUs.title}
-

{m:views.application.index.days.title}

+

{m:views.application.index.days.title}

@@ -231,7 +231,7 @@

{#if !displayPreviousSpeakers && speakersStar != null && speakersStar.size() > 0}
-

{m:views.application.index.speakers}

+

{m:views.application.index.speakers}

{#speakers speakers=speakersStar/}
@@ -296,7 +296,7 @@