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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
94919b47
Commit
94919b47
authored
May 05, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fade out border on scroll
parent
9059b99b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
11 deletions
+14
-11
app/assets/javascripts/layout_nav.js
app/assets/javascripts/layout_nav.js
+2
-6
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+10
-5
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+1
-0
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+1
-0
No files found.
app/assets/javascripts/layout_nav.js
View file @
94919b47
...
@@ -48,12 +48,8 @@ import _ from 'underscore';
...
@@ -48,12 +48,8 @@ import _ from 'underscore';
});
});
function
applyScrollNavClass
()
{
function
applyScrollNavClass
()
{
if
(
$
(
window
).
scrollTop
()
>
0
)
{
$
(
'
.navbar-border
'
).
css
(
"
opacity
"
,
$
(
window
).
scrollTop
()
/
40
);
$
(
'
.navbar-gitlab
'
).
addClass
(
'
scroll
'
);
}
else
{
$
(
'
.navbar-gitlab
'
).
removeClass
(
'
scroll
'
);
}
}
}
$
(
window
).
scroll
(
_
.
throttle
(
applyScrollNavClass
,
25
0
));
$
(
window
).
scroll
(
_
.
throttle
(
applyScrollNavClass
,
10
0
));
}).
call
(
window
);
}).
call
(
window
);
app/assets/stylesheets/framework/header.scss
View file @
94919b47
...
@@ -23,7 +23,6 @@ header {
...
@@ -23,7 +23,6 @@ header {
}
}
&
.navbar-gitlab
{
&
.navbar-gitlab
{
@include
transition
(
border-color
150ms
ease-in-out
);
padding
:
0
16px
;
padding
:
0
16px
;
z-index
:
100
;
z-index
:
100
;
margin-bottom
:
0
;
margin-bottom
:
0
;
...
@@ -43,10 +42,6 @@ header {
...
@@ -43,10 +42,6 @@ header {
border-color
:
transparent
;
border-color
:
transparent
;
}
}
&
.scroll
{
border-color
:
$border-color
;
}
.container-fluid
{
.container-fluid
{
width
:
100%
!
important
;
width
:
100%
!
important
;
filter
:
none
;
filter
:
none
;
...
@@ -118,6 +113,16 @@ header {
...
@@ -118,6 +113,16 @@ header {
}
}
}
}
.navbar-border
{
height
:
1px
;
position
:
fixed
;
left
:
0
;
right
:
0
;
top
:
50px
;
background-color
:
$border-color
;
opacity
:
0
;
}
.global-dropdown
{
.global-dropdown
{
position
:
absolute
;
position
:
absolute
;
left
:
-10px
;
left
:
-10px
;
...
...
app/views/layouts/header/_default.html.haml
View file @
94919b47
%header
.navbar.navbar-gitlab
{
class:
nav_header_class
}
%header
.navbar.navbar-gitlab
{
class:
nav_header_class
}
.navbar-border
%a
.sr-only.gl-accessibility
{
href:
"#content-body"
,
tabindex:
"1"
}
Skip to content
%a
.sr-only.gl-accessibility
{
href:
"#content-body"
,
tabindex:
"1"
}
Skip to content
.container-fluid
.container-fluid
.header-content
.header-content
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
94919b47
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
=
page_specific_javascript_bundle_tag
(
'sidebar'
)
=
page_specific_javascript_bundle_tag
(
'sidebar'
)
%aside
.right-sidebar.js-right-sidebar
{
data:
{
"offset-top"
=>
"50"
,
"spy"
=>
"affix"
},
class:
sidebar_gutter_collapsed_class
,
'aria-live'
=>
'polite'
}
%aside
.right-sidebar.js-right-sidebar
{
data:
{
"offset-top"
=>
"50"
,
"spy"
=>
"affix"
},
class:
sidebar_gutter_collapsed_class
,
'aria-live'
=>
'polite'
}
.issuable-sidebar
{
data:
{
endpoint:
"#{issuable_json_path(issuable)}"
}
}
-
can_edit_issuable
=
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
@project
)
-
can_edit_issuable
=
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
@project
)
.block.issuable-sidebar-header
.block.issuable-sidebar-header
-
if
current_user
-
if
current_user
...
...
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