diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-11-04 21:27:43 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-04 21:27:43 +0000 |
| commit | 09f4af04c6672f7e2d1584f9940a3d9ff53a4a4f (patch) | |
| tree | 8a999e98a1ef46ce3366888c07bdb0498d25eb2c /app/views/admin | |
| parent | b3dc990d944222ecc60532d7306dfddd75e065a7 (diff) | |
| parent | 4664188824efd968fe870ec5f7893598e6b078f3 (diff) | |
| download | gitlab-ce-09f4af04c6672f7e2d1584f9940a3d9ff53a4a4f.tar.gz | |
Merge branch 'remove-wiki-image-border-radius' into 'master'
Update avatar container name so it doesnt conflict with other image containers
Bug from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7206 renders all wiki images circular
Before:
After:
cc @tauriedavis @dzaporozhets
See merge request !7268
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/groups/_group.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/groups/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/projects/index.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/admin/groups/_group.html.haml b/app/views/admin/groups/_group.html.haml index 05c88ca1cc8..664bb417c6a 100644 --- a/app/views/admin/groups/_group.html.haml +++ b/app/views/admin/groups/_group.html.haml @@ -16,7 +16,7 @@ %span.visibility-icon.has-tooltip{data: { container: 'body', placement: 'left' }, title: visibility_icon_description(group)} = visibility_level_icon(group.visibility_level, fw: false) - .image-container.s40 + .avatar-container.s40 = image_tag group_icon(group), class: "avatar s40 hidden-xs" .title = link_to [:admin, group], class: 'group-name' do diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index a7c1a4f5038..40871e32913 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -13,7 +13,7 @@ Group info: %ul.well-list %li - .image-container.s60 + .avatar-container.s60 = image_tag group_icon(@group), class: "avatar s60" %li %span.light Name: diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml index 10dce6f3d8f..b37b8d4fee7 100644 --- a/app/views/admin/projects/index.html.haml +++ b/app/views/admin/projects/index.html.haml @@ -76,7 +76,7 @@ .title = link_to [:admin, project.namespace.becomes(Namespace), project] do .dash-project-avatar - .image-container.s40 + .avatar-container.s40 = project_icon(project, alt: '', class: 'avatar project-avatar s40') %span.project-full-name %span.namespace-name |