diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-16 15:59:50 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-16 15:59:50 +0000 |
| commit | c2746a89f702da91cca24a07a0e5c99634f89218 (patch) | |
| tree | 8bf7044dff2e343a7925e75e7bc909a624da21b3 | |
| parent | 032cbcdbf57de50c446c9c60468c2d0946e84e08 (diff) | |
| parent | c0b612ff07176d9cbddf0c7e5820607573b2af30 (diff) | |
| download | gitlab-ce-c2746a89f702da91cca24a07a0e5c99634f89218.tar.gz | |
Merge branch 'say-bye-bye-nicescroll' into 'master'
Removes nicescroll from issuable sidebar
See merge request !10831
| -rw-r--r-- | app/assets/javascripts/boards/components/board_sidebar.js | 12 | ||||
| -rw-r--r-- | app/assets/javascripts/issuable_context.js | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 9 |
3 files changed, 9 insertions, 13 deletions
diff --git a/app/assets/javascripts/boards/components/board_sidebar.js b/app/assets/javascripts/boards/components/board_sidebar.js index 9bcea302da2..082025eabaa 100644 --- a/app/assets/javascripts/boards/components/board_sidebar.js +++ b/app/assets/javascripts/boards/components/board_sidebar.js @@ -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 () { diff --git a/app/assets/javascripts/issuable_context.js b/app/assets/javascripts/issuable_context.js index 4520e990e6f..a4d7bf096ef 100644 --- a/app/assets/javascripts/issuable_context.js +++ b/app/assets/javascripts/issuable_context.js @@ -47,7 +47,6 @@ import UsersSelect from './users_select'; Cookies.set('collapsed_gutter', true); } }); - $(".right-sidebar").niceScroll(); } IssuableContext.prototype.initParticipants = function() { diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 0184208ab82..ed4e5811b56 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -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; |