nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5733 from margori/avatar_shadow

Browse source 
Avatar aspect update and DRY
This commit is contained in:
Steffen van Bergerem 2015-03-12 14:08:31 +01:00
commit 4f960fd34a
6 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -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) * 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) * 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) * 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 ## Bug fixes
* orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158) * orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)

8
app/assets/stylesheets/new_styles/_base.scss
View file

@ -31,6 +31,8 @@ a { color : $link-blue }
.icon-blue { background-image: image_url("img/glyphicons-halflings-blue.png"); } .icon-blue { background-image: image_url("img/glyphicons-halflings-blue.png"); }
.avatar { .avatar {
border-radius: 4px;
&.micro { &.micro {
height: 20px; height: 20px;
width: 20px; width: 20px;
@ -40,6 +42,12 @@ a { color : $link-blue }
height: 35px; height: 35px;
width: 35px; width: 35px;
} }
&.medium {
height: auto;
width: auto;
max-width: 75px;
}
} }
.author-name { .author-name {

7
app/assets/stylesheets/new_styles/_settings.scss
View file

@ -13,5 +13,8 @@
} }
#profile_photo_upload .avatar { #profile_photo_upload .avatar {
max-width: 150px; height: auto;
} width: auto;
max-width: 200px;
margin-bottom: 10px;
}

3
app/assets/stylesheets/single-post-view.scss
View file

@ -20,9 +20,6 @@
line-height: $font-size-text; line-height: $font-size-text;
} }
} }
.avatar.medium {
max-width: 75px;
}
.bd { .bd {
padding-left: 10px; padding-left: 10px;
} }

2
app/assets/templates/header_tpl.jst.hbs
View file

@ -72,7 +72,7 @@
<div class="user-menu-more-indicator"> <div class="user-menu-more-indicator">
▼ ▼
</div> </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> <a class="user-name" href="#">{{current_user.name}}</a>
</li> </li>
<li class="user-menu-item"><a href="/people/{{current_user.guid}}">{{t "header.profile"}}</a></li> <li class="user-menu-item"><a href="/people/{{current_user.guid}}">{{t "header.profile"}}</a></li>

2
app/views/photos/_new_profile_photo.haml
View file

@ -58,7 +58,7 @@
window.onload = createUploader; window.onload = createUploader;
#profile_photo_upload #profile_photo_upload
= owner_image_tag(:thumb_medium) = owner_image_tag(:thumb_large)
.clearfix .clearfix