]> git.mxchange.org Git - friendica.git/commitdiff
preserve newlines on all networks
authorFriendika <info@friendika.com>
Fri, 5 Nov 2010 09:19:39 +0000 (02:19 -0700)
committerFriendika <info@friendika.com>
Fri, 5 Nov 2010 09:19:39 +0000 (02:19 -0700)
boot.php
include/html2bbcode.php
view/theme/default/style.css

index 48770a2b21b197c4d54c32f6b0f4399a1e8add1a..eb52fb2a25cacc208e6bc1ccb0938bf423c81805 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -694,7 +694,7 @@ function xmlify($str) {
                                $buffer .= '&gt;';
                                break;
                        case "\n" :
-                               $buffer .= ' ';
+                               $buffer .= "\n";
                                break;
                        default :
                                $buffer .= $char;
index 31ede1a8e693332f72ef0a5063d983ec6f5adb8b..a2e53a81b8682f8e9ebc2693e9d013d3e5b1e804 100644 (file)
@@ -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]',
index f4bff76225e9feed7628684a62b6326870cf6a1f..fd51e1d53c3dec744e1274c269823bfd9d907215 100644 (file)
@@ -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%;