From b68b96667c939cf516f3db02da5fde37af2c6ac2 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Tue, 9 Oct 2018 09:52:45 +0200
Subject: [PATCH] Show linebreaks on comments display. Move name to meta
section. Make data format ISO standard.
---
.../activity/templates/activity/include/listing_base.html | 6 ++----
opentech/static_src/src/sass/apply/components/_feed.scss | 8 ++++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/opentech/apply/activity/templates/activity/include/listing_base.html b/opentech/apply/activity/templates/activity/include/listing_base.html
index 5f567ffe2..15ff754d5 100644
--- a/opentech/apply/activity/templates/activity/include/listing_base.html
+++ b/opentech/apply/activity/templates/activity/include/listing_base.html
@@ -6,7 +6,7 @@
<div class="feed__content">
<div class="feed__meta">
<p class="feed__label feed__label--{{ activity.type }} feed__label--mobile">{{ activity.type|capfirst }}</p>
- <p class="feed__meta-item">{{ activity.timestamp|date:"m.d.y h:iA e" }}</p>
+ <p class="feed__meta-item"><span>{{ activity|display_author:request.user }}</span> – {{ activity.timestamp|date:"Y-m-d H:i" }}</p>
{% if activity.private %}
<p class="feed__meta-item feed__meta-item--right">
<svg class="icon icon--eye"><use xlink:href="#eye"></use></svg>
@@ -15,13 +15,11 @@
{% endif %}
</div>
<p class="feed__heading">
- <span>{{ activity|display_author:request.user }}</span>
-
{% if submission_title %}
updated <a href="{{ activity.submission.get_absolute_url }}">{{ activity.submission.title }}</a>
{% endif %}
- - {{ activity.message }}
+ {{ activity.message|linebreaksbr }}
{% if not submission_title and activity|user_can_see_related:request.user %}
{% with url=activity.related_object.get_absolute_url %}
diff --git a/opentech/static_src/src/sass/apply/components/_feed.scss b/opentech/static_src/src/sass/apply/components/_feed.scss
index 8852c1926..87cec2429 100644
--- a/opentech/static_src/src/sass/apply/components/_feed.scss
+++ b/opentech/static_src/src/sass/apply/components/_feed.scss
@@ -69,7 +69,6 @@
display: flex;
align-items: center;
flex-wrap: wrap;
- text-transform: uppercase;
@include media-query(small-tablet) {
margin-bottom: 10px;
@@ -79,6 +78,10 @@
&__meta-item {
margin: 0 10px 0 0;
+ span {
+ font-weight: $weight--bold;
+ }
+
@include media-query(small-tablet) {
margin: 0 15px 0 0;
}
@@ -128,9 +131,6 @@
font-size: 18px;
}
- span {
- font-weight: $weight--bold;
- }
}
&__heading-status {
--
GitLab