BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
4281daf3
Commit
4281daf3
authored
Oct 27, 2016
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update links in side nav and header
parent
aba94f65
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
20 deletions
+25
-20
gitlab-theme.scss
app/assets/stylesheets/framework/gitlab-theme.scss
+10
-1
header.scss
app/assets/stylesheets/framework/header.scss
+5
-1
sidebar.scss
app/assets/stylesheets/framework/sidebar.scss
+5
-0
_default.html.haml
app/views/layouts/header/_default.html.haml
+2
-4
_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+3
-14
No files found.
app/assets/stylesheets/framework/gitlab-theme.scss
View file @
4281daf3
...
...
@@ -21,7 +21,14 @@
background
:
$color-darker
;
}
.nav-sidebar
li
{
.sidebar-header
,
.sidebar-action-buttons
{
color
:
$color-light
;
background-color
:
lighten
(
$color-darker
,
5%
);
}
.nav-sidebar
{
li
{
a
{
color
:
$color-light
;
...
...
@@ -73,6 +80,8 @@
}
}
}
}
}
}
...
...
app/assets/stylesheets/framework/header.scss
View file @
4281daf3
...
...
@@ -49,12 +49,16 @@ header {
font-size
:
18px
;
padding
:
0
;
margin
:
(
$header-height
-
28
)
/
2
0
;
margin-left
:
10
px
;
margin-left
:
8
px
;
height
:
28px
;
min-width
:
28px
;
line-height
:
28px
;
text-align
:
center
;
&
.header-user-dropdown-toggle
{
margin-left
:
14px
;
}
&
:hover
,
&
:focus
,
&
:active
{
...
...
app/assets/stylesheets/framework/sidebar.scss
View file @
4281daf3
...
...
@@ -59,6 +59,11 @@
padding
:
0
!
important
;
}
.sidebar-header
{
padding
:
11px
22px
12px
;
font-size
:
20px
;
}
li
{
&
.separate-item
{
padding-top
:
10px
;
...
...
app/views/layouts/header/_default.html.haml
View file @
4281daf3
...
...
@@ -29,10 +29,6 @@
=
icon
(
'bell fw'
)
%span
.badge.todos-pending-count
{
class:
(
"hidden"
if
todos_pending_count
==
0
)
}
=
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'
,
...
...
@@ -48,6 +44,8 @@
=
link_to
"Profile"
,
current_user
,
class:
'profile-link'
,
aria:
{
label:
"Profile"
},
data:
{
user:
current_user
.
username
}
%li
=
link_to
"Profile Settings"
,
profile_path
,
aria:
{
label:
"Profile Settings"
}
%li
=
link_to
"Help"
,
help_path
,
aria:
{
label:
"Help"
}
%li
.divider
%li
=
link_to
"Sign out"
,
destroy_user_session_path
,
method: :delete
,
class:
"sign-out-link"
,
aria:
{
label:
"Sign out"
}
...
...
app/views/layouts/nav/_dashboard.html.haml
View file @
4281daf3
%ul
.nav.nav-sidebar
.nav-sidebar
.sidebar-header
Across GitLab
%ul
.nav
=
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
%span
Projects
=
nav_link
(
controller: :todos
)
do
=
link_to
dashboard_todos_path
,
title:
'Todos'
do
%span
Todos
%span
.count.js-todos-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
%span
...
...
@@ -39,11 +36,3 @@
=
link_to
dashboard_snippets_path
,
title:
'Snippets'
do
%span
Snippets
=
nav_link
(
controller: :help
)
do
=
link_to
help_path
,
title:
'Help'
do
%span
Help
=
nav_link
(
html_options:
{
class:
profile_tab_class
})
do
=
link_to
profile_path
,
title:
'Profile Settings'
,
data:
{
placement:
'bottom'
}
do
%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