Fixed moderation-button-position when viewing reshare

diaspora · Jan 28, 2015 · 04625ad · 04625ad
1 parent ccd7561
commit 04625ad
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/app/assets/stylesheets/single-post-view.css.scss b/app/assets/stylesheets/single-post-view.css.scss
@@ -41,9 +41,19 @@
         margin-left: 8px;
         margin-right: 8px;
       }
+      .post-context {
+        font-size: 12px;
+
+        #single-post-moderation {
+          margin-left: 5px;
+
+          > div.info {
+            display: inline-block;
+          }
+        }
+      }
       .post-time a {
         color: $text-grey;
-        display: block;
         font-size: 12px;
       }
       .avatar {

diff --git a/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs b/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs
@@ -58,7 +58,9 @@
           {{/if}}
           <div class='status-message-location' />
         </div>
+        {{#unless root}}
         <div id='single-post-moderation' />
+        {{/unless}}
       </div>
     </div>
     {{#unless root}}
@@ -79,11 +81,14 @@
             {{name}}
           {{/linkToAuthor}}
         </span>
-        <span class="post-time">
-          <a href="/posts/{{id}}">
-            <time datetime="{{created_at}}" title="{{localTime created_at}}" />
-          </a>
-        </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='span4' />
     </div>