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