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

Refactor photo css

Browse source
This commit is contained in:
Steffen van Bergerem 2016-08-09 00:29:58 +02:00
parent 2afb0b95ff
commit 9cbc7b6050
No known key found for this signature in database
GPG key ID: 2F08F75F9525C7E0
2 changed files with 36 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
#main_stream .stream_element,
#main_stream > div > .photo {
.photo {
& > .media {
margin: 0px;
}
@ -9,23 +9,22 @@
}
}
#main_stream > div > .photo {
& > .media {
.photo {
> .media {
overflow: visible;
position: relative;
> .bd {
position: relative;
overflow: inherit;
> .control-icons {
border-radius: 4px;
position: absolute;
right: 6px;
text-align: center;
top: 1px;
}
.control-icons {
background: $white;
border-radius: 4px;
padding-left: 4px;
position: absolute;
right: 4px;
text-align: center;
top: 1px;
}
&:hover > .bd > .control-icons { background: $white; }
}
.thumbnail {
background: $white;
border-radius: 0;

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

@ -1,29 +1,28 @@
<div class="media">
<div class="bd">
{{#if loggedIn}}
<div class="control-icons">
{{#if authorIsCurrentUser}}
<a href="#" rel="nofollow" class="delete remove_post" title="{{t "delete"}}">
<i class="entypo-trash"></i>
</a>
{{else}}
<a href="#" rel="nofollow" data-type="Post" class="post_report" title="{{t "report.name"}}">
<i class="entypo-warning"></i>
</a>
<a href="#" rel="nofollow" class="block_user" title="{{t "ignore"}}">
<i class="entypo-block"></i>
</a>
<a href="#" rel="nofollow" class="delete hide_post" title="{{t "stream.hide"}}">
<i class="entypo-cross"></i>
</a>
{{/if}}
</div>
{{/if}}
{{#if loggedIn}}
<div class="control-icons">
{{#if authorIsCurrentUser}}
<a href="#" rel="nofollow" class="delete remove_post" title="{{t "delete"}}">
<i class="entypo-trash"></i>
</a>
{{else}}
<a href="#" rel="nofollow" data-type="Post" class="post_report" title="{{t "report.name"}}">
<i class="entypo-warning"></i>
</a>
<a href="#" rel="nofollow" class="block_user" title="{{t "ignore"}}">
<i class="entypo-block"></i>
</a>
<a href="#" rel="nofollow" class="delete hide_post" title="{{t "stream.hide"}}">
<i class="entypo-cross"></i>
</a>
{{/if}}
</div>
{{/if}}
<a href="{{sizes.large}}" class="thumbnail img-thumbnail photo-link gallery-picture">
<img src="{{sizes.large}}" class="photo big-photo">
</a>
<a href="{{sizes.large}}" class="thumbnail img-thumbnail photo-link gallery-picture">
<img src="{{sizes.large}}" class="photo big-photo">
</a>
</div>
<div class="card-footer">
<div class="footer-container">
{{#if status_message}}