diff options
author | Friendika <info@friendika.com> | 2010-11-05 02:19:39 -0700 |
---|---|---|
committer | Friendika <info@friendika.com> | 2010-11-05 02:19:39 -0700 |
commit | 206eee02294cc75c06479f599c03e5a95ea5ee70 (patch) | |
tree | ea519bbde2746f2bf5d3e6c71305c935ff80ed31 | |
parent | b94cb8d234d70bc534ad1cef767b9f62d10eef26 (diff) | |
download | volse-hubzilla-206eee02294cc75c06479f599c03e5a95ea5ee70.tar.gz volse-hubzilla-206eee02294cc75c06479f599c03e5a95ea5ee70.tar.bz2 volse-hubzilla-206eee02294cc75c06479f599c03e5a95ea5ee70.zip |
preserve newlines on all networks
-rw-r--r-- | boot.php | 2 | ||||
-rw-r--r-- | include/html2bbcode.php | 4 | ||||
-rw-r--r-- | view/theme/default/style.css | 6 |
3 files changed, 6 insertions, 6 deletions
@@ -694,7 +694,7 @@ function xmlify($str) { $buffer .= '>'; break; case "\n" : - $buffer .= ' '; + $buffer .= "\n"; break; default : $buffer .= $char; diff --git a/include/html2bbcode.php b/include/html2bbcode.php index 31ede1a8e..a2e53a81b 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -6,6 +6,7 @@ function html2bbcode($s) { // Tags to Find $htmltags = array( + '/\n/is', '/\<b\>(.*?)\<\/b\>/is', '/\<i\>(.*?)\<\/i\>/is', '/\<u\>(.*?)\<\/u\>/is', @@ -24,6 +25,7 @@ $htmltags = array( // Replace with $bbtags = array( + '', '[b]$1[/b]', '[i]$1[/i]', '[u]$1[/u]', @@ -31,7 +33,7 @@ $bbtags = array( '[*]$1', '[img]$2[/img]', '$2', - '\n', + "\n", '[b]$1[/b]', '[url=$1]$3[/url]', '[code]$1[/code]', diff --git a/view/theme/default/style.css b/view/theme/default/style.css index f4bff7622..fd51e1d53 100644 --- a/view/theme/default/style.css +++ b/view/theme/default/style.css @@ -14,7 +14,7 @@ body { background: #F5F6FB; color: #444444; - font-family: "Lucida Grande", Tahoma, sans-serif; + font-family: "lucida grande",tahoma,verdana,arial,sans-serif; font-size: 90%; margin-left: 10px; } @@ -123,11 +123,9 @@ blockquote:before { #banner { color: #F5F6FB; - -/* font-family: "lucida sans", verdana, sans; */ + font-family: "lucida grande",tahoma,verdana,arial,sans-serif; font-size: 1.8em; letter-spacing: 0.12em; -/* font-weight: bold; */ position: absolute; top: 10px; left: 40%; |