Merge branch 'develop' of https://github.com/ubyssey/ubyssey.ca into …

…develop
ubyssey · Feb 11, 2025 · d00d50c · d00d50c
2 parents 24b7556 + 76c6380
commit d00d50c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/article/templates/article/article_page.html b/article/templates/article/article_page.html
@@ -86,6 +86,10 @@
 
                         {% include 'article/objects/share_bar.html' %}
 
+                        <p class="time-stamp"><span>First online <time datetime="{{self.first_published_at|date:'Y-m-d H:i'}}">{{self.first_published_at}}</time></span>{% if self.show_last_modified %}, <span>last modified <time datetime="{{self.last_published_at|date:'Y-m-d H:i'}}">{{self.last_published_at}}</time></span>{% endif %}</p>
+
+                        <p class="report"><a href="https://docs.google.com/forms/d/e/1FAIpQLSft99fUQ3oZZ4BZiZeIRZmVYY80daqXxjZxLj29or2HmTnmnA/viewform?usp=sharing">Report a complaint</a></p>
+
                         {% for author_id, author_data in self.authors_in_order_for_cards.items %}
                             {% include "article/objects/author_card.html" with author=author_data.author author_roles=author_data.roles %}
                         {% endfor %}

diff --git a/ubyssey/static_src/src/styles/modules/article/_base.scss b/ubyssey/static_src/src/styles/modules/article/_base.scss
@@ -62,6 +62,10 @@ div.article-content .disclaimer {
 
 .c-article--default {
 
+  .author_card {
+    margin-left: 0;
+  }
+
   .o-headline--article {
     @media($bp-larger-than-tablet) {
       line-height: 1.277em;
@@ -443,6 +447,20 @@ div.article-content {
       margin-left: 0.53em;
     }
   }
+
+  .time-stamp {
+    font-style: italic;
+    span {
+      display: inline-block;
+    }
+  }
+
+  .report a {
+    color: var(--text_color);
+    font-family: $font-default;
+    font-style: italic;
+    font-weight: 400;
+  }
 }
 
 @media($bp-larger-than-mobile) {