aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-05-30 16:12:48 +0200
committerMario Vavti <mario@mariovavti.com>2016-05-30 16:12:48 +0200
commitd1efb59fcdd3d5e78f3071c7a7a959c285782931 (patch)
tree578ce7aa90d404cad9c534cde984f6f767644743 /view
parentf2ebe41a509d6e7f332fdc4cb43d14d555375bdf (diff)
downloadvolse-hubzilla-d1efb59fcdd3d5e78f3071c7a7a959c285782931.tar.gz
volse-hubzilla-d1efb59fcdd3d5e78f3071c7a7a959c285782931.tar.bz2
volse-hubzilla-d1efb59fcdd3d5e78f3071c7a7a959c285782931.zip
render code bbcode inline if there are no linebreaks in the text.
Diffstat (limited to 'view')
-rw-r--r--view/css/conversation.css20
-rw-r--r--view/theme/redbasic/css/style.css5
2 files changed, 14 insertions, 11 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 9b99efba4..328f9df02 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -1,11 +1,3 @@
-/* common */
-
-code {
- font-family: Courier, monospace;
- display: block;
- overflow: auto;
-}
-
/* jot */
.jothidden input {
@@ -305,6 +297,18 @@ a.wall-item-name-link {
/* bb-code */
+code {
+ font-family: Courier, monospace;
+ font-size: 1em;
+ padding: 1em 1.5em;
+ display: block;
+}
+
+code.inline-code {
+ padding: 0px 4px;
+ display: inline;
+}
+
.overline {
text-decoration: overline;
}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 1c2e8cdb2..ae2826516 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -113,13 +113,12 @@ pre code {
}
code {
- font-size: 1em;
- padding: 1em 1.5em;
- border: 1px solid #ccc;
background: #ccc;
color: #000;
}
+
+
pre {
background: #F5F5F5;
color: #333;