kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'sidebar-drop-shadow' into 'master' 

Adds drop shadow to the expanded sidebar

Closes #36750 and #13983

See merge request !13994
This commit is contained in:
Annabel Dunstone Gray 2017-09-08 21:50:59 +00:00
parent 2f46c3a80f e1af325de8
commit efb3a53605
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/new_sidebar.js
View File

@ -19,6 +19,11 @@ export default class NewNavSidebar {
}
bindEvents() {
document.addEventListener('click', (e) => {
if (!e.target.closest('.nav-sidebar') && (bp.getBreakpointSize() === 'sm' || bp.getBreakpointSize() === 'md')) {
this.toggleCollapsedSidebar(true);
}
});
this.$openSidebar.on('click', () => this.toggleSidebarNav(true));
this.$closeSidebar.on('click', () => this.toggleSidebarNav(false));
this.$overlay.on('click', () => this.toggleSidebarNav(false));

7
app/assets/stylesheets/new_sidebar.scss
View File

@ -99,6 +99,13 @@ $new-sidebar-collapsed-width: 50px;
box-shadow: inset -2px 0 0 $border-color;
transform: translate3d(0, 0, 0);
&:not(.sidebar-icons-only) {
@media (min-width: $screen-sm-min) and (max-width: $screen-md-max) {
box-shadow: inset -2px 0 0 $border-color,
2px 1px 3px $dropdown-shadow-color;
}
}
&.sidebar-icons-only {
width: $new-sidebar-collapsed-width;