diff --git a/public/education/education.js b/public/education/education.js index e49f473b130bd1e045bfa5f736c2cff05aadc4df..23a74cb9e1f69abb7b92a640136991d524187d02 100644 --- a/public/education/education.js +++ b/public/education/education.js @@ -518,8 +518,24 @@ class Popularization { { tag: "div", class: "full-row", - contents: - "<b>Nous proposons des animations d'une journée de vulgarisation autour de l'informatique sur les thèmes suivants</b>", + contents: [ + { + tag: "h3", + class: "big", + contents: + "<blue>Démystifier</blue> l'informatique", + }, + { + tag: "strong", + contents: + "Pour <blue>découvrir et échanger</blue> autour des <blue>outils numériques</blue> que nous utilisons tous les jours !", + }, + { + tag: "p", + contents: + "<em>Des animations d'un journée ouvertes à tous organisées en partenariat avec les structures demandeuses</em>", + }, + ] }, { tag: "div", @@ -701,8 +717,6 @@ module.exports = function runPage(PageComponent) { const { images_url } = require("../../../constants"); -const HOME_LOGO = "logo_kuadrado.svg"; -const HOME_LOGO_TXT = "logo_kuadrado_txt.svg"; const NAV_MENU_ITEMS = [ ["/games/", "Jeux"], ["/software-development/", "Software"], @@ -747,8 +761,12 @@ class NavBar { tag: "a", href: "/", contents: [ - { tag: "img", src: `${images_url}/${HOME_LOGO}` }, - { tag: "img", class: "logo-text", src: `${images_url}/${HOME_LOGO_TXT}` }, + { tag: "img", src: `${images_url}/logo_kuadrado.svg` }, + { + tag: "img", + class: "logo-text", + src: `${images_url}/logo_kuadrado_txt.svg`, + }, ], }, ], @@ -803,6 +821,7 @@ module.exports = NavBar; },{"../../../constants":2}],10:[function(require,module,exports){ "use strict"; +const { images_url } = require("../../constants"); const NavBar = require("./components/navbar"); class Template { @@ -825,6 +844,25 @@ class Template { { tag: "footer", contents: [ + { + tag: "div", + class: "logo", + contents: [ + { + tag: "img", + src: `${images_url}/logo_kuadrado.svg`, + }, + { + tag: "img", + class:"text-logo", + src: `${images_url}/logo_kuadrado_txt.svg`, + }, + ], + }, + { + tag:"span", + contents: "Toutes les images du site ont été réalisées par nos soins et peuvent être réutilisées pour un usage personnel." + }, { tag: "a", href: "mailto:contact@kuadrado-software.fr", @@ -839,4 +877,4 @@ class Template { module.exports = Template; -},{"./components/navbar":9}]},{},[7]); +},{"../../constants":2,"./components/navbar":9}]},{},[7]); diff --git a/public/games/games.js b/public/games/games.js index bc6e8ed7ad734fe8c40def971c57aff8e15033bd..3b0f3b482e5be47530f3bfb529c7b782d6200bc2 100644 --- a/public/games/games.js +++ b/public/games/games.js @@ -154,8 +154,6 @@ module.exports = function runPage(PageComponent) { const { images_url } = require("../../../constants"); -const HOME_LOGO = "logo_kuadrado.svg"; -const HOME_LOGO_TXT = "logo_kuadrado_txt.svg"; const NAV_MENU_ITEMS = [ ["/games/", "Jeux"], ["/software-development/", "Software"], @@ -200,8 +198,12 @@ class NavBar { tag: "a", href: "/", contents: [ - { tag: "img", src: `${images_url}/${HOME_LOGO}` }, - { tag: "img", class: "logo-text", src: `${images_url}/${HOME_LOGO_TXT}` }, + { tag: "img", src: `${images_url}/logo_kuadrado.svg` }, + { + tag: "img", + class: "logo-text", + src: `${images_url}/logo_kuadrado_txt.svg`, + }, ], }, ], @@ -256,6 +258,7 @@ module.exports = NavBar; },{"../../../constants":2}],8:[function(require,module,exports){ "use strict"; +const { images_url } = require("../../constants"); const NavBar = require("./components/navbar"); class Template { @@ -278,6 +281,25 @@ class Template { { tag: "footer", contents: [ + { + tag: "div", + class: "logo", + contents: [ + { + tag: "img", + src: `${images_url}/logo_kuadrado.svg`, + }, + { + tag: "img", + class:"text-logo", + src: `${images_url}/logo_kuadrado_txt.svg`, + }, + ], + }, + { + tag:"span", + contents: "Toutes les images du site ont été réalisées par nos soins et peuvent être réutilisées pour un usage personnel." + }, { tag: "a", href: "mailto:contact@kuadrado-software.fr", @@ -292,4 +314,4 @@ class Template { module.exports = Template; -},{"./components/navbar":7}]},{},[5]); +},{"../../constants":2,"./components/navbar":7}]},{},[5]); diff --git a/public/main.js b/public/main.js index a9e363cb5c6be8d18b2d39239864d8dcbc16944c..6d74ee1fd25196e0fab0a5cc483549767c26de1c 100644 --- a/public/main.js +++ b/public/main.js @@ -154,8 +154,6 @@ module.exports = function runPage(PageComponent) { const { images_url } = require("../../../constants"); -const HOME_LOGO = "logo_kuadrado.svg"; -const HOME_LOGO_TXT = "logo_kuadrado_txt.svg"; const NAV_MENU_ITEMS = [ ["/games/", "Jeux"], ["/software-development/", "Software"], @@ -200,8 +198,12 @@ class NavBar { tag: "a", href: "/", contents: [ - { tag: "img", src: `${images_url}/${HOME_LOGO}` }, - { tag: "img", class: "logo-text", src: `${images_url}/${HOME_LOGO_TXT}` }, + { tag: "img", src: `${images_url}/logo_kuadrado.svg` }, + { + tag: "img", + class: "logo-text", + src: `${images_url}/logo_kuadrado_txt.svg`, + }, ], }, ], @@ -256,6 +258,7 @@ module.exports = NavBar; },{"../../../constants":2}],8:[function(require,module,exports){ "use strict"; +const { images_url } = require("../../constants"); const NavBar = require("./components/navbar"); class Template { @@ -278,6 +281,25 @@ class Template { { tag: "footer", contents: [ + { + tag: "div", + class: "logo", + contents: [ + { + tag: "img", + src: `${images_url}/logo_kuadrado.svg`, + }, + { + tag: "img", + class:"text-logo", + src: `${images_url}/logo_kuadrado_txt.svg`, + }, + ], + }, + { + tag:"span", + contents: "Toutes les images du site ont été réalisées par nos soins et peuvent être réutilisées pour un usage personnel." + }, { tag: "a", href: "mailto:contact@kuadrado-software.fr", @@ -292,4 +314,4 @@ class Template { module.exports = Template; -},{"./components/navbar":7}]},{},[5]); +},{"../../constants":2,"./components/navbar":7}]},{},[5]); diff --git a/public/software-development/software-development.js b/public/software-development/software-development.js index 328afdd04fd7f670e80d80bf028207998c7de726..ee207c5d599bb346460c0ed9a635105c306cad66 100644 --- a/public/software-development/software-development.js +++ b/public/software-development/software-development.js @@ -154,8 +154,6 @@ module.exports = function runPage(PageComponent) { const { images_url } = require("../../../constants"); -const HOME_LOGO = "logo_kuadrado.svg"; -const HOME_LOGO_TXT = "logo_kuadrado_txt.svg"; const NAV_MENU_ITEMS = [ ["/games/", "Jeux"], ["/software-development/", "Software"], @@ -200,8 +198,12 @@ class NavBar { tag: "a", href: "/", contents: [ - { tag: "img", src: `${images_url}/${HOME_LOGO}` }, - { tag: "img", class: "logo-text", src: `${images_url}/${HOME_LOGO_TXT}` }, + { tag: "img", src: `${images_url}/logo_kuadrado.svg` }, + { + tag: "img", + class: "logo-text", + src: `${images_url}/logo_kuadrado_txt.svg`, + }, ], }, ], @@ -256,6 +258,7 @@ module.exports = NavBar; },{"../../../constants":2}],8:[function(require,module,exports){ "use strict"; +const { images_url } = require("../../constants"); const NavBar = require("./components/navbar"); class Template { @@ -278,6 +281,25 @@ class Template { { tag: "footer", contents: [ + { + tag: "div", + class: "logo", + contents: [ + { + tag: "img", + src: `${images_url}/logo_kuadrado.svg`, + }, + { + tag: "img", + class:"text-logo", + src: `${images_url}/logo_kuadrado_txt.svg`, + }, + ], + }, + { + tag:"span", + contents: "Toutes les images du site ont été réalisées par nos soins et peuvent être réutilisées pour un usage personnel." + }, { tag: "a", href: "mailto:contact@kuadrado-software.fr", @@ -292,4 +314,4 @@ class Template { module.exports = Template; -},{"./components/navbar":7}]},{},[5]); +},{"../../constants":2,"./components/navbar":7}]},{},[5]); diff --git a/public/style/pages/education/education.css b/public/style/pages/education/education.css index f4a31b939cf68793d093d3d3b2725b9911b55fea..1b7f865870606943b3aa18665fe3b00a1abbea5a 100644 --- a/public/style/pages/education/education.css +++ b/public/style/pages/education/education.css @@ -1,9 +1,9 @@ /* Error: Undefined variable. * , - * 53 | background-color: $light_0; - * | ^^^^^^^^ + * 15 | color: $light_2; + * | ^^^^^^^^ * ' - * src/pages/education/education.scss 53:31 root stylesheet */ + * src/pages/education/education.scss 15:16 root stylesheet */ body::before { font-family: "Source Code Pro", "SF Mono", Monaco, Inconsolata, "Fira Mono", @@ -13,5 +13,5 @@ body::before { padding: 1em; margin-bottom: 1em; border-bottom: 2px solid black; - content: "Error: Undefined variable.\a \2577 \a 53 \2502 background-color: $light_0;\a \2502 ^^^^^^^^\a \2575 \a src/pages/education/education.scss 53:31 root stylesheet"; + content: "Error: Undefined variable.\a \2577 \a 15 \2502 color: $light_2;\a \2502 ^^^^^^^^\a \2575 \a src/pages/education/education.scss 15:16 root stylesheet"; } diff --git a/public/style/style.css b/public/style/style.css index 5473c89f81565c29b12d5713a986a4703630e6dc..c2e6491406172f7464a4f76630c229a200ab8327 100644 --- a/public/style/style.css +++ b/public/style/style.css @@ -178,6 +178,7 @@ main #page-container #education-page .edu-philo { margin: 15px 40px 15px 100px; max-width: 800px; font-style: italic; + color: #aabbc8; } main #page-container #education-page .title-banner { display: flex; @@ -228,6 +229,7 @@ main #page-container #education-page .section-contents .practical-infos .info-it } main #page-container #education-page .section-contents .practical-infos .info-item strong { margin-bottom: 10px; + white-space: nowrap; } main #page-container #education-page .section-contents .practical-infos .info-item span, main #page-container #education-page .section-contents .practical-infos .info-item a { @@ -250,11 +252,12 @@ main #page-container #education-page .section-contents .list-wrapper ul.learning flex-direction: column; } main #page-container #education-page .section-contents .list-wrapper ul.learning-themes li.learning-theme .title { - color: #3c4144; + color: #6b7880; display: block; position: absolute; - background-color: #fff9; - padding: 5px 25px; + background-color: #fffa; + padding: 3px 25px; + width: 100%; } main #page-container #education-page .section-contents .list-wrapper ul.learning-themes li.learning-theme img { width: 100%; @@ -438,8 +441,28 @@ main #page-container #education-page .section-contents .infos-inscriptions .pric } main footer { width: 100%; - background-color: #fff1; + background-image: url("/assets/images/wallpaper_binary.png"); padding: 20px; + display: flex; + flex-direction: column; + align-items: center; + gap: 20px; + font-size: 12px; +} +main footer span { + color: #96a5ae; +} +main footer .logo { + display: flex; + justify-content: center; + align-items: center; + gap: 10px; +} +main footer .logo img { + width: 35px; +} +main footer .logo img.text-logo { + width: 100px; } /*# sourceMappingURL=style.css.map */ diff --git a/src/pages/education/components/popularization.js b/src/pages/education/components/popularization.js index 0733f0a753ba878716e45188c0af450588edd2a8..64b954c5b04a77bdc50b33addd1ce36c56ac786f 100644 --- a/src/pages/education/components/popularization.js +++ b/src/pages/education/components/popularization.js @@ -60,8 +60,24 @@ class Popularization { { tag: "div", class: "full-row", - contents: - "<b>Nous proposons des animations d'une journée de vulgarisation autour de l'informatique sur les thèmes suivants</b>", + contents: [ + { + tag: "h3", + class: "big", + contents: + "<blue>Démystifier</blue> l'informatique", + }, + { + tag: "strong", + contents: + "Pour <blue>découvrir et échanger</blue> autour des <blue>outils numériques</blue> que nous utilisons tous les jours !", + }, + { + tag: "p", + contents: + "<em>Des animations d'un journée ouvertes à tous organisées en partenariat avec les structures demandeuses</em>", + }, + ] }, { tag: "div", diff --git a/src/pages/education/education.scss b/src/pages/education/education.scss index 163dea9d2b3d7da994ada31d811acc2137f23472..1d063d7e3bf70918701fa4b1f0c100a28dc3e4d6 100644 --- a/src/pages/education/education.scss +++ b/src/pages/education/education.scss @@ -12,6 +12,7 @@ margin: 15px 40px 15px 100px; max-width: 800px; font-style: italic; + color: $light_2; } .title-banner { display: flex; @@ -59,6 +60,7 @@ padding: 20px; strong { margin-bottom: 10px; + white-space: nowrap; } span, a { @@ -80,11 +82,12 @@ display: flex; flex-direction: column; .title { - color: $dark_2; + color: $medium_grey; display: block; position: absolute; - background-color: #fff9; - padding: 5px 25px; + background-color: #fffa; + padding: 3px 25px; + width: 100%; } img { width: 100%; diff --git a/src/style.scss b/src/style.scss index 5a7bf25b2a505dba22734d7a4898b1cce2fad5de..c7fd41f8f6a9cbcb1db13ec6996234856547722d 100644 --- a/src/style.scss +++ b/src/style.scss @@ -186,7 +186,27 @@ main { } footer { width: 100%; - background-color: #fff1; + background-image: url("/assets/images/wallpaper_binary.png"); padding: 20px; + display: flex; + flex-direction: column; + align-items: center; + gap: 20px; + font-size: 12px; + span { + color: $light_1; + } + .logo { + display: flex; + justify-content: center; + align-items: center; + gap: 10px; + img { + width: 35px; + &.text-logo { + width: 100px; + } + } + } } } diff --git a/src/template/components/navbar.js b/src/template/components/navbar.js index c1c1e035b76a8f7833faa87e41d8ffd80d876bda..e931afd721eeae88fc58c8a9157877e32d11128c 100644 --- a/src/template/components/navbar.js +++ b/src/template/components/navbar.js @@ -2,8 +2,6 @@ const { images_url } = require("../../../constants"); -const HOME_LOGO = "logo_kuadrado.svg"; -const HOME_LOGO_TXT = "logo_kuadrado_txt.svg"; const NAV_MENU_ITEMS = [ ["/games/", "Jeux"], ["/software-development/", "Software"], @@ -48,8 +46,12 @@ class NavBar { tag: "a", href: "/", contents: [ - { tag: "img", src: `${images_url}/${HOME_LOGO}` }, - { tag: "img", class: "logo-text", src: `${images_url}/${HOME_LOGO_TXT}` }, + { tag: "img", src: `${images_url}/logo_kuadrado.svg` }, + { + tag: "img", + class: "logo-text", + src: `${images_url}/logo_kuadrado_txt.svg`, + }, ], }, ], diff --git a/src/template/template.js b/src/template/template.js index 7939dca69e488fc2f1e94fc125e2bf4b465e867e..74a5dbcffb09cf1b8cd32deac39ebd5cf8e78d37 100644 --- a/src/template/template.js +++ b/src/template/template.js @@ -1,5 +1,6 @@ "use strict"; +const { images_url } = require("../../constants"); const NavBar = require("./components/navbar"); class Template { @@ -22,6 +23,25 @@ class Template { { tag: "footer", contents: [ + { + tag: "div", + class: "logo", + contents: [ + { + tag: "img", + src: `${images_url}/logo_kuadrado.svg`, + }, + { + tag: "img", + class:"text-logo", + src: `${images_url}/logo_kuadrado_txt.svg`, + }, + ], + }, + { + tag:"span", + contents: "Toutes les images du site ont été réalisées par nos soins et peuvent être réutilisées pour un usage personnel." + }, { tag: "a", href: "mailto:contact@kuadrado-software.fr",