diff --git a/build/scss/_brand.scss b/build/scss/_brand.scss index 132b32479..c86a640b9 100644 --- a/build/scss/_brand.scss +++ b/build/scss/_brand.scss @@ -25,32 +25,47 @@ border-bottom: 1px solid $gray-300; color: rgba($black, .8); } -} -.brand-image { - float: left; - line-height: .8; - margin-left: .8rem; - margin-right: .5rem; - margin-top: -3px; - max-height: 33px; - width: auto; -} + .brand-image { + float: left; + line-height: .8; + margin-left: .8rem; + margin-right: .5rem; + margin-top: -3px; + max-height: 33px; + width: auto; + } -.brand-image-xs { - float: left; - line-height: .8; - margin-left: .8rem; - margin-right: .5rem; - margin-top: -3px; - max-height: 33px; - width: auto; -} + .brand-image-xs { + float: left; + line-height: .8; + margin-top: -.1rem; + max-height: 33px; + width: auto; + } -.brand-image-xl { - line-height: .8; - margin-bottom: -10px; - margin-top: -14px; - max-height: 40px; - width: auto; + .brand-image-xl { + line-height: .8; + max-height: 40px; + width: auto; + } + + &.text-sm { + .brand-image { + height: 29px; + margin-bottom: -.25rem; + margin-left: .95rem; + margin-top: -.25rem; + } + + .brand-image-xs { + margin-top: -.2rem; + max-height: 29px; + } + + .brand-image-xl { + margin-top: -.225rem; + max-height: 38px; + } + } } diff --git a/build/scss/_layout.scss b/build/scss/_layout.scss index 7aa6e2d71..915f17ef1 100644 --- a/build/scss/_layout.scss +++ b/build/scss/_layout.scss @@ -37,15 +37,28 @@ body, .control-sidebar { top: $main-header-height; } + + .main-header.text-sm ~ .control-sidebar { + top: $main-header-height-sm; + } + .sidebar { margin-top: $main-header-height; } + + .brand-link.text-sm ~ .sidebar { + margin-top: $main-header-height-sm; + } } .layout-navbar-fixed.sidebar-collapse & { .brand-link { height: $main-header-height; width: $sidebar-mini-width; + + &.text-sm { + height: $main-header-height-sm; + } } } @@ -91,6 +104,10 @@ body, margin-top: $main-header-height; } + .main-header.text-sm ~ .content-wrapper { + margin-top: $main-header-height-sm; + } + .main-header { left: 0; position: fixed; @@ -123,9 +140,18 @@ body, .control-sidebar { top: $main-header-height; } + + .main-header.text-sm ~ .control-sidebar { + top: $main-header-height-sm; + } + .sidebar { margin-top: $main-header-height; } + + .brand-link.text-sm ~ .sidebar { + margin-top: $main-header-height-sm; + } } .layout#{$infix}-navbar-fixed & { @@ -144,6 +170,10 @@ body, height: $main-header-height; transition: width $transition-speed $transition-fn; width: $sidebar-mini-width; + + &.text-sm { + height: $main-header-height-sm; + } } .main-sidebar:hover { @@ -178,6 +208,10 @@ body, margin-top: $main-header-height; } + .main-header.text-sm ~ .content-wrapper { + margin-top: $main-header-height-sm; + } + .main-header { left: 0; position: fixed; @@ -393,6 +427,10 @@ body, border-top: $main-footer-border-top; color: lighten($gray-700, 25%); padding: $main-footer-padding; + + &.text-sm { + padding: $main-footer-padding * .812; + } } .content-header { diff --git a/build/scss/_main-header.scss b/build/scss/_main-header.scss index 1378e11a1..97ee10657 100644 --- a/build/scss/_main-header.scss +++ b/build/scss/_main-header.scss @@ -11,6 +11,23 @@ position: relative; } + &.text-sm { + .nav-link { + height: $nav-link-sm-height; + padding: $nav-link-sm-padding-y $nav-link-padding-x; + + > .fa, + > .fas, + > .far, + > .fab, + > .glyphicon, + > .ion { + font-size: $font-size-sm; + } + } + + } + .navbar-nav { .nav-item { margin: 0; diff --git a/build/scss/_sidebar-mini.scss b/build/scss/_sidebar-mini.scss index 38318096b..2545418cf 100644 --- a/build/scss/_sidebar-mini.scss +++ b/build/scss/_sidebar-mini.scss @@ -5,7 +5,6 @@ // Logo style .logo-xs, .logo-xl { - margin: 0; opacity: 1; position: absolute; visibility: visible; diff --git a/build/scss/_variables.scss b/build/scss/_variables.scss index a22c94d96..b0b0757b7 100644 --- a/build/scss/_variables.scss +++ b/build/scss/_variables.scss @@ -58,6 +58,11 @@ $main-header-brand-padding-y: $navbar-brand-padding-y !default; $main-header-brand-padding-x: $navbar-padding-x !default; $main-header-height-inner: ($nav-link-height + ($main-header-link-padding-y * 2)) !default; $main-header-height: calc(#{$main-header-height-inner} + #{$main-header-bottom-border-width}) !default; +$nav-link-sm-padding-y: .35rem !default; +$nav-link-sm-height: ($font-size-sm * $line-height-sm + $nav-link-sm-padding-y * 1.785) !default; +$main-header-height-sm-inner: ($nav-link-sm-height + ($main-header-link-padding-y * 2)) !default; +$main-header-height-sm: calc(#{$main-header-height-sm-inner} + #{$main-header-bottom-border-width}) !default; + // Main header skins $main-header-dark-form-control-bg: hsla(100, 100%, 100%, 0.2) !default;