From b4bbacfac3bac7ee3d72b33f962edfa9301d23ce Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Tue, 19 Mar 2024 17:28:16 +0100
Subject: [PATCH 1/2] Ajouter les logos. refs #9
---
.../www/client/i18n/AppConstants.java | 24 ++++++
.../www/client/view/LayoutView.java | 42 ++++++++--
.../client/i18n/AppConstants_fr.properties | 1 +
.../www/client/public/img/logo_etat.svg | 14 ++++
.../www/client/public/img/logo_inrae.svg | 81 +++++++++++++++++++
.../www/client/public/img/logo_mesr.svg | 1 +
.../agrometinfo/www/client/public/style.css | 26 +++++-
7 files changed, 182 insertions(+), 7 deletions(-)
create mode 100644 www-client/src/main/resources/fr/agrometinfo/www/client/public/img/logo_etat.svg
create mode 100644 www-client/src/main/resources/fr/agrometinfo/www/client/public/img/logo_inrae.svg
create mode 100644 www-client/src/main/resources/fr/agrometinfo/www/client/public/img/logo_mesr.svg
diff --git a/www-client/src/main/java/fr/agrometinfo/www/client/i18n/AppConstants.java b/www-client/src/main/java/fr/agrometinfo/www/client/i18n/AppConstants.java
index 23eac35..7a307a1 100644
--- a/www-client/src/main/java/fr/agrometinfo/www/client/i18n/AppConstants.java
+++ b/www-client/src/main/java/fr/agrometinfo/www/client/i18n/AppConstants.java
@@ -183,6 +183,12 @@ public interface AppConstants extends com.google.gwt.i18n.client.ConstantsWithLo
@DefaultStringValue("HTTP status text:")
String failureStatusText();
+ /**
+ * @return translation
+ */
+ @DefaultStringValue("https://www.inrae.fr/en")
+ String inraeUrl();
+
/**
* @return translation
*/
@@ -201,12 +207,30 @@ public interface AppConstants extends com.google.gwt.i18n.client.ConstantsWithLo
@DefaultStringValue("en/legal-notice.html")
String legalNoticePath();
+ /**
+ * @return URL for MESR
+ */
+ @DefaultStringValue("Ministère de l'Enseignement Supérieur et de la Recherche")
+ String mesr();
+
+ /**
+ * @return URL for MESR
+ */
+ @DefaultStringValue("https://www.enseignementsup-recherche.gouv.fr/fr")
+ String mesrUrl();
+
/**
* @return translation
*/
@DefaultStringValue("Your message was sent to AgroMetInfo team.")
String messageSent();
+ /**
+ * @return translation
+ */
+ @DefaultStringValue("https://meteofrance.com/")
+ String meteoFranceUrl();
+
/**
* @return translation
*/
diff --git a/www-client/src/main/java/fr/agrometinfo/www/client/view/LayoutView.java b/www-client/src/main/java/fr/agrometinfo/www/client/view/LayoutView.java
index 6acdf6e..861264b 100644
--- a/www-client/src/main/java/fr/agrometinfo/www/client/view/LayoutView.java
+++ b/www-client/src/main/java/fr/agrometinfo/www/client/view/LayoutView.java
@@ -2,6 +2,7 @@ package fr.agrometinfo.www.client.view;
import static org.jboss.elemento.Elements.a;
import static org.jboss.elemento.Elements.div;
+import static org.jboss.elemento.Elements.img;
import static org.jboss.elemento.Elements.li;
import java.util.HashMap;
@@ -206,16 +207,40 @@ implements LayoutPresenter.View, LoadingHandler {
*/
private int loadingCounter = 0;
+ /**
+ * Container for logos in footer.
+ */
+ private final HtmlContentBuilder<HTMLDivElement> logos = div().css("logos");
+
+ /**
+ * Container for links in footer.
+ */
+ private final HtmlContentBuilder<HTMLDivElement> links = div().css("links");
+
/**
* @param text link text
* @param callback {@link EventCallbackFn<MouseEvent>} to be added to the click
* event of the component clickable element
* @return created link
*/
- private HtmlContentBuilder<HTMLAnchorElement> appendFooterMenuItem(final String text,
+ private HtmlContentBuilder<HTMLAnchorElement> appendFooterLink(final String text,
final EventCallbackFn<MouseEvent> callback) {
final HtmlContentBuilder<HTMLAnchorElement> link = a().textContent(text).on(EventType.click, callback);
- layout.getFooter().add(link);
+ links.add(link);
+ return link;
+ }
+
+ /**
+ * @param url url
+ * @param title link title
+ * @param imgUrl image url
+ * @return created link
+ */
+ private HtmlContentBuilder<HTMLAnchorElement> appendFooterLogo(final String title, final String url,
+ final String imgUrl) {
+ final HtmlContentBuilder<HTMLAnchorElement> link = a().attr("title", title).attr("target", "_blank")
+ .attr("href", url).add(img("app/img/" + imgUrl));
+ logos.add(link);
return link;
}
@@ -267,10 +292,15 @@ implements LayoutPresenter.View, LoadingHandler {
GWT.log("LayoutView.initFooter()");
layout.showFooter();
layout.fixFooter();
- appendFooterMenuItem(CSTS.credits(), e -> goToDocumentation(CSTS.creditsPath()));
- appendFooterMenuItem(CSTS.legalNotice(), e -> goToDocumentation(CSTS.legalNoticePath()));
- appendFooterMenuItem(CSTS.releaseNotes(), e -> goToDocumentation(CSTS.releaseNotesPath()));
- appendFooterMenuItem(CSTS.contactUs(), e -> getPresenter().showContactView());
+ layout.getFooter().add(logos);
+ appendFooterLogo(CSTS.mesr(), CSTS.mesrUrl(), "logo_mesr.svg");
+ appendFooterLogo("INRAE", CSTS.inraeUrl(), "logo_inrae.svg");
+ appendFooterLogo("Météo-France", CSTS.meteoFranceUrl(), "logo_meteo-france.svg");
+ layout.getFooter().add(links);
+ appendFooterLink(CSTS.credits(), e -> goToDocumentation(CSTS.creditsPath()));
+ appendFooterLink(CSTS.legalNotice(), e -> goToDocumentation(CSTS.legalNoticePath()));
+ appendFooterLink(CSTS.releaseNotes(), e -> goToDocumentation(CSTS.releaseNotesPath()));
+ appendFooterLink(CSTS.contactUs(), e -> getPresenter().showContactView());
}
private void initLeftPanel() {
diff --git a/www-client/src/main/resources/fr/agrometinfo/www/client/i18n/AppConstants_fr.properties b/www-client/src/main/resources/fr/agrometinfo/www/client/i18n/AppConstants_fr.properties
index 0f369e8..d8a2bba 100644
--- a/www-client/src/main/resources/fr/agrometinfo/www/client/i18n/AppConstants_fr.properties
+++ b/www-client/src/main/resources/fr/agrometinfo/www/client/i18n/AppConstants_fr.properties
@@ -28,6 +28,7 @@ documentationPath = decouvrir.html
failureBody = Corps :
failureHeaders = Entêtes HTTP :
failureStatusText = Texte d’état HTTP :
+inraeUrl = https://www.inrae.fr/
invalidEmailAddress = Adresse courriel invalide
legalNotice = Mentions légales
legalNoticePath = legal-notice.html
diff --git a/www-client/src/main/resources/fr/agrometinfo/www/client/public/img/logo_etat.svg b/www-client/src/main/resources/fr/agrometinfo/www/client/public/img/logo_etat.svg
new file mode 100644
index 0000000..496d11c
--- /dev/null
+++ b/www-client/src/main/resources/fr/agrometinfo/www/client/public/img/logo_etat.svg
@@ -0,0 +1,14 @@
+<svg viewBox="0 0 8500 7670" xmlns="http://www.w3.org/2000/svg">
+ <!-- fond -->
+ <path fill="#fff" d="M0 0h8500v7670h-8500z"/>
+ <!-- Marianne -->
+ <g>
+ <path d="M2145 1884c11-11 22-22 32-34 20-23 40-44 63-64 7-6 14-12 21-16 2-2 2-6 4-8-9 4-15 11-25 15-2 0-4-2-2-4 7-5 14-10 20-15h-1c-2 0-2-2-2-4-25-4-43 13-60 28-4 2-8-2-9-2-28 9-49 34-77 45v-4c-11 4-22 11-34 13-17 4-32 2-47 2-23 2-46 7-69 12-1 0-1 0-2 1-12 3-24 8-35 14l-4 4c-4 4-8 9-13 11-12 6-21 16-31 25-1 1-2 1-3 1-10 10-20 20-30 29-1 1-4 1-6 1 0-1 1-1 1-2 2-3 3-5 5-8l6-9c3-4 5-8 8-11 1-1 1-2 0-2-1-1-2-1-3-1 9-9 21-17 32-24-1 0-3-1-2-2 1-2 2-3 3-5 0-1 0-1 1-2 0-1-1-1-1-2l-9 6c-5 4-8 12-15 12h-3c-1 0-2 0-2-1v-1c0-1 1-1 1-2s1-1 1-2c0 0 0-1 1-1 0-1 1-2 1-2 0-1 1-1 1-2 1-1 2-3 2-4 0-1 1-1 1-2 1-1 1-2 2-3 1-2 0-3-1-3 3-5 8-8 13-11h-1c7-4 15-8 22-12l3-3c-11 4-20 9-30 15 0 0-2 1-3 2 0 0-2 1-5-2v-1c2-4 8-6 11-9 2 0 4 0 4 2 61-47 144-36 214-60 6-4 11-8 17-11 9-4 17-13 28-19 15-11 26-25 32-43 0-2-2-4-2-4-25 26-53 47-83 62-40 21-83 17-125 23 2-4 6-4 9-4 0-6 4-8 8-11h6c2 0 2-4 4-4 4 0 10-2 8-2-6-8-17 6-26 0 4-4 2-9 6-11h8c0-4 4-8 4-8 28-17 55-30 81-45-6 0-9 6-15 2 4 0 0-6 4-6 21-6 38-17 59-25-8 0-13 6-21 0 4-2 6-6 11-6v-6c0-2 2-2 4-2-2 0-4-2-4-2 2-4 8-2 11-6-2 0-6 0-6-2 6-8 15-9 25-11-2-4-8 0-8-4 0-2 2-2 4-2h-4c-4-2-2-6-2-8 11-13 11-30 17-45-2 0-4 0-4-2-19 21-49 28-77 36h-13c-9 4-23 4-32-2-8-4-11-9-19-15-15-9-30-17-47-23-47-15-96-23-145-21 21-11 44-12 66-19 32-9 62-21 96-19-6-2-13 0-19 0-26-2-53 6-81 11-19 4-36 11-55 15-11 4-17 15-30 13v-6c19-23 42-45 72-47 34-6 66 0 100 4 25 2 47 8 72 13 9 0 11 15 19 17 11 4 23 0 34 8 0-4-2-8 0-11 8-8 17 2 25-2 15-9-13-26-21-40 0-2 2-4 2-4 15 13 26 28 45 38 9 4 32 9 28-2-9-21-28-38-44-57v-8c-4 0-4-2-6-4v-8c-8-4-6-11-9-17-6-9-2-23-6-34-4-11-6-21-8-32-6-32-13-60-17-91-4-36 21-64 38-96 13-23 28-45 53-60 6-23 21-42 36-60 15-18 40-30 58-38 26-12 50-19 50-19h-1304v1e3h927c36-26 72-38 122-63 24-10 78-35 96-53m-290-136c-4 0-11 2-9-2 2-9 15-9 23-13 4-2 9-6 13-4 4 6 9 4 13 8-12 11-27 6-40 11m-290-41s-2-2-2-4c25-32 43-62 61-96 25-13 45-32 64-53 32-34 66-64 106-83 15-6 34-4 49 2-6 8-15 6-23 11-2 0-4 0-6-2 2-2 2-4 2-6-19 21-45 30-60 55-11 19-19 43-43 49-8 2 2-6-2-4-59 36-100 80-146 131m157-125c-2 4-4 4-6 8-2 4-4 6-8 8-2 0-4 0-4-2 2-8 8-15 15-17 3-1 3 1 3 3m88 283c-1 2-3 4-5 6 2 0 4 2 2 3-4 4-9 8-14 10h-3c-2 2-5 4-7 7-2 2-13 1-10-2 5-4 9-9 14-13 3-2 6-5 8-8 1-2 2-3 4-4 3-2 13-3 11 1m-34-15c-8 5-15 10-22 15-8 5-17 8-25 12-1-1-2-1-3-1-7 4-13 9-19 15l-3 3-3 3-4 4c-1 1-1 2-3 3-1 1-4 1-4-1-1 1-2 1-3 2-1 1-2 1-3 2h-2c-2 2-5 4-7 6-4 4-8 7-11 12v1l-1 1s0 1-1 1c0 1-1 1-1 2 0 0-1 1-2 1l-1-1s0-1-1-1c-1-1-1-2-2-3v-1c2-2 4-4 6-7 1-1 1-2 2-2 1-1 2-3 3-4 0-1 1-1 1-2 2-3 4-5 6-8l1-1c1-1 2-3 3-4s1-2 2-4v-1c1-2 1-3 2-4v-1c0-1 0-1 1-2 0-1 0-2 1-3v-1c2-4 5-7 8-10h-1c-3 2-5 4-7 6-2 2-6-1-3-3 2-1 3-3 4-4 3-3 6-7 10-10 2-2 4-3 6-4l1-1c1-2 3-3 4-5 18-17 49-17 72-28 9-4 21 2 30 0 6 0 11 0 17 4-17 3-32 14-48 24m39-132c-2-2 6 0 8-4h-15c-2 0-2-2-2-4-9 2-21 6-30 8-13 4-25 13-40 17-21 8-38 25-60 32-2 0-2-2-2-4 2-6 9-8 13-13 0-2 0-4-2-4 15-21 36-32 55-49v-6c6-8 15-11 19-21 2-6 10-13 19-17-2-2-6-2-6-6-8 0-15 4-23-2 4-3 8-5 12-7-2 0-3-1-4-3-2-4 4-8 9-9 8-2 17-2 23-8-13-2-28 4-42-4 9-25 25-45 47-57 2 0 6 0 6 2 0 9-6 17-15 19 15 4 30 4 45 11-2 4-6 2-8 2 9 6 21 2 30 9-6 6-11 0-17 0 59 17 121 30 170 68-42 21-85 30-130 40-6 0-9 0-15-2 0 2 0 6-2 6-8 0-13 0-19 4-7 6-18 8-24 2" fill="#000091"/>
+ <path d="M3755 1e3h-1074s2 0 10 5c9 5 20 11 27 14 14 7 27 16 36 30 4 6 9 17 6 25-4 9-6 25-15 28-11 6-26 6-40 4-8 0-15-2-23-4 28 11 55 25 74 51 2 4 9 6 17 6 2 0 2 4 2 6-4 4-8 6-6 11h6c9-4 8-23 21-17 9 6 13 19 8 28-8 8-15 13-23 19-2 4-2 9 0 13 6 8 8 15 9 23 6 13 8 28 13 42 8 28 15 57 13 85 0 15-8 28-2 43 4 15 13 26 21 40 8 11 15 19 21 30 11 19 32 38 23 60-6 13-26 11-40 19-11 9-2 25 4 34 9 17-11 28-25 33 4 6 11 4 13 8 2 9 11 15 6 25-8 11-30 17-19 34 8 13 3 28-2 42-6 15-19 25-34 28-11 4-25 4-36 2-4-2-8-4-11-4-32-4-64-13-96-13-9 2-19 4-26 7-8 6-16 13-23 20-1 2-3 3-4 5-1 1-2 2-2 3l-2 2c-6 7-10 14-15 22 0 1-1 1-1 1 0 1-1 2-2 3-6 11-11 23-14 35-13 43-7 80 2 89 2 2 62 21 104 40 20 9 33 15 45 23h1055v-1e3z" fill="#e1000f"/>
+ <path d="M2745 1366c8 2 19 2 19 6-4 15-26 19-38 34h-6c-6 4-4 13-9 13-6-2-11 0-17 2 8 8 17 13 28 11 2 0 6 4 6 8 0 0 2 0 4-2 2 0 4 0 4 2v8c-6 8-15 4-23 6 15 4 30 4 44 0 11-4 0-23 8-32-4 0 0-6-4-6 4-4 8-9 11-11 4 0 9-2 11-6 0-4-8-6-6-9 11-8 21-19 17-30-2-6-17-6-26-10s-21 0-32 2c-9 0-19 6-28 8-13 4-25 11-36 19 13-6 26-8 41-11 11-2 20-4 32-2" fill="gray"/>
+ </g>
+ <!-- RF -->
+ <path d="M1e3 3250v-750h228q124 0 194 60 71 60 72 164 0 67-31 116-31 50-88 78l234 332h-181l-199-303h-77v303zm152-432h85q48 0 74-25 27-25 27-71 0-43-27-68-27-25-74-24h-85zm563 432v-750h435v130h-284v173h241v130h-241v187h284v130zm147-814 120-145h156l-138 145zm473 814v-750h247q123 0 193 60 71 60 71 164 0 104-71 163-71 60-193 60h-95v303zm152-432h101q49 0 76-26 27-25 27-70 0-43-28-68-27-25-75-24h-101zm481 139v-457h152v469q0 75 40 118 40 42 111 42 70 0 110-42 40-42 40-118v-469h152v457q0 148-81 231t-222 83q-140 0-221-83-81-84-81-231zm803 293v-750h212q117 0 183 54 67 54 67 150 0 93-79 148 59 27 91 72 32 46 32 105 0 103-75 162-74 59-203 59zm151-130h86q53 0 83-26 30-27 30-73 0-46-30-72-30-25-83-25h-86zm0-326h64q43 0 67-22 24-21 24-61 0-38-24-59-23-22-67-22h-64zm520 456v-750h151v612h284v138zm579 0v-750h151v750zm336-222q-29-73-29-153t29-152q29-73 80-127 52-54 126-86 75-32 161-32 86 0 161 32 75 32 126 86 51 54 80 127 29 72 29 152 0 94-39 176t-108 137l45 43q79 72 156 71 32 0 54-8v129q-35 14-79 13-121 0-233-98l-89-80q-49 13-103 13-86 0-161-32-74-32-126-85-51-54-80-126zm195-334q-68 73-69 181 0 108 69 181 68 73 173 73 69 0 123-33 55-33 86-92 31-58 31-129 0-108-69-181-68-73-172-73-105 0-173 73zm710 263v-457h152v469q0 75 40 118 40 42 111 42 70 0 110-42 40-42 40-118v-469h152v457q0 148-81 231-81 84-222 83-140 0-221-83-81-84-81-231zm803 293v-750h435v130h-284v173h241v130h-241v187h284v130zm-6065 1085v-750h435v130h-283v173h241v130h-241v317zm579 0v-750h228q123 0 195 60 71 60 71 164 0 67-31 117-31 50-88 77l234 332h-181l-199-303h-77v303zm152-432h85q48 0 75-25 27-25 26-71 0-43-26-68-26-25-75-24h-85zm500 432 283-750h198l283 750h-161l-72-195h-299l-71 195zm279-325h206l-103-281zm611 325v-750h194l334 537v-537h151v750h-194l-334-539v539zm836-375q0-80 29-152 29-73 80-127 52-54 126-85 75-32 162-32 99 0 180 40 82 41 134 112l-119 93q-33-47-83-75-50-28-112-28-105 0-173 73-68 73-69 181 0 108 69 182 68 73 173 72 62 0 112-27 50-28 83-76l119 92q-44 61-110 100-66 39-146 49l-93 156h-134l94-158q-95-17-169-73-74-56-114-139-40-83-39-178zm755 375 283-750h198l283 750h-161l-71-195h-299l-72 195zm280-325h205l-103-281zm610 325v-750h152v750zm304-104 110-101q34 44 76 68 43 24 89 24 45 0 70-23 26-23 26-64 0-24-14-44-15-20-39-33-24-14-55-28-31-15-63-29-32-14-62-34-31-20-55-44-24-24-39-61-15-37-15-81 0-91 68-154 68-63 172-63 156 0 261 126l-111 100q-72-94-149-94-38 0-63 23t-24 56q0 21 12 39 12 17 31 31 20 13 46 26l53 25q29 13 57 26 29 14 54 34 26 19 46 44 20 24 31 57 12 34 12 75-2 102-73 163-70 61-175 61-92 0-159-31-67-32-118-94zm694 104v-750h435v130h-283v173h241v130h-241v187h283v130z"/>
+ <!-- devise -->
+ <path d="M3484 6391c22 0 41 17 31 56l-101 27c16-48 46-83 70-83m56 164h-20c-25 30-53 54-80 54-28 0-42-17-42-54 0-15 2-31 5-45l164-54c32-76-7-109-52-109-78 0-166 136-166 243 0 51 24 79 62 79 45 0 91-43 129-114m-26-244 93-85v-12h-62l-55 98h24zm-349 82h54l-86 236c-8 20 3 40 24 40 61 0 134-52 162-126h-15c-22 31-70 65-106 72l79-222h81l10-34h-79l30-85h-31l-56 85-67 9zm-56-12c7-22-8-34-19-34-47 0-104 43-126 102h15c15-22 41-46 66-50l-91 236c-8 22 8 34 20 34 45 0 98-43 120-102h-15c-15 22-41 46-66 50zm9-94c20 0 37-17 37-37s-17-37-37-37c-10 0-19 4-26 11-7 7-11 16-11 26 0 21 16 37 37 37m-439 126c14 0 22 22 0 71l-64 142c-12 27 1 44 27 44 16 0 23-4 30-21l63-166c29-36 83-74 107-74 17 0 15 14 4 36l-97 185c-9 18 3 40 24 40 47 0 104-43 126-102h-17c-15 22-41 46-66 50l83-168c11-21 16-41 16-57 0-27-15-45-44-45-41 0-76 46-126 103v-44c0-31-10-59-38-59-33 0-63 52-87 102h15c17-24 32-37 44-37m-65 6c11-39 5-72-24-72-37 0-49 25-85 103v-44c0-31-10-59-38-59-33 0-63 52-87 102h15c16-23 31-37 43-37 14 0 22 22 0 71l-64 142c-12 27 1 44 27 44 16 0 23-4 30-21l61-166c18-22 34-41 54-62h68zm-349-28c22 0 41 17 31 56l-101 27c17-48 46-83 70-83m56 164h-20c-25 30-53 54-80 54-28 0-42-17-42-54 0-15 2-31 5-45l164-54c32-76-6-109-52-109-78 0-166 136-166 243 0 51 24 79 62 79 45 0 91-43 129-114m-375-162h54l-86 236c-8 20 3 40 24 40 61 0 135-52 162-126h-15c-22 31-70 65-106 72l79-222h81l10-34h-79l30-85h-31l-56 85-67 9zm-287 184c0-73 81-172 127-172 10 0 20 1 28 4l-47 126c-27 33-69 73-89 73-12 0-19-9-19-31m249-244-25-2-28 28h-5c-119 0-247 148-247 265 0 27 15 45 44 45 35 0 69-50 108-103l-2 19c-5 54 12 84 40 84 33 0 63-52 86-102h-15c-16 23-31 37-43 37s-21-23 0-71zm-255 86c11-39 5-72-24-72-37 0-49 25-85 103v-44c0-31-10-59-39-59-33 0-63 52-86 102h15c16-23 31-37 43-37 14 0 22 22 0 71l-65 143c-12 27 1 44 27 44 16 0 23-4 30-21l63-167c18-22 34-41 54-62h67zm-419 239 6-18c-79-15-89-15-57-101l30-81h63c39 0 40 17 34 60h23l52-143h-23c-20 34-35 60-78 60h-63l43-117c15-42 22-50 76-50h14c55 0 62 15 62 73h22l18-97h-305l-6 18c63 13 69 19 40 101l-65 177c-30 81-42 88-115 101l-5 18h234zm1513-956c22 0 41 17 31 56l-101 27c16-48 46-83 70-83m56 164h-20c-25 30-53 54-80 54-28 0-42-17-42-54 0-15 2-31 5-45l164-54c32-76-7-109-52-109-78 0-166 136-166 243 0 51 24 79 62 79 45 1 91-43 129-114m-26-244 93-85v-12h-62l-55 98h24zm-349 82h54l-86 236c-8 20 3 40 24 40 61 0 134-52 162-126h-15c-22 31-70 65-106 72l79-222h81l10-34h-79l30-85h-31l-56 85-67 10zm-56-11c7-22-8-34-20-34-47 0-104 43-126 102h15c15-22 41-46 66-50l-91 236c-8 22 8 34 20 34 45 0 98-43 120-102h-15c-15 22-41 46-66 50zm9-94c20 0 37-17 37-37s-17-37-37-37c-13 0-25 7-32 18-7 11-7 26 0 38 7 11 19 19 32 18m-290 330 150-398-5-7-104 12v12l20 15c18 14 12 27-4 72l-114 304c-10 18 3 40 24 40 47 0 98-43 120-102h-15c-16 23-48 47-72 52m-306-41c0-73 81-172 127-172 10 0 19 1 28 4l-48 126c-27 33-69 73-89 73-11 1-18-9-18-31m249-243-25-2-28 28h-5c-119 0-247 148-247 265 0 27 15 45 44 45 35 0 69-50 108-103l-2 19c-5 54 12 84 40 84 33 0 63-52 86-102h-15c-16 23-31 37-43 37s-21-23 0-70zm-579 393c0-31 30-51 73-68 14 7 36 15 64 24 45 15 62 21 62 34 0 29-41 51-116 51-56 1-83-11-83-41m123-191c-20 0-27-17-27-36 0-59 28-130 73-130 20 0 27 17 27 36 0 58-29 130-73 130m128 162c0-38-34-52-89-68-47-14-69-18-69-34 0-12 10-27 30-38 78-4 127-74 127-136 0-11-2-21-5-30h53l10-34h-90c-12-8-27-12-44-12-82 0-135 72-135 136 0 41 24 69 62 74-38 18-60 37-60 61 0 14 5 24 17 33-88 26-124 59-124 97 0 41 54 58 118 58 108 1 199-58 199-107m-408-240c39 0 40 17 34 60h23l52-143h-23c-20 34-35 60-78 60h-87l43-117c15-42 23-50 76-50h38c55 0 62 15 62 73h22l18-97h-327l-6 18c63 13 69 19 40 101l-65 177c-30 81-42 88-115 101l-5 18h364l65-103h-25c-42 42-85 79-166 79-97 0-88-5-56-95l30-81h86zm47-244 93-68v-12h-62l-55 80zm1390-511c22 0 41 17 31 56l-101 27c16-49 46-83 70-83m56 164h-20c-25 30-53 54-80 54-28 0-42-17-42-54 0-15 2-31 5-45l164-54c32-76-7-109-52-109-78 0-166 136-166 243 0 51 24 79 62 79 45 0 91-43 129-114m-26-244 93-85v-12h-62l-55 98h24zm-349 81h55l-86 236c-8 20 3 40 24 40 61 0 135-52 162-126h-15c-22 31-70 65-106 72l79-222h81l10-34h-79l30-85h-31l-56 85-67 9v25zm-28 27c11-39 5-72-24-72-37 0-49 25-85 103v-44c0-31-10-59-38-59-33 0-63 52-87 102h15c16-23 31-37 43-37 14 0 22 22 0 71l-64 142c-12 27 1 44 27 44 16 0 23-4 30-21l63-166c18-22 34-41 54-62h66zm-349-28c22 0 41 17 31 56l-101 27c16-49 46-83 70-83m56 164h-20c-25 30-53 54-80 54-28 0-42-17-42-54 0-15 2-31 5-45l164-54c32-76-6-109-52-109-78 0-166 136-166 243 0 51 24 79 62 79 45 0 91-43 129-114m-382 66c-16 0-39-15-39-28 0-4 7-23 16-46l26-70c28-34 72-71 97-71 15 0 26 10 26 31-1 66-61 184-126 184m182-209c0-48-12-66-46-66-42 0-81 45-121 99l84-226-5-7-104 12v12l20 15c18 14 12 28-4 72l-91 239c-8 20-17 44-17 50 0 28 38 55 73 55 79 2 211-143 211-255m-307-31c6-22-8-34-20-34-47 0-104 43-126 102h15c15-22 41-46 66-50l-91 236c-8 22 8 34 20 34 45 0 98-43 120-102h-15c-15 22-41 46-66 50zm10-94c20 0 37-17 37-37s-17-37-37-37c-13 0-25 7-32 18-7 11-7 26 0 38 7 11 19 19 32 18m-231-45h-216l-6 18c63 13 69 19 40 101l-65 177c-30 81-42 88-115 101l-5 18h328l71-127h-25c-41 45-88 102-161 102-55 0-63-10-32-95l65-177c30-81 42-88 115-101z"/>
+</svg>
diff --git a/www-client/src/main/resources/fr/agrometinfo/www/client/public/img/logo_inrae.svg b/www-client/src/main/resources/fr/agrometinfo/www/client/public/img/logo_inrae.svg
new file mode 100644
index 0000000..631cd49
--- /dev/null
+++ b/www-client/src/main/resources/fr/agrometinfo/www/client/public/img/logo_inrae.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="517.48859"
+ height="245.40973"
+ id="svg3046"
+ version="1.1"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="logo_inrae.svg">
+ <defs
+ id="defs3048" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.979899"
+ inkscape:cx="91.507485"
+ inkscape:cy="120.26559"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ units="mm"
+ fit-margin-left="21.11"
+ fit-margin-top="21.11"
+ fit-margin-right="21.11"
+ fit-margin-bottom="21.11"
+ inkscape:window-width="1855"
+ inkscape:window-height="1176"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata3051">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-69.827127,-383.94312)">
+ <path
+ inkscape:connector-curvature="0"
+ id="path22"
+ style="fill:#00a5a8;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ d="m 161.58509,459.65878 -15.81625,0 c -0.63125,0 -1.1425,0.5125 -1.1425,1.145 l 0,91.50875 c 0,0.63125 0.51125,1.145 1.1425,1.145 l 15.81625,0 c 0.63,0 1.1425,-0.51375 1.1425,-1.145 l 0,-91.50875 c 0,-0.6325 -0.5125,-1.145 -1.1425,-1.145" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path26"
+ style="fill:#00a5a8;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ d="m 250.71284,459.65878 -15.755,0 c -0.63125,0 -1.1425,0.5125 -1.1425,1.145 l 0,61.2 -38.75125,-61.80875 c -0.20875,-0.33375 -0.575,-0.53625 -0.96625,-0.53625 l -15.88,0 c -0.63,0 -1.14375,0.5125 -1.14375,1.145 l 0,91.50875 c 0,0.63125 0.51375,1.145 1.14375,1.145 l 15.88,0 c 0.63,0 1.14375,-0.51375 1.14375,-1.145 l 0,-60.9525 38.62375,61.5625 c 0.20875,0.33125 0.57375,0.535 0.96625,0.535 l 15.88125,0 c 0.63,0 1.1425,-0.51375 1.1425,-1.145 l 0,-91.50875 c 0,-0.6325 -0.5125,-1.145 -1.1425,-1.145" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path30"
+ style="fill:#00a5a8;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ d="m 311.18471,499.38953 c -2.78374,2.49625 -6.74875,3.76125 -11.79124,3.76125 l -15.17625,0 0,-28.3825 15.59999,0 c 5.19626,0.08 9.12875,1.36875 11.68376,3.8275 2.53625,2.4475 3.82124,5.9975 3.82124,10.55375 0,4.39125 -1.3525,7.74 -4.1375,10.24 m 5.99625,14.5475 c 4.9025,-2.26875 8.825,-5.43125 11.66875,-9.41125 3.0775,-4.31 4.63751,-9.70625 4.63751,-16.04375 0,-9.29125 -3.03251,-16.51 -9.01376,-21.4525 -5.9175,-4.89 -14.37625,-7.37125 -25.1425,-7.37125 l -32.135,0 c -0.6325,0 -1.14374,0.5125 -1.14374,1.145 l 0,91.50875 c 0,0.63125 0.51124,1.14375 1.14374,1.14375 l 15.87875,0 c 0.63,0 1.1425,-0.5125 1.1425,-1.14375 l 0,-34.05125 15.865,0 18.00875,34.58 c 0.19626,0.3775 0.58626,0.615 1.01125,0.615 l 17.01001,0 c 0.63124,0 1.14249,-0.5125 1.14249,-1.14375 l 0,-0.815 c 0,-0.19125 -0.0475,-0.37625 -0.1375,-0.54375 l -19.93625,-37.01625 z" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path34"
+ style="fill:#00a5a8;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ d="m 512.51646,506.64728 c 0,-6.43 -1.37,-12.76 -3.87124,-18.645 -0.45875,-0.67625 -0.91375,-0.28125 -1.07501,-0.0937 l -9.52874,14.9575 c -0.85251,1.4875 -1.475,2.525 -1.64125,6.2525 -0.009,0.25875 -0.0225,0.46875 -0.06,0.655 -1.57625,16.12125 -15.2025,28.76125 -31.72875,28.76125 -3.095,0 -6.16875,-0.45 -9.13625,-1.34 -5.04751,-1.5125 -9.69125,-4.2925 -13.42875,-8.03875 -0.1325,-0.13375 -0.26375,-0.26875 -0.39251,-0.405 20.32126,-8.97 37.335,-24.5925 48.02501,-44.14125 2.33874,-4.27625 4.38124,-8.75875 6.07374,-13.3275 0.16751,-0.45125 0.0325,-0.96125 -0.33749,-1.27125 -3.55626,-2.9975 -7.5075,-5.4525 -11.74001,-7.2975 -6.03999,-2.635 -12.45375,-3.97125 -19.06374,-3.97125 -0.01,0 -0.0188,0.001 -0.0275,0.001 -0.009,0 -0.0163,-0.001 -0.0263,-0.001 -16.38875,0 -30.87001,8.3025 -39.49375,20.91875 -5.26625,7.69 -8.3575,16.98125 -8.3575,26.98625 0,4.5325 0.63875,9.01875 1.905,13.3525 -2.17625,0.4575 -4.38125,0.83 -6.57875,1.115 l -22.94495,-60.7175 c -0.16625,-0.44375 -0.59375,-0.7375 -1.0675,-0.7375 l -14.24875,0 c -0.475,0 -0.90125,0.29375 -1.06875,0.73875 l -34.52125,91.50875 c -0.1325,0.35125 -0.085,0.745 0.12875,1.055 0.215,0.31 0.56375,0.495 0.93875,0.495 l 16.51,0 c 0.4825,0 0.91625,-0.30875 1.07875,-0.76875 l 5.54125,-15.91375 37.02,0 0.1725,0.4975 5.3825,15.41625 c 0.16125,0.46 0.59375,0.76875 1.07875,0.76875 l 16.57,0 c 0.375,0 0.7275,-0.185 0.94,-0.495 0.2125,-0.31 0.26125,-0.70375 0.13,-1.055 l -6.04125,-15.98375 c 2.575,-0.4275 5.145,-0.96375 7.67,-1.58875 0.0712,-0.0187 0.145,-0.0312 0.2175,-0.0487 0.0688,0.0987 0.14,0.2 0.21,0.2975 3.14,4.36375 6.96,8.1475 11.3525,11.245 8.0925,5.7075 17.59375,8.725 27.47625,8.725 l 0,-0.002 c 0.0175,0 0.035,0.002 0.0538,0.002 26.415,0 47.905,-21.49125 47.905,-47.90625 m -47.94255,-31.885 c 3.99375,10e-4 7.88625,0.74125 11.59125,2.205 -9.32375,17.2075 -24.25625,30.7325 -42.25875,38.2725 -0.785,-2.7975 -1.1825,-5.68125 -1.1825,-8.5925 0,-17.57125 14.28625,-31.865 31.85,-31.885 m -70.49375,46.78125 0.1225,0.3475 -26.64,0 2.10625,-6.04875 11.1975,-32.1475 13.21375,37.84875 z" />
+ </g>
+</svg>
diff --git a/www-client/src/main/resources/fr/agrometinfo/www/client/public/img/logo_mesr.svg b/www-client/src/main/resources/fr/agrometinfo/www/client/public/img/logo_mesr.svg
new file mode 100644
index 0000000..5750fae
--- /dev/null
+++ b/www-client/src/main/resources/fr/agrometinfo/www/client/public/img/logo_mesr.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1139.47 836.76"><defs><style>.cls-1{fill:#000091;}.cls-2{fill:#e1000f;}.cls-3{fill:#9d9d9c;}.cls-4{fill:none;}</style></defs><g id="vect"><path d="M293.6,730.36c1.74,0,3.24,1.31,2.44,4.65L288,736.88c1.41-3.75,3.76-6.52,5.64-6.52m4.46,13h-1.6c-2,2.39-4.18,4.27-6.34,4.27s-3.33-1.32-3.33-4.27a17.92,17.92,0,0,1,.37-3.57l13-4.28c2.54-6-.51-8.64-4.08-8.64-6.15,0-13.15,10.29-13.15,19.3,0,4,1.92,6.25,4.93,6.25,3.52,0,7.18-3.43,10.19-9.06m-2.58-18.88,9.15-8.55v-1H299.7l-5.63,9.54Zm-28.08,6h4.32l-6.86,18.73c-.61,1.6.23,3.2,1.88,3.2,3.9,0,10.19-3.85,12.4-9.11h-1.23c-1.73,1.83-5.07,4.27-7.93,4.79l6.29-17.61h6.43l.8-2.68h-6.24l2.39-6.76h-2.49l-4.46,6.76-5.3.75Zm-5.83-.89c.52-1.74-.65-2.73-1.55-2.73-3.75,0-8.21,3.38-10,8.13h1.22c1.22-1.74,3.29-3.67,5.21-4l-7.18,18.69a1.88,1.88,0,0,0,1.55,2.73c3.57,0,7.75-3.43,9.53-8.13h-1.22c-1.22,1.74-3.29,3.67-5.21,4Zm1.32-9.4a3.1,3.1,0,1,0-3.1-3.1,3.06,3.06,0,0,0,3.1,3.1M221.52,749c-.94,2.12,0,3.48,2.11,3.48,1.27,0,1.83-.33,2.35-1.69l5-13.2c2.3-2.82,7-5.82,8.92-5.82,1.36,0,1.17,1.13.28,2.82l-7.65,14.69a2.16,2.16,0,0,0,1.87,3.2c3.76,0,8.22-3.38,10-8.13h-1.22c-1.23,1.74-3.29,3.67-5.22,4L244.53,735a10.75,10.75,0,0,0,1.27-4.56,3.24,3.24,0,0,0-3.48-3.57c-3.24,0-6.53,3.67-10.42,8.17v-3.47c0-2.49-.8-4.7-3.06-4.7-1.41,0-2.77,1.22-4,3v.47c2.45-.14,3.53,3.52,1.79,7.37Zm-.1-16.34c.9-3.05.43-5.73-1.92-5.73-2.77,0-3.48,2.12-6.29,8.17v-3.47c0-2.49-.8-4.7-3.06-4.7-2.63,0-5,4.09-6.85,8.13h1.22c1.27-1.84,2.44-2.92,3.38-2.92,1.13,0,1.74,1.74,0,5.59L202.83,749c-.94,2.12,0,3.48,2.11,3.48,1.27,0,1.83-.33,2.35-1.69l5-13.2c1.41-1.74,2.67-3.24,4.27-4.93Zm-28.83-2.25c1.74,0,3.24,1.31,2.44,4.65L187,736.88c1.4-3.75,3.75-6.52,5.63-6.52m4.46,13h-1.59c-2,2.39-4.18,4.27-6.34,4.27s-3.34-1.32-3.34-4.27a17.21,17.21,0,0,1,.38-3.57l13-4.28c2.54-6-.51-8.64-4.08-8.64-6.15,0-13.15,10.29-13.15,19.3,0,4,1.93,6.25,4.93,6.25,3.52,0,7.19-3.43,10.19-9.06M166.39,730.5h4.32l-6.86,18.73c-.61,1.6.24,3.2,1.88,3.2,3.9,0,10.19-3.85,12.4-9.11h-1.22c-1.74,1.83-5.08,4.27-7.94,4.79l6.29-17.61h6.44l.79-2.68h-6.24l2.39-6.76h-2.49l-4.46,6.76-5.3.75Zm-23.72,14.6c0-5.77,6.44-13.62,10.05-13.62a8,8,0,0,1,2.21.29l-3.76,10c-2.16,2.63-5.49,5.82-7,5.82-.89,0-1.46-.75-1.46-2.49m19.77-19.3-2-.14-2.21,2.16h-.47c-10.7,0-19.95,12-19.95,20.76a3.55,3.55,0,0,0,3.85,3.85c2.77,0,5.49-3.95,8.54-8.17l-.14,1.5c-.37,4.32.94,6.67,3.2,6.67,2.63,0,5-4.09,6.85-8.13h-1.22c-1.27,1.84-2.44,2.92-3.38,2.92s-1.69-1.79,0-5.59Zm-22.82,6.81c.89-3.05.42-5.73-1.92-5.73-2.77,0-3.48,2.12-6.3,8.17v-3.47c0-2.49-.79-4.7-3.05-4.7-2.63,0-5,4.09-6.85,8.13h1.22c1.26-1.84,2.44-2.92,3.38-2.92,1.12,0,1.73,1.74,0,5.59L121,749c-.94,2.12,0,3.48,2.11,3.48,1.27,0,1.83-.33,2.35-1.69l5-13.2c1.41-1.74,2.68-3.24,4.28-4.93Zm-36,18.88.47-1.46c-6.24-1.17-7-1.17-4.55-8l2.53-7H109c3.1,0,3.15,1.27,2.68,4.65h1.79l4.13-11.32h-1.79c-1.55,2.68-2.77,4.65-6.15,4.65h-6.81l3.62-9.9c1.13-3.15,1.78-3.81,6-3.81h3c4.37,0,4.89,1.18,4.89,5.59h1.74l1.45-7.7H97.64l-.47,1.45c5,1,5.49,1.51,3.15,8l-5.64,15.4c-2.35,6.43-3.33,7-9.11,8l-.42,1.46Z"/><path d="M230.72,671.66c1.74,0,3.24,1.31,2.44,4.65l-8.07,1.88c1.4-3.76,3.75-6.53,5.63-6.53m4.46,13h-1.59c-2,2.39-4.18,4.27-6.34,4.27s-3.34-1.32-3.34-4.27a17.21,17.21,0,0,1,.38-3.57l13-4.28c2.53-6-.52-8.64-4.09-8.64-6.15,0-13.15,10.29-13.15,19.3,0,4,1.93,6.25,4.93,6.25,3.52,0,7.19-3.43,10.19-9.06m-2.58-18.88,9.16-8.55v-1h-4.93l-5.64,9.53Zm-28.08,6h4.32L202,690.54c-.61,1.59.24,3.19,1.88,3.19,3.9,0,10.19-3.85,12.4-9.11H215c-1.74,1.83-5.07,4.27-7.94,4.79l6.29-17.61h6.44l.8-2.68h-6.25l2.39-6.76h-2.48l-4.47,6.76-5.3.75Zm-5.82-.89c.51-1.74-.66-2.73-1.55-2.73-3.76,0-8.22,3.38-10,8.13h1.22c1.23-1.74,3.29-3.67,5.22-4L186.39,691a1.87,1.87,0,0,0,1.55,2.72c3.57,0,7.75-3.43,9.54-8.13h-1.23c-1.22,1.74-3.28,3.67-5.21,4Zm1.31-9.4a3.1,3.1,0,1,0-3.1-3.09,3.06,3.06,0,0,0,3.1,3.09M175,689.6l13.1-34.33-.42-.52-8.22.94v1l1.6,1.22c1.45,1.13,1,2.21-.33,5.68l-10.24,27a2.16,2.16,0,0,0,1.88,3.19c3.76,0,7.75-3.38,9.53-8.13h-1.22a10.63,10.63,0,0,1-5.68,4m-24.89-3.2c0-5.77,6.43-13.62,10.05-13.62a8,8,0,0,1,2.21.29l-3.76,10c-2.16,2.63-5.49,5.82-7,5.82-.9,0-1.46-.75-1.46-2.49m19.77-19.3-2-.14-2.21,2.16h-.47c-10.71,0-20,12-20,20.76a3.56,3.56,0,0,0,3.85,3.85c2.77,0,5.5-4,8.55-8.17l-.14,1.5c-.38,4.32.94,6.67,3.19,6.67,2.63,0,5-4.09,6.86-8.13h-1.22c-1.27,1.84-2.44,2.92-3.38,2.92s-1.69-1.79,0-5.59Zm-47.8,31.18c0-2.48,2.39-4,5.82-5.4a41.65,41.65,0,0,0,5.07,1.93c3.57,1.17,4.93,1.64,4.93,2.72,0,2.3-3.9,4-9.2,4-4.46,0-6.62-.94-6.62-3.29m9.72-15.16c-1.55,0-2.16-1.32-2.16-2.82,0-4.18,2.25-10.33,5.77-10.33,1.55,0,2.16,1.31,2.16,2.81,0,4.18-2.25,10.34-5.77,10.34M142,696c0-3-2.68-4.08-7.05-5.4-3.75-1.12-5.44-1.45-5.44-2.67,0-1,.79-2.16,2.39-3a11,11,0,0,0,10.14-10.52,6.32,6.32,0,0,0-.51-2.58h5.21l.8-2.68h-8.27a6.37,6.37,0,0,0-3.33-.94,10.89,10.89,0,0,0-10.75,10.38,6.05,6.05,0,0,0,5,6.25c-3.05,1.36-4.74,3-4.74,4.83a3,3,0,0,0,1.27,2.54c-7,2.07-9.82,4.41-9.82,7.75s4.28,4.6,9.35,4.6c8.59,0,15.78-4.65,15.78-8.55m-32.83-20.1c3.1,0,3.15,1.27,2.68,4.65h1.78l4.14-11.31H116c-1.55,2.67-2.77,4.64-6.15,4.64H103l3.43-9.43c1.13-3.15,1.78-3.76,6-3.76h3c4.37,0,4.89,1.17,4.89,5.54h1.74l1.45-7.7H97.64L97.17,660c5,1,5.49,1.51,3.15,8l-5.64,15.4c-2.35,6.43-3.33,6.95-9.11,8l-.42,1.46H114l5.17-8.17h-2c-3.29,3.1-7.42,6.06-13.2,6.06-7.65,0-7-.33-4.41-7.33l2.72-7.47ZM113,656.21l9.16-6.29v-1h-5.55l-5.07,7.28Z"/><path d="M227.67,613c1.74,0,3.24,1.31,2.44,4.65L222,619.49c1.41-3.76,3.76-6.53,5.64-6.53m4.46,13h-1.6c-2,2.39-4.18,4.27-6.34,4.27s-3.33-1.32-3.33-4.27a18,18,0,0,1,.37-3.57l13-4.28c2.54-6-.51-8.64-4.08-8.64-6.15,0-13.15,10.29-13.15,19.3,0,4,1.92,6.25,4.93,6.25,3.52,0,7.18-3.43,10.19-9.06m-2.58-18.88,9.15-8.55v-1h-4.93l-5.63,9.53Zm-26.91,6h3.43l-6.86,18.74c-.61,1.59.24,3.19,1.88,3.19,3.9,0,10.19-3.85,12.4-9.11h-1.22c-1.74,1.83-5.08,4.27-7.94,4.79l6.29-17.61h6.44l.79-2.68h-6.24l2.39-6.76h-2.49l-4.46,6.76-4.41.75Zm-3.38,2.11c.89-3.05.42-5.73-1.93-5.73-2.77,0-3.47,2.12-6.29,8.17v-3.47c0-2.49-.8-4.7-3-4.7-2.63,0-5,4.09-6.86,8.13h1.22c1.27-1.83,2.45-2.91,3.38-2.91,1.13,0,1.74,1.73,0,5.58l-5.07,11.27c-.94,2.12.05,3.48,2.12,3.48a2.09,2.09,0,0,0,2.34-1.69l5-13.2c1.41-1.73,2.68-3.24,4.28-4.93ZM170.43,613c1.73,0,3.24,1.31,2.44,4.65l-8.08,1.88c1.41-3.76,3.76-6.53,5.64-6.53m4.46,13h-1.6c-2,2.39-4.18,4.27-6.34,4.27s-3.33-1.32-3.33-4.27a18,18,0,0,1,.37-3.57l13-4.28c2.54-6-.52-8.64-4.09-8.64-6.15,0-13.14,10.29-13.14,19.3,0,4,1.92,6.25,4.93,6.25,3.52,0,7.18-3.43,10.19-9.06M143,631.23c-1.27,0-3.1-1.18-3.1-2.21a26.86,26.86,0,0,1,1.27-3.62l2.11-5.59c2.26-2.67,5.69-5.54,7.61-5.54,1.18,0,2.07.75,2.07,2.49,0,5.12-4.79,14.47-10,14.47m14.79-16.53c0-3.81-1.4-5.22-4-5.22-3.29,0-6.39,3.48-9.49,7.7l7.84-20.61-.42-.52-8.22.94v1l1.6,1.22c1.45,1.13,1,2.3-.33,5.68l-8.45,21.79a25.38,25.38,0,0,0-1.37,4c0,2.26,3.06,4.37,5.83,4.37,6.38,0,17-11.51,17-20.33m-25.54-2.49a1.93,1.93,0,0,0-1.55-2.73c-3.76,0-8.22,3.38-10,8.13h1.22c1.22-1.74,3.28-3.67,5.21-4L120,632.31A1.87,1.87,0,0,0,121.5,635c3.56,0,7.74-3.43,9.53-8.12h-1.22c-1.22,1.73-3.29,3.66-5.22,4Zm1.31-9.39a3.1,3.1,0,1,0-3.1-3.1,3.1,3.1,0,0,0,3.1,3.1m-18.92-3H97.55l-.47,1.46c5,1,5.49,1.5,3.14,8l-5.54,15.4c-2.35,6.43-3.33,7-9.11,8l-.42,1.46h26L116.8,624h-2c-3.2,3.52-7,7.94-12.73,7.94-4.37,0-4.88-.75-2.53-7.33l5.54-15.4c2.3-6.43,3.33-7,9.11-8Z"/><path class="cls-1" d="M181.65,160c.91-.91,1.84-1.89,2.75-2.88h0a55.32,55.32,0,0,1,5.36-5.47,17.66,17.66,0,0,1,1.75-1.39c.16-.16.16-.49.32-.65-.8.32-1.28,1-2.09,1.29-.16,0-.32-.16-.16-.32l1.72-1.29h-.11c-.16,0-.16-.16-.16-.32-2.09-.32-3.7,1.13-5.14,2.41-.33.16-.65-.16-.81-.16-2.41.8-4.18,2.89-6.59,3.86v-.32a30.78,30.78,0,0,1-2.89,1.12,17.26,17.26,0,0,1-4,.16,56.77,56.77,0,0,0-5.84,1l-.17,0a13.78,13.78,0,0,0-3,1.21l-.11.06a3.48,3.48,0,0,1-.24.28,3.74,3.74,0,0,1-1.1,1,16.53,16.53,0,0,0-2.66,2.09.45.45,0,0,1-.26.08c-.86.83-1.71,1.67-2.59,2.48a.78.78,0,0,1-.49.06h0c0-.06.07-.11.1-.16l.41-.68c.15-.25.31-.5.48-.74s.44-.66.68-1a.15.15,0,0,0,0-.21.28.28,0,0,0-.22-.09,15.52,15.52,0,0,1,2.7-2v0c-.11,0-.26,0-.18-.16s.18-.29.27-.44l.06-.14a.8.8,0,0,1-.13-.13,5.92,5.92,0,0,0-.75.53c-.39.35-.69,1.06-1.27,1.05l-.24,0-.17-.06,0,0,0,0,0,0,.08-.14c0-.05,0-.1.08-.14l.06-.11.11-.21.09-.14c.07-.12.14-.24.2-.36a1,1,0,0,0,.1-.17l.18-.29a.2.2,0,0,0-.13-.29,3.91,3.91,0,0,1,1.1-1h0c.61-.31,1.23-.68,1.84-1l.27-.23a11.28,11.28,0,0,0-2.56,1.26,1.32,1.32,0,0,0-.27.15s-.18.07-.4-.15a.18.18,0,0,1,0-.11c.16-.33.64-.49,1-.81.16,0,.32,0,.32.16,5.14-4,12.21-3.05,18.16-5.14l1.44-1c.81-.33,1.45-1.13,2.41-1.61a7.09,7.09,0,0,0,2.74-3.7.56.56,0,0,0-.16-.32,24.56,24.56,0,0,1-7.08,5.3c-3.37,1.77-7.07,1.45-10.6,1.93.16-.32.48-.32.8-.32,0-.48.32-.64.64-1h.49c.16,0,.16-.32.32-.32.32,0,.8-.16.64-.16-.48-.65-1.45.48-2.25,0,.32-.33.16-.81.48-1h.64a1.11,1.11,0,0,1,.33-.64c2.41-1.45,4.66-2.57,6.91-3.86-.49,0-.81.48-1.29.16.32,0,0-.48.32-.48,1.77-.48,3.22-1.45,5-2.09-.64,0-1.12.48-1.76,0,.32-.16.48-.48,1-.48v-.48c0-.16.16-.16.32-.16a.55.55,0,0,1-.32-.17c.16-.32.64-.16,1-.48-.17,0-.49,0-.49-.16a3.22,3.22,0,0,1,2.09-1c-.16-.32-.64,0-.64-.32,0-.16.16-.16.32-.16h-.32c-.32-.16-.16-.49-.16-.65,1-1.12,1-2.57,1.45-3.85-.17,0-.33,0-.33-.17-1.6,1.77-4.17,2.42-6.59,3.06h-.8a3.27,3.27,0,0,1-2.73-.16,11.37,11.37,0,0,1-1.61-1.29,18.84,18.84,0,0,0-4-1.93,36.17,36.17,0,0,0-12.37-1.76c1.77-1,3.72-1.05,5.62-1.61,2.74-.8,5.31-1.77,8.2-1.61a5.43,5.43,0,0,0-1.61,0c-2.25-.16-4.5.48-6.91,1-1.6.32-3.05,1-4.66,1.28-1,.32-1.44,1.29-2.57,1.13v-.49c1.61-1.92,3.54-3.85,6.11-4,2.89-.49,5.62,0,8.52.32a41,41,0,0,1,6.1,1.12c.81,0,1,1.29,1.61,1.45,1,.32,1.93,0,2.89.64,0-.32-.16-.64,0-1,.65-.64,1.45.16,2.09-.16,1.29-.81-1.12-2.25-1.77-3.38a.56.56,0,0,1,.16-.32c1.29,1.13,2.25,2.41,3.86,3.22.81.32,2.73.8,2.41-.17-.8-1.76-2.41-3.21-3.69-4.82V124c-.33,0-.33-.16-.49-.32v-.64c-.64-.33-.48-1-.8-1.45-.48-.8-.16-1.93-.48-2.89a17,17,0,0,1-.64-2.74c-.49-2.73-1.13-5.14-1.45-7.71-.32-3.05,1.77-5.46,3.21-8.2A13.89,13.89,0,0,1,183,95,14.17,14.17,0,0,1,186,89.81a13.45,13.45,0,0,1,5-3.22A43.16,43.16,0,0,1,195.26,85H85V170h78.1c3.06-2.2,6.12-3.25,10.39-5.35C175.47,163.66,180.09,161.54,181.65,160Zm-24.71-11.51c-.32,0-1,.16-.81-.16.17-.81,1.29-.81,1.93-1.13.32-.16.81-.48,1.13-.32.32.48.8.32,1.12.64C159.35,148.47,158.06,148,156.94,148.47Zm-24.59-3.54a.56.56,0,0,1-.16-.32,48.81,48.81,0,0,0,5.14-8.2,22.19,22.19,0,0,0,5.47-4.49,31.13,31.13,0,0,1,9-7.08A6.23,6.23,0,0,1,156,125c-.48.65-1.28.49-1.92,1a.6.6,0,0,1-.49-.16.59.59,0,0,0,.16-.48c-1.6,1.76-3.85,2.57-5.14,4.66-1,1.6-1.61,3.69-3.69,4.17-.65.17.16-.48-.17-.32C139.74,136.9,136.21,140.59,132.35,144.93Zm13.34-10.6c-.16.32-.34.35-.48.64a1.23,1.23,0,0,1-.65.64c-.16,0-.32,0-.32-.16a2,2,0,0,1,1.29-1.45C145.69,134,145.69,134.16,145.69,134.33Zm7.46,24.07a1.33,1.33,0,0,1-.39.47c.2,0,.34.13.21.25a3.45,3.45,0,0,1-1.22.85l-.25,0c-.19.19-.39.38-.6.56s-1.07,0-.8-.2.79-.75,1.19-1.12a8,8,0,0,0,.67-.64,1.88,1.88,0,0,1,.34-.35C152.43,158.16,153.28,158.09,153.15,158.4Zm-2.88-1.32,0,0c-.6.43-1.2.86-1.83,1.23s-1.41.7-2.12,1c0,0,0,0,0,0a.22.22,0,0,0-.27-.07,7.57,7.57,0,0,0-1.62,1.24l-.23.21v0h0c-.08.07-.15.15-.23.23l0,0v0l-.35.37a.77.77,0,0,1-.21.23c-.1.06-.38.06-.35-.12v0l-.29.14-.25.14-.11,0-.11,0-.58.49a9.75,9.75,0,0,0-.94,1v0l0,0-.05.06,0,.07,0,0-.11.16h0a.26.26,0,0,1-.13.06l-.07-.09s0-.05,0-.08a2.15,2.15,0,0,1-.14-.26h0a.2.2,0,0,1,0-.08c.17-.18.34-.38.5-.58l0,0,.17-.21.27-.34a1.47,1.47,0,0,1,.1-.13l.5-.68v0a.36.36,0,0,0,.07-.1c.08-.11.15-.23.22-.34l.18-.32v0l0,0a.14.14,0,0,0,0-.06c.06-.12.11-.25.16-.38v0l0-.1c0-.06,0-.12.05-.18h0v0a1.69,1.69,0,0,0,0-.24.12.12,0,0,0,0-.1,4.87,4.87,0,0,1,.64-.87l-.07,0c-.23.15-.39.36-.6.52s-.5-.09-.29-.25a4,4,0,0,0,.37-.33v0a9.07,9.07,0,0,1,.82-.82,5.43,5.43,0,0,0,.5-.38l.07-.06a3.52,3.52,0,0,1,.36-.41h0c1.54-1.49,4.13-1.42,6.16-2.37.8-.32,1.77.16,2.57,0a2.36,2.36,0,0,1,1.45.33C152.92,155.36,151.59,156.25,150.27,157.08Zm3.29-11.18c-.16-.16.49,0,.65-.32h-1.29c-.16,0-.16-.17-.16-.33-.8.16-1.77.49-2.57.65-1.13.32-2.09,1.12-3.38,1.44-1.76.65-3.21,2.09-5.14,2.74-.16,0-.16-.17-.16-.33.16-.48.8-.64,1.12-1.12,0-.16,0-.32-.16-.32,1.29-1.77,3.06-2.73,4.66-4.18v-.48c.49-.65,1.29-1,1.61-1.77a2.92,2.92,0,0,1,1.61-1.45c-.16-.16-.48-.16-.48-.48-.65,0-1.29.32-1.93-.16a2.28,2.28,0,0,1,1-.57.62.62,0,0,1-.37-.23c-.16-.32.31-.68.8-.81.65-.16,1.45-.16,1.93-.64-1.12-.16-2.41.32-3.53-.32a8.55,8.55,0,0,1,4-4.82c.16,0,.48,0,.48.16a1.56,1.56,0,0,1-1.29,1.6,17.62,17.62,0,0,1,3.86,1c-.16.32-.48.16-.64.16.8.48,1.76.16,2.57.8-.48.49-1,0-1.45,0,5,1.45,10.29,2.58,14.46,5.79a44,44,0,0,1-11.08,3.37,3.55,3.55,0,0,1-1.29-.16c0,.16,0,.49-.16.49a2.66,2.66,0,0,0-1.61.32A2,2,0,0,1,153.56,145.9Z"/><path class="cls-2" d="M318.84,85H227.36a4.07,4.07,0,0,1,.86.41l2.31,1.22a7.59,7.59,0,0,1,3.07,2.58c.32.48.8,1.44.48,2.09s-.48,2.08-1.29,2.41a6,6,0,0,1-3.37.32,8.11,8.11,0,0,1-1.93-.32c2.41,1,4.66,2.09,6.27,4.34.16.32.8.48,1.44.48.16,0,.16.32.16.48-.32.32-.64.48-.48,1h.48c.81-.32.65-1.92,1.77-1.44a1.81,1.81,0,0,1,.65,2.41,19.36,19.36,0,0,1-1.93,1.61,1.37,1.37,0,0,0,0,1.12,5,5,0,0,1,.8,1.93c.48,1.12.64,2.41,1.13,3.53a22.77,22.77,0,0,1,1.12,7.24c0,1.28-.64,2.41-.16,3.69a13.31,13.31,0,0,0,1.77,3.38,25.14,25.14,0,0,1,1.77,2.57c1,1.61,2.73,3.21,1.92,5.14-.48,1.13-2.25,1-3.37,1.61-1,.8-.16,2.09.32,2.89.8,1.45-1,2.41-2.09,2.89.32.49,1,.33,1.13.65.16.8,1,1.28.48,2.09-.65,1-2.57,1.44-1.61,2.89.64,1.12.23,2.37-.16,3.53a4,4,0,0,1-2.89,2.42,6.62,6.62,0,0,1-3.06.16,2.3,2.3,0,0,0-1-.33c-2.73-.32-5.46-1.12-8.2-1.12a9.38,9.38,0,0,0-2.25.64,14.78,14.78,0,0,0-1.94,1.72l0,0-.35.39-.21.25-.14.17a14.7,14.7,0,0,0-1.26,1.85l-.07.12-.13.23a15.87,15.87,0,0,0-1.21,2.94c-1.1,3.68-.62,6.84.15,7.61.21.21,5.3,1.78,8.85,3.36A29.63,29.63,0,0,1,229,170h89.84Z"/><path class="cls-3" d="M232.8,116c.64.16,1.6.16,1.6.48-.32,1.29-2.25,1.61-3.21,2.9h-.48c-.48.32-.32,1.12-.81,1.12a2.26,2.26,0,0,0-1.44.16,2.73,2.73,0,0,0,2.41,1,.73.73,0,0,1,.48.65.5.5,0,0,0,.32-.16c.16,0,.32,0,.32.16v.64c-.48.64-1.28.32-1.93.48a7.24,7.24,0,0,0,3.7,0c1-.32,0-1.93.64-2.73-.32,0,0-.48-.32-.48a5.91,5.91,0,0,1,1-1,1.14,1.14,0,0,0,1-.48c0-.32-.64-.48-.48-.8,1-.64,1.77-1.61,1.45-2.57-.17-.48-1.45-.48-2.25-.81a5.42,5.42,0,0,0-2.74.16,13.7,13.7,0,0,0-2.41.65,11.12,11.12,0,0,0-3.05,1.6,22.74,22.74,0,0,1,3.53-1A10.47,10.47,0,0,1,232.8,116Z"/><path d="M85.38,212.53h16.16l15.61,26.84,15.61-26.84h16.15v63.9H136V230.6l-14.24,23.92h-9.13L98.35,230.6v45.83h-13Z"/><path d="M166.71,212.53h13v63.9h-13Z"/><path d="M197.56,212.53h16.61l28.57,46.19V212.53h13v63.9H239.09l-28.57-46.19v46.19h-13Z"/><path d="M273.59,212.53h13v63.9h-13Z"/><path d="M308.09,258.9c3.84,4.93,9,7.85,14.15,7.85s8.22-2.74,8.22-7.3c0-11.78-29-8.58-29-30.21,0-10.14,8.4-18.53,20.63-18.53,9.58,0,16.89,4.29,22.36,10.77l-9.49,8.58c-3.74-4.84-7.94-8-12.78-8-4.56,0-7.57,2.93-7.57,6.76,0,11.59,29,8.31,29,30.21-.18,12.05-9.58,19.26-21.27,19.26-10.77,0-18-3.92-23.64-10.68Z"/><path d="M350.17,212.53h52.4v11.78H382.85v52.12h-13V224.31H350.17Z"/><path d="M414,212.53h37.25V223.3H426.94v15.15h20.63v10.78H426.94v16.43h24.28v10.77H414Zm1.1-17.8H428.4l10.31,12.33H426.85Z"/><path d="M466.28,212.53h19.53c14.06,0,22.73,7.21,22.73,19.08,0,7.76-3.75,13.51-10.32,16.52l20,28.3H503L485.9,250.59h-6.66v25.84h-13Zm13,10.77v16.52h7.3c5.48,0,8.67-3.19,8.67-8.39,0-4.84-3.19-8.13-8.67-8.13Z"/><path d="M526.43,212.53h37.24V223.3H539.39v15.15H560v10.78H539.39v16.43h24.28v10.77H526.43Z"/><path d="M85.38,304.82h25.11c20.26,0,34,14.7,34,31.95s-13.69,32-33.95,32H85.38Zm13,11.78v40.34h12.32c11.86,0,20.44-8.85,20.44-20.17s-8.58-20.17-20.44-20.17Z"/><path d="M156.94,304.82h37.25v10.77H169.91v15.16h20.62v10.77H169.91V358h24.28v10.77H156.94Z"/><path d="M233,304.82h13v52.12h24.28v11.78H233Z"/><path d="M267.48,331.11l8.21-26.29h13.15l-10.59,26.29Z"/><path d="M299,304.82h37.24v10.77H311.93v15.16h20.63v10.77H311.93V358h24.28v10.77H299Z"/><path d="M351.27,304.82h16.61L396.45,351V304.82h13v63.9H392.8l-28.57-46.19v46.19h-13Z"/><path d="M431,351.19c3.83,4.93,8.95,7.85,14.15,7.85s8.21-2.74,8.21-7.3c0-11.78-29-8.58-29-30.21,0-10.14,8.4-18.53,20.63-18.53,9.58,0,16.88,4.29,22.36,10.77l-9.49,8.58c-3.75-4.84-7.94-8-12.78-8-4.57,0-7.58,2.93-7.58,6.76,0,11.59,29,8.31,29,30.21-.18,12.05-9.59,19.26-21.27,19.26-10.77,0-18-3.92-23.64-10.68Z"/><path d="M480.06,304.82H517.3v10.77H493v15.16h20.63v10.77H493V358H517.3v10.77H480.06Z"/><path d="M532.36,304.82h13v63.9h-13Z"/><path d="M607.48,352.83V341.7H591.23V330.65h29.21v26.84c-5.93,7.94-15.88,13.05-27.84,13.05-20.72,0-34.87-15.52-34.87-33.77s13.78-33.77,34-33.77c11.59,0,21.08,5.2,26.92,13l-10.22,7.94a20,20,0,0,0-16.7-8.76c-12.05,0-20.63,9.4-20.63,21.63s9,21.63,21.54,21.63A21.34,21.34,0,0,0,607.48,352.83Z"/><path d="M634.86,304.82h16.61L680,351V304.82h13v63.9H676.39l-28.57-46.19v46.19h-13Z"/><path d="M710.89,304.82h37.24v10.77H723.85v15.16h20.63v10.77H723.85V358h24.28v10.77H710.89Z"/><path d="M763.19,304.82h16.16L795,331.66l15.61-26.84h16.15v63.9h-13V322.9l-14.24,23.91h-9.13L776.15,322.9v45.82h-13Z"/><path d="M844.52,304.82h37.24v10.77H857.48v15.16h20.63v10.77H857.48V358h24.28v10.77H844.52Z"/><path d="M896.82,304.82h16.61L942,351V304.82h13v63.9H938.35l-28.57-46.19v46.19h-13Z"/><path d="M966.28,304.82h52.39V316.6H999v52.12H986V316.6H966.28Z"/><path d="M89,443.48c3.84,4.93,9,7.85,14.15,7.85s8.22-2.74,8.22-7.3c0-11.78-29-8.58-29-30.21,0-10.14,8.4-18.53,20.63-18.53,9.58,0,16.89,4.29,22.36,10.77l-9.49,8.58c-3.74-4.84-7.94-8-12.78-8-4.56,0-7.57,2.92-7.57,6.75,0,11.59,29,8.31,29,30.21-.18,12.05-9.58,19.26-21.27,19.26-10.77,0-18-3.92-23.64-10.68Z"/><path d="M175.11,397.11h13V436c0,16.79-9.86,26.83-25.92,26.83s-25.83-10-25.83-26.83V397.11h13v40c0,8.58,4.84,13.6,13,13.6,7.94,0,12.87-5,12.87-13.6Z"/><path d="M204.13,397.11h21.09c14.05,0,22.64,7.21,22.64,19.08s-8.59,19-22.64,19h-8.13V461h-13Zm13,10.77V424.4h8.68c5.47,0,8.76-3.19,8.76-8.39,0-4.84-3.29-8.13-8.76-8.13Z"/><path d="M258.53,397.11h37.24v10.77H271.49V423h20.63v10.77H271.49v16.43h24.28V461H258.53Zm12.6-5.47,10.31-12.33h13.33L282.9,391.64Z"/><path d="M310.83,397.11h19.54c14.05,0,22.73,7.21,22.73,19.08,0,7.76-3.75,13.51-10.32,16.52l20,28.3H347.53l-17.07-25.83h-6.67V461h-13Zm13,10.77V424.4h7.31c5.47,0,8.67-3.19,8.67-8.39,0-4.84-3.2-8.13-8.67-8.13Z"/><path d="M371,397.11h13V461H371Z"/><path d="M401.83,397.11h37.25v10.77H414.8V423h20.62v10.77H414.8v16.43h24.28V461H401.83Z"/><path d="M491.47,397.11h13V436c0,16.79-9.86,26.83-25.92,26.83s-25.84-10-25.84-26.83V397.11h13v40c0,8.58,4.83,13.6,13,13.6,7.94,0,12.87-5,12.87-13.6Z"/><path d="M520.49,397.11H540c14.06,0,22.73,7.21,22.73,19.08,0,7.76-3.74,13.51-10.31,16.52l20,28.3H557.18l-17.06-25.83h-6.67V461h-13Zm13,10.77V424.4h7.31c5.47,0,8.67-3.19,8.67-8.39,0-4.84-3.2-8.13-8.67-8.13Z"/><path d="M85.38,489.4h37.25v10.77H98.35v15.16H119V526.1H98.35v16.43h24.28V553.3H85.38Z"/><path d="M132.48,489.4h52.4v11.78H165.16V553.3h-13V501.18H132.48Z"/><path d="M220,489.4h25.11c20.26,0,33.95,14.7,33.95,32s-13.69,31.95-33.95,31.95H220Zm13,11.78v40.34H245.3c11.86,0,20.44-8.85,20.44-20.17s-8.58-20.17-20.44-20.17Z"/><path d="M291.57,489.4h37.25v10.77H304.54v15.16h20.62V526.1H304.54v16.43h24.28V553.3H291.57Z"/><path d="M367.61,489.4h13v52.12h24.28V553.3H367.61Z"/><path d="M435.15,489.4h17l24.19,63.9H462.53l-6.11-16.62H430.86l-6.12,16.62H411Zm17.25,36.24-8.76-24-8.76,24Z"/><path d="M509.9,489.4h19.54c14,0,22.72,7.21,22.72,19.08,0,7.76-3.74,13.51-10.31,16.52l20,28.3H546.6l-17.07-25.84h-6.67V553.3h-13Zm13,10.77v16.52h7.31c5.47,0,8.67-3.19,8.67-8.39,0-4.84-3.2-8.13-8.67-8.13Z"/><path d="M570.05,489.4h37.24v10.77H583v15.16h20.63V526.1H583v16.43h24.28V553.3H570.05Z"/><path d="M666.08,534.22l10.22,7.85c-5.84,7.94-15.34,13-26.93,13-20.17,0-34-15.51-34-33.77s13.78-33.77,34-33.77c11.59,0,21.09,5.2,26.93,13l-10.22,7.94a20,20,0,0,0-16.71-8.76c-12,0-20.63,9.4-20.63,21.63S637.32,543,649.37,543A20,20,0,0,0,666.08,534.22Z"/><path d="M687.52,489.4h13v25.47h32.22V489.4h13v63.9h-13V526.64H700.49V553.3h-13Z"/><path d="M763.56,489.4H800.8v10.77H776.52v15.16h20.63V526.1H776.52v16.43H800.8V553.3H763.56Z"/><path d="M815.86,489.4h19.53c14.06,0,22.73,7.21,22.73,19.08,0,7.76-3.74,13.51-10.32,16.52l20,28.3H852.55l-17.07-25.84h-6.66V553.3h-13Zm13,10.77v16.52h7.3c5.48,0,8.67-3.19,8.67-8.39,0-4.84-3.19-8.13-8.67-8.13Z"/><path d="M920.55,534.22l10.23,7.85c-5.85,7.94-15.34,13-26.93,13-20.17,0-34-15.51-34-33.77s13.79-33.77,34-33.77c11.59,0,21.08,5.2,26.93,13l-10.23,7.94a20,20,0,0,0-16.7-8.76c-12.05,0-20.63,9.4-20.63,21.63S891.8,543,903.85,543A20,20,0,0,0,920.55,534.22Z"/><path d="M942,489.4h13v25.47h32.22V489.4h13v63.9h-13V526.64H955V553.3H942Z"/><path d="M1018,489.4h37.24v10.77H1031v15.16h20.63V526.1H1031v16.43h24.28V553.3H1018Z"/></g><g id="zone"><rect class="cls-4" x="151.36" y="-151.36" width="836.76" height="1139.47" transform="translate(988.11 -151.36) rotate(90)"/></g></svg>
\ No newline at end of file
diff --git a/www-client/src/main/resources/fr/agrometinfo/www/client/public/style.css b/www-client/src/main/resources/fr/agrometinfo/www/client/public/style.css
index 306dadd..b909569 100644
--- a/www-client/src/main/resources/fr/agrometinfo/www/client/public/style.css
+++ b/www-client/src/main/resources/fr/agrometinfo/www/client/public/style.css
@@ -2,7 +2,7 @@ footer {
background-color: #353854;
}
footer.footer {
- max-height: 2em;
+ display: flex;
min-height: 2em;
text-align: center;
margin-left: auto;
@@ -17,6 +17,30 @@ footer, footer a {
footer a:hover {
color: #ffffff;
}
+footer div.links {
+ text-align: center;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: auto;
+ white-space: nowrap;
+}
+footer div.logos {
+ display: flex;
+ align-items: center;
+ height: 100%;
+}
+footer div.logos a {
+ padding: 0;
+}
+footer div.logos img {
+ background-color: #ffffff;
+ filter: grayscale(100%);
+ float: left;
+ height: 32px;
+}
+footer div.logos img:hover {
+ filter: grayscale(0);
+}
select {
width: 100%;
height: 2.5em;
--
GitLab
From 4cf9947e41c211f5b17b074c778e90c3162ca560 Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Wed, 20 Mar 2024 09:52:54 +0100
Subject: [PATCH 2/2] style.css
---
.../agrometinfo/www/client/public/style.css | 42 ++++++++++---------
1 file changed, 22 insertions(+), 20 deletions(-)
diff --git a/www-client/src/main/resources/fr/agrometinfo/www/client/public/style.css b/www-client/src/main/resources/fr/agrometinfo/www/client/public/style.css
index b909569..b9a4628 100644
--- a/www-client/src/main/resources/fr/agrometinfo/www/client/public/style.css
+++ b/www-client/src/main/resources/fr/agrometinfo/www/client/public/style.css
@@ -2,14 +2,14 @@ footer {
background-color: #353854;
}
footer.footer {
- display: flex;
- min-height: 2em;
- text-align: center;
- margin-left: auto;
- margin-right: auto;
+ min-height: auto;
+ content: "";
+ display: table;
+ clear: both;
}
footer, footer a {
color: #b5b5c8;
+ display: inline-block;
font-weight: bold;
margin-right: 1em;
padding: 0.3em;
@@ -17,29 +17,27 @@ footer, footer a {
footer a:hover {
color: #ffffff;
}
+footer div.links,
+footer div.logos {
+ float: left;
+}
footer div.links {
- text-align: center;
- margin-left: auto;
- margin-right: auto;
- margin-top: auto;
- white-space: nowrap;
+ text-align: center;
}
footer div.logos {
- display: flex;
- align-items: center;
- height: 100%;
+ float: left;
}
footer div.logos a {
- padding: 0;
+ padding: 0;
}
footer div.logos img {
- background-color: #ffffff;
- filter: grayscale(100%);
- float: left;
- height: 32px;
+ background-color: #ffffff;
+ filter: grayscale(100%);
+ height: var(--footer-logo-height);
+ margin-right: 0.5em;
}
footer div.logos img:hover {
- filter: grayscale(0);
+ filter: grayscale(0);
}
select {
width: 100%;
@@ -277,11 +275,12 @@ body > .modal-backdrop {
bottom: 2em;
}
:root {
+ --footer-logo-height: 32px;
--logo-height: 50px;
}
@media screen and (max-width: 380px) {
.navbar-brand > .version {
- left: 2.1em;
+ left: 2.1em;
float: left;
top: -0.8em;
}
@@ -307,6 +306,9 @@ body > .modal-backdrop {
.navbar-brand > .version {
display: none;
}
+ footer div.links {
+ width: calc(100% - 210px);
+ }
}
@media screen and (min-width: 1200px) {
:root {
--
GitLab