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

DRY on avatars

Browse source
This commit is contained in:
Marcelo Briones 2015-03-05 20:42:30 -03:00
parent b04a2638a5
commit 7be56849d9
7 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/header.scss
View file

@ -339,7 +339,6 @@ body > header {
left: 8px; left: 8px;
top: 8px; top: 8px;
display: block; display: block;
border-radius: 3px;
} }
.header-nav { .header-nav {

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

@ -31,22 +31,22 @@ 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;
box-shadow: 0px 1px 2px 0px #666;
-webkit-box-shadow: 0px 1px 2px 0px #666;
-moz-box-shadow: 0px 1px 2px 0px #666;
border-radius: 3px;
} }
&.small { &.small {
height: 35px; height: 35px;
width: 35px; width: 35px;
box-shadow: 0px 1px 2px 0px #666; }
-webkit-box-shadow: 0px 1px 2px 0px #666;
-moz-box-shadow: 0px 1px 2px 0px #666; &.medium {
border-radius: 4px; height: auto;
width: auto;
max-width: 75px;
} }
} }

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;
}

4
app/assets/stylesheets/notifications.scss
View file

@ -78,10 +78,6 @@
.avatar { .avatar {
width: 35px; width: 35px;
height: 35px; height: 35px;
box-shadow: 0px 1px 2px 0px #666;
-webkit-box-shadow: 0px 1px 2px 0px #666;
-moz-box-shadow: 0px 1px 2px 0px #666;
border-radius: 3px;
} }
.unread-toggle { .unread-toggle {

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