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

fix reshare tempalte; reorder header

Browse source
This commit is contained in:
danielgrippi 2012-02-09 15:50:32 -08:00 committed by Maxwell Salzberg
parent 173894d926
commit 29ea9c05e3
3 changed files with 34 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
public/javascripts/app/templates/header.handlebars
View file

@ -1,22 +1,21 @@
<div class="container" style="position:relative;"> <div class="container" style="position:relative;">
<a href="/explore">
<a href="/participate">
<img alt="Logo_small" class="diaspora_header_logo" height="38px" width="65px" src="{{imageUrl "/images/header-logo.png"}}" /> <img alt="Logo_small" class="diaspora_header_logo" height="38px" width="65px" src="{{imageUrl "/images/header-logo.png"}}" />
</a> </a>
<span class="header-nav"> <span class="header-nav">
<span>
<a href="/participate">
{{t "participate"}}
</a>
</span>
<span> <span>
<a href="/explore"> <a href="/explore">
{{t "explore"}} {{t "explore"}}
</a> </a>
</span> </span>
<span>
<a href="/participate">
{{t "participate"}}
</a>
</span>
</span> </span>
<div id="nav_badges"> <div id="nav_badges">

47
public/javascripts/app/templates/reshare.handlebars
View file

@ -2,34 +2,37 @@
{{#if root}} {{#if root}}
{{#with root}} <div class="media">
<a href="/people/{{author.guid}}">
<img src="{{author.avatar.small}}" class="avatar" />
</a>
<div class="content"> {{#with root}}
<div class="post_initial_info"> <a href="/people/{{author.guid}}" class="img">
<span class="from"> <img src="{{author.avatar.small}}" class="avatar" />
<a href="/people/{{author.guid}}"> </a>
{{/with}}
{{#with root}}
<div class="bd">
<div>
<a href="/people/{{author.guid}}" class="author">
{{author.name}} {{author.name}}
</a> </a>
</span>
<span class="details"> <span class="details grey">
- -
<a href="/posts/{{id}}"> <a href="/posts/{{id}}">
<time class="timeago" datetime="{{created_at}}"/> <time class="timeago" datetime="{{created_at}}"/>
</a> </a>
</span>
{{#if reshares_count}} {{#if reshares_count}}
- -
{{t "stream.reshares" count=reshares_count}} {{t "stream.reshares" count=reshares_count}}
{{/if}} {{/if}}
</div> </span>
{{/with}} </div>
{{/with}}
{{> status-message}} {{> status-message}}
</div>
</div> </div>

6
public/stylesheets/sass/application.sass
View file

@ -561,13 +561,7 @@ ul.as-selections
.stream_element .reshare .stream_element .reshare
:padding
:left 10px
:border-left 2px solid #ddd :border-left 2px solid #ddd
:margin
:top 5px
:bottom 10px
form.new_comment form.new_comment
input input