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
iv
gitlab-ce
Commits
2293100d
Commit
2293100d
authored
Jun 03, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update nav link font size and spacing; fix hamburger icon
parent
e8a0cafc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
24 deletions
+17
-24
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+2
-1
app/assets/stylesheets/framework/sidebar.scss
app/assets/stylesheets/framework/sidebar.scss
+5
-13
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+10
-10
No files found.
app/assets/stylesheets/framework/header.scss
View file @
2293100d
...
@@ -89,7 +89,8 @@ header {
...
@@ -89,7 +89,8 @@ header {
display
:
none
;
display
:
none
;
position
:
absolute
;
position
:
absolute
;
left
:
-10px
;
left
:
-10px
;
margin
:
8px
0
;
margin
:
6px
0
;
font-size
:
18px
;
padding
:
6px
10px
;
padding
:
6px
10px
;
border
:
none
;
border
:
none
;
background-color
:
$background-color
;
background-color
:
$background-color
;
...
...
app/assets/stylesheets/framework/sidebar.scss
View file @
2293100d
#logo
{
z-index
:
2
;
position
:
relative
;
cursor
:
pointer
;
}
.page-with-sidebar
{
.page-with-sidebar
{
padding-top
:
$header-height
;
padding-top
:
$header-height
;
transition-duration
:
.3s
;
transition-duration
:
.3s
;
...
@@ -98,9 +92,8 @@
...
@@ -98,9 +92,8 @@
a
{
a
{
text-align
:
center
;
text-align
:
center
;
padding
:
8px
0
;
padding
:
8px
;
font-size
:
$gl-font-size
;
font-size
:
$gl-font-size
;
line-height
:
24px
;
color
:
$gray
;
color
:
$gray
;
display
:
block
;
display
:
block
;
text-decoration
:
none
;
text-decoration
:
none
;
...
@@ -120,11 +113,10 @@
...
@@ -120,11 +113,10 @@
color
:
$gray-light
;
color
:
$gray-light
;
}
}
.count
{
.nav-link-text
{
float
:
right
;
margin-top
:
3px
;
background
:
#eee
;
font-size
:
13px
;
padding
:
0
8px
;
line-height
:
18px
;
@include
border-radius
(
6px
);
}
}
&
.back-link
i
{
&
.back-link
i
{
...
...
app/views/layouts/nav/_dashboard.html.haml
View file @
2293100d
...
@@ -2,50 +2,50 @@
...
@@ -2,50 +2,50 @@
=
nav_link
(
path:
[
'root#index'
,
'projects#trending'
,
'projects#starred'
,
'dashboard/projects#index'
],
html_options:
{
class:
"
#{
project_tab_class
}
home"
})
do
=
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
=
link_to
dashboard_projects_path
,
title:
'Projects'
,
class:
'dashboard-shortcuts-projects'
do
=
icon
(
'bookmark fw'
)
=
icon
(
'bookmark fw'
)
%div
.nav-link-text
Projects
Projects
=
nav_link
(
controller: :todos
)
do
=
nav_link
(
controller: :todos
)
do
=
link_to
dashboard_todos_path
,
title:
'Todos'
do
=
link_to
dashboard_todos_path
,
title:
'Todos'
do
=
icon
(
'bell fw'
)
=
icon
(
'bell fw'
)
%div
.nav-link-text
Todos
Todos
=
nav_link
(
path:
'dashboard#activity'
)
do
=
nav_link
(
path:
'dashboard#activity'
)
do
=
link_to
activity_dashboard_path
,
class:
'dashboard-shortcuts-activity'
,
title:
'Activity'
do
=
link_to
activity_dashboard_path
,
class:
'dashboard-shortcuts-activity'
,
title:
'Activity'
do
=
icon
(
'dashboard fw'
)
=
icon
(
'dashboard fw'
)
%div
.nav-link-text
Activity
Activity
=
nav_link
(
controller:
[
:groups
,
'groups/milestones'
,
'groups/group_members'
])
do
=
nav_link
(
controller:
[
:groups
,
'groups/milestones'
,
'groups/group_members'
])
do
=
link_to
dashboard_groups_path
,
title:
'Groups'
do
=
link_to
dashboard_groups_path
,
title:
'Groups'
do
=
icon
(
'group fw'
)
=
icon
(
'group fw'
)
%div
.nav-link-text
Groups
Groups
=
nav_link
(
controller:
'dashboard/milestones'
)
do
=
nav_link
(
controller:
'dashboard/milestones'
)
do
=
link_to
dashboard_milestones_path
,
title:
'Milestones'
do
=
link_to
dashboard_milestones_path
,
title:
'Milestones'
do
=
icon
(
'clock-o fw'
)
=
icon
(
'clock-o fw'
)
%div
.nav-link-text
Milestones
Milestones
=
nav_link
(
path:
'dashboard#issues'
)
do
=
nav_link
(
path:
'dashboard#issues'
)
do
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
class:
'dashboard-shortcuts-issues'
do
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
class:
'dashboard-shortcuts-issues'
do
=
icon
(
'exclamation-circle fw'
)
=
icon
(
'exclamation-circle fw'
)
%div
.nav-link-text
Issues
Issues
=
nav_link
(
path:
'dashboard#merge_requests'
)
do
=
nav_link
(
path:
'dashboard#merge_requests'
)
do
=
link_to
assigned_mrs_dashboard_path
,
title:
'Merge Requests'
,
class:
'dashboard-shortcuts-merge_requests'
do
=
link_to
assigned_mrs_dashboard_path
,
title:
'Merge Requests'
,
class:
'dashboard-shortcuts-merge_requests'
do
=
icon
(
'tasks fw'
)
=
icon
(
'tasks fw'
)
%div
.nav-link-text
Merge Requests
Merge Requests
=
nav_link
(
controller: :snippets
)
do
=
nav_link
(
controller: :snippets
)
do
=
link_to
dashboard_snippets_path
,
title:
'Snippets'
do
=
link_to
dashboard_snippets_path
,
title:
'Snippets'
do
=
icon
(
'clipboard fw'
)
=
icon
(
'clipboard fw'
)
%div
.nav-link-text
Snippets
Snippets
=
nav_link
(
controller: :help
)
do
=
nav_link
(
controller: :help
)
do
=
link_to
help_path
,
title:
'Help'
do
=
link_to
help_path
,
title:
'Help'
do
=
icon
(
'question-circle fw'
)
=
icon
(
'question-circle fw'
)
%div
.nav-link-text
Help
Help
=
nav_link
(
html_options:
{
class:
profile_tab_class
})
do
=
nav_link
(
html_options:
{
class:
profile_tab_class
})
do
=
link_to
profile_path
,
title:
'Profile Settings'
,
data:
{
placement:
'bottom'
}
do
=
link_to
profile_path
,
title:
'Profile Settings'
,
data:
{
placement:
'bottom'
}
do
=
icon
(
'user fw'
)
=
icon
(
'user fw'
)
%div
.nav-link-text
Profile Settings
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