Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
4b415117e659
Commit
67ad6cc7
authored
Jul 14, 2015
by
Dmitriy Zaporozhets
Browse files
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
4f8ae8a6ab2b
923c7c031c12
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
app/assets/javascripts/application.js.coffee
View file @
4b415117
...
...
@@ -40,6 +40,7 @@
#= require shortcuts_issuable
#= require shortcuts_network
#= require cal-heatmap
#= require jquery.nicescroll.min
#= require_tree .
window
.
slugify
=
(
text
)
->
...
...
@@ -104,6 +105,8 @@ if location.hash
window
.
addEventListener
"hashchange"
,
shiftWindow
$
->
$
(
".nicescroll"
).
niceScroll
(
cursoropacitymax
:
'0.4'
,
cursorcolor
:
'#FFF'
,
cursorborder
:
"1px solid #FFF"
)
# Click a .js-select-on-focus field, select the contents
$
(
".js-select-on-focus"
).
on
"focusin"
,
->
# Prevent a mouseup event from deselecting the input
...
...
app/assets/stylesheets/generic/sidebar.scss
View file @
4b415117
...
...
@@ -3,7 +3,8 @@
position
:
fixed
;
top
:
0
;
bottom
:
0
;
overflow-y
:
scroll
;
overflow-y
:
auto
;
overflow-x
:
hidden
;
left
:
0
;
height
:
100%
;
transition-duration
:
.3s
;
...
...
app/assets/stylesheets/themes/gitlab-theme.scss
View file @
4b415117
...
...
@@ -35,7 +35,6 @@
.sidebar-wrapper
{
background
:
$color-darker
;
border-right
:
1px
solid
$color-darker
;
.sidebar-user
{
background
:
$color-darker
;
...
...
app/views/layouts/_page.html.haml
View file @
4b415117
.page-with-sidebar
{
class:
nav_sidebar_class
}
=
render
"layouts/broadcast"
.sidebar-wrapper
.sidebar-wrapper
.nicescroll
-
if
defined?
(
sidebar
)
&&
sidebar
=
render
"layouts/nav/
#{
sidebar
}
"
-
elsif
current_user
...
...
vendor/assets/javascripts/jquery.nicescroll.min.js
0 → 100644
View file @
4b415117
This diff is collapsed.
Click to expand it.
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