From 3fa415f24c78b0fd991117943ec46e30054e5f33 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Tue, 15 Feb 2022 14:48:50 +0100 Subject: [PATCH] position header --- .../components/header/header.component.scss | 3 +- .../core/components/home/home.component.scss | 2 +- .../stepper/stepper.component.html | 82 +++++++++---------- .../stepper/stepper.component.scss | 6 +- .../language-selector.component.html | 1 - .../language-selector.component.scss | 2 +- src/styles/partials/_navigation.scss | 2 +- src/styles/partials/_responsive.scss | 5 -- src/styles/variables.scss | 4 +- 9 files changed, 47 insertions(+), 60 deletions(-) diff --git a/src/app/core/components/header/header.component.scss b/src/app/core/components/header/header.component.scss index 724975d3..8b4ef263 100644 --- a/src/app/core/components/header/header.component.scss +++ b/src/app/core/components/header/header.component.scss @@ -1,6 +1,7 @@ @import '../../../../styles/variables'; .big-header { - height: $home-nav-height; + height: $header-nav-height; + padding-top: 1rem; box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.05); position: fixed; top: 0; diff --git a/src/app/core/components/home/home.component.scss b/src/app/core/components/home/home.component.scss index 5cc042f4..a3f2c288 100644 --- a/src/app/core/components/home/home.component.scss +++ b/src/app/core/components/home/home.component.scss @@ -2,7 +2,7 @@ :host { .landing-box { - padding: 70px 1em 6em; + padding: 6em 0; color: $primary_color; min-height: 500px; .title { diff --git a/src/app/features/administration/stepper/stepper.component.html b/src/app/features/administration/stepper/stepper.component.html index 81b51027..ffeae92a 100644 --- a/src/app/features/administration/stepper/stepper.component.html +++ b/src/app/features/administration/stepper/stepper.component.html @@ -52,53 +52,47 @@
-
-
- - - -

- - - {{ 'creation.title' | translate }} - - + + + +

+ + + {{ 'creation.title' | translate }} + + -
- - {{ pollService.form.value.title }} - - - {{ 'nav.no_title' | translate }} - -
-
- {{ 'nav.step' | translate }} {{ step_current }} {{ 'nav.on' | translate }} {{ step_max }} -
-

-
-
- - - - +
+ + {{ pollService.form.value.title }} + + + {{ 'nav.no_title' | translate }}
+
+ {{ 'nav.step' | translate }} {{ step_current }} {{ 'nav.on' | translate }} {{ step_max }} +
+ + +
+ +
diff --git a/src/app/features/administration/stepper/stepper.component.scss b/src/app/features/administration/stepper/stepper.component.scss index af0bc7c3..96f433f7 100644 --- a/src/app/features/administration/stepper/stepper.component.scss +++ b/src/app/features/administration/stepper/stepper.component.scss @@ -76,8 +76,8 @@ .nav-button { margin-top: 0; margin-right: 1em; - line-height: $stepper-nav-height / 2; - height: $stepper-nav-height / 2; + line-height: $stepper-nav-height; + height: $stepper-nav-height; display: inline-block; padding-left: 1em; @@ -150,7 +150,6 @@ .cancel-button-stepper { padding: 0 1rem; height: auto; - margin-top: 0.75rem; border-color: $primary_color; color: $primary_color; } @@ -206,7 +205,6 @@ width: $logo-side; display: inline-block; margin-right: 1rem; - margin-top: 10px; border-radius: 100%; &:hover { background: $d-primary; diff --git a/src/app/shared/components/selectors/language-selector/language-selector.component.html b/src/app/shared/components/selectors/language-selector/language-selector.component.html index b58a3f94..c035d01f 100644 --- a/src/app/shared/components/selectors/language-selector/language-selector.component.html +++ b/src/app/shared/components/selectors/language-selector/language-selector.component.html @@ -7,7 +7,6 @@ [attr.aria-label]="'LANGUAGES.' + currentLang.toUpperCase() | translate" > - {{ 'LANGUAGES_SHORT.' + currentLang.toUpperCase() | translate }} diff --git a/src/app/shared/components/selectors/language-selector/language-selector.component.scss b/src/app/shared/components/selectors/language-selector/language-selector.component.scss index 1dba291e..f8076e74 100644 --- a/src/app/shared/components/selectors/language-selector/language-selector.component.scss +++ b/src/app/shared/components/selectors/language-selector/language-selector.component.scss @@ -59,7 +59,7 @@ border: none; padding: 0 1rem; display: block; - line-height: 2rem; + line-height: $stepper-nav-height; height: $stepper-nav-height; } diff --git a/src/styles/partials/_navigation.scss b/src/styles/partials/_navigation.scss index 4107e490..262c5946 100644 --- a/src/styles/partials/_navigation.scss +++ b/src/styles/partials/_navigation.scss @@ -72,7 +72,7 @@ a span.ui-steps-number { position: fixed; right: 0; left: 0; - padding: 0; + padding: 10px; .button { display: inline-block; diff --git a/src/styles/partials/_responsive.scss b/src/styles/partials/_responsive.scss index 79a38f65..21ac04e6 100644 --- a/src/styles/partials/_responsive.scss +++ b/src/styles/partials/_responsive.scss @@ -45,9 +45,7 @@ @media (max-width: 569px) { .logo-home-link-img { display: inline-block; - margin-top: 8px; width: 50px; - padding: 8px !important; } .title-section { width: 60%; @@ -78,9 +76,6 @@ background: transparent; } } - .step-info { - height: 4.5rem; - } .cancel-button { padding: 0.5rem 0.75rem; min-width: 1em; diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 08b1c3f0..2f86f3cf 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -79,8 +79,8 @@ $mobile-size: 25rem; $header-nav-height: 4.85rem; $header-nav-inner-height: 4.5rem; $widescreen-width-main-column: 75rem; -$stepper-nav-height: 56px; -$home-nav-height: 56px; +$stepper-nav-height: 2rem; +$home-nav-height: 2rem; $home-nav-height-small: 3.5rem; // datepicker $cell-size-datepicker-small: 30px;