From a11377700339e45bbce09e96a454145b280261c2 Mon Sep 17 00:00:00 2001 From: Kris Date: Fri, 30 Nov 2018 19:49:26 -0500 Subject: [PATCH] Extra margin isn't needed on mobile --- app/assets/stylesheets/common/base/topic-post.scss | 6 ------ app/assets/stylesheets/desktop/topic-post.scss | 5 +++++ config/locales/client.en.yml | 1 + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index 557d48d8807..6150468078a 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -509,12 +509,6 @@ aside.quote { } } -// this ensures consistent top margin on topic posts even if the first line of a post -// is a top-margin-less element like a list or image. -.topic-body .regular { - margin-top: 15px; -} - .post-info { flex: 0 0 auto; margin-right: 0.5em; diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index aa86b3fd2b3..6ab671de833 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -12,6 +12,11 @@ h1 .topic-statuses .topic-status .d-icon { } .topic-body { + // this ensures consistent top margin on topic posts even if the first line of a post + // is a top-margin-less element like a list or image. + .regular { + margin-top: 15px; + } padding: 0; &:first-of-type { border-top: none; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index b06270555dc..1bc38a5758f 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -2848,6 +2848,7 @@ en: activity_metrics: Activity Metrics all_reports: "All reports" general_tab: "General" + reports_tab: "Reports" moderation_tab: "Moderation" disabled: Disabled timeout_error: Sorry, query is taking too long, please pick a shorter interval