vendor/assets/stylesheets/_sidebar.scss in active_frontend-10.3.0 vs vendor/assets/stylesheets/_sidebar.scss in active_frontend-11.0.0

- old
+ new

@@ -17,33 +17,30 @@ } .sidebar-alt { border-right: 1px solid $color-haze; border-left: 0; } -.sidebar-striped { border-top: 3px solid $color-primary !important; } .sidebar-header { border-bottom: 1px solid $color-haze; font-size: 12px; - line-height: 12px; - padding: 12px 20px 10px 10px; + line-height: 1; + padding: 10px 20px 8px 10px; } .sidebar-alt > .sidebar-header { padding-left: 20px; padding-right: 10px; } .sidebar-header > h6 { - font-size: 12px; + font-size: 11px; font-weight: normal; letter-spacing: 1px; - line-height: 12px; + line-height: 1; text-transform: uppercase; } .sidebar-content { - height: calc(100% - 54px); - -webkit-overflow-scrolling: touch; - -ms-overflow-scrolling: touch; - overflow-scrolling: touch; + height: calc(100% - 50px); + @include overflow-scrolling(touch); overflow-x: hidden; overflow-y: auto; padding: 10px 20px 10px 10px; } .sidebar-alt > .sidebar-content { @@ -51,31 +48,23 @@ padding-left: 20px; } .sidebar-scrollable { border-bottom: 1px solid $color-light-haze; height: auto; - max-height: calc(50% - 54px); - -webkit-overflow-scrolling: touch; - -ms-overflow-scrolling: touch; - overflow-scrolling: touch; + max-height: calc(50% - 50px); + @include overflow-scrolling(touch); overflow-y: auto; } /* # Colors ================================================== */ -.sidebar-dark { - background: $color-black; - border-color: $color-dark-black; -} -.sidebar-dark.sidebar-alt, +.sidebar-dark { background: $color-black; } +.sidebar-dark, .sidebar-dark > .sidebar-header, .sidebar-dark > .sidebar-scrollable { border-color: $color-dark-black; } .sidebar-dark > .sidebar-header > h6 { color: $color-white; } -.sidebar-light { - background: $color-light-haze; - border-color: $color-dark-haze; -} -.sidebar-light.sidebar-alt, +.sidebar-light { background: $color-light-haze; } +.sidebar-light, .sidebar-light > .sidebar-header, .sidebar-light > .sidebar-scrollable { border-color: $color-dark-haze; } /* # Media Queries ================================================== */ \ No newline at end of file