From cb7f49c10355ec32dd243b49e6a315d65c7fab41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Mon, 17 Dec 2018 09:47:11 -0500 Subject: [PATCH] Minimize flash of different navbar color by not having it transition in the first time, but really we need a full fix not a meh mitigation. --- agaric/js/script.js | 4 +++- agaric/sass/agaric/_component.navbar.scss | 11 +++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/agaric/js/script.js b/agaric/js/script.js index 6bc3a49..d61e64e 100644 --- a/agaric/js/script.js +++ b/agaric/js/script.js @@ -20,7 +20,9 @@ $(document).ready(function(){ }) .offset(el.offset().top - headerEl.outerHeight()) .on("enter",function(e){headerEl.addClass(elClass)}) - .on("leave",function(e){headerEl.removeClass(elClass)}) + // Minimize flash of different navbar color by not having it transition in + // the first time, but really we need a full fix not a meh mitigation. + .on("leave",function(e){headerEl.removeClass(elClass); headerEl.addClass('navbar-transition')}) .addTo(controller); }); diff --git a/agaric/sass/agaric/_component.navbar.scss b/agaric/sass/agaric/_component.navbar.scss index a9dab1a..2aa37a6 100644 --- a/agaric/sass/agaric/_component.navbar.scss +++ b/agaric/sass/agaric/_component.navbar.scss @@ -30,15 +30,18 @@ .navbar { color: $white; background-color: $dark; + @include desktop { + padding: 1.25em 0; + } + z-index: +9; +} + +.navbar-transition { @include tablet { transition-property: color, background-color; transition-timing-function: ease-out; transition-duration: 500ms; } - @include desktop { - padding: 1.25em 0; - } - z-index: +9; } // Header colors