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 8b9fcd309d7fdb11b4b90f40e55dcc13c8906eba..c8aafe48935abc69bb8e1be73c01b59ff9536ab6 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1,10 +1,10 @@
 /** theme: base
  *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 * { margin:0; padding:0; }
@@ -156,7 +156,8 @@ font-weight:bold;
 #form_notice_delete legend,
 #form_password_recover legend,
 #form_password_change legend,
-.form_entity_block legend {
+.form_entity_block legend,
+#form_filter_bytag legend {
 display:none;
 }
 
@@ -250,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;
 }
@@ -467,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 {
@@ -510,6 +510,7 @@ margin-top:7px;
 margin-bottom:7px;
 margin-left:18px;
 float:left;
+max-width:322px;
 }
 #form_notice .error,
 #form_notice .success {
@@ -876,21 +877,9 @@ float:left;
 font-size:1.025em;
 }
 
-.notice div.entry-content dl,
-.notice div.entry-content dt,
-.notice div.entry-content dd {
-display:inline;
-}
-
-.notice div.entry-content .response dt {
-display:none;
-}
-.notice div.entry-content a.timestamp {
+.notice div.entry-content .timestamp {
 display:inline-block;
 }
-.notice div.entry-content .device dt {
-text-transform:lowercase;
-}
 
 .notice-options {
 position:relative;
@@ -1061,36 +1050,37 @@ display:none;
 #filter_tags ul {
 list-style-type:none;
 }
-#filter_tags ul li {
+#filter_tags li {
 float:left;
 margin-left:7px;
 padding-left:7px;
 border-left-width:1px;
 border-left-style:solid;
 }
-#filter_tags ul li.child_1 {
+#filter_tags #filter_tags_all {
 margin-left:0;
 border-left:0;
 padding-left:0;
 }
-#filter_tags ul li#filter_tags_all a {
+#filter_tags_all a {
 font-weight:bold;
 margin-top:7px;
 float:left;
 }
 
-#filter_tags ul li#filter_tags_item label {
+#filter_tags_item label {
 margin-right:7px;
 }
-#filter_tags ul li#filter_tags_item label,
-#filter_tags ul li#filter_tags_item select {
-display:inline;
+#filter_tags_item label,
+#filter_tags_item select {
+float:left;
 }
-#filter_tags ul li#filter_tags_item p {
+#filter_tags_item p {
 float:left;
+clear:both;
 margin-left:38px;
 }
-#filter_tags ul li#filter_tags_item input {
+#filter_tags_item .submit {
 position:relative;
 top:3px;
 left:3px;
@@ -1305,3 +1295,13 @@ display:none;
 .guide {
 clear:both;
 }
+
+#bookmarklet address {
+display:none;
+}
+#bookmarklet #form_notice {
+width:auto;
+}
+#bookmarklet #wrap {
+min-width:0;
+}