merge from testing

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

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 1f37a7637bc8e69ab5fc3ce4a0caad5ab119a0c1..c8aafe48935abc69bb8e1be73c01b59ff9536ab6 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -251,7 +251,7 @@ margin-right:18px;
 margin-bottom:11px;
 margin-left:18px;
 }
-#site_nav_global_primary ul li {
+#site_nav_global_primary li {
 display:inline;
 margin-left:11px;
 }
@@ -468,23 +468,22 @@ margin-bottom:7px;
 #form_notice #notice_data-attach {
 position:absolute;
 top:25px;
+right:10.5%;
 cursor:pointer;
 }
 #form_notice label[for=notice_data-attach] {
 text-indent:-9999px;
-left:86%;
 width:16px;
 height:16px;
 }
 #form_notice #notice_data-attach {
-left:40.6%;
 padding:0;
 height:16px;
 }
 #form_notice .form_note {
 position:absolute;
 bottom:2px;
-right:98px;
+right:21.715%;
 z-index:9;
 }
 #form_notice .form_note dt {
@@ -1296,3 +1295,13 @@ display:none;
 .guide {
 clear:both;
 }
+
+#bookmarklet address {
+display:none;
+}
+#bookmarklet #form_notice {
+width:auto;
+}
+#bookmarklet #wrap {
+min-width:0;
+}