From 67754100fff22d62cf29898c4972417e4b61d3bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20S=C3=A9chet?= Date: Mon, 10 Jun 2024 11:06:54 +0200 Subject: [PATCH 1/7] fix: don't localize urls for svg assets --- config/.htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/.htaccess b/config/.htaccess index 6920183..c0027b0 100644 --- a/config/.htaccess +++ b/config/.htaccess @@ -4,7 +4,7 @@ Options -Indexes -MultiViews # assets. RewriteEngine on -RewriteRule \.(css|js|jpg|png|gif|woff|woff2)$ - [NC,L] +RewriteRule \.(css|js|jpg|png|gif|woff|woff2|svg)$ - [NC,L] RewriteCond %{HTTP:Accept-Language} ^(fr) [NC] RewriteCond %{REQUEST_URI} !^/(fr|en)/ -- 2.39.2 From ab05bead5235067ecdde299032c39c90b5fc6cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20S=C3=A9chet?= Date: Mon, 10 Jun 2024 11:07:47 +0200 Subject: [PATCH 2/7] fix: fix double equal in social links --- src/lib/nav.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/nav.html b/src/lib/nav.html index 754e4ec..acc0514 100644 --- a/src/lib/nav.html +++ b/src/lib/nav.html @@ -29,22 +29,22 @@
- + - + - + - + - + - +
-- 2.39.2 From 313333deaf416216d139e0d344d709d7f8b19784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20S=C3=A9chet?= Date: Mon, 10 Jun 2024 11:36:08 +0200 Subject: [PATCH 3/7] feat: move menu before social links --- src/lib/nav.html | 41 +++++++++++++++++++++-------------------- src/lib/nav.scss | 5 ++--- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/lib/nav.html b/src/lib/nav.html index acc0514..8ba5c43 100644 --- a/src/lib/nav.html +++ b/src/lib/nav.html @@ -17,6 +17,27 @@ {{ gettext('Contact') }}
+
+ + + + + + + + + + + + + + + + + + +
+
{{ language_button('fr', 'Version Française') }} {{ language_button('en', 'English version') }} @@ -27,25 +48,5 @@
-
- - - - - - - - - - - - - - - - - - -
diff --git a/src/lib/nav.scss b/src/lib/nav.scss index 06678a5..f2d0c73 100644 --- a/src/lib/nav.scss +++ b/src/lib/nav.scss @@ -33,7 +33,7 @@ margin: 0; display: grid; - grid-template-columns: 1fr auto auto; + grid-template-columns: var(--desktop-logo-width) 1fr auto auto auto; @media ($mobile-breakpoint) { height: var(--mobile-height); @@ -73,7 +73,7 @@ } &--menu { - justify-self: end; + grid-area: 1 / 2 / 2 / 3; align-self: center; display: flex; @@ -184,7 +184,6 @@ } &--links { - grid-area: 1 / 3 / 2 / 4; height: var(--desktop-height); grid-template-columns: 1fr auto auto; -- 2.39.2 From 71857029961c11a074cc6bb4906c26a0e27508fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20S=C3=A9chet?= Date: Mon, 10 Jun 2024 11:36:31 +0200 Subject: [PATCH 4/7] fix: remove unused property on links --- src/lib/nav.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/nav.scss b/src/lib/nav.scss index f2d0c73..f064afe 100644 --- a/src/lib/nav.scss +++ b/src/lib/nav.scss @@ -185,7 +185,6 @@ &--links { height: var(--desktop-height); - grid-template-columns: 1fr auto auto; justify-self: end; align-self: center; -- 2.39.2 From 00a535308063dc5ce6839b0e6a758d45ae21bbd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20S=C3=A9chet?= Date: Mon, 10 Jun 2024 11:38:57 +0200 Subject: [PATCH 5/7] fix: center links vertically --- src/lib/nav.html | 12 ++++++------ src/lib/nav.scss | 8 +++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/lib/nav.html b/src/lib/nav.html index 8ba5c43..abc62a0 100644 --- a/src/lib/nav.html +++ b/src/lib/nav.html @@ -18,22 +18,22 @@
- + - + - + - + - + - +
diff --git a/src/lib/nav.scss b/src/lib/nav.scss index f064afe..6f9a472 100644 --- a/src/lib/nav.scss +++ b/src/lib/nav.scss @@ -184,12 +184,10 @@ } &--links { - height: var(--desktop-height); - + display: flex; justify-self: end; align-self: center; - display: flex; padding: var(--space-small); img { @@ -197,5 +195,9 @@ filter: invert(100%); } } + + &--link { + display: flex; + } } -- 2.39.2 From b3b6e1c6585792289fc41593ae13b0a6cc7734ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20S=C3=A9chet?= Date: Mon, 10 Jun 2024 11:44:21 +0200 Subject: [PATCH 6/7] fix: add BEM class on links icons --- src/lib/nav.html | 12 ++++++------ src/lib/nav.scss | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/lib/nav.html b/src/lib/nav.html index abc62a0..79744aa 100644 --- a/src/lib/nav.html +++ b/src/lib/nav.html @@ -19,22 +19,22 @@
- + - + - + - + - + - +
diff --git a/src/lib/nav.scss b/src/lib/nav.scss index 6f9a472..c47c5b5 100644 --- a/src/lib/nav.scss +++ b/src/lib/nav.scss @@ -189,15 +189,15 @@ align-self: center; padding: var(--space-small); - - img { - width: 2em; - filter: invert(100%); - } } &--link { display: flex; } + + &--link-icon { + width: 2em; + filter: invert(100%); + } } -- 2.39.2 From 268bc34315971a2e39c4dcc1ff9586839f47be4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20S=C3=A9chet?= Date: Mon, 10 Jun 2024 11:44:39 +0200 Subject: [PATCH 7/7] fix: temporarily hide social links on mobile --- src/lib/nav.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/nav.scss b/src/lib/nav.scss index c47c5b5..e6e6642 100644 --- a/src/lib/nav.scss +++ b/src/lib/nav.scss @@ -189,6 +189,10 @@ align-self: center; padding: var(--space-small); + + @media($mobile-breakpoint) { + display: none; + } } &--link { -- 2.39.2