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
Léo-Paul Géneau
gitlab-ce
Commits
eb56b700
Commit
eb56b700
authored
Mar 22, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
genericise sidebar vertical offset css as it relates to the subnav
parent
25d779a3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+7
-5
app/helpers/nav_helper.rb
app/helpers/nav_helper.rb
+5
-1
No files found.
app/assets/stylesheets/framework/nav.scss
View file @
eb56b700
...
...
@@ -416,14 +416,16 @@
.page-with-layout-nav
{
.right-sidebar
{
top
:
(
$header-height
*
2
)
+
2
;
top
:
(
$header-height
+
1
)
*
2
;
}
.build-sidebar
{
top
:
(
$header-height
*
3
)
+
3
;
&
.page-with-sub-nav
{
.right-sidebar
{
top
:
(
$header-height
+
1
)
*
3
;
&
.affix
{
top
:
0
;
&
.affix
{
top
:
0
;
}
}
}
}
...
...
app/helpers/nav_helper.rb
View file @
eb56b700
...
...
@@ -31,7 +31,11 @@ module NavHelper
end
def
layout_nav_class
"page-with-layout-nav"
if
defined?
(
nav
)
&&
nav
class_name
=
''
class_name
<<
" page-with-layout-nav"
if
defined?
(
nav
)
&&
nav
class_name
<<
" page-with-sub-nav"
if
content_for?
(
:sub_nav
)
class_name
end
def
nav_control_class
...
...
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