Move comment timestamp next to author name, add permalink

closes #7905

Changelog.md

@@ -4,6 +4,7 @@
 
 * Make setting up a development environment 9001% easier by adding a Docker-based setup [#7870](https://github.com/diaspora/diaspora/pull/7870)
 * Improve `web+diaspora://` handler description [#7909](https://github.com/diaspora/diaspora/pull/7909)
+* Move comment timestamp next to author name [#7905](https://github.com/diaspora/diaspora/pull/7905)
 
 ## Bug fixes
 

app/assets/stylesheets/comments.scss

@@ -44,6 +44,19 @@
     }
   }
 
+  .permalink {
+    @include transition(opacity);
+    opacity: 0;
+  }
+
+  .comment:hover .permalink {
+    opacity: .8;
+
+    &:hover {
+      opacity: 1;
+    }
+  }
+
   .comment.new-comment-form-wrapper { padding-bottom: 0; }
 
   .submit-button {

app/assets/stylesheets/stream_element.scss

@@ -122,9 +122,12 @@
     opacity: 0;
   }
 
-  &:hover .permalink {
+  &:hover .post-timestamp .permalink {
     opacity: .8;
-    &:hover { opacity: 1; }
+
+    &:hover {
+      opacity: 1;
+    }
   }
 
   div.reshare {

app/assets/templates/comment_tpl.jst.hbs

@@ -20,18 +20,21 @@
     {{/if}}
     </div>
 
-    {{#linkToAuthor author}}
-      {{name}}
-    {{/linkToAuthor}}
+    <div>
+      {{#linkToAuthor author}}
+        {{name}}
+      {{/linkToAuthor}}
+      -
+      <a href="/posts/{{parent.id}}#{{guid}}" class="permalink_comment">
+        <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}"/>
+      </a>
+      <a href="/posts/{{parent.guid}}#{{guid}}" class="permalink gray" title="{{t "stream.permalink"}}">
+        <i class="entypo-link"></i>
+      </a>
+    </div>
 
     <div class="collapsible comment-content markdown-content">
       {{{text}}}
     </div>
-
-    <div class="info">
-      <a href="/posts/{{parent.id}}#{{guid}}" class="permalink_comment">
-        <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}"/>
-      </a>
-    </div>
   </div>
 </div>

app/assets/templates/stream-element_tpl.jst.hbs

@@ -19,7 +19,7 @@
           {{~name~}}
         {{/linkToAuthor}}
 
-        <span class="details gray">
+        <span class="details gray post-timestamp">
           -
           <a href="/posts/{{id}}">
             <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}" />