diff --git a/assets/scss/style.scss b/assets/scss/style.scss index ba3ad65..8981f41 100644 --- a/assets/scss/style.scss +++ b/assets/scss/style.scss @@ -40,12 +40,16 @@ a { } } -#content { +@mixin limitWidth { max-width: $content_width; - padding: 15px; margin: auto; } +#content { + @include limitWidth; + padding: 15px; +} + footer { color: $dim_fg_color; a { @@ -449,6 +453,8 @@ nav, #links { } header { + @include limitWidth; + padding: 15px; margin-bottom: $content_spacing; .titleAndHamburger { display: flex; @@ -532,12 +538,10 @@ header { {{ if (and (.Site.Params.enableJumbotron | default false) .Site.Data.jumbotron) }} header { .jumbotron { display: none; } - margin-top: -15px; - margin-left: -15px; - margin-right: -15px; - padding-top: 15px; - padding-left: 15px; - padding-right: 15px; + max-width: 100%; + > * { + @include limitWidth; + } } header.jumbotronContainer { .jumbotron { display: flex; } @@ -556,8 +560,6 @@ header.jumbotronContainer { {{ end }} } .jumbotron { - top: 0; - left: 0; width: 100%; min-height: 40vh; flex-direction: column; diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index b99b323..8474b10 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -2,8 +2,8 @@ {{- partial "head.html" . -}} + {{- partial "header.html" . -}}
- {{- partial "header.html" . -}}
{{- block "main" . }}{{- end }}