From 8eb70013474f46073e593ed0d399a5511b429d60 Mon Sep 17 00:00:00 2001 From: utarwyn Date: Fri, 3 May 2024 00:38:09 +0200 Subject: [PATCH] Standardize design of sections --- src/assets/main.css | 4 +- src/assets/variables.css | 4 + src/components/global/Hero.vue | 82 ++++++++ src/components/global/Title.vue | 187 ------------------- src/views/Accueil/Home.vue | 104 ++++++----- src/views/Accueil/scss/style.scss | 108 +++++------ src/views/Page/contributeur/contributeur.vue | 46 ++--- src/views/Page/entreprise/entreprise.vue | 58 +++--- src/views/Page/team/Team.vue | 3 +- 9 files changed, 252 insertions(+), 344 deletions(-) create mode 100644 src/components/global/Hero.vue delete mode 100644 src/components/global/Title.vue diff --git a/src/assets/main.css b/src/assets/main.css index a736e7f..5320bfb 100755 --- a/src/assets/main.css +++ b/src/assets/main.css @@ -33,7 +33,7 @@ p { font-weight: 900; text-align: center; margin: 0 1rem; - max-width: 780px; + max-width: 1200px; color: var(--color-primary); } @@ -42,7 +42,7 @@ p { font-weight: 900; text-align: center; margin: 0 1rem; - max-width: 780px; + max-width: 1050px; color: var(--color-secondary); } diff --git a/src/assets/variables.css b/src/assets/variables.css index 6a82942..ac7153f 100644 --- a/src/assets/variables.css +++ b/src/assets/variables.css @@ -5,7 +5,11 @@ --color-primary-lighter: hsl(220, 43%, 65%); --color-primary-focus-ring: hsl(220, 43%, 37%, 20%); --color-secondary: #57c18b; + --color-on-secondary: #ffffff; --color-tertiary: #f05067; + --color-on-tertiary: #ffffff; + --color-quaternary: #5374c9; + --color-on-quaternary: #ffffff; --color-on-surface: #022826; --color-card-background: white; diff --git a/src/components/global/Hero.vue b/src/components/global/Hero.vue new file mode 100644 index 0000000..cd679b5 --- /dev/null +++ b/src/components/global/Hero.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/src/components/global/Title.vue b/src/components/global/Title.vue deleted file mode 100644 index 34f86db..0000000 --- a/src/components/global/Title.vue +++ /dev/null @@ -1,187 +0,0 @@ - - - - - diff --git a/src/views/Accueil/Home.vue b/src/views/Accueil/Home.vue index 4ce3624..567a9ad 100644 --- a/src/views/Accueil/Home.vue +++ b/src/views/Accueil/Home.vue @@ -1,55 +1,73 @@ + + +
+ +

+ Les membres contributeurs du collectif conceptualisent et implémentent des règles permettant de repérer + les défauts de qualité du code source d’un projet pouvant avoir un impact écologique négatif. + Le tout est mis à disposition en open source. +

+
+ + - + + + + +
+ + +
+
+ + + diff --git a/src/views/Accueil/scss/style.scss b/src/views/Accueil/scss/style.scss index a9606ff..bc0a457 100644 --- a/src/views/Accueil/scss/style.scss +++ b/src/views/Accueil/scss/style.scss @@ -1,77 +1,81 @@ .block-button-section-1 { - width: 100%; - min-height: 130px; - display: flex; - align-items: center; - justify-content: center; - gap: 4rem; + width: 100%; + min-height: 130px; + display: flex; + align-items: center; + justify-content: center; + gap: 4rem; + + &.green { + background-color: var(--color-secondary); + } } .after-block-section-2 { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - padding: 0 0 50px 0; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + padding: 0 0 50px 0; } -.container-after>p { - width: 600px; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - text-align: right; - padding: 0 97px 0 0; +.container-after > p { + width: 600px; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + text-align: right; + padding: 0 97px 0 0; } .container-after { - display: flex; - flex-direction: row; - align-items: center; - justify-content: center; - flex-wrap: wrap; + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + flex-wrap: wrap; } -.container-after:nth-child(2)>p { - text-align: left; - padding: 0 0 0 97px; +.container-after:nth-child(2) > p { + text-align: left; + padding: 0 0 0 97px; } @media screen and (max-width: 768px) { - .container-after>p { - text-align: center; - padding: 50px 100px 0 100px; - width: 100%; - font-size: 15px; - } + .container-after > p { + text-align: center; + padding: 50px 100px 0 100px; + width: 100%; + font-size: 15px; + } - .container-after:nth-child(2)>p { - text-align: center; - padding: 0px 100px 0 100px; - } + .container-after:nth-child(2) > p { + text-align: center; + padding: 0 100px 0 100px; + } } @media screen and (max-width: 425px) { - .container-after>p { - text-align: center; - padding: 50px 25px 0 25px; - width: 100%; - font-size: 15px; - } + .container-after > p { + text-align: center; + padding: 50px 25px 0 25px; + width: 100%; + font-size: 15px; + } - .container-after:nth-child(2)>p { - text-align: center; - padding: 0px 25px 0 25px; - } + .container-after:nth-child(2) > p { + text-align: center; + padding: 0 25px 0 25px; + } } @media screen and (max-width: 920px) { - .block-button-section-1 { - flex-direction: column; - gap: 1.2rem; - padding: 1.5rem; - } + .block-button-section-1 { + flex-direction: column; + gap: 1.2rem; + padding: 1.5rem; + } } diff --git a/src/views/Page/contributeur/contributeur.vue b/src/views/Page/contributeur/contributeur.vue index ad83cd9..69ff711 100644 --- a/src/views/Page/contributeur/contributeur.vue +++ b/src/views/Page/contributeur/contributeur.vue @@ -1,33 +1,33 @@ diff --git a/src/views/Page/entreprise/entreprise.vue b/src/views/Page/entreprise/entreprise.vue index 62ae0c9..e583a20 100644 --- a/src/views/Page/entreprise/entreprise.vue +++ b/src/views/Page/entreprise/entreprise.vue @@ -2,44 +2,30 @@ import CaseStudyForm from '@/components/company/CaseStudyForm.vue'; import RuleCreationProcess from '@/components/company/RuleCreationProcess.vue'; import AppButton from '@/components/global/Button.vue'; -import TitleBox from '@/components/global/Title.vue'; - -const scroll = (elementId: string) => { - const element = document.getElementById(elementId); - if (element) { - element.scrollIntoView({ behavior: 'smooth' }); - } -} +import AppHero from '@/components/global/Hero.vue'; +import AppSection from '@/components/Shared/AppSection.vue'; + + + - + + + + + + diff --git a/src/views/Page/team/Team.vue b/src/views/Page/team/Team.vue index 525c2e7..b388e9f 100644 --- a/src/views/Page/team/Team.vue +++ b/src/views/Page/team/Team.vue @@ -13,6 +13,7 @@ import { RouterLink, RouterView } from 'vue-router';