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

diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index a27bd74b801638e77e090b122e597e2713b11c9a..6986222bbc6d978fa12815a1841896d05b4db9c2 100644 (file)
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -1518,12 +1518,7 @@ min-width:0;
 #subscribers.user_in #content,
 #showgroup.user_in #content,
 #conversation.user_in #content,
-#attachment.user_in #content,
-#siteadminpanel.user_in #content,
-#designadminpanel.user_in #content,
-#useradminpanel.user_in #content,
-#pathsadminpanel.user_in #content,
-#adminprofileflag.user_in #content {
+#attachment.user_in #content {
 padding-top:12.5em;
 }
 
@@ -1550,10 +1545,24 @@ padding-top:12.5em;
 #register #form_notice,
 #shownotice #form_notice,
 #confirmaddress #form_notice,
-#tag #form_notice {
+#tag #form_notice,
+#siteadminpanel #form_notice,
+#designadminpanel #form_notice,
+#useradminpanel #form_notice,
+#pathsadminpanel #form_notice,
+#adminprofileflag #form_notice {
 display:none;
 }
 
+#public #core,
+#showstream #core {
+margin-top:10em;
+}
+#public.user_in #core,
+#showstream.user_in #core {
+margin-top:0;
+}
+
 #jOverlayContent #core #content {
 padding-top:11px;
 }