Commit 9c14954a authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

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

Fixed text overflow issue in new sidebars

See merge request !12648
parents 5f996e8c f5e3db5f
...@@ -31,6 +31,12 @@ $new-sidebar-width: 220px; ...@@ -31,6 +31,12 @@ $new-sidebar-width: 220px;
&:hover { &:hover {
background-color: $border-color; background-color: $border-color;
} }
.project-title,
.group-title {
overflow: hidden;
text-overflow: ellipsis;
}
} }
.settings-avatar { .settings-avatar {
......
.nav-sidebar .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 .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
- can_edit = can?(current_user, :admin_project, @project) - 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 .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