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
646feca6
Commit
646feca6
authored
Jun 28, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make header into links; CSS tweaks
parent
ef722faa
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
8 deletions
+14
-8
new_sidebar.scss
app/assets/stylesheets/new_sidebar.scss
+8
-2
_new_admin_sidebar.html.haml
app/views/layouts/nav/_new_admin_sidebar.html.haml
+1
-1
_new_group_sidebar.html.haml
app/views/layouts/nav/_new_group_sidebar.html.haml
+1
-1
_new_profile_sidebar.html.haml
app/views/layouts/nav/_new_profile_sidebar.html.haml
+3
-3
_new_project_sidebar.html.haml
app/views/layouts/nav/_new_project_sidebar.html.haml
+1
-1
No files found.
app/assets/stylesheets/new_sidebar.scss
View file @
646feca6
...
...
@@ -19,6 +19,7 @@ $new-sidebar-width: 220px;
.context-header
{
background-color
:
$gray-normal
;
border-bottom
:
1px
solid
$border-color
;
font-weight
:
600
;
display
:
flex
;
align-items
:
center
;
padding
:
10px
14px
;
...
...
@@ -26,15 +27,20 @@ $new-sidebar-width: 220px;
.avatar-container
{
flex
:
0
0
40px
;
}
&
:hover
{
background-color
:
$border-color
;
}
}
.settings-avatar
{
background-color
:
$white-light
;
.fa-wrench
{
.fa-wrench
,
.fa-user
{
font-size
:
20px
;
width
:
100%
;
color
:
$gl-text-color-
light
;
color
:
$gl-text-color-
secondary
;
text-align
:
center
;
align-self
:
center
;
}
...
...
app/views/layouts/nav/_new_admin_sidebar.html.haml
View file @
646feca6
.nav-sidebar
.context-header
=
link_to
admin_root_path
,
title:
'Overview'
,
class:
'context-header'
do
.avatar-container.s40.settings-avatar
=
icon
(
'wrench'
)
.project-title
Admin Area
...
...
app/views/layouts/nav/_new_group_sidebar.html.haml
View file @
646feca6
.nav-sidebar
.context-header
=
link_to
group_path
(
@group
),
title:
'Home'
,
class:
'context-header'
do
.avatar-container.s40.group-avatar
=
image_tag
group_icon
(
@group
),
class:
"avatar s40 avatar-tile"
.group-title
...
...
app/views/layouts/nav/_new_profile_sidebar.html.haml
View file @
646feca6
.nav-sidebar
.context-header
=
link_to
profile_path
,
title:
'Profile Settings'
,
class:
'context-header'
do
.avatar-container.s40.settings-avatar
=
icon
(
'
wrench
'
)
.project-title
Settings
=
icon
(
'
user
'
)
.project-title
User
Settings
%ul
.sidebar-top-level-items
=
nav_link
(
path:
'profiles#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
profile_path
,
title:
'Profile Settings'
do
...
...
app/views/layouts/nav/_new_project_sidebar.html.haml
View file @
646feca6
.nav-sidebar
-
can_edit
=
can?
(
current_user
,
:admin_project
,
@project
)
.context-header
=
link_to
project_path
(
@project
),
title:
'Project'
,
class:
'context-header'
do
.avatar-container.s40.project-avatar
=
project_icon
(
@project
,
alt:
@project
.
name
,
class:
'avatar s40 avatar-tile'
)
.project-title
...
...
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