From 69e028292f9c5f1a8e8206ef4d265b282e99b9cc Mon Sep 17 00:00:00 2001 From: Tykayn Date: Tue, 15 Feb 2022 16:12:01 +0100 Subject: [PATCH] header width --- .../core/components/header/header.component.html | 9 --------- .../form/steps/step-five/step-five.component.scss | 2 ++ .../steps/step-seven/step-seven.component.html | 2 +- .../form/steps/step-six/step-six.component.html | 2 +- .../form/steps/step-six/step-six.component.scss | 3 +++ src/styles/dev-utilities/_debug.scss | 4 +++- src/styles/partials/_forms.scss | 4 ++-- src/styles/partials/global.scss | 14 ++++++++++---- src/styles/variables.scss | 2 ++ 9 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/app/core/components/header/header.component.html b/src/app/core/components/header/header.component.html index 9d8fab1e..ced931ab 100644 --- a/src/app/core/components/header/header.component.html +++ b/src/app/core/components/header/header.component.html @@ -14,15 +14,6 @@
- - - - - - - - -
diff --git a/src/app/features/administration/form/steps/step-five/step-five.component.scss b/src/app/features/administration/form/steps/step-five/step-five.component.scss index 272562a4..63180275 100644 --- a/src/app/features/administration/form/steps/step-five/step-five.component.scss +++ b/src/app/features/administration/form/steps/step-five/step-five.component.scss @@ -1,3 +1,5 @@ +@import '../../../../../../styles/variables'; + .advanced-config { margin-bottom: 2em; } diff --git a/src/app/features/administration/form/steps/step-seven/step-seven.component.html b/src/app/features/administration/form/steps/step-seven/step-seven.component.html index 0637cb64..e9135d71 100644 --- a/src/app/features/administration/form/steps/step-seven/step-seven.component.html +++ b/src/app/features/administration/form/steps/step-seven/step-seven.component.html @@ -5,7 +5,7 @@

{{ 'resume.title' | translate }}

-

+

{{ 'resume.description' | translate }}

diff --git a/src/app/features/administration/form/steps/step-six/step-six.component.html b/src/app/features/administration/form/steps/step-six/step-six.component.html index 5353b915..9202586d 100644 --- a/src/app/features/administration/form/steps/step-six/step-six.component.html +++ b/src/app/features/administration/form/steps/step-six/step-six.component.html @@ -15,7 +15,7 @@ {{ 'validation.required' | translate }} -

+

{{ 'owner.email_description' | translate }}

diff --git a/src/app/features/administration/form/steps/step-six/step-six.component.scss b/src/app/features/administration/form/steps/step-six/step-six.component.scss index e69de29b..5ec2402f 100644 --- a/src/app/features/administration/form/steps/step-six/step-six.component.scss +++ b/src/app/features/administration/form/steps/step-six/step-six.component.scss @@ -0,0 +1,3 @@ +.description { + font-size: 12px; +} diff --git a/src/styles/dev-utilities/_debug.scss b/src/styles/dev-utilities/_debug.scss index dea350a8..2c78e65b 100644 --- a/src/styles/dev-utilities/_debug.scss +++ b/src/styles/dev-utilities/_debug.scss @@ -16,7 +16,9 @@ label { color: $font_color; - font-wieght: 600; + font-weight: bold; + font-size: 14px; + line-height: 16px; &[for] { cursor: pointer; diff --git a/src/styles/partials/_forms.scss b/src/styles/partials/_forms.scss index 9d42e059..6f770bc6 100644 --- a/src/styles/partials/_forms.scss +++ b/src/styles/partials/_forms.scss @@ -335,12 +335,12 @@ label { font-family: $default_font; color: $font_color; font-weight: bold; - font-size: 0.85rem; + font-size: 14px; line-height: 1rem; margin-bottom: 0.5rem; display: block; - @extend .clickable; max-width: 100%; + @extend .clickable; } .striked-background { diff --git a/src/styles/partials/global.scss b/src/styles/partials/global.scss index c59aa792..d426ce04 100644 --- a/src/styles/partials/global.scss +++ b/src/styles/partials/global.scss @@ -16,7 +16,11 @@ body { form { margin: 0 !important; } - +.description { + font-size: 12px; + color: $font_color_light !important; + margin-bottom: 0.5rem; +} main { min-height: 60vh; } @@ -30,10 +34,13 @@ main { padding: 1em; } +.footer { + padding: 0; +} .main-footer { background: $primary-color; color: $white; - + padding-top: 2rem; .title { color: $white; } @@ -75,7 +82,6 @@ main { .contained-desktop, .stuff { display: block; - width: 100%; - max-width: $widescreen-width-main-column; + margin: 0 auto; } diff --git a/src/styles/variables.scss b/src/styles/variables.scss index b768139f..a1a74464 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -31,6 +31,7 @@ $d-blue30: #f6f5fd; // bleu 300 $d-rule: #e2e0fa; // bleu 100 $d-neutral: #b5b5c6; $d-border: #4e4c59; +$d-grey: #767486; $d-black: #383838; $d-alt: #a9607f; @@ -50,6 +51,7 @@ $primary: $d-primary; $secondary_color: $d-primary-intense; $bg-grey: $d-blue30; $font_color: $d-black; +$font_color_light: $d-grey; $logo_color: $d-primary; $logo_color_2: $d-primary-intense; $legend_color: $d-info-text;