Merge remote-tracking branch 'upstream/master'

diff --git a/include/network.php b/include/network.php
index edd03d557acc2bb28066dab678e71cf1c671ade7..599088a2daeace1ab0e4b37170e8b3c8939011b3 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -99,7 +99,7 @@ if(! function_exists('post_url')) {
 function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0) {
        $a = get_app();
        $ch = curl_init($url);
-       if(($redirects > 8) || (! $ch)) 
+       if(($redirects > 8) || (! $ch))
                return false;
 
        curl_setopt($ch, CURLOPT_HEADER, true);

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 2c4a7c7049618171a04de50c093f1ee035ec2b8f..f5e64ca4785bc7d59b0407b44837e183ea503fe8 100644 (file)
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -398,6 +398,7 @@ code {
   color: #444;
   padding: 10px;
   margin-top: 20px;
+  max-width: 640px;
 }
 #panel {
   position: absolute;
@@ -1045,7 +1046,7 @@ section {
 
 .wall-item-container .wall-item-content {
   font-size: 13px;
-  max-width: 720px;
+  max-width: 660px;
   word-wrap: break-word;
   line-height: 1.4;
 }
@@ -1128,6 +1129,10 @@ section {
   width: 665px;
   border-bottom: 1px solid hsl(198, 21%, 79%);
 }
+.wall-item-container.comment .wall-item-content {
+  max-width: 585px;
+}
+
 .wall-item-container.comment .contact-photo {
   width: 32px;
   height: 32px;