Merge branch '0.8.x' of git://gitorious.org/~brion/statusnet/brion-fixes into 0.8.x

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

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index f2b200376d0875d74eb9ead74698df487afd0f93..1f37a7637bc8e69ab5fc3ce4a0caad5ab119a0c1 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;
 }
 
@@ -275,7 +276,7 @@ margin-bottom:18px;
 
 #anon_notice {
 float:left;
-width:43.2%;
+width:42.4%;
 padding:1.1%;
 border-radius:7px;
 -moz-border-radius:7px;
@@ -396,7 +397,7 @@ margin-bottom:1em;
 }
 
 #content {
-width:64.009%;
+width:63.311%;
 min-height:259px;
 padding:1.795%;
 float:left;
@@ -422,7 +423,7 @@ float:left;
 width:27.917%;
 min-height:259px;
 float:left;
-margin-left:0.5%;
+margin-left:0.699%;
 padding:1.795%;
 border-radius:7px;
 -moz-border-radius:7px;
@@ -432,7 +433,7 @@ border-style:solid;
 }
 
 #form_notice {
-width:45.664%;
+width:45%;
 float:left;
 position:relative;
 line-height:1;
@@ -471,18 +472,18 @@ cursor:pointer;
 }
 #form_notice label[for=notice_data-attach] {
 text-indent:-9999px;
-left:394px;
+left:86%;
 width:16px;
 height:16px;
 }
 #form_notice #notice_data-attach {
-left:183px;
+left:40.6%;
 padding:0;
 height:16px;
 }
 #form_notice .form_note {
 position:absolute;
-top:99px;
+bottom:2px;
 right:98px;
 z-index:9;
 }
@@ -510,6 +511,7 @@ margin-top:7px;
 margin-bottom:7px;
 margin-left:18px;
 float:left;
+max-width:322px;
 }
 #form_notice .error,
 #form_notice .success {
@@ -783,8 +785,8 @@ list-style-type:none;
 }
 .notices .notices {
 margin-top:7px;
-margin-left:5%;
-width:95%;
+margin-left:2%;
+width:98%;
 float:left;
 }
 
@@ -863,7 +865,7 @@ clear:left;
 float:left;
 font-size:0.95em;
 margin-left:59px;
-width:60%;
+width:50%;
 }
 #showstream .notice div.entry-content,
 #shownotice .notice div.entry-content {
@@ -876,22 +878,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 .timestamp dt,
-.notice div.entry-content .response dt {
-display:none;
-}
-.notice div.entry-content .timestamp a {
+.notice div.entry-content .timestamp {
 display:inline-block;
 }
-.notice div.entry-content .device dt {
-text-transform:lowercase;
-}
 
 .notice-options {
 position:relative;
@@ -921,38 +910,28 @@ left:29px;
 .notice-options .notice_delete {
 right:0;
 }
-.notice-options .notice_reply dt {
-display:none;
-}
-
 .notice-options input,
 .notice-options a {
 text-indent:-9999px;
 outline:none;
 }
-
-.notice-options .notice_reply a,
 .notice-options input.submit {
 display:block;
 border:0;
 }
-.notice-options .notice_reply a,
-.notice-options .notice_delete a {
+.notice-options .notice_reply,
+.notice-options .notice_delete {
 text-decoration:none;
 padding-left:16px;
 }
-
 .notice-options form input.submit {
 width:16px;
 padding:2px 0;
 }
-
-.notice-options .notice_delete dt,
 .notice-options .form_favor legend,
 .notice-options .form_disfavor legend {
 display:none;
 }
-.notice-options .notice_delete fieldset,
 .notice-options .form_favor fieldset,
 .notice-options .form_disfavor fieldset {
 border:0;
@@ -1020,20 +999,21 @@ font-weight:bold;
 padding:0;
 }
 #jOverlayContent h1 {
-max-width:475px;
+max-width:425px;
 }
 #jOverlayContent #content {
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
 }
-#jOverlayContent #content img {
-max-width:480px;
-}
 #jOverlayLoading {
-top:22.5%;
+top:5%;
 left:40%;
 }
+#attachment_view img {
+max-width:480px;
+max-height:480px;
+}
 #attachment_view #oembed_info {
 margin-top:11px;
 }
@@ -1071,36 +1051,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;
@@ -1278,6 +1259,7 @@ margin-bottom:0;
 
 #form_settings_design #settings_design_background-image img {
 max-width:480px;
+max-height:480px;
 }
 
 #form_settings_design #settings_design_color .form_data,