Commit 470efd4e authored by flaburgan's avatar flaburgan Committed by Benjamin Neff

Move comment timestamp next to author name, add permalink

closes #7905
parent b977e9c3
......@@ -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
......
......@@ -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 {
......
......@@ -122,9 +122,12 @@
opacity: 0;
}
&:hover .permalink {
&:hover .post-timestamp .permalink {
opacity: .8;
&:hover { opacity: 1; }
&:hover {
opacity: 1;
}
}
div.reshare {
......
......@@ -20,18 +20,21 @@
{{/if}}
</div>
{{#linkToAuthor author}}
{{name}}
{{/linkToAuthor}}
<div class="collapsible comment-content markdown-content">
{{{text}}}
</div>
<div class="info">
<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>
</div>
......@@ -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}}" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment