From fad4ae43b7bbdcbd3b90563fe9cb891f4e66cb30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= Date: Tue, 7 Jan 2020 17:16:11 +0100 Subject: [PATCH] feat(navbar): use transitions between standard and minimized navbar --- scss/_navbar.scss | 7 +++++-- scss/_variables.scss | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/scss/_navbar.scss b/scss/_navbar.scss index 75aacc68fa..876e89a400 100644 --- a/scss/_navbar.scss +++ b/scss/_navbar.scss @@ -23,6 +23,7 @@ justify-content: space-between; // space out brand from logo padding: 0; // Boosted mod font-weight: $font-weight-bold; // Boosted mod + @include transition($navbar-transition); // Boosted mod @include media-breakpoint-up(md) { padding: $navbar-padding-y $navbar-padding-x; @@ -86,7 +87,7 @@ letter-spacing: inherit; // Boosted mod white-space: nowrap; outline-offset: $spacer; // Boosted mod - @include transition($transition-focus); // Boosted mod + @include transition($transition-focus, $navbar-brand-transition); // Boosted mod // Boosted mod @include media-breakpoint-up(sm) { @@ -130,6 +131,7 @@ img { width: $navbar-brand-logo-height; height: $navbar-brand-logo-height; + @include transition($navbar-brand-logo-transition); + * { margin: 0 $spacer 0 .9375rem; @@ -160,7 +162,7 @@ position: relative; padding: map-get($spacers, 2) map-get($spacers, 1); outline-offset: $spacer; - @include transition($transition-focus); + @include transition($transition-focus, $navbar-transition); &[class*="svg-"]::after { width: $navbar-supra-icon-size; @@ -179,6 +181,7 @@ height: $border-width * 2; content: ""; background-color: currentColor; + @include transition($navbar-active-transition); } } diff --git a/scss/_variables.scss b/scss/_variables.scss index eb1f16e7be..6f07176ae9 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -828,12 +828,19 @@ $navbar-expanded-padding-y: 1.5625rem !default; $navbar-expanded-padding-x: 0 !default; $navbar-expanded-minimized-padding-y: $navbar-padding-y !default; // Boosted mod + // Boosted mod : adapt navbar padding when mobile view $navbar-height: 6.25rem !default; $navbar-brand-logo-height: map-get($spacers, 4) !default; $navbar-brand-logo-expanded-height: 3.125rem !default; $navbar-supra-padding-y: $navbar-brand-logo-height / 10 !default; $navbar-supra-icon-size: 1.5625rem !default; +$navbar-transition-duration: .2s !default; +$navbar-transition-timing-function: ease-in-out !default; +$navbar-transition: padding $navbar-transition-duration $navbar-transition-timing-function !default; +$navbar-brand-transition: margin $navbar-transition-duration $navbar-transition-timing-function !default; +$navbar-brand-logo-transition: width $navbar-transition-duration $navbar-transition-timing-function, height $navbar-transition-duration $navbar-transition-timing-function !default; +$navbar-active-transition: bottom $navbar-transition-duration $navbar-transition-timing-function !default; // end mod //$navbar-nav-link-padding-x: 0 !default;