Commit 4f960fd3 authored by Steffen van Bergerem's avatar Steffen van Bergerem

Merge pull request #5733 from margori/avatar_shadow

Avatar aspect update and DRY
parents e99fe86c 7be56849
......@@ -99,6 +99,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a
* Unify not connected pages (sign in, sign up, forgot password) [#5391](https://github.com/diaspora/diaspora/pull/5391)
* Port remaining stream pages to Bootstrap [#5715](https://github.com/diaspora/diaspora/pull/5715)
* Partial Backbone port of the notification dropdown [#5707](https://github.com/diaspora/diaspora/pull/5707)
* Add rounded corners for avatars [#5733](https://github.com/diaspora/diaspora/pull/5733)
## Bug fixes
* orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)
......
......@@ -31,6 +31,8 @@ a { color : $link-blue }
.icon-blue { background-image: image_url("img/glyphicons-halflings-blue.png"); }
.avatar {
border-radius: 4px;
&.micro {
height: 20px;
width: 20px;
......@@ -40,6 +42,12 @@ a { color : $link-blue }
height: 35px;
width: 35px;
}
&.medium {
height: auto;
width: auto;
max-width: 75px;
}
}
.author-name {
......
......@@ -13,5 +13,8 @@
}
#profile_photo_upload .avatar {
max-width: 150px;
}
\ No newline at end of file
height: auto;
width: auto;
max-width: 200px;
margin-bottom: 10px;
}
......@@ -20,9 +20,6 @@
line-height: $font-size-text;
}
}
.avatar.medium {
max-width: 75px;
}
.bd {
padding-left: 10px;
}
......
......@@ -72,7 +72,7 @@
<div class="user-menu-more-indicator">
</div>
<img alt="{{current_user.name}}" class="user-menu-avatar" src="{{current_user.avatar.small}}" title="{{current_user.name}}" />
<img alt="{{current_user.name}}" class="avatar user-menu-avatar" src="{{current_user.avatar.small}}" title="{{current_user.name}}" />
<a class="user-name" href="#">{{current_user.name}}</a>
</li>
<li class="user-menu-item"><a href="/people/{{current_user.guid}}">{{t "header.profile"}}</a></li>
......
......@@ -58,7 +58,7 @@
window.onload = createUploader;
#profile_photo_upload
= owner_image_tag(:thumb_medium)
= owner_image_tag(:thumb_large)
.clearfix
......
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