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

Fix Bootstrap3 regression: reshares in SPV

Browse source
This commit is contained in:
Steffen van Bergerem 2015-06-07 11:51:53 +02:00
parent ab1e879cc2
commit 06a1a1c978
2 changed files with 85 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,6 @@
#single-post-content { #single-post-content {
border-right: solid 1px #cccccc; border-right: solid 1px #cccccc;
padding-right: 12px;
#head { #head {
padding-bottom: 10px; padding-bottom: 10px;
border-bottom: 1px solid $border-grey; border-bottom: 1px solid $border-grey;
@ -60,7 +59,6 @@
.img { margin-right: 10px; } .img { margin-right: 10px; }
} }
#single-post-actions { #single-post-actions {
padding-right: 5px;
i { i {
font-size: 28px; font-size: 28px;
line-height: 30px; line-height: 30px;

169
app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs
View file

@ -1,101 +1,102 @@
<div id='head' class='row'> <div id="head" class="row">
<div class='col-md-12 <div class="col-md-12">
'> <div class="row">
<div id='post-info' class='col-md-8'> <div id="post-info" class="col-md-8">
<div class="img pull-left"> <div class="img pull-left">
{{#if root}}
{{#linkToAuthor root.author}}
{{{personImage this 'medium'}}}
{{/linkToAuthor}}
{{else}}
{{#linkToAuthor author}}
{{{personImage this 'medium'}}}
{{/linkToAuthor}}
{{/if}}
</div>
<div class="bd">
<span class='author'>
{{#if root}} {{#if root}}
{{#linkToAuthor root.author}} {{#linkToAuthor root.author}}
{{name}} {{{personImage this "medium"}}}
{{/linkToAuthor}} {{/linkToAuthor}}
{{else}} {{else}}
{{#linkToAuthor author}} {{#linkToAuthor author}}
{{name}} {{{personImage this "medium"}}}
{{/linkToAuthor}} {{/linkToAuthor}}
{{/if}} {{/if}}
</span> </div>
<div class='info'> <div class="bd">
{{#if public}} <span class="author">
<span class='post_scope' title="{{t "stream.public"}}">
<i class="entypo globe small"></i>
</span>
{{else}}
<span class='post_scope' title="{{t "stream.limited"}}">
<i class="entypo lock small"></i>
</span>
{{/if}}
<span class="post-time">
{{#if root}} {{#if root}}
<a href="/posts/{{root.id}}"> {{#linkToAuthor root.author}}
<time datetime="{{root.created_at}}" title="{{localTime root.created_at}}" /> {{name}}
</a> {{/linkToAuthor}}
{{else}} {{else}}
{{#linkToAuthor author}}
{{name}}
{{/linkToAuthor}}
{{/if}}
</span>
<div class="info">
{{#if public}}
<span class="post_scope" title="{{t "stream.public"}}">
<i class="entypo globe small"></i>
</span>
{{else}}
<span class="post_scope" title="{{t "stream.limited"}}">
<i class="entypo lock small"></i>
</span>
{{/if}}
<span class="post-time">
{{#if root}}
<a href="/posts/{{root.id}}">
<time datetime="{{root.created_at}}" title="{{localTime root.created_at}}" />
</a>
{{else}}
<a href="/posts/{{id}}">
<time datetime="{{created_at}}" title="{{localTime created_at}}" />
</a>
{{/if}}
</span>
{{#if root}}
{{#if root.provider_display_name}}
{{t "stream.via" provider=root.provider_display_name}}
{{/if}}
{{else}}
{{#if provider_display_name}}
{{t "stream.via" provider=provider_display_name}}
{{/if}}
{{/if}}
<div class="status-message-location" />
</div>
{{#unless root}}
<div id="single-post-moderation" />
{{/unless}}
</div>
</div>
{{#unless root}}
<div id="single-post-actions" class="col-md-4" />
{{/unless}}
</div>
{{#if root}}
<div class="row reshare">
<div class="col-md-8" id="reshare-info">
<i class="entypo retweet small pull-left"></i>
<div class="img pull-left">
{{#linkToAuthor author}}
{{{personImage this "small"}}}
{{/linkToAuthor}}
</div>
<span class="author">
{{#linkToAuthor author}}
{{name}}
{{/linkToAuthor}}
</span>
<div class="post-context">
<span class="post-time">
<a href="/posts/{{id}}"> <a href="/posts/{{id}}">
<time datetime="{{created_at}}" title="{{localTime created_at}}" /> <time datetime="{{created_at}}" title="{{localTime created_at}}" />
</a> </a>
{{/if}} </span>
</span> <span id="single-post-moderation" />
{{#if root}} </div>
{{#if root.provider_display_name}}
{{t "stream.via" provider=root.provider_display_name}}
{{/if}}
{{else}}
{{#if provider_display_name}}
{{t "stream.via" provider=provider_display_name}}
{{/if}}
{{/if}}
<div class='status-message-location' />
</div> </div>
{{#unless root}} <div id="single-post-actions" class="col-md-4" />
<div id='single-post-moderation' />
{{/unless}}
</div> </div>
</div> {{/if}}
{{#unless root}} </div>
<div id='single-post-actions' class='col-md-4' /> </div>
{{/unless}} <div id="body" class="row">
</div> <div id="real-post-content" class="post-content col-md-12">
{{#if root}}
<div class='row reshare'>
<div class='col-md-8' id='reshare-info'>
<i class='entypo retweet small pull-left'></i>
<div class="img pull-left">
{{#linkToAuthor author}}
{{{personImage this 'small'}}}
{{/linkToAuthor}}
</div>
<span class="author">
{{#linkToAuthor author}}
{{name}}
{{/linkToAuthor}}
</span>
<div class="post-context">
<span class="post-time">
<a href="/posts/{{id}}">
<time datetime="{{created_at}}" title="{{localTime created_at}}" />
</a>
</span>
<span id='single-post-moderation' />
</div>
</div>
<div id='single-post-actions' class='col-md-4' />
</div>
{{/if}}
</div>
<div id='body' class='row'>
<div id='real-post-content' class='post-content col-md-12'>
</div> </div>
</div> </div>