Merge branch 'testing' into filesize

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

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 782d3dc714d5493116142cc36a23f03427aa7968..3268aea39be0bffa884774f39dd764d584abcf7b 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -3,10 +3,11 @@
  * @package   StatusNet
  * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009-2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
  * @link      http://status.net/
  */
 
+@media screen, projection, tv {
 * { margin:0; padding:0; }
 img { display:block; border:0; }
 a abbr { cursor: pointer; border-bottom:0; }
@@ -345,14 +346,12 @@ list-style-type:none;
 float:left;
 text-decoration:none;
 padding:4px 11px;
-border-radius-topleft:4px;
-border-radius-topright:4px;
+border-top-left-radius:4px;
+border-top-right-radius:4px;
 -moz-border-radius-topleft:4px;
 -moz-border-radius-topright:4px;
 -webkit-border-top-left-radius:4px;
 -webkit-border-top-right-radius:4px;
-border-radius-topleft:0;
-border-radius-topright:0;
 border-width:1px;
 border-style:solid;
 border-bottom:0;
@@ -380,13 +379,13 @@ display:block;
 width:80%;
 padding-right:10%;
 padding-left:10%;
-border-radius-toprleft:0;
+border-top-left-radius:0;
 -moz-border-radius-topleft:0;
 -webkit-border-top-left-radius:0;
-border-radius-topright:4px;
+border-top-right-radius:4px;
 -moz-border-radius-topright:4px;
 -webkit-border-top-right-radius:4px;
-border-radius-bottomright:4px;
+border-bottom-right-radius:4px;
 -moz-border-radius-bottomright:4px;
 -webkit-border-bottom-right-radius:4px;
 }
@@ -397,13 +396,10 @@ box-shadow:none;
 }
 
 body[id$=adminpanel] #content {
-border-radius-topleft:7px;
-border-radius-topright:7px;
+border-top-left-radius:7px;
 -moz-border-radius-topleft:7px;
--moz-border-radius-topright:7px;
 -webkit-border-top-left-radius:7px;
--webkit-border-top-right-radius:7px;
-border-radius-topright:0;
+border-top-right-radius:0;
 -moz-border-radius-topright:0;
 -webkit-border-top-right-radius:0;
 }
@@ -487,6 +483,7 @@ min-height:259px;
 padding:1.795%;
 float:left;
 border-radius:7px;
+border-top-left-radius:0;
 -moz-border-radius:7px;
 -moz-border-radius-topleft:0;
 -webkit-border-radius:7px;
@@ -857,6 +854,9 @@ display:inline;
 display:inline;
 margin-right:7px;
 }
+.entity_tags li:before {
+content:'\0009';
+}
 
 .aside .section {
 margin-bottom:29px;
@@ -925,7 +925,7 @@ display:inline;
 }
 
 .profile .entity_profile .fn,
-.profile .entity_profile .location {
+.profile .entity_profile .label {
 margin-left:11px;
 margin-bottom:4px;
 width:auto;
@@ -971,6 +971,29 @@ max-height:96px;
 margin-right:18px;
 float:left;
 }
+
+.oauth-desktop-mode #wrap {
+    min-width: 500px;
+}
+
+.oauth-desktop-mode #content {
+    width: 480px;
+    padding: 6px;
+    margin: 4px 0px 0px 4px;
+    border-top-left-radius: 7px;
+    -moz-border-radius-topleft: 7px;
+    -webkit-border-top-left-radius: 7px;
+}
+
+.oauth-desktop-mode fieldset {
+    margin-bottom: 10px !important;
+}
+
+#oauth_pin {
+    text-align: center;
+    font-size: 3em;
+}
+
 #showapplication .entity_profile {
 width:68%;
 }
@@ -1284,17 +1307,19 @@ height:16px;
 position:relative;
 padding-left:16px;
 }
-#attachments .attachment {
-padding-left:0;
-}
-.notice .attachment img {
-position:absolute;
-top:18px;
-left:0;
-z-index:99;
+.notice .attachment.more {
+text-indent:-9999px;
+width:16px;
+height:16px;
+display:inline-block;
+overflow:hidden;
+vertical-align:middle;
+margin-left:4px;
 }
-#shownotice .notice .attachment img {
-position:static;
+
+#attachments .attachment,
+.notice .attachment.more {
+padding-left:0;
 }
 
 #attachments {
@@ -1326,7 +1351,7 @@ margin-bottom:0;
 padding:11px;
 min-height:auto;
 }
-#jOverlayContent .external span {
+#jOverlayContent .entry-title {
 display:block;
 margin-bottom:11px;
 }
@@ -1677,3 +1702,40 @@ width:auto;
 #bookmarklet #wrap {
 min-width:0;
 }
+
+.inline-attachment img {
+    /* Why on earth is this changed to block at the top? */
+    display: inline;
+    border: solid 1px #aaa;
+    padding: 1px;
+}
+}/*end of @media screen, projection, tv*/
+
+
+@media print {
+a:after { background-color:#FFFFFF; }
+a:not([href^="#"]):after { content:" <"attr(href)"> "; }
+img { border:none; }
+p { orphans: 2; widows: 1; }
+
+#site_nav_global_primary,
+#site_nav_local_views,
+#form_notice,
+.pagination,
+#site_nav_global_secondary,
+.entity_actions,
+.notice-options,
+#aside_primary,
+.form_subscription_edit .submit {
+display:none;
+}
+.timestamp dt, .timestamp dd,
+.device dt, .device dd {
+display:inline;
+}
+.profiles li,
+.notices li {
+margin-bottom:18px;
+}
+
+}/*end of @media print*/