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
06092192
Commit
06092192
authored
Nov 17, 2016
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove fixed positioning from navbar
parent
58131ac9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
7 deletions
+3
-7
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+0
-4
app/assets/stylesheets/framework/sidebar.scss
app/assets/stylesheets/framework/sidebar.scss
+1
-1
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+1
-1
spec/javascripts/fixtures/header.html.haml
spec/javascripts/fixtures/header.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/nav.scss
View file @
06092192
...
@@ -283,10 +283,7 @@
...
@@ -283,10 +283,7 @@
}
}
.layout-nav
{
.layout-nav
{
position
:
fixed
;
top
:
$header-height
;
width
:
100%
;
width
:
100%
;
z-index
:
11
;
background
:
$gray-light
;
background
:
$gray-light
;
border-bottom
:
1px
solid
$border-color
;
border-bottom
:
1px
solid
$border-color
;
transition
:
padding
$sidebar-transition-duration
;
transition
:
padding
$sidebar-transition-duration
;
...
@@ -419,7 +416,6 @@
...
@@ -419,7 +416,6 @@
}
}
.page-with-layout-nav
{
.page-with-layout-nav
{
margin-top
:
$header-height
+
2
;
.right-sidebar
{
.right-sidebar
{
top
:
(
$header-height
*
2
)
+
2
;
top
:
(
$header-height
*
2
)
+
2
;
...
...
app/assets/stylesheets/framework/sidebar.scss
View file @
06092192
.page-with-sidebar
{
.page-with-sidebar
{
padding
:
$header-height
0
25px
;
padding
-bottom
:
25px
;
transition
:
padding
$sidebar-transition-duration
;
transition
:
padding
$sidebar-transition-duration
;
&
.page-sidebar-pinned
{
&
.page-sidebar-pinned
{
...
...
app/views/layouts/header/_default.html.haml
View file @
06092192
%header
.navbar.navbar-
fixed-top.navbar-
gitlab
{
class:
nav_header_class
}
%header
.navbar.navbar-gitlab
{
class:
nav_header_class
}
%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
...
...
spec/javascripts/fixtures/header.html.haml
View file @
06092192
%header
.navbar.navbar-
fixed-top.navbar-
gitlab.nav_header_class
%header
.navbar.navbar-gitlab.nav_header_class
.container-fluid
.container-fluid
.header-content
.header-content
%button
.side-nav-toggle
%button
.side-nav-toggle
...
...
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