diff --git a/assets/sass/navigation.scss b/assets/sass/navigation.scss index 526f50fb..d9c943f3 100644 --- a/assets/sass/navigation.scss +++ b/assets/sass/navigation.scss @@ -1,15 +1,13 @@ -#header { + +.o-header { position: sticky; width: 100%; top: 0; box-shadow: 0 .4rem 1rem 0 rgba(0,0,0,.1); -} - -.o-header { background-color: var(--bg-default); z-index: 5; - position: relative; height: 6rem; + padding-left: calc((100vw - 100%) / 2); } .o-header__wrapper { diff --git a/assets/sass/print.scss b/assets/sass/print.scss index 22a6b693..a512b71c 100644 --- a/assets/sass/print.scss +++ b/assets/sass/print.scss @@ -14,14 +14,13 @@ margin-bottom: 1rem; } - main > .o-container.o-single, - main > .o-container.o-list { + main > .o-container > .o-single, + main > .o-container > .o-list { margin-top: 0; } .o-single__container, - .o-container, - main > .o-container { + .o-container { padding: 0; } diff --git a/assets/sass/styles.scss b/assets/sass/styles.scss index 688639ba..b61fb38c 100644 --- a/assets/sass/styles.scss +++ b/assets/sass/styles.scss @@ -49,6 +49,7 @@ a { main { margin-top: 2rem; + padding-left: calc(100vw - 100%); } .o-container { @@ -85,7 +86,7 @@ main { padding: 2rem; } -main > .o-container:is(.o-single--with-sidemenu) { +.o-single--with-sidemenu { background-color: unset; padding: 0; diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 015f098e..3a4026ea 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -8,7 +8,11 @@ -
{{ block "main" . }}{{ end }}
+
+
+ {{ block "main" . }}{{ end }} +
+
{{ if and (eq .Kind "page") (or (eq .Page.Type "country") (eq .Page.Type "operator")) }} {{ partial "snackbar" . }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 6525757d..31dff533 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,5 +1,5 @@ {{ define "main" }} -
+

{{ .Title }}

{{ .Content }} {{ range .Pages }} diff --git a/layouts/country/single.html b/layouts/country/single.html index 220e24d6..4890f796 100644 --- a/layouts/country/single.html +++ b/layouts/country/single.html @@ -1,7 +1,7 @@ {{ define "main" }} {{ $related := .Site.RegularPages.RelatedIndices . "country" }} -
+
{{ partial "sidemenu" . }}
diff --git a/layouts/news/list.html b/layouts/news/list.html index fd4b8644..c345c143 100644 --- a/layouts/news/list.html +++ b/layouts/news/list.html @@ -1,5 +1,5 @@ {{ define "main" }} -
+

{{ .Title }}

{{ .Content }} diff --git a/layouts/news/single.html b/layouts/news/single.html index 62ebbee1..ce214927 100644 --- a/layouts/news/single.html +++ b/layouts/news/single.html @@ -1,5 +1,5 @@ {{ define "main" }} -
+