Merge branch '0.7.x' into conversationtree

[quix0rs-gnu-social.git] / theme / base / css / display.css

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 8029a5eee17266e4a0cdd2ff0443ce03db8b56ca..547752b5105601e5155682f8359f03c8efca8e0c 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -248,10 +248,10 @@ display:none;
 }
 
 #site_notice {
-position:absolute;
-top:65px;
-right:18px;
-width:250px;
+float:right;
+clear:right;
+margin-top:7px;
+margin-right:18px;
 width:24%;
 }
 #page_notice {
@@ -397,6 +397,9 @@ border-radius:7px;
 border-style:solid;
 border-width:1px;
 }
+#shownotice #content {
+min-height:0;
+}
 
 #content_inner {
 position:relative;
@@ -730,7 +733,7 @@ clear:both;
 float:left;
 width:100%;
 border-top-width:1px;
-border-top-style:dashed;
+border-top-style:dotted;
 }
 .notices li {
 list-style-type:none;
@@ -769,16 +772,14 @@ overflow:hidden;
 font-weight:bold;
 }
 
-.notice .author .photo {
-margin-bottom:0;
-}
-
 .vcard .photo {
 display:inline;
 margin-right:11px;
-margin-bottom:11px;
 float:left;
 }
+#shownotice .vcard .photo {
+margin-bottom:4px;
+}
 .vcard .url {
 text-decoration:none;
 }
@@ -815,9 +816,10 @@ clear:left;
 float:left;
 font-size:0.95em;
 margin-left:59px;
-width:70%;
+width:65%;
 }
-#showstream .notice div.entry-content {
+#showstream .notice div.entry-content,
+#shownotice .notice div.entry-content {
 margin-left:0;
 }
 
@@ -1148,6 +1150,18 @@ clear:both;
 margin-bottom:0;
 }
 
+#form_settings_design #settings_design_color .form_data,
+#form_settings_design #color-picker {
+float:left;
+}
+#form_settings_design #settings_design_color .form_data {
+width:400px;
+margin-right:28px;
+}
+
+.instructions ul {
+list-style-position:inside;
+}
 .instructions p,
 .instructions ul {
 margin-bottom:18px;