diff --git a/assets/css/main.css b/assets/css/main.css index 9173d00..a4f90b5 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -15,8 +15,8 @@ h1, h2, h3, h4 { margin-top: 1em; font-family: 'Crimson Text', serif; } -main h1:first-child { - margin-top: 0.4em; } +main h1:first-child, main div.container:first-child { + margin-top: 0; } h5 { margin-bottom: 8px; } @@ -134,9 +134,10 @@ nav { line-height: 1; } } footer { - margin-top: 20px; + margin-top: 25px; padding-top: 15px; padding-bottom: 10px; + height: 70px; min-width: inherit; background-color: #bebebe; color: #000; } @@ -163,30 +164,18 @@ footer { height: 1.4rem; padding-right: 0.2em; } -/* make footer sticky */ -html { - position: relative; - min-height: 100%; } - -@media (min-width: 576px) { - body { - /* Margin bottom by footer height */ - margin-bottom: 100px; } +@media (max-width: 575px) { footer { - position: absolute; - bottom: 0; - width: 100%; - height: 70px; } } + height: 175px; } } + +/* space footer at bottom of page */ +@media (min-width: 576px) { + main { + min-height: calc(100vh - 83px - 70px - 25px); } } @media (max-width: 575px) { - body { - /* Margin bottom by footer height */ - margin-bottom: 205px; } - footer { - position: absolute; - bottom: 0; - width: 100%; - height: 175px; } } + main { + min-height: calc(100vh - 83px - 25px); } } /* * HELPERS diff --git a/assets/css/main.css.map b/assets/css/main.css.map index 6dabe27..a32df3e 100644 Binary files a/assets/css/main.css.map and b/assets/css/main.css.map differ diff --git a/assets/css/templates/home.css b/assets/css/templates/home.css index ed4f60f..516df88 100644 --- a/assets/css/templates/home.css +++ b/assets/css/templates/home.css @@ -1,33 +1,32 @@ /* STYLE for jannikbeyerstedt.de * for specific template */ -main div.home { - text-align: center; - margin-top: 15vh; - margin-bottom: 20vh; } - main div.home div.logo { - font-family: 'Boon-Logo', "Verdana", "Arial", sans-serif; - font-size: 24.5px; - line-height: 1.2em; - font-weight: 300; - width: 11em; - margin: 0 auto; } - main div.home div.logo span { - color: #2dac01; - font-weight: 400; } - main div.home div.logo span.firstname { - padding-left: 0.1em; - padding-right: 0.56em; } - main div.home div.logo span.surname { - letter-spacing: -0.036em; } - main div.home p { - margin-top: 0.5em; - font-size: 14px; - letter-spacing: -0.02em; } +main { + padding-top: 14vh; } + main div.home { + text-align: center; } + main div.home div.logo { + font-family: 'Boon-Logo', "Verdana", "Arial", sans-serif; + font-size: 24.5px; + line-height: 1.2em; + font-weight: 300; + width: 11em; + margin: 0 auto; } + main div.home div.logo span { + color: #2dac01; + font-weight: 400; } + main div.home div.logo span.firstname { + padding-left: 0.1em; + padding-right: 0.56em; } + main div.home div.logo span.surname { + letter-spacing: -0.036em; } + main div.home p { + margin-top: 0.5em; + font-size: 14px; + letter-spacing: -0.02em; } @media (max-width: 575px) { - main div.home { - margin-top: 13vh; - margin-bottom: 17vh; } } + main { + padding-top: 16vh; } } /*# sourceMappingURL=home.css.map */ \ No newline at end of file diff --git a/assets/css/templates/home.css.map b/assets/css/templates/home.css.map index 7923802..6a6e824 100644 Binary files a/assets/css/templates/home.css.map and b/assets/css/templates/home.css.map differ diff --git a/assets/scss/main.scss b/assets/scss/main.scss index 33d3560..fc0836b 100644 --- a/assets/scss/main.scss +++ b/assets/scss/main.scss @@ -21,8 +21,8 @@ h1, h2, h3, h4 { margin-top: 1em; font-family: 'Crimson Text', serif; } -main h1:first-child { - margin-top: 0.4em; +main h1:first-child, main div.container:first-child { + margin-top: 0; } h5 { margin-bottom: 8px; @@ -93,12 +93,12 @@ main div.container { $header_logoSize: 75px; - +$header_logoPadg: 4px; header { img { width: $header_logoSize; height: $header_logoSize; - margin: 4px 0; + margin: $header_logoPadg 0; float: left; } @@ -184,11 +184,15 @@ nav { $footer_logoHeight: 1.4rem; +$footer_margin: 25px; +$footer_height: 70px; +$footer_height_xs: 175px; footer { - margin-top: 20px; + margin-top: 25px; padding-top: 15px; padding-bottom: 10px; + height: $footer_height; min-width: inherit; background-color: $footer_color_bg; @@ -226,36 +230,22 @@ footer { } -/* make footer sticky */ -$footer_height: 70px; -$footer_height_xs: 175px; -$footer_margin: 30px; -html { - position: relative; - min-height: 100%; -} -@include media-breakpoint-up(sm) { - body { - /* Margin bottom by footer height */ - margin-bottom: $footer_height + $footer_margin; - } +@include media-breakpoint-down(xs) { footer { - position: absolute; - bottom: 0; - width: 100%; - height: $footer_height; + height: $footer_height_xs; + } +} + +/* space footer at bottom of page */ +$header_height: 2*$header_logoPadg + $header_logoSize; +@include media-breakpoint-up(sm) { + main { + min-height: calc(100vh - #{$header_height} - #{$footer_height} - #{$footer_margin}); } } @include media-breakpoint-down(xs) { - body { - /* Margin bottom by footer height */ - margin-bottom: $footer_height_xs + $footer_margin; - } - footer { - position: absolute; - bottom: 0; - width: 100%; - height: $footer_height_xs; + main { + min-height: calc(100vh - #{$header_height} - #{$footer_margin}); } } diff --git a/assets/scss/templates/home.scss b/assets/scss/templates/home.scss index f348d3f..893f7b1 100644 --- a/assets/scss/templates/home.scss +++ b/assets/scss/templates/home.scss @@ -8,10 +8,10 @@ @import "../mainvariables"; main { + padding-top: 14vh; + div.home { text-align: center; - margin-top: 15vh; - margin-bottom: 20vh; div.logo { font-family: 'Boon-Logo', "Verdana", "Arial", sans-serif; @@ -46,8 +46,7 @@ main { } @include media-breakpoint-down(xs) { - main div.home { - margin-top: 13vh; - margin-bottom: 17vh; + main { + padding-top: 16vh; } }