vendor/assets/stylesheets/_sidebar.scss in active_frontend-11.1.0 vs vendor/assets/stylesheets/_sidebar.scss in active_frontend-12.0.0

- old
+ new

@@ -6,36 +6,47 @@ /* # Sidebar ================================================== */ .sidebar { background: $color-white; - border-left: 1px solid $color-haze; + border-left: 1px solid; + border-color: $color-haze; box-sizing: border-box; + color: $color-black; height: 100%; min-width: 280px; position: fixed; width: 280px; } .sidebar-alt { - border-right: 1px solid $color-haze; + border-right: 1px solid; + border-color: inherit; border-left: 0; } .sidebar-header { - border-bottom: 1px solid $color-haze; + border-bottom: 1px solid; + border-color: inherit; font-size: 12px; line-height: 1; padding: 10px 20px 8px 10px; } .sidebar-alt > .sidebar-header { padding-left: 20px; padding-right: 10px; } +.sidebar-header > h1, +.sidebar-header > h2, +.sidebar-header > h3, +.sidebar-header > h4, +.sidebar-header > h5, .sidebar-header > h6 { font-size: 11px; font-weight: normal; letter-spacing: 1px; line-height: 1; + margin: 0; + padding: 0; text-transform: uppercase; } .sidebar-content { height: calc(100% - 50px); @include overflow-scrolling(touch); @@ -46,28 +57,29 @@ .sidebar-alt > .sidebar-content { padding-right: 10px; padding-left: 20px; } .sidebar-scrollable { - border-bottom: 1px solid $color-light-haze; + border-bottom: 1px solid; + border-color: inherit; height: auto; max-height: calc(50% - 50px); @include overflow-scrolling(touch); overflow-y: auto; } /* # Colors ================================================== */ -.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; } -.sidebar-light, -.sidebar-light > .sidebar-header, -.sidebar-light > .sidebar-scrollable { border-color: $color-dark-haze; } +.sidebar-dark { + background: $color-black; + border-color: $color-dark-black; + color: $color-white; +} +.sidebar-light { + background: $color-light-haze; + border-color: $color-dark-haze; +} /* # Media Queries ================================================== */ @media only screen and (max-width: 1365px) { .sidebar { @@ -92,7 +104,12 @@ only screen and ( min-resolution: 192dpi), only screen and ( min-resolution: 2dppx) { .sidebar, .sidebar-header, .sidebar-scrollable { border-width: 0.5px; } + .sidebar-header > h1, + .sidebar-header > h2, + .sidebar-header > h3, + .sidebar-header > h4, + .sidebar-header > h5, .sidebar-header > h6 { letter-spacing: 0.5px; } } \ No newline at end of file