From 7b802a76ba0f5c61b8720a839a37580cfe4e71d5 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 20 Jul 2018 11:38:42 +0930 Subject: [PATCH] Dissociate .sideNav--horizontal from @expand-side-nav --- less/common/sideNav.less | 85 +++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 45 deletions(-) diff --git a/less/common/sideNav.less b/less/common/sideNav.less index 13383a41b..98b42f109 100644 --- a/less/common/sideNav.less +++ b/less/common/sideNav.less @@ -11,7 +11,6 @@ // .dropdown-select into a plain list. @media @expand-side-nav { .sideNav { - // Expand the dropdown-select component into a normal nav list. & .Dropdown--select { display: block; @@ -48,50 +47,9 @@ } } -.sideNav--horizontal {} - -@media @expand-side-nav { - .sideNav--horizontal { - padding: 15px 0; - white-space: nowrap; - overflow: auto; - -webkit-overflow-scrolling: touch; - - &:after { - content: " "; - position: absolute; - left: 0; - right: 0; - margin-top: 15px; - border-bottom: 1px solid @control-bg; - } - - > ul > li, .Dropdown-menu > li { - display: inline-block; - margin: 0 20px 0 0; - vertical-align: top; - } - .Dropdown-separator { - display: none; - } - - .Dropdown--select .Dropdown-menu > li > a { - padding-left: 25px; - - .icon { - margin-left: -25px; - } - } - - .affix { - position: static; - } - } - - @media @tablet { - .sideNav { - .sideNav--horizontal(); - } +@media @tablet { + .sideNav { + .sideNav--horizontal(); } } @@ -115,6 +73,43 @@ } } +.sideNav--horizontal { + padding: 15px 0; + white-space: nowrap; + overflow: auto; + -webkit-overflow-scrolling: touch; + + &:after { + content: " "; + position: absolute; + left: 0; + right: 0; + margin-top: 15px; + border-bottom: 1px solid @control-bg; + } + + > ul > li, .Dropdown-menu > li { + display: inline-block; + margin: 0 20px 0 0; + vertical-align: top; + } + .Dropdown-separator { + display: none; + } + + .Dropdown--select .Dropdown-menu > li > a { + padding-left: 25px; + + .icon { + margin-left: -25px; + } + } + + .affix { + position: static; + } +} + @media @phone, @tablet { .sideNavOffset { margin-top: 15px;