aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-06-24 21:56:58 -0700
committerzotlabs <mike@macgirvin.com>2018-06-24 21:56:58 -0700
commit4866ed52836028008af795da65faa2c0cd6e5df2 (patch)
tree796dfcaa5e54b98e7013816a8781ddd9009845b1
parent86e93664d02cecb2fc27584135961cf121f283b9 (diff)
downloadvolse-hubzilla-4866ed52836028008af795da65faa2c0cd6e5df2.tar.gz
volse-hubzilla-4866ed52836028008af795da65faa2c0cd6e5df2.tar.bz2
volse-hubzilla-4866ed52836028008af795da65faa2c0cd6e5df2.zip
remove the white-space pre-wrap property on code blocks. This should probably be done with the word-break property instead
-rwxr-xr-xinclude/items.php10
-rw-r--r--view/css/conversation.css1
2 files changed, 2 insertions, 9 deletions
diff --git a/include/items.php b/include/items.php
index ab42b7cd3..83ee219a2 100755
--- a/include/items.php
+++ b/include/items.php
@@ -980,11 +980,7 @@ function empty_acl($item) {
}
function encode_item($item,$mirror = false) {
- $x = array();
- $x['type'] = 'activity';
- $x['encoding'] = 'zot';
-
-// logger('encode_item: ' . print_r($item,true));
+ $x = [];
$r = q("select channel_id from channel where channel_id = %d limit 1",
intval($item['uid'])
@@ -1362,9 +1358,7 @@ function encode_item_flags($item) {
}
function encode_mail($item,$extended = false) {
- $x = array();
- $x['type'] = 'mail';
- $x['encoding'] = 'zot';
+ $x = [];
if(array_key_exists('mail_obscured',$item) && intval($item['mail_obscured'])) {
if($item['title'])
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 0f69ffaba..e6324b30d 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -297,7 +297,6 @@ code {
font-size: 1em;
padding: 1em 1.5em;
display: block;
- white-space: pre-wrap;
}
code.inline-code {