Skip to content
Snippets Groups Projects
Commit c2746a89 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray
Browse files

Merge branch 'say-bye-bye-nicescroll' into 'master'

Removes nicescroll from issuable sidebar

See merge request !10831
parents 032cbcdb c0b612ff
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -59,18 +59,6 @@ gl.issueBoards.BoardSidebar = Vue.extend({
},
deep: true
},
issue () {
if (this.showSidebar) {
this.$nextTick(() => {
$('.right-sidebar').getNiceScroll(0).doScrollTop(0, 0);
$('.right-sidebar').getNiceScroll().resize();
});
}
this.issue = this.detail.issue;
this.list = this.detail.list;
},
deep: true
},
methods: {
closeSidebar () {
Loading
Loading
Loading
Loading
@@ -47,7 +47,6 @@ import UsersSelect from './users_select';
Cookies.set('collapsed_gutter', true);
}
});
$(".right-sidebar").niceScroll();
}
 
IssuableContext.prototype.initParticipants = function() {
Loading
Loading
Loading
Loading
@@ -197,6 +197,15 @@
background: $gray-light;
padding: 10px 20px;
z-index: 200;
overflow: hidden;
.issuable-sidebar {
width: calc(100% + 100px);
height: 100%;
overflow-y: scroll;
overflow-x: hidden;
-webkit-overflow-scrolling: touch;
}
 
&.right-sidebar-expanded {
width: $gutter_width;
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment