From 36be6d15ca582d87b1ccd54d421b2d21a328a859 Mon Sep 17 00:00:00 2001 From: peter_rabbit <pierrejarriges@gmail.com> Date: Fri, 19 Feb 2021 12:15:18 +0100 Subject: [PATCH] removed software page link - not ready yet --- public/education/education.js | 21 +++++----- public/games/games.js | 17 ++++---- public/main.js | 31 +++++++------- .../software-development.js | 17 ++++---- public/style/style.css | 40 +++++++++---------- src/homepage.js | 14 +++---- src/homepage.scss | 8 ++-- src/style.scss | 5 --- src/template/components/navbar.js | 17 ++++---- 9 files changed, 85 insertions(+), 85 deletions(-) diff --git a/public/education/education.js b/public/education/education.js index 1bca2ed..4fe9f16 100644 --- a/public/education/education.js +++ b/public/education/education.js @@ -469,7 +469,7 @@ class GameStudioClub { tag: "td", contents: "(4 séances)", }, - { tag: "td", contents: "60€" }, + { tag: "td", contents: "<b><blue>60€</blue></b>" }, ], }, { @@ -484,7 +484,7 @@ class GameStudioClub { tag: "td", contents: "(12 séances)", }, - { tag: "td", contents: "160€" }, + { tag: "td", contents: "<b><blue>160€</blue></b>" }, ], }, ], @@ -793,14 +793,15 @@ const { images_url } = require("../../../constants"); const NAV_MENU_ITEMS = [ ["/games/", "Jeux"], - [ - "/software-development/", - "Software", - [ - ["/software-development/#projects", "Projets"], - ["/software-development/#service", "Prestation de services"], - ], - ], + // À murir.. + // [ + // "/software-development/", + // "Software", + // [ + // ["/software-development/#projects", "Projets"], + // ["/software-development/#service", "Prestation de services"], + // ], + // ], [ "/education/", "Pédagogie", diff --git a/public/games/games.js b/public/games/games.js index ef1c0d9..d544e71 100644 --- a/public/games/games.js +++ b/public/games/games.js @@ -539,14 +539,15 @@ const { images_url } = require("../../../constants"); const NAV_MENU_ITEMS = [ ["/games/", "Jeux"], - [ - "/software-development/", - "Software", - [ - ["/software-development/#projects", "Projets"], - ["/software-development/#service", "Prestation de services"], - ], - ], + // À murir.. + // [ + // "/software-development/", + // "Software", + // [ + // ["/software-development/#projects", "Projets"], + // ["/software-development/#service", "Prestation de services"], + // ], + // ], [ "/education/", "Pédagogie", diff --git a/public/main.js b/public/main.js index 5debd47..9ecb0a2 100644 --- a/public/main.js +++ b/public/main.js @@ -405,7 +405,7 @@ class HomePage extends WebPage { }, { tag: "section", - class: "page-contents-center grid-3", + class: "page-contents-center poles", contents: [ { title: "Jeux", @@ -414,12 +414,12 @@ class HomePage extends WebPage { description: "Toutes nos créations vidéoludiques, jeux web et jeux PC, projets en cours, c'est par ici que ça se passe.", }, - { - title: "Software", - img: "meca_proc.svg", - href: "/software-development/", - description: `Développement web, moteur de jeux, outillage logiciel, retrouvez nos projets en détail sur cette page.`, - }, + // { + // title: "Software", + // img: "meca_proc.svg", + // href: "/software-development/", + // description: `Développement web, moteur de jeux, outillage logiciel, retrouvez nos projets en détail sur cette page.`, + // }, { title: "Pédagogie", img: "brain.svg", @@ -669,14 +669,15 @@ const { images_url } = require("../../../constants"); const NAV_MENU_ITEMS = [ ["/games/", "Jeux"], - [ - "/software-development/", - "Software", - [ - ["/software-development/#projects", "Projets"], - ["/software-development/#service", "Prestation de services"], - ], - ], + // À murir.. + // [ + // "/software-development/", + // "Software", + // [ + // ["/software-development/#projects", "Projets"], + // ["/software-development/#service", "Prestation de services"], + // ], + // ], [ "/education/", "Pédagogie", diff --git a/public/software-development/software-development.js b/public/software-development/software-development.js index 0c1344b..2659d17 100644 --- a/public/software-development/software-development.js +++ b/public/software-development/software-development.js @@ -700,14 +700,15 @@ const { images_url } = require("../../../constants"); const NAV_MENU_ITEMS = [ ["/games/", "Jeux"], - [ - "/software-development/", - "Software", - [ - ["/software-development/#projects", "Projets"], - ["/software-development/#service", "Prestation de services"], - ], - ], + // À murir.. + // [ + // "/software-development/", + // "Software", + // [ + // ["/software-development/#projects", "Projets"], + // ["/software-development/#service", "Prestation de services"], + // ], + // ], [ "/education/", "Pédagogie", diff --git a/public/style/style.css b/public/style/style.css index fa35664..2108052 100644 --- a/public/style/style.css +++ b/public/style/style.css @@ -22,10 +22,6 @@ body a:hover { body blue { color: #4baabb; } -body .grid-3 { - display: grid; - grid-template-columns: 1fr 1fr 1fr; -} body .bg-blue { background-color: #4baabb; color: white; @@ -566,17 +562,19 @@ main #page-container #home-page .articles-displayer article.article-placeholder grid-column: 1; } } -main #page-container #home-page .grid-3 { +main #page-container #home-page .poles { + display: grid; + grid-template-columns: 1fr 1fr; gap: 30px; } -main #page-container #home-page .grid-3 .theme-card { +main #page-container #home-page .poles .theme-card { display: flex; flex-direction: column; width: 100%; cursor: pointer; transition: transform 0.3s; } -main #page-container #home-page .grid-3 .theme-card .card-img { +main #page-container #home-page .poles .theme-card .card-img { width: 100%; height: 240px; overflow: hidden; @@ -588,13 +586,13 @@ main #page-container #home-page .grid-3 .theme-card .card-img { background-color: black; position: relative; } -main #page-container #home-page .grid-3 .theme-card .card-img img { +main #page-container #home-page .poles .theme-card .card-img img { position: absolute; max-width: 100%; height: 100%; padding: 10px; } -main #page-container #home-page .grid-3 .theme-card .card-title h2 { +main #page-container #home-page .poles .theme-card .card-title h2 { margin: 0; text-align: center; padding: 10px 20px; @@ -602,17 +600,17 @@ main #page-container #home-page .grid-3 .theme-card .card-title h2 { display: block; background-color: white; } -main #page-container #home-page .grid-3 .theme-card .card-description { +main #page-container #home-page .poles .theme-card .card-description { background-image: url("/assets/images/wallpaper_binary.png"); flex: 1; padding: 30px 20px; } -main #page-container #home-page .grid-3 .theme-card .card-description p { +main #page-container #home-page .poles .theme-card .card-description p { margin: 0; color: #72e3f0; text-align: center; } -main #page-container #home-page .grid-3 .theme-card:hover { +main #page-container #home-page .poles .theme-card:hover { transform: scale(1.03); } main #page-container #home-page .kuadrado-values { @@ -650,34 +648,34 @@ main #page-container #home-page .kuadrado-values ul.values-list li p { text-align: justify; } @media screen and (max-width: 900px) { - main #page-container #home-page .grid-3 { + main #page-container #home-page .poles { grid-template-columns: 1fr; gap: 40px; } - main #page-container #home-page .grid-3 .theme-card { + main #page-container #home-page .poles .theme-card { transition: transform 0.3s; } - main #page-container #home-page .grid-3 .theme-card .card-img { + main #page-container #home-page .poles .theme-card .card-img { height: 300px; } - main #page-container #home-page .grid-3 .theme-card .card-img img { + main #page-container #home-page .poles .theme-card .card-img img { min-width: unset; height: 100%; } - main #page-container #home-page .grid-3 .theme-card .card-title h2 { + main #page-container #home-page .poles .theme-card .card-title h2 { padding: 5px 20px; } - main #page-container #home-page .grid-3 .theme-card .card-description { + main #page-container #home-page .poles .theme-card .card-description { background-image: url("/assets/images/wallpaper_binary.png"); flex: 1; padding: 20px 30px; } - main #page-container #home-page .grid-3 .theme-card .card-description p { + main #page-container #home-page .poles .theme-card .card-description p { margin: 0; color: #72e3f0; text-align: center; } - main #page-container #home-page .grid-3 .theme-card:hover { + main #page-container #home-page .poles .theme-card:hover { transform: none; } main #page-container #home-page .kuadrado-values ul.values-list { @@ -685,7 +683,7 @@ main #page-container #home-page .kuadrado-values ul.values-list li p { } } @media screen and (max-width: 1300px) { - main #page-container #home-page .grid-3 { + main #page-container #home-page .poles { padding: 0 20px; } main #page-container #home-page .articles-displayer { diff --git a/src/homepage.js b/src/homepage.js index 351b0ef..cef2ff9 100644 --- a/src/homepage.js +++ b/src/homepage.js @@ -57,7 +57,7 @@ class HomePage extends WebPage { }, { tag: "section", - class: "page-contents-center grid-3", + class: "page-contents-center poles", contents: [ { title: "Jeux", @@ -66,12 +66,12 @@ class HomePage extends WebPage { description: "Toutes nos créations vidéoludiques, jeux web et jeux PC, projets en cours, c'est par ici que ça se passe.", }, - { - title: "Software", - img: "meca_proc.svg", - href: "/software-development/", - description: `Développement web, moteur de jeux, outillage logiciel, retrouvez nos projets en détail sur cette page.`, - }, + // { + // title: "Software", + // img: "meca_proc.svg", + // href: "/software-development/", + // description: `Développement web, moteur de jeux, outillage logiciel, retrouvez nos projets en détail sur cette page.`, + // }, { title: "Pédagogie", img: "brain.svg", diff --git a/src/homepage.scss b/src/homepage.scss index df0f554..a76fa5c 100644 --- a/src/homepage.scss +++ b/src/homepage.scss @@ -196,7 +196,9 @@ } } - .grid-3 { + .poles { + display: grid; + grid-template-columns: 1fr 1fr; gap: 30px; .theme-card { display: flex; @@ -277,7 +279,7 @@ } @media screen and (max-width: $screen_l) { - .grid-3 { + .poles { grid-template-columns: 1fr; gap: 40px; .theme-card { @@ -317,7 +319,7 @@ } } @media screen and (max-width: $page_contents_center_width) { - .grid-3 { + .poles { padding: 0 20px; } .articles-displayer { diff --git a/src/style.scss b/src/style.scss index 4c97d06..cfb15a1 100644 --- a/src/style.scss +++ b/src/style.scss @@ -25,11 +25,6 @@ body { color: $blue_2; } - .grid-3 { - display: grid; - grid-template-columns: 1fr 1fr 1fr; - } - .bg-blue { background-color: $blue_2; color: white; diff --git a/src/template/components/navbar.js b/src/template/components/navbar.js index 44d846d..13f9e1c 100644 --- a/src/template/components/navbar.js +++ b/src/template/components/navbar.js @@ -4,14 +4,15 @@ const { images_url } = require("../../../constants"); const NAV_MENU_ITEMS = [ ["/games/", "Jeux"], - [ - "/software-development/", - "Software", - [ - ["/software-development/#projects", "Projets"], - ["/software-development/#service", "Prestation de services"], - ], - ], + // À murir.. + // [ + // "/software-development/", + // "Software", + // [ + // ["/software-development/#projects", "Projets"], + // ["/software-development/#service", "Prestation de services"], + // ], + // ], [ "/education/", "Pédagogie", -- GitLab