profile photos as thumbnails
This commit is contained in:
parent
dece3cf6b0
commit
43a2a5c336
3 changed files with 43 additions and 10 deletions
|
|
@ -1,8 +1,5 @@
|
|||
#main_stream .stream_element,
|
||||
#main_stream > div > .photo {
|
||||
border-bottom: 1px solid $border-grey;
|
||||
padding: 10px;
|
||||
|
||||
& > .media {
|
||||
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 {
|
||||
border-bottom: 1px solid $border-grey;
|
||||
padding: 10px;
|
||||
& > .media {
|
||||
& > .img > .avatar.small {
|
||||
height: 50px;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<div class="media">
|
||||
<div class="media span4">
|
||||
<div class="bd">
|
||||
{{#if loggedIn}}
|
||||
<div class="controls">
|
||||
|
|
@ -20,10 +20,11 @@
|
|||
</div>
|
||||
{{/if}}
|
||||
|
||||
<a href="#" class="photo-link">
|
||||
<img src="{{sizes.large}}" class="photo big_photo" data-small-photo="{{sizes.small}}" data-full-photo="{{sizes.large}}" rel="lightbox">
|
||||
</a>
|
||||
|
||||
<div class="thumbnail">
|
||||
<a href="#" class="photo-link">
|
||||
<img src="{{sizes.large}}" class="photo big_photo" data-small-photo="{{sizes.small}}" data-full-photo="{{sizes.large}}" rel="lightbox">
|
||||
</a>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ And /^I mark myself as safe for work$/ do
|
|||
end
|
||||
|
||||
When(/^I delete a photo$/) do
|
||||
find('.photo.loaded').hover
|
||||
find('.photo.loaded .thumbnail', :match => :first).hover
|
||||
find('.delete', :match => :first).click
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue