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

profile photos as thumbnails

Browse source
This commit is contained in:
arlogn 2015-01-04 02:33:17 +01:00
parent dece3cf6b0
commit 43a2a5c336
3 changed files with 43 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/assets/stylesheets/stream_element.css.scss
View file

@ -1,8 +1,5 @@
#main_stream .stream_element, #main_stream .stream_element,
#main_stream > div > .photo { #main_stream > div > .photo {
border-bottom: 1px solid $border-grey;
padding: 10px;
& > .media { & > .media {
margin: 0px; margin: 0px;
} }
@ -12,7 +9,42 @@
} }
} }
#main_stream > div > .photo {
& > .media {
overflow: visible;
> .bd {
position: relative;
overflow: inherit;
> .controls {
position: absolute;
right: 6px;
top: 1px;
width: 15px;
height: 15px;
text-align: center;
line-height: 15px;
}
}
&:hover > .bd > .controls { background: #fff; }
}
.thumbnail {
height: 200px;
padding: 10px;
margin: 0 5px 10px;
text-align: center;
line-height: 200px;
border: 1px solid $border-grey;
background: #fefefe;
box-shadow: 3px 3px 2px #eee;
img {
&.big_photo { max-height: 200px; }
}
}
}
#main_stream .stream_element { #main_stream .stream_element {
border-bottom: 1px solid $border-grey;
padding: 10px;
& > .media { & > .media {
& > .img > .avatar.small { & > .img > .avatar.small {
height: 50px; height: 50px;

13
app/assets/templates/photo_tpl.jst.hbs
View file

@ -1,4 +1,4 @@
<div class="media"> <div class="media span4">
<div class="bd"> <div class="bd">
{{#if loggedIn}} {{#if loggedIn}}
<div class="controls"> <div class="controls">
@ -20,10 +20,11 @@
</div> </div>
{{/if}} {{/if}}
<a href="#" class="photo-link"> <div class="thumbnail">
<img src="{{sizes.large}}" class="photo big_photo" data-small-photo="{{sizes.small}}" data-full-photo="{{sizes.large}}" rel="lightbox"> <a href="#" class="photo-link">
</a> <img src="{{sizes.large}}" class="photo big_photo" data-small-photo="{{sizes.small}}" data-full-photo="{{sizes.large}}" rel="lightbox">
</a>
</div>
</div> </div>

2
features/step_definitions/profile_steps.rb
View file

@ -7,7 +7,7 @@ And /^I mark myself as safe for work$/ do
end end
When(/^I delete a photo$/) do When(/^I delete a photo$/) do
find('.photo.loaded').hover find('.photo.loaded .thumbnail', :match => :first).hover
find('.delete', :match => :first).click find('.delete', :match => :first).click
end end