From 335fc2e87249cfc89f6d91cfd5a88879a8a41427 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Tue, 17 Sep 2019 00:28:41 -0500
Subject: [PATCH] css: fix blockquote margins in tables.

Don't remove the bottom margin from all <p> elements in tables. Instead
remove it only from the last element in dtext blocks. This way we don't
have to also kludge <blockquote> padding to work with zero-margin paragraphs.

Better fix for #1655.
---
 app/javascript/src/styles/common/dtext.scss           | 5 +++++
 app/javascript/src/styles/common/tables.scss          | 4 ----
 app/javascript/src/styles/specific/user_feedback.scss | 4 ----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/javascript/src/styles/common/dtext.scss b/app/javascript/src/styles/common/dtext.scss
index 6e39098cf..d7c9ad241 100644
--- a/app/javascript/src/styles/common/dtext.scss
+++ b/app/javascript/src/styles/common/dtext.scss
@@ -98,6 +98,11 @@ div.prose {
   }
 }
 
+// avoid empty gaps beneath dtext blocks in table rows.
+table td div.prose > *:last-child {
+  margin-bottom: 0;
+}
+
 div.dtext-preview {
   display: none;
 
diff --git a/app/javascript/src/styles/common/tables.scss b/app/javascript/src/styles/common/tables.scss
index 8f68b7bba..9ec70cb76 100644
--- a/app/javascript/src/styles/common/tables.scss
+++ b/app/javascript/src/styles/common/tables.scss
@@ -1,10 +1,6 @@
 @import "../base/000_vars.scss";
 
 table.striped {
-  p {
-    margin: 0;
-  }
-
   td, th {
     padding: 4px 6px;
   }
diff --git a/app/javascript/src/styles/specific/user_feedback.scss b/app/javascript/src/styles/specific/user_feedback.scss
index 0f63c6c5e..58a6bf359 100644
--- a/app/javascript/src/styles/specific/user_feedback.scss
+++ b/app/javascript/src/styles/specific/user_feedback.scss
@@ -10,10 +10,6 @@ div#c-user-feedbacks, div#c-moderator-dashboards div#col2 {
   .feedback-category-neutral {
     background: #FFFFFF !important;
   }
-  
-  blockquote {
-    padding: 0.5em;
-  }
 
   #negative-policy {
     max-width: 50em;