Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

2 files changed, 5 insertions, 7 deletions

diff --git a/actions/api.php b/actions/api.php
index 21fe4eea3..a27d24492 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -131,14 +131,14 @@ class ApiAction extends Action
                                  'statuses/followers',
                                  'favorites/favorites');
 
-        # If the site is "private", all API methods need authentication
-
+        $fullname = "$this->api_action/$this->api_method";
+        
+        // If the site is "private", all API methods except laconica/config 
+        // need authentication
         if (common_config('site', 'private')) {
-            return true;
+            return $fullname != 'laconica/config' || false;
         }
 
-        $fullname = "$this->api_action/$this->api_method";
-
         if (in_array($fullname, $bareauth)) {
             # bareauth: only needs auth if without an argument
             if ($this->api_arg) {
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 5ce5ac884..b5796374e 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -27,7 +27,6 @@ overflow:hidden;
 }
 h1 {
 font-size:1.4em;
-line-height:1;
 margin-bottom:18px;
 }
 h2 { font-size:1.3em; }
@@ -365,7 +364,6 @@ margin-right:4px;
 
 #wrap {
 margin:0 auto;
-width:71.714em;
 width:1003px;
 overflow:hidden;
 }