Commit 9a3afa4d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'refactor-avatars' into 'master'

Refactor avatars css

See merge request !1487
parents 72cf8173 f228e17d
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
&.s24 { margin-right: 4px; } &.s24 { margin-right: 4px; }
} }
&.avatar-tile { &.group-avatar, &.project-avatar, &.avatar-tile {
@include border-radius(0px); @include border-radius(0px);
} }
......
...@@ -75,9 +75,6 @@ ...@@ -75,9 +75,6 @@
} }
} }
} }
.project-avatar {
float: left;
}
.project-description { .project-description {
overflow: hidden; overflow: hidden;
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
.avatar { .avatar {
width: 70px; width: 70px;
height: 70px; height: 70px;
@include border-radius(0px);
} }
.identicon { .identicon {
......
= link_to project_path(project), class: dom_class(project) do = link_to project_path(project), class: dom_class(project) do
.dash-project-avatar .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 .dash-project-access-icon
= visibility_level_icon(project.visibility_level) = visibility_level_icon(project.visibility_level)
%span.str-truncated %span.str-truncated
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
- @projects.each do |project| - @projects.each do |project|
%li.my-project-row %li.my-project-row
%h4.project-title %h4.project-title
.project-avatar .pull-left
= project_icon(project.to_param, alt: '', class: 'avatar s60') = project_icon(project.to_param, alt: '', class: 'avatar project-avatar s60')
.project-access-icon .project-access-icon
= visibility_level_icon(project.visibility_level) = visibility_level_icon(project.visibility_level)
= link_to project_path(project), class: dom_class(project) do = link_to project_path(project), class: dom_class(project) do
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
.form-group .form-group
.col-sm-2 .col-sm-2
.col-sm-10 .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 %p.light
- if @group.avatar? - if @group.avatar?
You can change your group avatar here You can change your group avatar here
......
.dashboard .dashboard
%div %div
= image_tag group_icon(@group.path), class: "avatar avatar-tile s90" = image_tag group_icon(@group.path), class: "avatar group-avatar s90"
.clearfix .clearfix
%h2 %h2
= @group.name = @group.name
......
- empty_repo = @project.empty_repo? - empty_repo = @project.empty_repo?
.project-home-panel{:class => ("empty-project" if empty_repo)} .project-home-panel{:class => ("empty-project" if empty_repo)}
.project-identicon-holder .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-row
.project-home-desc .project-home-desc
- if @project.description.present? - if @project.description.present?
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
.col-sm-2 .col-sm-2
.col-sm-10 .col-sm-10
- if @project.avatar? - 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 %p.light
- if @project.avatar_in_git - if @project.avatar_in_git
Project avatar in repository: #{ @project.avatar_in_git } Project avatar in repository: #{ @project.avatar_in_git }
......
.clearfix .clearfix
- groups.each do |group| - groups.each do |group|
= link_to group, class: 'profile-groups-avatars inline', title: group.name do = 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'
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