summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorEzekiel Kigbo <ekigbo@gitlab.com>2019-03-04 15:49:18 +1100
committerEzekiel Kigbo <ekigbo@gitlab.com>2019-03-05 00:58:22 +1100
commitd53005ef167de0a4b5b560d173435f3e0d0b4d9f (patch)
tree72c3bd7b3af44c0a4efc51b8212144f248681e47 /app/assets/stylesheets
parent9ef058bee2b13b975cc52d9c9c688c6250ad2363 (diff)
downloadgitlab-ce-d53005ef167de0a4b5b560d173435f3e0d0b4d9f.tar.gz
Added test for interacting with the nav-sidebar on smaller screens
Use mobile collapsing behaviour at width 1200px
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/framework/contextual_sidebar.scss8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/contextual_sidebar.scss b/app/assets/stylesheets/framework/contextual_sidebar.scss
index 4f4ce389d5d..79c770a3a35 100644
--- a/app/assets/stylesheets/framework/contextual_sidebar.scss
+++ b/app/assets/stylesheets/framework/contextual_sidebar.scss
@@ -5,7 +5,9 @@
padding-left: $contextual-sidebar-collapsed-width;
}
- @include media-breakpoint-up(xl) {
+
+ $desktop-nav-sidebar-breakpoint: 1201px;
+ @media (min-width: $desktop-nav-sidebar-breakpoint) {
padding-left: $contextual-sidebar-width;
}
@@ -210,8 +212,8 @@
width: 16px;
}
- &:not(.sidebar-expanded-mobile) {
- @media (min-width: map-get($grid-breakpoints, sm)) and (max-width: map-get($grid-breakpoints, xl)) {
+ @media (min-width: map-get($grid-breakpoints, sm)) and (max-width: map-get($grid-breakpoints, xl)) {
+ &:not(.sidebar-expanded-mobile) {
@include collapse-contextual-sidebar;
@include collapse-contextual-sidebar-content;
}