Merge branch 'new-project-sidebar-overflow-fix' into 'master'

Fixed text overflow issue in new sidebars

See merge request !12648
This commit is contained in:
Annabel Dunstone Gray 2017-07-07 16:23:59 +00:00
commit 9c14954a81
3 changed files with 8 additions and 2 deletions

View file

@ -31,6 +31,12 @@ $new-sidebar-width: 220px;
&:hover {
background-color: $border-color;
}
.project-title,
.group-title {
overflow: hidden;
text-overflow: ellipsis;
}
}
.settings-avatar {

View file

@ -1,5 +1,5 @@
.nav-sidebar
= link_to group_path(@group), title: 'Group', class: 'context-header' do
= link_to group_path(@group), title: @group.name, class: 'context-header' do
.avatar-container.s40.group-avatar
= image_tag group_icon(@group), class: "avatar s40 avatar-tile"
.group-title

View file

@ -1,6 +1,6 @@
.nav-sidebar
- can_edit = can?(current_user, :admin_project, @project)
= link_to project_path(@project), title: 'Project', class: 'context-header' do
= link_to project_path(@project), title: @project.name, class: 'context-header' do
.avatar-container.s40.project-avatar
= project_icon(@project, alt: @project.name, class: 'avatar s40 avatar-tile')
.project-title