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

Merge pull request #6838 from Flaburgan/masonry-photo

Browse source 
Set fixed height of tile in photos stream, fix #6809
This commit is contained in:
Steffen van Bergerem 2016-08-08 23:46:23 +02:00
commit dc236b8b9d
No known key found for this signature in database
GPG key ID: 2F08F75F9525C7E0
2 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/assets/stylesheets/stream_element.scss
View file

@ -18,7 +18,6 @@
overflow: inherit; overflow: inherit;
> .control-icons { > .control-icons {
border-radius: 4px; border-radius: 4px;
padding-left: 5px;
position: absolute; position: absolute;
right: 6px; right: 6px;
text-align: center; text-align: center;
@ -28,12 +27,37 @@
&:hover > .bd > .control-icons { background: $white; } &:hover > .bd > .control-icons { background: $white; }
} }
.thumbnail { .thumbnail {
padding: 10px;
margin: 0 0 15px;
background: $white; background: $white;
border-radius: 0; border-radius: 0;
box-shadow: $card-shadow; box-shadow: $card-shadow;
img.big_photo { max-height: 200px; } height: 240px;
margin: 0 0 15px;
padding: 10px;
// Vertically align the image
text-align: center;
white-space: nowrap;
&:hover,
&:focus,
&:active {
border-color: $light-grey;
text-decoration: none;
}
&::before {
content: '';
display: inline-block;
height: 100%;
vertical-align: middle;
}
.big-photo {
display: inline;
margin-left: -4px;
max-height: 200px;
vertical-align: middle;
}
} }
} }

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

@ -20,12 +20,10 @@
</div> </div>
{{/if}} {{/if}}
<div class="thumbnail img-thumbnail"> <a href="{{sizes.large}}" class="thumbnail img-thumbnail photo-link gallery-picture">
<a href="{{sizes.large}}" class="photo-link gallery-picture"> <img src="{{sizes.large}}" class="photo big-photo">
<img src="{{sizes.large}}" class="photo big_photo">
</a> </a>
</div> </div>
</div>
<div class="card-footer"> <div class="card-footer">
<div class="footer-container"> <div class="footer-container">
{{#if status_message}} {{#if status_message}}