diff --git a/src/api/models/themes.js b/src/api/models/themes.js
index c7b372f75..e10192c0b 100644
--- a/src/api/models/themes.js
+++ b/src/api/models/themes.js
@@ -7,7 +7,7 @@ import { cloneDeep, merge } from 'lodash';
import fs from 'fs/promises';
// --- Global variable for the Theme system
-export const THEMES_VERSION = '6';
+export const THEMES_VERSION = '7';
export const THEMES_FOLDER = '../../app/custom/themes';
// --- Global function for the Theme system
diff --git a/src/app/custom/themes/default/lodex-theme.json b/src/app/custom/themes/default/lodex-theme.json
index 3be77478b..86fa6b45e 100644
--- a/src/app/custom/themes/default/lodex-theme.json
+++ b/src/app/custom/themes/default/lodex-theme.json
@@ -1,5 +1,5 @@
{
- "version": "6",
+ "version": "7",
"licence": "CeCILL",
"name": {
"fr": "Système",
diff --git a/src/app/custom/themes/inist/css/inist-styles.css b/src/app/custom/themes/inist/css/inist-styles.css
index 6983397c7..e974b1802 100644
--- a/src/app/custom/themes/inist/css/inist-styles.css
+++ b/src/app/custom/themes/inist/css/inist-styles.css
@@ -2,21 +2,6 @@
/*lodex theme_inist lodex14*/
/* MOBILE FIRST*/
@media (min-width: 794px) {
- :root {
- --logosSansMarge: 70px;
- --height-header: calc(
- var(--logosSansMarge) + var(--height-breadcrumb)
- ) !important;
- }
- /*breadcrumb titre court*/
- .breadcrumb-root {
- margin-top: var(--logosSansMarge) !important;
- }
- /* titre courant box*/
- .breadcrumb-trail a:not([href*='https']):last-child {
- padding-left: 3rem;
- margin-right: 4.6rem;
- }
h1 {
font-size: 1.7rem;
}
@@ -26,12 +11,6 @@
div.dataset-characteristics > div > div.property:nth-child(2) {
padding: 0 4rem !important;
}
- /*lodex content*/
- /*petite marge full screen*/
- .container,
- .container-fluid {
- width: 95% !important;
- }
}
@media only screen and (min-width: 481px) and (max-width: 793.9px) {
h1 {
@@ -42,9 +21,6 @@
}
}
@media only screen and (max-width: 480px) {
- :root {
- --height-header: var(--height-logos) !important;
- }
.breadcrumb-root {
display: none !important;
}
@@ -60,12 +36,17 @@
}
}
/* PROP COMMUNES */
+*,
+*::before,
+*::after {
+ box-sizing: border-box;
+}
:root {
--font-titre: IBM Plex Sans bold, Arial, Helvetica, sans-serif;
--font-texte: Satoshi Regular, Arial, Helvetica, sans-serif;
- --height-logos: 108px; /*calc(76px+32px)marges*/
- --height-breadcrumb: 50px;
- --height-header: calc(var(--height-logos) + var(--height-breadcrumb));
+ --maxWidth: 1700px; /* .css-19r6kue-MuiContainer-root 19.08.2024*/
+ /*fond semi opaque*/
+ --fondsemiopaque: background-color: rgba(24, 20, 79, 0.6);
}
/* text : font, size, color*/
body {
@@ -81,7 +62,7 @@ a {
background-color: transparent;
text-decoration: none;
}
-a:hover {
+a:is(:hover, :focus, :active) {
text-decoration: underline 2px var(--info-main);
}
/*Hierarchie et style titres*/
@@ -104,7 +85,6 @@ h4 {
}
/*structure generale*/
html {
- height: 100%;
padding: 0;
margin: 0;
}
@@ -115,26 +95,21 @@ body {
background-repeat: repeat-x;
background-position: top left;
opacity: 1;
+ gap: 0 !important;
}
/*header theme inist*/
header {
- position: fixed;
+ position: relative;
+ margin: 0;
top: 0;
+ z-index: -1;
width: 100vw;
- background-color: var(--primary-main);
- background-image: url('../img/bg_projets.jpg');
- background-repeat: repeat-x;
- background-position: top left;
- opacity: 1;
- z-index: 1100;
- margin: 0;
- height: var(--height-header);
}
header div.container {
- padding: 1rem 0 1rem;
display: flex;
+ margin: 0 auto;
+ padding: 1rem 0 0.2rem;
gap: 10%;
- max-width: 1670px !important;
}
header div.container * {
color: var(--primary-contrast-text);
@@ -191,7 +166,7 @@ header a.logoinist > span:first-child::after {
/*text header bg fonce sur img bg body*/
header #logos, header #titre_lodex/*,
.breadcrumb-trail a[href*="https"]*/ {
- background-color: rgba(24, 20, 79, 0.6);
+ background-color: var(--fondsemiopaque);
box-shadow: 0px 0px 10px rgba(24, 20, 79, 0.9);
}
/*footer theme inist*/
@@ -199,10 +174,9 @@ footer {
flex-grow: 0;
flex-shrink: 0;
margin-bottom: 90px;
- margin-top: 1rem;
background-color: #fff;
}
-footer ul {
+footer ul.container {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
@@ -223,14 +197,13 @@ footer ul li {
margin: 15px 0;
}
footer li a,
-footer li a:hover,
-footer li a:focus,
-footer li a:active {
+footer li a:is(:hover, :focus, :active) {
font-family: var(--font-texte);
font-size: 18px;
border-bottom: 1px solid var(--info-main);
color: #434148;
text-decoration: none;
+ width: max-content;
}
footer li a[href*='https']::after {
background-image: url('../img/external-link-alt_gris.svg');
@@ -244,96 +217,67 @@ footer li#lodex::before {
}
/*ELEMENTS LODEX structure*/
-/*padding et fond descendent 3 noeuds*/
-/*breadcrumb au niveau header fond transparent*/
-#root {
- min-height: 85vh;
-}
.container,
.container-fluid {
- width: 100%;
- max-width: 1700px;
- margin-right: auto;
- margin-left: auto;
- padding-left: 0;
- padding-right: 0;
-}
-/*connexion*/
-.body > .MuiPaper-root {
- margin-top: var(--height-header);
- padding: 3rem;
-}
-/*annul reserve pour nav bas de pages lodex (sur footer)*/
-._1dzy633 {
- padding-bottom: 0 !important;
+ max-width: var(--maxWidth) !important;
}
-/*pages+drawers margin padding fond blanc*/
-div.dataset-characteristics,
-div.resource,
-.static-page,
-.graph-container,
-.drawer._13un6rc {
+/*connexion + home*/
+#root > #content:first-child .container {
+ padding: 0 0 0 0 !important;
+ background-color: transparent;
+}
+#root > #content:first-child .container #home-page {
+ background-color: #fff;
padding-left: 1.6rem;
padding-right: 1.6rem;
}
-/*header+breadcrumb fixed*/
-div.dataset-characteristics,
-div.resource,
-div.static-page,
-.graph-page.graph-container {
- margin-top: var(--height-header) !important;
- padding-top: 2rem;
- background-color: white;
+#root > #content:first-child > .container > .MuiPaper-root.MuiPaper-elevation {
+ padding: 2rem;
+ margin: 1rem;
}
-/*drawer entre header et nav fixed*/
-.drawer-drawerOpen._13un6rc {
- top: 12vh !important;
- height: -webkit-calc(100vh - 12vh - 80px) !important ;
- height: -moz-calc(100vh - 12vh - 80px) !important;
- height: calc(100vh - 12vh - 80px) !important;
- border-top: 1px solid #e3eaf2 !important;
- box-shadow: 0 2px 1rem #777 !important;
- z-index: 1270 !important;
- padding-top: 3rem;
-}
-/*position sous header*/
-/*WIDTH : breadcrumb-root idem nav + container*/
-.breadcrumb-root {
- z-index: 1220;
- position: fixed;
+/*version*/
+#version {
+ background-color: #fff;
+}
+#version .container {
+ padding-bottom: 1rem !important;
+}
+/*breadcrumb au niveau header fond transparent*/
+#breadcrumb {
+ position: absolute;
top: 0;
- left: 0;
- margin: var(--height-logos) auto 0;
- padding: 0;
width: 100vw;
- max-width: 1700px;
+ display: flex;
+ justify-content: center;
+}
+.breadcrumb-root.container {
background-color: transparent;
+ display: inline-flex;
justify-content: flex-end !important;
- align-items: flex-end !important;
- height: var(--height-breadcrumb);
-}
-.breadcrumb-root > svg {
- z-index: inherit;
- margin-right: -30px !important;
+ margin: 0 !important;
+ margin-top: 3rem !important;
}
.breadcrumb-root span {
display: none;
}
-/*idem .container*/
+.breadcrumb-root svg {
+ transform: translate(30px);
+}
.breadcrumb-trail {
margin: 0 !important;
- height: max-content;
- display: flex;
+ width: max-content;
+ display: inline-flex;
justify-content: flex-end;
+ align-items: center;
+ gap: 0px;
+ background-color: white;
}
/*breadcrumb titre court et liens externes*/
/* titre courant box*/
-.breadcrumb-trail a:not([href*='https']):last-child {
+.breadcrumb-trail a {
display: flex;
- align-items: end;
- background-color: white;
- padding: 0 3rem;
- height: 50px;
+ align-items: center;
+ padding: 1rem 3rem;
width: max-content;
}
/*titre courant texte*/
@@ -344,24 +288,53 @@ div.static-page,
font-weight: normal;
}
/*titre court clicable*/
-.breadcrumb-trail a:not([href*='https']):last-child:hover,
-.breadcrumb-trail a:not([href*='https']):last-child:focus,
-.breadcrumb-trail a:not([href*='https']):last-child:active {
+.breadcrumb-trail a:is(:hover, :focus, :active) {
text-decoration: underline 2px var(--info-main);
text-underline-offset: 5px;
}
-/*external links*/
-.breadcrumb-trail a[href*='https'] {
- display: none;
-}
/*barre nav lodex*/
-#root div.body nav {
+#root nav {
box-shadow: 0px -5px 3px rgba(0, 0, 0, 0.2);
}
+/*#content*/
+/*#content {
+ transform: translateY(-1rem);
+}*/
+/*pages+drawers margin padding fond blanc*/
+#content > div.container,
+.drawer {
+ padding-top: 2rem;
+ padding-bottom: 2rem;
+ padding-left: 1.6rem;
+ padding-right: 1.6rem;
+ background-color: white;
+}
+/*drawer entre header et nav fixed*/
+.drawer-drawerOpen {
+ top: 8vh !important;
+}
+/*graph-page .header_1vkcagi*/
+.graph-page {
+ margin: 0 auto !important;
+}
+.graph-header {
+ flex-flow: row wrap !important;
+ justify-content: center !important;
+ align-items: center !important;
+ margin: 0 auto;
+ gap: 2%;
+}
+.graph-header > div {
+ flex-grow: 1;
+ max-width: 875px;
+ min-width: 450px;
+}
+.graph-header > div .stats {
+ text-align: center;
+}
+/************************
/* les paves de données*/
-.dataset-characteristics > div > .property:not(.titreInstance),
-.graph-page .property,
-.resource .property {
+.property:not(.titreInstance) {
padding: 1rem 0.5rem 0 !important;
}
/*lodex Etiquette : home, graph,resource titre champs, graphs titre*/
@@ -384,32 +357,21 @@ a.VoirPlus {
.resources-grid-list {
background-color: rgba(229, 229, 229, 0.17);
}
-/*home spec*/
-.dataset-characteristics > div:first-child {
- justify-content: space-between;
- padding-top: 0 !important;
-}
-/*TITRE instance*/
-div.dataset-characteristics > div > div.property:nth-child(2) {
- padding: 0 3rem !important;
- margin: 0 !important;
- width: max-content;
- padding: 0 1rem;
- background-color: white;
- text-align: initial !important;
- box-sizing: border-box;
- background-color: white;
-}
-/* PAGE resource et graph*/
-.body > div div.resource,
-.body .graph-container {
- padding-bottom: 1rem;
-}
/*resource titres champs*/
div.resource span.property_label {
font-size: 1rem !important;
border-bottom: 1px dotted var(--neutral-dark-light);
}
+/*svg suivant précédent*/
+.resource
+ .css-78trlr-MuiButtonBase-root-MuiIconButton-root:is(
+ :not(:hover),
+ :hover,
+ :focus,
+ :active
+ ) {
+ background-color: #fff;
+}
/*barre search*/
.searchbar-container fieldset,
.searchbar-container fieldset:hover {
@@ -467,7 +429,7 @@ ul.MuiList-root.facets-list > li .facet-value-list {
ul.MuiList-root.facets-list > li .facet-value-list svg {
font-size: 1.8rem;
}
-/*search-result*/
+/*drawer search-result*/
.search.search-container .search-content {
background-color: white !important;
}
@@ -484,13 +446,6 @@ ul.MuiList-root.facets-list > li .facet-value-list svg {
.search-result-title {
color: var(--info-main);
}
-/*nb de doc résultats stats*/
-.stats {
- height: auto !important;
- line-height: 1.2rem !important;
- padding: 1rem 0;
- margin: 1rem auto 1rem 1%;
-}
/*static-page reprend prop page home*/
.static-page {
display: flex;
diff --git a/src/app/custom/themes/inist/index.ejs b/src/app/custom/themes/inist/index.ejs
index 434b554ab..1dd609253 100644
--- a/src/app/custom/themes/inist/index.ejs
+++ b/src/app/custom/themes/inist/index.ejs
@@ -13,7 +13,6 @@
-
@@ -36,7 +35,7 @@
<% } %>
-
+