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
d183e27e
Commit
d183e27e
authored
Jun 14, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Put all sidebar icons in fixed width container
parent
1c0c5232
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
10 deletions
+26
-10
app/assets/stylesheets/framework/sidebar.scss
app/assets/stylesheets/framework/sidebar.scss
+6
-0
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+20
-10
No files found.
app/assets/stylesheets/framework/sidebar.scss
View file @
d183e27e
...
...
@@ -83,6 +83,12 @@
margin-top
:
10px
;
}
.icon-container
{
width
:
34px
;
display
:
inline-block
;
text-align
:
center
;
}
a
{
width
:
$sidebar_width
;
padding
:
7px
15px
7px
23px
;
...
...
app/views/layouts/nav/_dashboard.html.haml
View file @
d183e27e
%ul
.nav.nav-sidebar
=
nav_link
(
path:
[
'root#index'
,
'projects#trending'
,
'projects#starred'
,
'dashboard/projects#index'
],
html_options:
{
class:
"
#{
project_tab_class
}
home"
})
do
=
link_to
dashboard_projects_path
,
title:
'Projects'
,
class:
'dashboard-shortcuts-projects'
do
=
navbar_icon
(
'project'
)
.icon-container
=
navbar_icon
(
'project'
)
%span
Projects
=
nav_link
(
controller: :todos
)
do
=
link_to
dashboard_todos_path
,
title:
'Todos'
do
=
icon
(
'bell fw'
)
.icon-container
=
icon
(
'bell fw'
)
%span
Todos
%span
.count
=
number_with_delimiter
(
todos_pending_count
)
=
nav_link
(
path:
'dashboard#activity'
)
do
=
link_to
activity_dashboard_path
,
class:
'dashboard-shortcuts-activity'
,
title:
'Activity'
do
=
navbar_icon
(
'activity'
)
.icon-container
=
navbar_icon
(
'activity'
)
%span
Activity
=
nav_link
(
controller:
[
:groups
,
'groups/milestones'
,
'groups/group_members'
])
do
=
link_to
dashboard_groups_path
,
title:
'Groups'
do
=
navbar_icon
(
'group'
)
.icon-container
=
navbar_icon
(
'group'
)
%span
Groups
=
nav_link
(
controller:
'dashboard/milestones'
)
do
=
link_to
dashboard_milestones_path
,
title:
'Milestones'
do
=
navbar_icon
(
'milestones'
)
.icon-container
=
navbar_icon
(
'milestones'
)
%span
Milestones
=
nav_link
(
path:
'dashboard#issues'
)
do
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
class:
'dashboard-shortcuts-issues'
do
=
navbar_icon
(
'issues'
)
.icon-container
=
navbar_icon
(
'issues'
)
%span
Issues
%span
.count
=
number_with_delimiter
(
current_user
.
assigned_issues
.
opened
.
count
)
=
nav_link
(
path:
'dashboard#merge_requests'
)
do
=
link_to
assigned_mrs_dashboard_path
,
title:
'Merge Requests'
,
class:
'dashboard-shortcuts-merge_requests'
do
=
navbar_icon
(
'mr'
)
.icon-container
=
navbar_icon
(
'mr'
)
%span
Merge Requests
%span
.count
=
number_with_delimiter
(
current_user
.
assigned_merge_requests
.
opened
.
count
)
=
nav_link
(
controller: :snippets
)
do
=
link_to
dashboard_snippets_path
,
title:
'Snippets'
do
=
icon
(
'clipboard fw'
)
.icon-container
=
icon
(
'clipboard fw'
)
%span
Snippets
=
nav_link
(
controller: :help
)
do
=
link_to
help_path
,
title:
'Help'
do
=
icon
(
'question-circle fw'
)
.icon-container
=
icon
(
'question-circle fw'
)
%span
Help
=
nav_link
(
html_options:
{
class:
profile_tab_class
})
do
=
link_to
profile_path
,
title:
'Profile Settings'
,
data:
{
placement:
'bottom'
}
do
=
icon
(
'user fw'
)
.icon-container
=
icon
(
'user fw'
)
%span
Profile Settings
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