From 24653ba48080feed9b3a3b469f130b9c9a957e14 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Mon, 13 Dec 2021 14:26:36 +0100 Subject: [PATCH] move nav padding, simplify home screen --- src/app/app.component.html | 8 +++----- src/styles/libraries/_overrides.scss | 4 ---- src/styles/partials/_forms.scss | 2 ++ src/styles/partials/_navigation.scss | 2 +- src/styles/partials/_responsive.scss | 3 +++ src/styles/partials/global.scss | 17 +++++++++++++++-- src/styles/themes/_base.scss | 1 - 7 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index 84493431..534dbdf3 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -15,10 +15,8 @@ [appTitle]="appTitle" [appLogo]="appLogo" > -
-
- -
-
+
+ +
diff --git a/src/styles/libraries/_overrides.scss b/src/styles/libraries/_overrides.scss index dd7545ee..1f847af9 100644 --- a/src/styles/libraries/_overrides.scss +++ b/src/styles/libraries/_overrides.scss @@ -19,7 +19,3 @@ $input-shadow: none; display: block !important; width: 80%; } - -html { - padding-top: $header-nav-height; -} diff --git a/src/styles/partials/_forms.scss b/src/styles/partials/_forms.scss index 19b17359..8519484f 100644 --- a/src/styles/partials/_forms.scss +++ b/src/styles/partials/_forms.scss @@ -277,6 +277,8 @@ mat-checkbox { padding: 2rem 1rem; box-sizing: border-box; overflow: auto; + @extend .top-padding-nav; + .title { color: $d-primary-intense; margin-bottom: 36px; diff --git a/src/styles/partials/_navigation.scss b/src/styles/partials/_navigation.scss index 06d47c99..0a4d7805 100644 --- a/src/styles/partials/_navigation.scss +++ b/src/styles/partials/_navigation.scss @@ -117,7 +117,7 @@ a span.ui-steps-number { width: 100%; position: fixed; right: 0; - padding: 1rem 0; + padding: 1rem 0.5rem; .button { display: inline-block; diff --git a/src/styles/partials/_responsive.scss b/src/styles/partials/_responsive.scss index e56f44c4..b578050b 100644 --- a/src/styles/partials/_responsive.scss +++ b/src/styles/partials/_responsive.scss @@ -6,6 +6,9 @@ } // wide screen like desktop @media (min-width: $widescreen) { + .step { + padding: 2rem 0; + } .date-choice > input:first-of-type { width: 75%; } diff --git a/src/styles/partials/global.scss b/src/styles/partials/global.scss index 71d7ac1a..b551de7e 100644 --- a/src/styles/partials/global.scss +++ b/src/styles/partials/global.scss @@ -1,8 +1,19 @@ @charset "UTF-8"; html { - font-size: 1rem; /* 10px */ + font-size: 1rem; /* equals 16px */ color: $font_color; + height: 100%; + + * { + box-sizing: border-box; + } + + overflow-x: hidden; +} +body { + height: 100%; + overflow-x: hidden; } form { @@ -81,7 +92,9 @@ main { } } } - +.top-padding-nav { + padding-top: $header-nav-height; +} .contained-in-main-column { max-width: $main-column-width; margin: 0 auto; diff --git a/src/styles/themes/_base.scss b/src/styles/themes/_base.scss index 1a3e78f0..d1a0d8ae 100644 --- a/src/styles/themes/_base.scss +++ b/src/styles/themes/_base.scss @@ -1,6 +1,5 @@ #big_container { background: $white; - main { margin-bottom: 2em; padding-bottom: 5em;