From d76bb506dc76376faf5cd6227a808a96f4d04d4d Mon Sep 17 00:00:00 2001 From: ouidade Date: Fri, 18 Feb 2022 09:28:59 +0100 Subject: [PATCH] =?UTF-8?q?pr=C3=A9paration=20code=20pour=2019/02,=20essai?= =?UTF-8?q?=20js=20pour=20base=20de=20donn=C3=A9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/profiles/d8-starterkit-profile | 2 +- web/themes/custom/eql/css-compiled/styles.css | 5 ++-- web/themes/custom/eql/scripts/main.js | 26 +++++++++++++++++++ web/themes/custom/eql/scss/pages/_ami.scss | 3 +++ .../custom/eql/scss/pages/_basededonnees.scss | 4 +++ web/themes/custom/eql/scss/pages/_faq.scss | 5 ++++ web/themes/custom/eql/scss/pages/_home.scss | 22 ++++++++++++++-- 7 files changed, 62 insertions(+), 5 deletions(-) diff --git a/web/profiles/d8-starterkit-profile b/web/profiles/d8-starterkit-profile index 6fb8027..6fe8986 160000 --- a/web/profiles/d8-starterkit-profile +++ b/web/profiles/d8-starterkit-profile @@ -1 +1 @@ -Subproject commit 6fb80278a224c3fe38d240c4237dc5f845bf0529 +Subproject commit 6fe8986494069c7e9bf019cbe98d8f2c7d5166d0 diff --git a/web/themes/custom/eql/css-compiled/styles.css b/web/themes/custom/eql/css-compiled/styles.css index 57e9aa2..4aa9ba0 100644 --- a/web/themes/custom/eql/css-compiled/styles.css +++ b/web/themes/custom/eql/css-compiled/styles.css @@ -406,7 +406,7 @@ a { max-width: 100%; max-height: 100%; } .path-frontpage .block-region-content .block-views-blockhome-nodes-block-1 .node-type-static div:first-child .field--name-field-accroche { - grid-column: 2 /span 3; + grid-column: 2 /span 2; grid-row: 2 / span 2; font-size: 5rem; font-weight: 900; @@ -1553,7 +1553,8 @@ a { background-color: #009ee3; height: fit-content; width: 60%; - margin-left: 2rem; } + margin-left: 2rem; + grid-row: 2; } .path-ressources.basededonnees .layout-content .region-content #block-contenudelapageprincipale .layout--onecol .block-region-content .block-block-content82917d0c-5004-4bfb-af66-ce334782d82d .field--name-field-lien { display: flex; flex-direction: column; diff --git a/web/themes/custom/eql/scripts/main.js b/web/themes/custom/eql/scripts/main.js index a9da7d8..1919f0c 100644 --- a/web/themes/custom/eql/scripts/main.js +++ b/web/themes/custom/eql/scripts/main.js @@ -132,6 +132,32 @@ jQuery(function($) { }); +///////////////////////////////////////// +// masquer bouton proposer une ressource pour collection 50 ans + +// jQuery(function($) { +// var path = window.location.href; // because the 'href' property of the DOM element is the absolute path +// console.log(path); + +// $ (function bouton() { + +// if (path.indexOf("/ressources/bdd/29") > -1) { +// (".block-block-content82917d0c-5004-4bfb-af66-ce334782d82d").addClass('.notdisplaid'); +// } +// }); +// }); + + +// jQuery(function($) { +// var path = window.location.href; // because the 'href' property of the DOM element is the absolute path +// console.log(path); +// $(".block-block-content82917d0c-5004-4bfb-af66-ce334782d82d").each(function() { +// if (this.href === path) { +// $(this).parent().closest('.field--name-field-lien').addClass('notdisplaid'); +// } +// }); +// }); + // ///////////////// diff --git a/web/themes/custom/eql/scss/pages/_ami.scss b/web/themes/custom/eql/scss/pages/_ami.scss index f8a3f27..b3c3fe8 100644 --- a/web/themes/custom/eql/scss/pages/_ami.scss +++ b/web/themes/custom/eql/scss/pages/_ami.scss @@ -36,6 +36,9 @@ } } .block-entity-fieldnodefield-liens{ + ///////////////// à activer le 19 février ///////////////// + // display: none; + ////////////////////////////////// .field--name-field-liens{ .field__item{ diff --git a/web/themes/custom/eql/scss/pages/_basededonnees.scss b/web/themes/custom/eql/scss/pages/_basededonnees.scss index 9e7e6f6..13c31ee 100644 --- a/web/themes/custom/eql/scss/pages/_basededonnees.scss +++ b/web/themes/custom/eql/scss/pages/_basededonnees.scss @@ -144,12 +144,15 @@ //button proposer une ressource .block-block-content82917d0c-5004-4bfb-af66-ce334782d82d{ + // display: none; grid-column: 8 / span 9; margin-top: 4rem; background-color: $blue-light; height: fit-content; width: 60%; margin-left: 2rem; + grid-row: 2; + .field--name-field-lien{ display: flex; @@ -301,6 +304,7 @@ margin-top: 2rem; flex-direction: row; flex-wrap: wrap; + // &::after{ // content: url("../images/pictos/noun_Arrow_3771902.svg"); diff --git a/web/themes/custom/eql/scss/pages/_faq.scss b/web/themes/custom/eql/scss/pages/_faq.scss index ebffdb8..08446ad 100644 --- a/web/themes/custom/eql/scss/pages/_faq.scss +++ b/web/themes/custom/eql/scss/pages/_faq.scss @@ -38,10 +38,15 @@ // bloc bleu déposer une question .block-block-content.block-block-content10aba627-5586-4529-b44e-c0b4551a4398{ + ///////////////// à activer le 19 février ///////////////// + // display: none; + ////////////////////////////////// grid-column: 5; grid-row: 1 /span 2; height: fit-content; + ///////////////// à désactiver le 19 février ///////////////// display: flex; + ////////////////////////////////// flex-direction: column; max-width: fit-content; margin-left: 2rem; diff --git a/web/themes/custom/eql/scss/pages/_home.scss b/web/themes/custom/eql/scss/pages/_home.scss index 220a190..cd63f3b 100644 --- a/web/themes/custom/eql/scss/pages/_home.scss +++ b/web/themes/custom/eql/scss/pages/_home.scss @@ -39,7 +39,9 @@ grid-template-columns: 1fr repeat(4, 2fr) 1fr; grid-template-rows: repeat(4, auto); .field--name-field-images{ - // display: none; + ///////////////// à activer le 19 février ///////////////// + // display: none; + ////////////////////////////////// grid-column: 4 / span 6; grid-row: 2; .field__item{ @@ -58,7 +60,7 @@ } .field--name-field-accroche{ - grid-column: 2 /span 3; + grid-column: 2 /span 2; grid-row: 2 / span 2; font-size: 5rem; font-weight: 900; @@ -121,7 +123,12 @@ } } .links.inline{ + ///////////////// à désactiver le 19 février ///////////////// grid-column: 2; + ////////////////////////////////// + ///////////////// à activer le 19 février ///////////////// + // grid-column: 5; + ////////////////////////////////// grid-row: 4; max-width: 70%; min-width: fit-content; @@ -165,6 +172,9 @@ // bouton déposer candidature .block-block-content9448ca2a-90e3-488b-89cf-8ec6a986a9ca{ + ///////////////// à activer le 19 février ///////////////// + // display: none; + ////////////////////////////////// grid-area: presentation; grid-column: 3 /span 4; grid-row: 4; @@ -219,6 +229,9 @@ // bouton foire aux questions .block-block-content1bb9024b-d95f-4137-894c-362abf10a483{ + ///////////////// à activer le 19 février ///////////////// + // display: none; + ////////////////////////////////// grid-area: presentation; grid-column: 5 ; grid-row: 4; @@ -280,10 +293,15 @@ // date limite de candidature .block-block-content7db64d87-3e22-4fbd-9c11-2b95f5bef695{ + ///////////////// à activer le 19 février ///////////////// + // display: none; + ////////////////////////////////// grid-column: 5; grid-row: 1; height: fit-content; + ///////////////// à désactiver le 19 février ///////////////// display: flex; + ////////////////////////////////// justify-self: flex-end; width: 50%; margin-top: 3rem;