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
a1a0a035
Commit
a1a0a035
authored
Feb 13, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove sidebar toggle button; replace with dropdown
parent
572bc7bc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
16 deletions
+14
-16
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+4
-1
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+10
-15
No files found.
app/assets/stylesheets/framework/header.scss
View file @
a1a0a035
...
@@ -101,9 +101,12 @@ header {
...
@@ -101,9 +101,12 @@ header {
}
}
}
}
.global-dropdown
-toggle
{
.global-dropdown
{
position
:
absolute
;
position
:
absolute
;
left
:
-10px
;
left
:
-10px
;
}
.global-dropdown-toggle
{
margin
:
7px
0
;
margin
:
7px
0
;
font-size
:
18px
;
font-size
:
18px
;
padding
:
6px
10px
;
padding
:
6px
10px
;
...
...
app/views/layouts/header/_default.html.haml
View file @
a1a0a035
...
@@ -2,9 +2,16 @@
...
@@ -2,9 +2,16 @@
%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
%button
.side-nav-toggle
{
type:
'button'
,
"aria-label"
=>
"Toggle global navigation"
}
.dropdown.global-dropdown
%span
.sr-only
Toggle navigation
%button
.global-dropdown-toggle
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
=
icon
(
'bars'
)
%span
.sr-only
Toggle navigation
=
icon
(
'bars'
)
.dropdown-menu-nav
%ul
-
if
current_user
=
render
'layouts/nav/dashboard'
-
else
=
render
'layouts/nav/explore'
%button
.navbar-toggle
{
type:
'button'
}
%button
.navbar-toggle
{
type:
'button'
}
%span
.sr-only
Toggle navigation
%span
.sr-only
Toggle navigation
=
icon
(
'ellipsis-v'
)
=
icon
(
'ellipsis-v'
)
...
@@ -55,20 +62,8 @@
...
@@ -55,20 +62,8 @@
%div
%div
=
link_to
"Sign in"
,
new_session_path
(
:user
,
redirect_to_referer:
'yes'
),
class:
'btn btn-sign-in btn-success'
=
link_to
"Sign in"
,
new_session_path
(
:user
,
redirect_to_referer:
'yes'
),
class:
'btn btn-sign-in btn-success'
%h1
.title
=
title
%h1
.title
=
title
.dropdown
%button
.global-dropdown-toggle
{
href:
'#'
,
'data-toggle'
=>
'dropdown'
}
%span
.sr-only
Toggle navigation
=
icon
(
'bars'
)
.dropdown-menu-nav
%ul
-
if
current_user
=
render
'layouts/nav/dashboard'
-
else
=
render
'layouts/nav/explore'
.header-logo
.header-logo
=
link_to
root_path
,
class:
'home'
,
title:
'Dashboard'
,
id:
'logo'
do
=
link_to
root_path
,
class:
'home'
,
title:
'Dashboard'
,
id:
'logo'
do
=
brand_header_logo
=
brand_header_logo
...
...
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