Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
c2746a89
Commit
c2746a89
authored
May 16, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'say-bye-bye-nicescroll' into 'master'
Removes nicescroll from issuable sidebar See merge request !10831
parents
032cbcdb
c0b612ff
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
13 deletions
+9
-13
app/assets/javascripts/boards/components/board_sidebar.js
app/assets/javascripts/boards/components/board_sidebar.js
+0
-12
app/assets/javascripts/issuable_context.js
app/assets/javascripts/issuable_context.js
+0
-1
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+9
-0
No files found.
app/assets/javascripts/boards/components/board_sidebar.js
View file @
c2746a89
...
@@ -59,18 +59,6 @@ gl.issueBoards.BoardSidebar = Vue.extend({
...
@@ -59,18 +59,6 @@ gl.issueBoards.BoardSidebar = Vue.extend({
},
},
deep
:
true
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
:
{
methods
:
{
closeSidebar
()
{
closeSidebar
()
{
...
...
app/assets/javascripts/issuable_context.js
View file @
c2746a89
...
@@ -47,7 +47,6 @@ import UsersSelect from './users_select';
...
@@ -47,7 +47,6 @@ import UsersSelect from './users_select';
Cookies
.
set
(
'
collapsed_gutter
'
,
true
);
Cookies
.
set
(
'
collapsed_gutter
'
,
true
);
}
}
});
});
$
(
"
.right-sidebar
"
).
niceScroll
();
}
}
IssuableContext
.
prototype
.
initParticipants
=
function
()
{
IssuableContext
.
prototype
.
initParticipants
=
function
()
{
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
c2746a89
...
@@ -197,6 +197,15 @@
...
@@ -197,6 +197,15 @@
background
:
$gray-light
;
background
:
$gray-light
;
padding
:
10px
20px
;
padding
:
10px
20px
;
z-index
:
200
;
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
{
&
.right-sidebar-expanded
{
width
:
$gutter_width
;
width
:
$gutter_width
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment