aboutsummaryrefslogtreecommitdiffstats
path: root/view/css
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-09-07 13:19:13 -0700
committerzotlabs <mike@macgirvin.com>2017-09-07 13:19:13 -0700
commit23e774db8ea25ba8eb8d8d5d6731622998534bbc (patch)
tree38735d4454173248b6b30a98740d1738b2d43e1f /view/css
parent41e0d5f6645e17fbd6dd26e0f5c7859a01d77462 (diff)
downloadvolse-hubzilla-23e774db8ea25ba8eb8d8d5d6731622998534bbc.tar.gz
volse-hubzilla-23e774db8ea25ba8eb8d8d5d6731622998534bbc.tar.bz2
volse-hubzilla-23e774db8ea25ba8eb8d8d5d6731622998534bbc.zip
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
Diffstat (limited to 'view/css')
-rw-r--r--view/css/bootstrap-red.css4
-rw-r--r--view/css/conversation.css10
2 files changed, 10 insertions, 4 deletions
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;
+}