Commit 646feca6 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Make header into links; CSS tweaks

parent ef722faa
...@@ -19,6 +19,7 @@ $new-sidebar-width: 220px; ...@@ -19,6 +19,7 @@ $new-sidebar-width: 220px;
.context-header { .context-header {
background-color: $gray-normal; background-color: $gray-normal;
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
font-weight: 600;
display: flex; display: flex;
align-items: center; align-items: center;
padding: 10px 14px; padding: 10px 14px;
...@@ -26,15 +27,20 @@ $new-sidebar-width: 220px; ...@@ -26,15 +27,20 @@ $new-sidebar-width: 220px;
.avatar-container { .avatar-container {
flex: 0 0 40px; flex: 0 0 40px;
} }
&:hover {
background-color: $border-color;
}
} }
.settings-avatar { .settings-avatar {
background-color: $white-light; background-color: $white-light;
.fa-wrench { .fa-wrench,
.fa-user {
font-size: 20px; font-size: 20px;
width: 100%; width: 100%;
color: $gl-text-color-light; color: $gl-text-color-secondary;
text-align: center; text-align: center;
align-self: center; align-self: center;
} }
......
.nav-sidebar .nav-sidebar
.context-header = link_to admin_root_path, title: 'Overview', class: 'context-header' do
.avatar-container.s40.settings-avatar .avatar-container.s40.settings-avatar
= icon('wrench') = icon('wrench')
.project-title Admin Area .project-title Admin Area
......
.nav-sidebar .nav-sidebar
.context-header = link_to group_path(@group), title: 'Home', class: 'context-header' do
.avatar-container.s40.group-avatar .avatar-container.s40.group-avatar
= image_tag group_icon(@group), class: "avatar s40 avatar-tile" = image_tag group_icon(@group), class: "avatar s40 avatar-tile"
.group-title .group-title
......
.nav-sidebar .nav-sidebar
.context-header = link_to profile_path, title: 'Profile Settings', class: 'context-header' do
.avatar-container.s40.settings-avatar .avatar-container.s40.settings-avatar
= icon('wrench') = icon('user')
.project-title Settings .project-title User Settings
%ul.sidebar-top-level-items %ul.sidebar-top-level-items
= nav_link(path: 'profiles#show', html_options: {class: 'home'}) do = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
= link_to profile_path, title: 'Profile Settings' do = link_to profile_path, title: 'Profile Settings' do
......
.nav-sidebar .nav-sidebar
- can_edit = can?(current_user, :admin_project, @project) - 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 .avatar-container.s40.project-avatar
= project_icon(@project, alt: @project.name, class: 'avatar s40 avatar-tile') = project_icon(@project, alt: @project.name, class: 'avatar s40 avatar-tile')
.project-title .project-title
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment