diff --git a/Makefile b/Makefile index 51f5771ce..17722a4c3 100644 --- a/Makefile +++ b/Makefile @@ -54,8 +54,8 @@ build: ## Deploy ================================================================= publish: build ## publish version to docker hub - docker build -t cnrsinist/lodex:14.0.59 --build-arg http_proxy --build-arg https_proxy . - docker push cnrsinist/lodex:14.0.59 + docker build -t cnrsinist/lodex:14.0.60 --build-arg http_proxy --build-arg https_proxy . + docker push cnrsinist/lodex:14.0.60 ## Development ================================================================= diff --git a/package-lock.json b/package-lock.json index 5a6955424..fafa11712 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "lodex", - "version": "14.0.59", + "version": "14.0.60", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "lodex", - "version": "14.0.59", + "version": "14.0.60", "hasInstallScript": true, "license": "CECILL-2.1", "dependencies": { @@ -221,7 +221,7 @@ "nodemon": "3.0.3", "prettier": "^3.2.5", "sleepjs": "4.0.3", - "webpack": "5.90.3", + "webpack": "5.94.0", "webpack-bundle-analyzer": "4.10.1", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.2" @@ -7643,24 +7643,6 @@ "integrity": "sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==", "dev": true }, - "node_modules/@types/eslint": { - "version": "8.44.6", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "node_modules/@types/eslint-scope": { - "version": "3.7.6", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, "node_modules/@types/estree": { "version": "1.0.5", "license": "MIT" @@ -8126,9 +8108,10 @@ "license": "MIT" }, "node_modules/@webassemblyjs/ast": { - "version": "1.11.6", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", + "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", "dev": true, - "license": "MIT", "dependencies": { "@webassemblyjs/helper-numbers": "1.11.6", "@webassemblyjs/helper-wasm-bytecode": "1.11.6" @@ -8136,23 +8119,27 @@ }, "node_modules/@webassemblyjs/floating-point-hex-parser": { "version": "1.11.6", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", + "dev": true }, "node_modules/@webassemblyjs/helper-api-error": { "version": "1.11.6", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", + "dev": true }, "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.6", - "dev": true, - "license": "MIT" + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", + "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", + "dev": true }, "node_modules/@webassemblyjs/helper-numbers": { "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", "dev": true, - "license": "MIT", "dependencies": { "@webassemblyjs/floating-point-hex-parser": "1.11.6", "@webassemblyjs/helper-api-error": "1.11.6", @@ -8161,62 +8148,69 @@ }, "node_modules/@webassemblyjs/helper-wasm-bytecode": { "version": "1.11.6", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", + "dev": true }, "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.6", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", + "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", "dev": true, - "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6" + "@webassemblyjs/wasm-gen": "1.12.1" } }, "node_modules/@webassemblyjs/ieee754": { "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", "dev": true, - "license": "MIT", "dependencies": { "@xtuc/ieee754": "^1.2.0" } }, "node_modules/@webassemblyjs/leb128": { "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/utf8": { "version": "1.11.6", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", + "dev": true }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.6", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", + "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", "dev": true, - "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-opt": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6", - "@webassemblyjs/wast-printer": "1.11.6" + "@webassemblyjs/helper-wasm-section": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-opt": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1", + "@webassemblyjs/wast-printer": "1.12.1" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.6", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", + "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", "dev": true, - "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/ast": "1.12.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", "@webassemblyjs/ieee754": "1.11.6", "@webassemblyjs/leb128": "1.11.6", @@ -8224,22 +8218,24 @@ } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.6", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", + "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", "dev": true, - "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6" + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.6", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", + "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", "dev": true, - "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/ast": "1.12.1", "@webassemblyjs/helper-api-error": "1.11.6", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", "@webassemblyjs/ieee754": "1.11.6", @@ -8248,11 +8244,12 @@ } }, "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.6", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", + "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", "dev": true, - "license": "MIT", "dependencies": { - "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/ast": "1.12.1", "@xtuc/long": "4.2.2" } }, @@ -8303,13 +8300,15 @@ }, "node_modules/@xtuc/ieee754": { "version": "1.2.0", - "dev": true, - "license": "BSD-3-Clause" + "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", + "dev": true }, "node_modules/@xtuc/long": { "version": "4.2.2", - "dev": true, - "license": "Apache-2.0" + "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", + "dev": true }, "node_modules/abab": { "version": "2.0.6", @@ -8410,10 +8409,11 @@ "node": ">=0.4.0" } }, - "node_modules/acorn-import-assertions": { - "version": "1.9.0", + "node_modules/acorn-import-attributes": { + "version": "1.9.5", + "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", + "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", "dev": true, - "license": "MIT", "peerDependencies": { "acorn": "^8" } @@ -13574,9 +13574,10 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.15.0", + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", + "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", "dev": true, - "license": "MIT", "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -16949,8 +16950,9 @@ }, "node_modules/glob-to-regexp": { "version": "0.4.1", - "dev": true, - "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", + "dev": true }, "node_modules/global": { "version": "4.4.0", @@ -30545,8 +30547,9 @@ }, "node_modules/tapable": { "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } @@ -32552,9 +32555,10 @@ } }, "node_modules/watchpack": { - "version": "2.4.0", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz", + "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==", "dev": true, - "license": "MIT", "dependencies": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" @@ -32593,25 +32597,25 @@ "license": "BSD-2-Clause" }, "node_modules/webpack": { - "version": "5.90.3", + "version": "5.94.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz", + "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==", "dev": true, - "license": "MIT", "dependencies": { - "@types/eslint-scope": "^3.7.3", "@types/estree": "^1.0.5", - "@webassemblyjs/ast": "^1.11.5", - "@webassemblyjs/wasm-edit": "^1.11.5", - "@webassemblyjs/wasm-parser": "^1.11.5", + "@webassemblyjs/ast": "^1.12.1", + "@webassemblyjs/wasm-edit": "^1.12.1", + "@webassemblyjs/wasm-parser": "^1.12.1", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.9.0", + "acorn-import-attributes": "^1.9.5", "browserslist": "^4.21.10", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.15.0", + "enhanced-resolve": "^5.17.1", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", + "graceful-fs": "^4.2.11", "json-parse-even-better-errors": "^2.3.1", "loader-runner": "^4.2.0", "mime-types": "^2.1.27", @@ -32619,7 +32623,7 @@ "schema-utils": "^3.2.0", "tapable": "^2.1.1", "terser-webpack-plugin": "^5.3.10", - "watchpack": "^2.4.0", + "watchpack": "^2.4.1", "webpack-sources": "^3.2.3" }, "bin": { diff --git a/package.json b/package.json index 8e783b3f8..5195bd314 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "node": ">= 16" }, "name": "lodex", - "version": "14.0.59", + "version": "14.0.60", "description": "", "main": "src/api/index.js", "browser": { @@ -275,7 +275,7 @@ "nodemon": "3.0.3", "prettier": "^3.2.5", "sleepjs": "4.0.3", - "webpack": "5.90.3", + "webpack": "5.94.0", "webpack-bundle-analyzer": "4.10.1", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.2" diff --git a/packages/transformers/src/operations/ARRAY.js b/packages/transformers/src/operations/ARRAY.js index 86f8b88f7..78af57f1a 100644 --- a/packages/transformers/src/operations/ARRAY.js +++ b/packages/transformers/src/operations/ARRAY.js @@ -1,11 +1,11 @@ -import { transformer } from './transformer'; +import { rawTransformerWithoutArg } from './transformer'; -export const valueToArray = value => { +export const valueToArray = (value) => { const arr = Array.isArray(value) ? value : [value]; - return arr.filter(x => x); + return arr.filter((x) => x); }; -const transformation = () => value => transformer(valueToArray, value); +const transformation = () => (value) => rawTransformerWithoutArg(valueToArray, value); transformation.getMetas = () => ({ name: 'ARRAY', diff --git a/packages/transformers/src/operations/transformer.js b/packages/transformers/src/operations/transformer.js index 59df39ddb..a1f47630a 100644 --- a/packages/transformers/src/operations/transformer.js +++ b/packages/transformers/src/operations/transformer.js @@ -12,7 +12,7 @@ export const transformer = (func, value) => }); export const transformerWithArg = (func, name, value, args) => { - const arg = args.find(a => a.name === name); + const arg = args.find((a) => a.name === name); if (!arg) { throw new Error(`Invalid Argument for ${name}`); @@ -21,7 +21,7 @@ export const transformerWithArg = (func, name, value, args) => { return new Promise((resolve, reject) => { try { if (Array.isArray(value)) { - resolve(value.map(val => func(val, arg.value))); + resolve(value.map((val) => func(val, arg.value))); } else { resolve(func(value, arg.value)); } @@ -32,8 +32,8 @@ export const transformerWithArg = (func, name, value, args) => { }; export const transformerWithTwoArgs = (func, name1, name2, value, args) => { - const arg1 = args.find(a => a.name === name1); - const arg2 = args.find(a => a.name === name2); + const arg1 = args.find((a) => a.name === name1); + const arg2 = args.find((a) => a.name === name2); if (!arg1 || !arg2) { throw new Error(`Invalid Argument for ${name1} or ${name2}`); @@ -42,7 +42,7 @@ export const transformerWithTwoArgs = (func, name1, name2, value, args) => { return new Promise((resolve, reject) => { try { if (Array.isArray(value)) { - resolve(value.map(val => func(val, arg1.value, arg2.value))); + resolve(value.map((val) => func(val, arg1.value, arg2.value))); } else { resolve(func(value, arg1.value, arg2.value)); } @@ -53,7 +53,7 @@ export const transformerWithTwoArgs = (func, name1, name2, value, args) => { }; export const rawTransformerWithArg = (func, name, value, args) => { - const arg = args.find(a => a.name === name); + const arg = args.find((a) => a.name === name); if (!arg) { throw new Error(`Invalid Argument for ${name}`); @@ -68,10 +68,11 @@ export const rawTransformerWithArg = (func, name, value, args) => { }); }; -export const rawTransformerWithoutArg = (func, value) => new Promise((resolve, reject) => { - try { - resolve(func(value)); - } catch (error) { - reject(error); - } -}); +export const rawTransformerWithoutArg = (func, value) => + new Promise((resolve, reject) => { + try { + resolve(func(value)); + } catch (error) { + reject(error); + } + }); diff --git a/src/api/models/themes.js b/src/api/models/themes.js index d8d9260f5..e10192c0b 100644 --- a/src/api/models/themes.js +++ b/src/api/models/themes.js @@ -2,12 +2,12 @@ import config from '../../../config.json'; import path from 'path'; import getLogger from '../services/logger'; import defaultMuiTheme from '../../app/custom/themes/default/defaultTheme'; -import deepClone from 'lodash/cloneDeep'; +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 @@ -155,7 +155,7 @@ const init = async () => { } } - let muiTheme = deepClone(defaultMuiTheme); + let muiTheme = cloneDeep(defaultMuiTheme); if (themeConfig?.configuration?.files?.palette) { const unVerifiedMuiTheme = getThemeFile( theme, @@ -164,7 +164,7 @@ const init = async () => { try { await fs.access(unVerifiedMuiTheme, fs.constants.R_OK); - Object.assign( + muiTheme = merge( muiTheme, (await import(unVerifiedMuiTheme)).default, ); 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 @@ <% } %> -
+