diff --git a/build/scss/_control-sidebar.scss b/build/scss/_control-sidebar.scss index 94c2ec031..a15c2e464 100644 --- a/build/scss/_control-sidebar.scss +++ b/build/scss/_control-sidebar.scss @@ -30,6 +30,21 @@ html.control-sidebar-animate { } } +body.text-sm { + .control-sidebar { + bottom: $main-footer-height-sm; + top: $main-header-height-sm; + } +} + +.main-header.text-sm ~ .control-sidebar { + top: $main-header-height-sm; +} + +.main-footer.text-sm ~ .control-sidebar { + bottom: $main-footer-height-sm; +} + .control-sidebar-push-slide { .content-wrapper, .main-footer { diff --git a/build/scss/_layout.scss b/build/scss/_layout.scss index 4c91b5266..d0ef6ceaa 100644 --- a/build/scss/_layout.scss +++ b/build/scss/_layout.scss @@ -488,7 +488,7 @@ body, .text-sm &, &.text-sm { - padding: $main-footer-padding * .812; + padding: $main-footer-padding-sm; } } diff --git a/build/scss/_miscellaneous.scss b/build/scss/_miscellaneous.scss index 0b18db53e..905d56559 100644 --- a/build/scss/_miscellaneous.scss +++ b/build/scss/_miscellaneous.scss @@ -358,6 +358,7 @@ bottom: 1.25rem; position: fixed; right: 1.25rem; + z-index: $zindex-control-sidebar + 1; &:focus { box-shadow: none; diff --git a/build/scss/_variables.scss b/build/scss/_variables.scss index 35dc01861..ef47ce961 100644 --- a/build/scss/_variables.scss +++ b/build/scss/_variables.scss @@ -82,11 +82,14 @@ $main-header-light-placeholder-color: hsla(0, 0%, 0%, 0.6) !default; // MAIN FOOTER // -------------------------------------------------------- $main-footer-padding: 1rem !default; +$main-footer-padding-sm: $main-footer-padding * .812 !default; $main-footer-border-top-width: 1px !default; $main-footer-border-top-color: $gray-300 !default; $main-footer-border-top: $main-footer-border-top-width solid $main-footer-border-top-color !default; $main-footer-height-inner: (($font-size-root * $line-height-base) + ($main-footer-padding * 2)) !default; $main-footer-height: calc(#{$main-footer-height-inner} + #{$main-footer-border-top-width}) !default; +$main-footer-height-sm-inner: (($font-size-sm * $line-height-base) + ($main-footer-padding-sm * 2)) !default; +$main-footer-height-sm: calc(#{$main-footer-height-sm-inner} + #{$main-footer-border-top-width}) !default; $main-footer-bg: $white; // SIDEBAR SKINS