menu sur toutes les pages + index design template

open4good · Oct 24, 2023 · fe74060 · fe74060
1 parent 66f939a
commit fe74060
Show file tree

Hide file tree

Showing 26 changed files with 589 additions and 682 deletions.
diff --git a/ui/src/main/resources/static/css/custom.css b/ui/src/main/resources/static/css/custom.css
@@ -1,3 +1,13 @@
+* {
+	font-family: 'League Spartan', sans-serif!important;
+}
+.fa, .far, .fas {
+	font-family: "Font Awesome 5 Free"!important;
+}
+.fab {
+	font-family: "Font Awesome 5 Brands"!important;
+  }
+
 
 /***********************************************
 CUSTOM
@@ -71,7 +81,7 @@ Xwiki css
 }
 
 
-
+/* bouton recherche animé au click */
 
 .button {
 	display: inline-block;

diff --git a/ui/src/main/resources/templates/compensation.html b/ui/src/main/resources/templates/compensation.html
@@ -31,13 +31,9 @@
 
 
 	<!--/* Navbar */-->
-	<header class="header-global">
-    	<nav id="navbar-main" th:aria-label="#{aria.navigation.primary}" class="navbar navbar-main navbar-expand-lg navbar-theme-primary headroom navbar-dark navbar-theme-primary">
-			<th:block th:insert="~{inc/navbar-non-product.html}"></th:block>
-		</nav>
-       <!--/* Loader */-->
-       <th:block th:insert="~{inc/preloader.html}"></th:block>
-	</header>
+	<th:block th:insert="~{inc/navbar-non-product.html}"></th:block>
+    <!--/* Loader */-->
+    <th:block th:insert="~{inc/preloader.html}"></th:block>
 
     <main>
 

diff --git a/ui/src/main/resources/templates/contact.html b/ui/src/main/resources/templates/contact.html
@@ -30,13 +30,9 @@
 <body>
 
 	<!--/* Navbar */-->
-	<header class="header-global">
-    	<nav id="navbar-main" aria-label="Primary navigation" class="navbar navbar-main navbar-expand-lg navbar-theme-primary headroom navbar-dark navbar-theme-primary">
-			<th:block th:insert="~{inc/navbar-non-product.html}"></th:block>
-		</nav>
-       <!--/* Loader */-->
-       <th:block th:insert="~{inc/preloader.html}"></th:block>
-	</header>
+	<th:block th:insert="~{inc/navbar-non-product.html}"></th:block>
+    <!--/* Loader */-->
+    <th:block th:insert="~{inc/preloader.html}"></th:block>
 
     <main>
 

diff --git a/ui/src/main/resources/templates/ecoscore.html b/ui/src/main/resources/templates/ecoscore.html
@@ -30,13 +30,9 @@
 
 
 	<!--/* Navbar */-->
-	<header class="header-global">
-    	<nav id="navbar-main" th:aria-label="#{aria.navigation.primary}" class="navbar navbar-main navbar-expand-lg navbar-theme-primary headroom navbar-dark navbar-theme-primary">
-			<th:block th:insert="~{inc/navbar-non-product.html}"></th:block>
-		</nav>
-       <!--/* Loader */-->
-       <th:block th:insert="~{inc/preloader.html}"></th:block>
-	</header>
+	<th:block th:insert="~{inc/navbar-non-product.html}"></th:block>
+    <!--/* Loader */-->
+    <th:block th:insert="~{inc/preloader.html}"></th:block>
 
     <main>
 

diff --git a/ui/src/main/resources/templates/error/403.html b/ui/src/main/resources/templates/error/403.html
@@ -25,11 +25,9 @@
 
 <body>
  	<!--/* Navbar */-->
-	<header class="header-global">
-    	<nav id="navbar-main" aria-label="Primary navigation" class="navbar navbar-main navbar-expand-lg navbar-theme-primary headroom navbar-light navbar-theme-secondary">
-			<th:block th:insert="~{inc/navbar-non-product.html}"></th:block>
-		</nav>
-	</header>
+	<th:block th:insert="~{inc/navbar-non-product.html}"></th:block>
+    <!--/* Loader */-->
+    <th:block th:insert="~{inc/preloader.html}"></th:block>
 
     <main>	
        <!--/* Loader */-->

diff --git a/ui/src/main/resources/templates/error/404.html b/ui/src/main/resources/templates/error/404.html
@@ -25,11 +25,9 @@
 
 <body>
  	<!--/* Navbar */-->
-	<header class="header-global">
-    	<nav id="navbar-main" aria-label="Primary navigation" class="navbar navbar-main navbar-expand-lg navbar-theme-primary headroom navbar-light navbar-theme-secondary">
-			<th:block th:insert="~{inc/navbar-non-product.html}"></th:block>
-		</nav>
-	</header>
+	<th:block th:insert="~{inc/navbar-non-product.html}"></th:block>
+    <!--/* Loader */-->
+    <th:block th:insert="~{inc/preloader.html}"></th:block>
 
     <main>	
        <!--/* Loader */-->

diff --git a/ui/src/main/resources/templates/error/500.html b/ui/src/main/resources/templates/error/500.html
@@ -25,11 +25,9 @@
 
 <body>
  	<!--/* Navbar */-->
-	<header class="header-global">
-    	<nav id="navbar-main" aria-label="Primary navigation" class="navbar navbar-main navbar-expand-lg navbar-theme-primary headroom navbar-light navbar-theme-secondary">
-			<th:block th:insert="~{inc/navbar-non-product.html}"></th:block>
-		</nav>
-	</header>
+	<th:block th:insert="~{inc/navbar-non-product.html}"></th:block>
+    <!--/* Loader */-->
+    <th:block th:insert="~{inc/preloader.html}"></th:block>
 
     <main>	
        <!--/* Loader */-->

diff --git a/ui/src/main/resources/templates/inc/header-meta.html b/ui/src/main/resources/templates/inc/header-meta.html
@@ -11,6 +11,7 @@
 <meta name="theme-color" content="#ffffff">
 
 <link type="text/css" href="../../vendor/@fortawesome/fontawesome-free/css/all.min.css" rel="stylesheet">
+<script src="../../vendor/countup.js/dist/countUp.umd.js"></script>
 
 <!-- Glide JS 
 <link rel="stylesheet" href="../../vendor/@glidejs/glide/dist/css/glide.core.min.css">
@@ -19,6 +20,9 @@
 
 <link type="text/css" href="../../css/pixel.css" rel="stylesheet">
 <link type="text/css" href="../../css/custom.css" rel="stylesheet">
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=League+Spartan:wght@500&display=swap" rel="stylesheet">
 
 
 <link rel="search" type="application/opensearchdescription+xml" th:title="#{opensearch.title}" th:href="${baseUrl} + 'opensearch.xml'">