From 5ef6da0dcd628aa7f8591ba6cdc3a244710309f4 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Sat, 5 May 2018 23:07:57 +1000 Subject: [PATCH] Fixing some margin collapsing bugs --- public/styles/components/_page.scss | 1 - public/styles/elements/html.scss | 2 ++ public/styles/objects/_app.scss | 1 + public/styles/objects/_navbar.scss | 4 +++- public/styles/settings/colors.scss | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/public/styles/components/_page.scss b/public/styles/components/_page.scss index 6deba4d..f276004 100644 --- a/public/styles/components/_page.scss +++ b/public/styles/components/_page.scss @@ -8,5 +8,4 @@ * 1.0.0 - 2018/05/05 */ .c-page { - background: white; } diff --git a/public/styles/elements/html.scss b/public/styles/elements/html.scss index e73271f..5b59602 100644 --- a/public/styles/elements/html.scss +++ b/public/styles/elements/html.scss @@ -6,4 +6,6 @@ * 1.0.0 - 2018/05/03 */ html { + padding: 0; + margin: 0; } diff --git a/public/styles/objects/_app.scss b/public/styles/objects/_app.scss index 4bc41ce..5a2925b 100644 --- a/public/styles/objects/_app.scss +++ b/public/styles/objects/_app.scss @@ -8,6 +8,7 @@ * 1.0.0 - 2018/05/03 */ .o-app { + display: inline-block;//Fixes collapsing margins on children. min-height: 100vh; //Civil Twilight diff --git a/public/styles/objects/_navbar.scss b/public/styles/objects/_navbar.scss index b0a94b0..1c7d37f 100644 --- a/public/styles/objects/_navbar.scss +++ b/public/styles/objects/_navbar.scss @@ -21,9 +21,11 @@ &__section { border: 1px solid blue; - .is-stuck { + &.is-stuck { position: fixed; width: 100%; + top: 0; + left: 0; } } diff --git a/public/styles/settings/colors.scss b/public/styles/settings/colors.scss index 831ed08..a559419 100644 --- a/public/styles/settings/colors.scss +++ b/public/styles/settings/colors.scss @@ -25,6 +25,6 @@ $s-color--link: #FC78DE; $s-color--link-hover: lighten($s-color--link, 10%); //Navbar Colors -$s-color--navbar: rgba(0, 0, 0, 0.7); +$s-color--navbar: rgba(0, 0, 0, 0.75); $s-color--navbar__text: white; $s-color--navbar__text-hover: #CCC;