From bd94b103418e4b1d253c9e44d76c67257874d32b Mon Sep 17 00:00:00 2001 From: maxgrapps Date: Tue, 25 Jun 2019 13:37:08 +0300 Subject: [PATCH 1/4] header content alignment issue --- .../assets/css/components/_navbar.scss | 35 +++++++++++++++++-- .../templates/layout/_topnav.html.eex | 4 +-- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/apps/block_scout_web/assets/css/components/_navbar.scss b/apps/block_scout_web/assets/css/components/_navbar.scss index 7f0b81f803..370204e1b8 100644 --- a/apps/block_scout_web/assets/css/components/_navbar.scss +++ b/apps/block_scout_web/assets/css/components/_navbar.scss @@ -22,7 +22,7 @@ $navbar-logo-width: auto !default; font-size: 14px; } .navbar-nav { - flex-grow: 1; + // flex-grow: 1; .nav-link { align-items: center; @@ -153,6 +153,18 @@ $navbar-logo-width: auto !default; @include media-breakpoint-up(xl) { width: 280px; } + @media (min-width: 1366px) { + width: 330px; + } + @media (min-width: 1440px) { + width: 380px; + } + @media (min-width: 1580px) { + width: 430px; + } + @media (min-width: 1800px) { + width: 520px; + } } .input-group-append { height: 38px; @@ -198,7 +210,7 @@ $navbar-logo-width: auto !default; width: 100%; .awesomplete { - @include media-breakpoint-down(sm) { + @include media-breakpoint-down(lg) { width: 100%; } } @@ -210,6 +222,10 @@ $navbar-logo-width: auto !default; .navbar-brand { margin-left: 0; + flex-shrink: 1; + .navbar-logo { + max-width: 100%; + } } .navbar-logo { @@ -227,3 +243,18 @@ $navbar-logo-width: auto !default; .add-border { border: 1px solid transparentize($white, 0.30); } + +.navbar-collapse { + justify-content: flex-end; + align-items: flex-start; + flex-shrink: 0; + @media (min-width: 992px) { + align-items: center; + } +} + +.navbar-container, .navbar-primary { + @include media-breakpoint-up(xl) { + padding-right: 0; + } +} \ No newline at end of file diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex index f2a4e9441e..929cd30ab7 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex @@ -1,5 +1,5 @@