Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

3 files changed, 21 insertions, 18 deletions

diff --git a/include/bbcode.php b/include/bbcode.php
index f47dc6f2e..42741b392 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -477,9 +477,12 @@ function bb_observer($Text) {
 	return $Text;
 }
 
-
-
-
+function bb_code($match) {
+	if(strpos($match[0], "<br />"))
+		return '<code>' . trim($match[1]) . '</code>';
+	else
+		return '<code class="inline-code">' . trim($match[1]) . '</code>';
+}
 
 
 
@@ -785,12 +788,9 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 		$Text = preg_replace("/\[font=(.*?)\](.*?)\[\/font\]/sm", "<span style=\"font-family: $1;\">$2</span>", $Text);
 	}
 
-	// Declare the format for [code] layout
-	$CodeLayout = '<code>$1</code>';
-
 	// Check for [code] text
 	if (strpos($Text,'[code]') !== false) {
-		$Text = preg_replace("/\[code\](.*?)\[\/code\]/ism", "$CodeLayout", $Text);
+		$Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/ism", 'bb_code', $Text);
 	}
 
 	// Check for [spoiler] text
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;