Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

diff --git a/theme/base/css/facebookapp.css b/theme/base/css/facebookapp.css
index e6b1c9ee536ada46cdf3ce77c08b64245271813b..47c63d8231ef0547f66e5b1fd32d98ff84196da6 100644 (file)
--- a/theme/base/css/facebookapp.css
+++ b/theme/base/css/facebookapp.css
@@ -5,8 +5,8 @@ font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif;
 
 #wrap {
 background-color:#F0F2F5;
-padding-left:18px;
-padding-right:18px;
+padding-left:1.795%;
+padding-right:1.795%;
 width:auto;
 }
 
@@ -15,8 +15,16 @@ h1,h2,h3,h4,h5,h6 {
 color:#000;
 }
 
+#header {
+width:131%;
+}
+
 #content {
-width:95%;
+width:92.7%;
+}
+
+#aside_primary {
+display:none;
 }
 
 #site_nav_local_views a {
@@ -26,6 +34,22 @@ background-color:#D0DFE7;
 background-color:#FAFBFC;
 }
 
+#form_notice .form_note + label {
+position:absolute;
+top:25px;
+right:10.5%;
+cursor:pointer;
+text-indent:-9999px;
+width:16px;
+height:16px;
+background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px;
+}
+
+#form_notice #notice_action-submit {
+height:47px !important;
+}
+
+
 span.facebook-button {
 border: 2px solid #aaa;
 padding: 3px;