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
a3c926af
Commit
a3c926af
authored
Mar 30, 2017
by
tauriedavis
Committed by
Annabel Dunstone Gray
Mar 31, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
30276 Move issue, mr, todos next to profile dropdown in top nav
parent
47cc1fea
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+9
-9
changelogs/unreleased/30276-move-top-badges.yml
changelogs/unreleased/30276-move-top-badges.yml
+4
-0
No files found.
app/views/layouts/header/_default.html.haml
View file @
a3c926af
...
@@ -35,6 +35,15 @@
...
@@ -35,6 +35,15 @@
%li
%li
=
link_to
admin_root_path
,
title:
'Admin Area'
,
aria:
{
label:
"Admin Area"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
link_to
admin_root_path
,
title:
'Admin Area'
,
aria:
{
label:
"Admin Area"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'wrench fw'
)
=
icon
(
'wrench fw'
)
-
if
current_user
.
can_create_project?
%li
=
link_to
new_project_path
,
title:
'New project'
,
aria:
{
label:
"New project"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'plus fw'
)
-
if
Gitlab
::
Sherlock
.
enabled?
%li
=
link_to
sherlock_transactions_path
,
title:
'Sherlock Transactions'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'tachometer fw'
)
%li
%li
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
aria:
{
label:
"Issues"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
aria:
{
label:
"Issues"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'hashtag fw'
)
=
icon
(
'hashtag fw'
)
...
@@ -50,15 +59,6 @@
...
@@ -50,15 +59,6 @@
=
icon
(
'check-circle fw'
)
=
icon
(
'check-circle fw'
)
%span
.badge.todos-count
%span
.badge.todos-count
=
todos_count_format
(
todos_pending_count
)
=
todos_count_format
(
todos_pending_count
)
-
if
current_user
.
can_create_project?
%li
=
link_to
new_project_path
,
title:
'New project'
,
aria:
{
label:
"New project"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'plus fw'
)
-
if
Gitlab
::
Sherlock
.
enabled?
%li
=
link_to
sherlock_transactions_path
,
title:
'Sherlock Transactions'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'tachometer fw'
)
%li
.header-user.dropdown
%li
.header-user.dropdown
=
link_to
current_user
,
class:
"header-user-dropdown-toggle"
,
data:
{
toggle:
"dropdown"
}
do
=
link_to
current_user
,
class:
"header-user-dropdown-toggle"
,
data:
{
toggle:
"dropdown"
}
do
=
image_tag
avatar_icon
(
current_user
,
26
),
width:
26
,
height:
26
,
class:
"header-user-avatar"
=
image_tag
avatar_icon
(
current_user
,
26
),
width:
26
,
height:
26
,
class:
"header-user-avatar"
...
...
changelogs/unreleased/30276-move-top-badges.yml
0 → 100644
View file @
a3c926af
---
title
:
Move issue, mr, todos next to profile dropdown in top nav
merge_request
:
author
:
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