From 23e774db8ea25ba8eb8d8d5d6731622998534bbc Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 7 Sep 2017 13:19:13 -0700
Subject: markdown code blocks not preserving line breaks, removed a bootstrap
 over-ride which fixes this, but also changed the style to pre-wrap to wrap
 the text rather than the default horizontal scroll

---
 view/css/bootstrap-red.css |  4 ----
 view/css/conversation.css  | 10 ++++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'view')

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index a3a8ce0be..e0018989d 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -71,10 +71,6 @@ nav .dropdown-menu {
 	min-width: auto;
 }
 
-code {
-	white-space: normal;
-}
-
 label {
 	font-weight: bold;
 }
diff --git a/view/css/conversation.css b/view/css/conversation.css
index dcabb5f3c..32870065b 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -1,3 +1,4 @@
+
 /* jot */
 
 .jothidden input[type="text"] {
@@ -302,3 +303,12 @@ img.smiley.emoji:hover {
 #filer_save {
 	margin-left: 15px;
 }
+
+
+
+/* general over-rides */
+
+/* prevent horizontal scrollbars in code blocks */
+code {
+	white-space: pre-wrap;
+}
-- 
cgit v1.2.3


From 1104e2652f15aaa405208b6dec9e439fb8c39537 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 7 Sep 2017 21:29:32 -0700
Subject: improve the code block styling a wee bit

---
 view/css/conversation.css         | 10 +---------
 view/theme/redbasic/css/style.css |  2 ++
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'view')

diff --git a/view/css/conversation.css b/view/css/conversation.css
index 32870065b..a5a847676 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -274,6 +274,7 @@ code {
 	font-size: 1em;
 	padding: 1em 1.5em;
 	display: block;
+	white-space: pre-wrap;
 }
 
 code.inline-code {
@@ -303,12 +304,3 @@ img.smiley.emoji:hover {
 #filer_save {
 	margin-left: 15px;
 }
-
-
-
-/* general over-rides */
-
-/* prevent horizontal scrollbars in code blocks */
-code {
-	white-space: pre-wrap;
-}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 621fa2781..b508b2576 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -136,6 +136,8 @@ input, optgroup, select, textarea {
 
 pre code {
 	border: none;
+	padding: 1em 1.5em;
+	border-radius: $radius;
 }
 
 code {
-- 
cgit v1.2.3