From f228e17d39804e5cd5642e81a12df1cca19fd77d Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 7 Feb 2015 11:38:58 -0800
Subject: [PATCH] Add project-avatar and group-avatar css classes
---
app/assets/stylesheets/generic/avatar.scss | 2 +-
app/assets/stylesheets/sections/dashboard.scss | 3 ---
app/assets/stylesheets/sections/projects.scss | 1 -
app/views/dashboard/_project.html.haml | 2 +-
app/views/dashboard/projects.html.haml | 4 ++--
app/views/groups/edit.html.haml | 2 +-
app/views/groups/show.html.haml | 2 +-
app/views/projects/_home_panel.html.haml | 2 +-
app/views/projects/edit.html.haml | 2 +-
app/views/users/_groups.html.haml | 2 +-
10 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/app/assets/stylesheets/generic/avatar.scss b/app/assets/stylesheets/generic/avatar.scss
index b88cdd83937..700cc7e6947 100644
--- a/app/assets/stylesheets/generic/avatar.scss
+++ b/app/assets/stylesheets/generic/avatar.scss
@@ -15,7 +15,7 @@
&.s24 { margin-right: 4px; }
}
- &.avatar-tile {
+ &.group-avatar, &.project-avatar, &.avatar-tile {
@include border-radius(0px);
}
diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/sections/dashboard.scss
index 17c0cd81b93..77d403cc687 100644
--- a/app/assets/stylesheets/sections/dashboard.scss
+++ b/app/assets/stylesheets/sections/dashboard.scss
@@ -75,9 +75,6 @@
}
}
}
-.project-avatar {
- float: left;
-}
.project-description {
overflow: hidden;
diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index 0a7671e3feb..3bb3779c294 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -32,7 +32,6 @@
.avatar {
width: 70px;
height: 70px;
- @include border-radius(0px);
}
.identicon {
diff --git a/app/views/dashboard/_project.html.haml b/app/views/dashboard/_project.html.haml
index e9f411725a3..f0fb2c1881b 100644
--- a/app/views/dashboard/_project.html.haml
+++ b/app/views/dashboard/_project.html.haml
@@ -1,6 +1,6 @@
= link_to project_path(project), class: dom_class(project) do
.dash-project-avatar
- = project_icon(project.to_param, alt: '', class: 'avatar s40')
+ = project_icon(project.to_param, alt: '', class: 'avatar project-avatar s40')
.dash-project-access-icon
= visibility_level_icon(project.visibility_level)
%span.str-truncated
diff --git a/app/views/dashboard/projects.html.haml b/app/views/dashboard/projects.html.haml
index f60bcc72e1d..dba3025b3cc 100644
--- a/app/views/dashboard/projects.html.haml
+++ b/app/views/dashboard/projects.html.haml
@@ -11,8 +11,8 @@
- @projects.each do |project|
%li.my-project-row
%h4.project-title
- .project-avatar
- = project_icon(project.to_param, alt: '', class: 'avatar s60')
+ .pull-left
+ = project_icon(project.to_param, alt: '', class: 'avatar project-avatar s60')
.project-access-icon
= visibility_level_icon(project.visibility_level)
= link_to project_path(project), class: dom_class(project) do
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index a963c59586e..c4eb00e8925 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -12,7 +12,7 @@
.form-group
.col-sm-2
.col-sm-10
- = image_tag group_icon(@group.to_param), alt: '', class: 'avatar s160'
+ = image_tag group_icon(@group.to_param), alt: '', class: 'avatar group-avatar s160'
%p.light
- if @group.avatar?
You can change your group avatar here
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 484bebca2d8..f2e591c1939 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -1,6 +1,6 @@
.dashboard
%div
- = image_tag group_icon(@group.path), class: "avatar avatar-tile s90"
+ = image_tag group_icon(@group.path), class: "avatar group-avatar s90"
.clearfix
%h2
= @group.name
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index 2ed49f83a7a..5697f9ea1af 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -1,7 +1,7 @@
- empty_repo = @project.empty_repo?
.project-home-panel{:class => ("empty-project" if empty_repo)}
.project-identicon-holder
- = project_icon(@project.to_param, alt: '', class: 'avatar')
+ = project_icon(@project.to_param, alt: '', class: 'avatar project-avatar')
.project-home-row
.project-home-desc
- if @project.description.present?
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 367bd8806db..737cda411bc 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -78,7 +78,7 @@
.col-sm-2
.col-sm-10
- if @project.avatar?
- = project_icon(@project.to_param, alt: '', class: 'avatar s160')
+ = project_icon(@project.to_param, alt: '', class: 'avatar project-avatar s160')
%p.light
- if @project.avatar_in_git
Project avatar in repository: #{ @project.avatar_in_git }
diff --git a/app/views/users/_groups.html.haml b/app/views/users/_groups.html.haml
index b66a8808f87..cb84570a6d5 100644
--- a/app/views/users/_groups.html.haml
+++ b/app/views/users/_groups.html.haml
@@ -1,4 +1,4 @@
.clearfix
- groups.each do |group|
= link_to group, class: 'profile-groups-avatars inline', title: group.name do
- = image_tag group_icon(group.path), class: 'avatar avatar-tile s40'
+ = image_tag group_icon(group.path), class: 'avatar group-avatar s40'
--
GitLab