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

Merge pull request #4428 from svbergerem/4421-display-photos-inline

Browse source 
Fix photos in spv and always show visibility of post
This commit is contained in:
Jonne Haß 2013-08-22 11:35:31 -07:00
commit d891bcb6e4
3 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/stylesheets/entypo.css.scss
View file

@ -19,6 +19,14 @@
content: '\e718'; content: '\e718';
} }
&.globe:before {
content: '\1f30e';
}
&.lock:before {
content: '\1f512';
}
&.red { &.red {
color: #A40802; color: #A40802;
} }
@ -39,4 +47,8 @@
&.middle { &.middle {
font-size: 1.5em; font-size: 1.5em;
} }
&.small {
font-size: 1.2em;
}
} }

5
app/assets/stylesheets/single-post-view.css.scss
View file

@ -56,14 +56,17 @@
} }
border-right: solid 1px #cccccc; border-right: solid 1px #cccccc;
padding-right: 10px; padding-right: 10px;
#body { #body {
margin-left: 20px; margin-left: 20px;
padding-top: 20px; padding-top: 20px;
width: auto; width: auto;
.photo_attachments { .photo_attachments {
padding-bottom: 10px; padding-bottom: 10px;
text-align: center;
img { img {
display: block; &.big_stream_photo { display: block; }
display: inline;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
padding-bottom: 5px; padding-bottom: 5px;

8
app/assets/templates/single-post-viewer/single-post-actions_tpl.jst.hbs
View file

@ -1,8 +1,10 @@
<div class='pull-right'> <div class='pull-right'>
<span class='public-info'> <span class='public-info'>
{{#unless public}} {{#if public}}
<i class="icon-lock icon-grey"> </i> <i class="entypo globe small"> </i>
{{/unless}} {{else}}
<i class="entypo lock small"> </i>
{{/if}}
</span> </span>
<span class="post-time"> <span class="post-time">
<time datetime="{{created_at}}" title="{{localTime created_at}}" /> <time datetime="{{created_at}}" title="{{localTime created_at}}" />