From 5d9ab6a0a28d7aa7e6bc51ceb4bc7f0c8e95b4b3 Mon Sep 17 00:00:00 2001
From: Owen Conti <owen@ohseemedia.com>
Date: Sat, 8 Jul 2017 10:48:52 -0600
Subject: [PATCH 1/4] Fixes #3078 - Added `breaks: true` to Remarkable so
 newlines are rendered as line breaks. Remove `margin-top` from `<p>` tags
 within `.model` elements to fix the alignment in the model's description
 text.

---
 src/core/components/providers/markdown.jsx | 2 +-
 src/style/_models.scss                     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/components/providers/markdown.jsx b/src/core/components/providers/markdown.jsx
index ff29f021..fb2088c0 100644
--- a/src/core/components/providers/markdown.jsx
+++ b/src/core/components/providers/markdown.jsx
@@ -19,7 +19,7 @@ function Markdown({ source }) {
   }
 
   return <Remarkable
-    options={{html: true, typographer: true, linkify: true, linkTarget: "_blank"}}
+    options={{html: true, typographer: true, linkify: true, breaks: true, linkTarget: "_blank"}}
     source={sanitized}
     ></Remarkable>
 }
diff --git a/src/style/_models.scss b/src/style/_models.scss
index accfb5d2..ccbd5cca 100644
--- a/src/style/_models.scss
+++ b/src/style/_models.scss
@@ -79,6 +79,10 @@
         border-radius: 4px;
         background: rgba(#000,.7);
     }
+
+    p {
+        margin: 0 0 1em 0;
+    }
 }
 
 

From b11399a57e87362062a4cc9535da6c67e6e8bba3 Mon Sep 17 00:00:00 2001
From: Owen Conti <owen@ohseemedia.com>
Date: Mon, 10 Jul 2017 17:39:05 -0600
Subject: [PATCH 2/4] Revert original fix and implement fix from @1Map

---
 src/core/components/providers/markdown.jsx | 10 ++++++----
 src/style/_markdown.scss                   |  3 +++
 src/style/main.scss                        |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 src/style/_markdown.scss

diff --git a/src/core/components/providers/markdown.jsx b/src/core/components/providers/markdown.jsx
index fb2088c0..9e2d2f0c 100644
--- a/src/core/components/providers/markdown.jsx
+++ b/src/core/components/providers/markdown.jsx
@@ -18,10 +18,12 @@ function Markdown({ source }) {
     return null
   }
 
-  return <Remarkable
-    options={{html: true, typographer: true, linkify: true, breaks: true, linkTarget: "_blank"}}
-    source={sanitized}
-    ></Remarkable>
+  return <div className="markdown">
+    <Remarkable
+      options={{html: true, typographer: true, linkify: true, linkTarget: "_blank"}}
+      source={sanitized}
+      ></Remarkable>
+  </div>
 }
 
 Markdown.propTypes = {
diff --git a/src/style/_markdown.scss b/src/style/_markdown.scss
new file mode 100644
index 00000000..96e802bc
--- /dev/null
+++ b/src/style/_markdown.scss
@@ -0,0 +1,3 @@
+.markdown {
+    white-space: pre;
+}
\ No newline at end of file
diff --git a/src/style/main.scss b/src/style/main.scss
index f6ff00fb..4476e159 100644
--- a/src/style/main.scss
+++ b/src/style/main.scss
@@ -14,4 +14,5 @@
     @import 'information';
     @import 'authorize';
     @import 'errors';
+    @import 'markdown';
 }

From 914b21f22846f9afa3dbd4af8331f40e5b07c89f Mon Sep 17 00:00:00 2001
From: Owen Conti <owen@ohseemedia.com>
Date: Mon, 10 Jul 2017 19:23:18 -0600
Subject: [PATCH 3/4] Revert back to the 'breaks' fix for newlines in markdown
 content

---
 src/core/components/providers/markdown.jsx | 4 ++--
 src/style/_markdown.scss                   | 3 ---
 src/style/main.scss                        | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 src/style/_markdown.scss

diff --git a/src/core/components/providers/markdown.jsx b/src/core/components/providers/markdown.jsx
index 9e2d2f0c..e500a4a3 100644
--- a/src/core/components/providers/markdown.jsx
+++ b/src/core/components/providers/markdown.jsx
@@ -20,8 +20,8 @@ function Markdown({ source }) {
 
   return <div className="markdown">
     <Remarkable
-      options={{html: true, typographer: true, linkify: true, linkTarget: "_blank"}}
-      source={sanitized}
+      options={{html: true, typographer: true, breaks: true, linkify: true, linkTarget: "_blank"}}
+      source={source}
       ></Remarkable>
   </div>
 }
diff --git a/src/style/_markdown.scss b/src/style/_markdown.scss
deleted file mode 100644
index 96e802bc..00000000
--- a/src/style/_markdown.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.markdown {
-    white-space: pre;
-}
\ No newline at end of file
diff --git a/src/style/main.scss b/src/style/main.scss
index 4476e159..f6ff00fb 100644
--- a/src/style/main.scss
+++ b/src/style/main.scss
@@ -14,5 +14,4 @@
     @import 'information';
     @import 'authorize';
     @import 'errors';
-    @import 'markdown';
 }

From 6ec7006c21a76cd9f307281c3998ccd3dff8a510 Mon Sep 17 00:00:00 2001
From: shockey <shockey@users.noreply.github.com>
Date: Fri, 14 Jul 2017 17:28:36 -0700
Subject: [PATCH 4/4] Update markdown.jsx

---
 src/core/components/providers/markdown.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/components/providers/markdown.jsx b/src/core/components/providers/markdown.jsx
index e500a4a3..8c8d0f78 100644
--- a/src/core/components/providers/markdown.jsx
+++ b/src/core/components/providers/markdown.jsx
@@ -21,7 +21,7 @@ function Markdown({ source }) {
   return <div className="markdown">
     <Remarkable
       options={{html: true, typographer: true, breaks: true, linkify: true, linkTarget: "_blank"}}
-      source={source}
+      source={sanitized}
       ></Remarkable>
   </div>
 }