diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-07 16:23:56 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-07-07 16:23:56 +0000 |
| commit | f5e3db5f8a4485ef34ad3ee7dd5ba5a4be7fc4fd (patch) | |
| tree | 148647c232dc5d01799592e893bd2755c1501b9f | |
| parent | 5f996e8c3dfb8a78c5f440cfc88cd8a39e975234 (diff) | |
| download | gitlab-ce-f5e3db5f8a4485ef34ad3ee7dd5ba5a4be7fc4fd.tar.gz | |
Fixed text overflow issue in new sidebars
| -rw-r--r-- | app/assets/stylesheets/new_sidebar.scss | 6 | ||||
| -rw-r--r-- | app/views/layouts/nav/_new_group_sidebar.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/_new_project_sidebar.html.haml | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss index 17f23f7fce3..f9ceaec9418 100644 --- a/app/assets/stylesheets/new_sidebar.scss +++ b/app/assets/stylesheets/new_sidebar.scss @@ -31,6 +31,12 @@ $new-sidebar-width: 220px; &:hover { background-color: $border-color; } + + .project-title, + .group-title { + overflow: hidden; + text-overflow: ellipsis; + } } .settings-avatar { diff --git a/app/views/layouts/nav/_new_group_sidebar.html.haml b/app/views/layouts/nav/_new_group_sidebar.html.haml index b7ac04cc3e5..7b68d11041e 100644 --- a/app/views/layouts/nav/_new_group_sidebar.html.haml +++ b/app/views/layouts/nav/_new_group_sidebar.html.haml @@ -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 diff --git a/app/views/layouts/nav/_new_project_sidebar.html.haml b/app/views/layouts/nav/_new_project_sidebar.html.haml index 6e483353a2d..cc731db3cc1 100644 --- a/app/views/layouts/nav/_new_project_sidebar.html.haml +++ b/app/views/layouts/nav/_new_project_sidebar.html.haml @@ -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 |