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

Merge pull request #6949 from svbergerem/refactor-photos-css

Browse source 
Refactor photo css
This commit is contained in:
Jonne Haß 2016-08-09 11:13:32 +02:00 committed by GitHub
commit 6495845de6
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 .stream_element,
#main_stream > div > .photo { .photo {
& > .media { & > .media {
margin: 0px; margin: 0px;
} }
@ -9,23 +9,22 @@
} }
} }
#main_stream > div > .photo { .photo {
& > .media { > .media {
overflow: visible; overflow: visible;
position: relative; position: relative;
> .bd {
position: relative; .control-icons {
overflow: inherit; background: $white;
> .control-icons { border-radius: 4px;
border-radius: 4px; padding-left: 4px;
position: absolute; position: absolute;
right: 6px; right: 4px;
text-align: center; text-align: center;
top: 1px; top: 1px;
}
} }
&:hover > .bd > .control-icons { background: $white; }
} }
.thumbnail { .thumbnail {
background: $white; background: $white;
border-radius: 0; border-radius: 0;

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

@ -1,29 +1,28 @@
<div class="media"> <div class="media">
<div class="bd"> {{#if loggedIn}}
{{#if loggedIn}} <div class="control-icons">
<div class="control-icons"> {{#if authorIsCurrentUser}}
{{#if authorIsCurrentUser}} <a href="#" rel="nofollow" class="delete remove_post" title="{{t "delete"}}">
<a href="#" rel="nofollow" class="delete remove_post" title="{{t "delete"}}"> <i class="entypo-trash"></i>
<i class="entypo-trash"></i> </a>
</a> {{else}}
{{else}} <a href="#" rel="nofollow" data-type="Post" class="post_report" title="{{t "report.name"}}">
<a href="#" rel="nofollow" data-type="Post" class="post_report" title="{{t "report.name"}}"> <i class="entypo-warning"></i>
<i class="entypo-warning"></i> </a>
</a> <a href="#" rel="nofollow" class="block_user" title="{{t "ignore"}}">
<a href="#" rel="nofollow" class="block_user" title="{{t "ignore"}}"> <i class="entypo-block"></i>
<i class="entypo-block"></i> </a>
</a> <a href="#" rel="nofollow" class="delete hide_post" title="{{t "stream.hide"}}">
<a href="#" rel="nofollow" class="delete hide_post" title="{{t "stream.hide"}}"> <i class="entypo-cross"></i>
<i class="entypo-cross"></i> </a>
</a> {{/if}}
{{/if}} </div>
</div> {{/if}}
{{/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="card-footer">
<div class="footer-container"> <div class="footer-container">
{{#if status_message}} {{#if status_message}}