Commit 25a5c848 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'round-avatars' into 'master'

Round avatars

* Make all avatars rounded for consistency
* Introduce variable for border-radius for avatars

See merge request !1427
parents c6e24850 99736d45
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
float: left; float: left;
margin-right: 12px; margin-right: 12px;
width: 40px; width: 40px;
padding: 1px; height: 40px;
@include border-radius(4px); padding: 0;
@include border-radius($avatar_radius);
&.avatar-inline { &.avatar-inline {
float: none; float: none;
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
background: #fff; background: #fff;
color: #737881; color: #737881;
float: left; float: left;
@include border-radius(40px); @include border-radius($avatar_radius);
@include box-shadow(0 0 0 3px #EEE); @include box-shadow(0 0 0 3px #EEE);
overflow: hidden; overflow: hidden;
......
...@@ -57,3 +57,5 @@ $list-font-size: 15px; ...@@ -57,3 +57,5 @@ $list-font-size: 15px;
* Sidebar navigation width * Sidebar navigation width
*/ */
$sidebar_width: 230px; $sidebar_width: 230px;
$avatar_radius: 50%;
...@@ -140,7 +140,7 @@ header { ...@@ -140,7 +140,7 @@ header {
img { img {
width: 26px; width: 26px;
height: 26px; height: 26px;
@include border-radius(4px); @include border-radius($avatar_radius);
} }
} }
......
...@@ -102,12 +102,3 @@ ...@@ -102,12 +102,3 @@
} }
} }
} }
.profile-groups-avatars {
margin: 0 5px 10px 0;
img {
width: 50px;
height: 50px;
}
}
- groups.each do |group| .clearfix
= link_to group, class: 'profile-groups-avatars', :title => group.name do - groups.each do |group|
- image_tag group_icon(group.path) = link_to group, class: 'profile-groups-avatars', title: group.name do
= image_tag group_icon(group.path), class: '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