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: ![Screen_Shot_2016-11-03_at_9.27.45_AM](/uploads/f49baa4481cec6d6c043087aa1a83d09/Screen_Shot_2016-11-03_at_9.27.45_AM.png) After: ![Screen_Shot_2016-11-03_at_9.27.37_AM](/uploads/5b21d1752b5fa5adcabd44b8973fb55d/Screen_Shot_2016-11-03_at_9.27.37_AM.png) cc @tauriedavis @dzaporozhets See merge request !7268

Merge branch 'remove-wiki-image-border-radius' into 'master'
09f4af04 · Fatih Acet · b3dc990d · 46641888 · 09f4af04 · 09f4af04
Commit 09f4af04 authored Nov 04, 2016 by Fatih Acet
11 changed files
--- a/app/assets/stylesheets/framework/avatar.scss
+++ b/app/assets/stylesheets/framework/avatar.scss
@@ -4,7 +4,7 @@
  margin-right: $margin-right;
 }

-.avatar-container {
+.avatar-circle {
  float: left;
  margin-right: 15px;
  border-radius: $avatar_radius;
@@ -27,7 +27,7 @@
 }

 .avatar {
-  @extend .avatar-container;
+  @extend .avatar-circle;
  width: 40px;
  height: 40px;
  padding: 0;
@@ -64,8 +64,8 @@
  &.s160 { font-size: 96px; line-height: 158px; }
 }

-.image-container {
-  @extend .avatar-container;
+.avatar-container {
+  @extend .avatar-circle;
  overflow: hidden;
  display: flex;

@@ -76,4 +76,4 @@
    margin: 0;
    align-self: center;
  }
-}
\ No newline at end of file
+}
--- 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

--- 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:

--- 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

--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -8,7 +8,7 @@

      .form-group
        .col-sm-offset-2.col-sm-10
-          .image-container.s160
+          .avatar-container.s160
            = image_tag group_icon(@group), alt: '', class: 'avatar group-avatar s160'
          %p.light
            - if @group.avatar?

--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -6,7 +6,7 @@

 .cover-block.groups-cover-block
  %div{ class: container_class }
-    .image-container.s70.group-avatar
+    .avatar-container.s70.group-avatar
      = image_tag group_icon(@group), class: "avatar s70 avatar-tile"
    .group-info
      .cover-title

--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
 - empty_repo = @project.empty_repo?
 .project-home-panel.text-center{ class: ("empty-project" if empty_repo) }
  %div{ class: container_class }
-    .image-container.s70.project-avatar
+    .avatar-container.s70.project-avatar
      = project_icon(@project, alt: @project.name, class: 'avatar s70 avatar-tile')
    %h1.project-title
      = @project.name

--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -118,7 +118,7 @@
            Project avatar
          .form-group
            - if @project.avatar?
-              .image-container.s160
+              .avatar-container.s160
                = project_icon("#{@project.namespace.to_param}/#{@project.to_param}", alt: '', class: 'avatar project-avatar s160')
            %p.light
              - if @project.avatar_in_git

--- a/app/views/shared/groups/_group.html.haml
+++ b/app/views/shared/groups/_group.html.haml
@@ -24,7 +24,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 group, class: 'group-name' do

--- a/app/views/shared/projects/_project.html.haml
+++ b/app/views/shared/projects/_project.html.haml
@@ -32,7 +32,7 @@
      = link_to project_path(project), class: dom_class(project) do
        - if avatar
          .dash-project-avatar
-            .image-container.s40
+            .avatar-container.s40
              - if use_creator_avatar
                = image_tag avatar_icon(project.creator.email, 40), class: "avatar s40", alt:''
              - else

--- a/app/views/users/_groups.html.haml
+++ b/app/views/users/_groups.html.haml
 .clearfix
  - groups.each do |group|
    = link_to group, class: 'profile-groups-avatars inline', title: group.name do
-      .image-container.s40
+      .avatar-container.s40
        = image_tag group_icon(group), class: 'avatar group-avatar s40'