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
Jérome Perrin
gitlab-ce
Commits
4a3f3bc7
Commit
4a3f3bc7
authored
Apr 28, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make layout navigation gray and fluid
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
adc296e9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
4 deletions
+23
-4
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+19
-0
app/views/layouts/_page.html.haml
app/views/layouts/_page.html.haml
+4
-4
No files found.
app/assets/stylesheets/framework/nav.scss
View file @
4a3f3bc7
...
@@ -185,3 +185,22 @@
...
@@ -185,3 +185,22 @@
}
}
}
}
}
}
.layout-nav
{
background
:
$gray-light
;
border-bottom
:
1px
solid
$border-color
;
.controls
{
float
:
right
;
position
:
relative
;
top
:
10px
;
.dropdown
{
margin-left
:
7px
;
}
}
.nav-links
{
border-bottom
:
none
;
}
}
app/views/layouts/_page.html.haml
View file @
4a3f3bc7
...
@@ -22,13 +22,13 @@
...
@@ -22,13 +22,13 @@
=
image_tag
avatar_icon
(
current_user
,
60
),
alt:
'Profile'
,
class:
'avatar avatar s36'
=
image_tag
avatar_icon
(
current_user
,
60
),
alt:
'Profile'
,
class:
'avatar avatar s36'
.username
.username
=
current_user
.
username
=
current_user
.
username
.content-wrapper
=
render
"layouts/flash"
=
yield
:flash_message
-
if
defined?
(
nav
)
&&
nav
-
if
defined?
(
nav
)
&&
nav
.layout-nav
.layout-nav
%div
{
class:
container_class
}
.container-fluid
=
render
"layouts/nav/
#{
nav
}
"
=
render
"layouts/nav/
#{
nav
}
"
.content-wrapper
=
render
"layouts/flash"
=
yield
:flash_message
%div
{
class:
(
container_class
unless
@no_container
)
}
%div
{
class:
(
container_class
unless
@no_container
)
}
.content
.content
.clearfix
.clearfix
...
...
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