Merge branch '1.0.x' into inline-comments

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

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index b5cfab7e9c7acb0dd1a803ea3a0881ede3ae50e6..dabf929a72d3f633781ef49aadf5dd6578d90967 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1,12 +1,13 @@
 /** theme: base
  *
  * @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
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @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; }
@@ -93,6 +94,55 @@ list-style-type:none;
 form label.submit {
 display:none;
 }
+
+body[id$=settings] #site_nav_local_views {
+position:relative;
+z-index:9;
+float:right;
+margin-right:10.65%;
+width:22.25%;
+}
+body[id$=settings] #site_nav_local_views li {
+width:100%;
+margin-right:0;
+margin-bottom:7px;
+}
+body[id$=settings] #site_nav_local_views a {
+display:block;
+width:80%;
+padding-right:10%;
+padding-left:10%;
+border-radius-toprleft:0;
+-moz-border-radius-topleft:0;
+-webkit-border-top-left-radius:0;
+border-radius-topright:4px;
+-moz-border-radius-topright:4px;
+-webkit-border-top-right-radius:4px;
+border-radius-bottomright:4px;
+-moz-border-radius-bottomright:4px;
+-webkit-border-bottom-right-radius:4px;
+}
+body[id$=settings] #site_nav_local_views li.current {
+box-shadow:none;
+-moz-box-shadow:none;
+-webkit-box-shadow:none;
+}
+
+body[id$=settings] #content {
+border-radius-topleft:7px;
+border-radius-topright: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;
+-moz-border-radius-topright:0;
+-webkit-border-top-right-radius:0;
+}
+body[id$=settings] #aside_primary {
+display:none;
+}
+
 .form_settings {
 clear:both;
 }
@@ -288,7 +338,7 @@ margin-left:18px;
 }
 #site_nav_global_primary li {
 display:inline;
-margin-left:11px;
+margin-left:18px;
 }
 
 .system_notice dt {
@@ -345,6 +395,8 @@ list-style-type:none;
 float:left;
 text-decoration:none;
 padding:4px 11px;
+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;
@@ -359,6 +411,51 @@ float:left;
 width:100%;
 }
 
+body[id$=adminpanel] #site_nav_local_views {
+position:relative;
+z-index:9;
+float:right;
+margin-right:10.65%;
+width:22.25%;
+}
+body[id$=adminpanel] #site_nav_local_views li {
+width:100%;
+margin-right:0;
+margin-bottom:7px;
+}
+body[id$=adminpanel] #site_nav_local_views a {
+display:block;
+width:80%;
+padding-right:10%;
+padding-left:10%;
+border-top-left-radius:0;
+-moz-border-radius-topleft:0;
+-webkit-border-top-left-radius:0;
+border-top-right-radius:4px;
+-moz-border-radius-topright:4px;
+-webkit-border-top-right-radius:4px;
+border-bottom-right-radius:4px;
+-moz-border-radius-bottomright:4px;
+-webkit-border-bottom-right-radius:4px;
+}
+body[id$=adminpanel] #site_nav_local_views li.current {
+box-shadow:none;
+-moz-box-shadow:none;
+-webkit-box-shadow:none;
+}
+
+body[id$=adminpanel] #content {
+border-top-left-radius:7px;
+-moz-border-radius-topleft:7px;
+-webkit-border-top-left-radius:7px;
+border-top-right-radius:0;
+-moz-border-radius-topright:0;
+-webkit-border-top-right-radius:0;
+}
+body[id$=adminpanel] #aside_primary {
+display:none;
+}
+
 #site_nav_global_primary dt,
 #site_nav_global_secondary dt {
 display:none;
@@ -368,9 +465,9 @@ display:none;
 margin-bottom:11px;
 }
 
-#site_nav_global_secondary ul li {
+#site_nav_global_secondary li {
 display:inline;
-margin-right:11px;
+margin-right:18px;
 }
 #export_data li a {
 padding-left:20px;
@@ -383,15 +480,13 @@ padding-left:28px;
 }
 
 #export_data ul {
-display:inline;
+width:100%;
+float:left;
 }
 #export_data li {
 list-style-type:none;
-display:inline;
-margin-left:11px;
-}
-#export_data li:first-child {
-margin-left:0;
+float:left;
+margin-right:11px;
 }
 
 #licenses {
@@ -437,6 +532,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;
@@ -766,10 +862,12 @@ display:none;
 text-align:center;
 }
 
-.entity_moderation {
+.entity_moderation,
+.entity_role {
 position:relative;
 }
-.entity_moderation p {
+.entity_moderation p,
+.entity_role p {
 border-radius:4px;
 -moz-border-radius:4px;
 -webkit-border-radius:4px;
@@ -777,13 +875,14 @@ font-weight:bold;
 padding-bottom:2px;
 margin-bottom:7px;
 }
-.entity_moderation ul {
+.entity_moderation ul,
+.entity_role ul {
 display:none;
 }
-.entity_moderation:hover ul {
+.entity_moderation:hover ul,
+.entity_role:hover ul {
 display:block;
-min-width:21%;
-width:100%;
+width:110%;
 padding:11px;
 position:absolute;
 top:-1px;
@@ -802,7 +901,10 @@ display:inline;
 }
 .entity_tags li {
 display:inline;
-margin-right:4px;
+margin-right:7px;
+}
+.entity_tags li:before {
+content:'\0009';
 }
 
 .aside .section {
@@ -817,9 +919,12 @@ text-transform:uppercase;
 font-size:1em;
 }
 
-#entity_statistics dt,
+#entity_statistics dt {
+margin-right:11px;
+}
 #entity_statistics dd {
 display:inline;
+margin-right:11px;
 }
 #entity_statistics dt:after {
 content: ":";
@@ -871,7 +976,7 @@ display:inline;
 }
 
 .profile .entity_profile .fn,
-.profile .entity_profile .location {
+.profile .entity_profile .label {
 margin-left:11px;
 margin-bottom:4px;
 width:auto;
@@ -917,6 +1022,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%;
 }
@@ -977,6 +1105,35 @@ border-top-width:1px;
 border-top-style:solid;
 }
 
+/* Threaded notices sublist */
+#content .notices .threaded-notices {
+    margin-left: 10%;
+    width: 90%;
+
+    background: #e4e8f1;
+}
+#content .threaded-notices .notice .author .photo {
+    left: 8px;
+    width: 32px;
+    height: 32px;
+}
+.threaded-notices .notice-reply {
+    margin: 8px;
+}
+.threaded-notices .notice-reply textarea,
+.threaded-notices .notice-reply-placeholder input.placeholder {
+    margin-left: 0;
+    width: 95%;
+}
+.threaded-notices .notice-reply-placeholder input.placeholder {
+    color: gray;
+    margin-left: 8px; /* ?? */
+    margin-bottom: 8px;
+}
+.threaded-notices .notice-reply .controls {
+    text-align: right;
+}
+
 /* NOTICES */
 #notices_primary {
 float:left;
@@ -1024,6 +1181,7 @@ float:none;
 }
 #content .notice .entry-title {
 margin-left:59px;
+margin-right:7px;
 }
 
 .vcard .url {
@@ -1035,6 +1193,7 @@ text-decoration:underline;
 
 .notice .entry-title {
 overflow:hidden;
+word-wrap:break-word;
 }
 .notice .entry-title.ov {
 overflow:visible;
@@ -1103,25 +1262,22 @@ left:0;
 
 .dialogbox {
 position:absolute;
-top:-4px;
-right:29px;
+top:-1px;
+right:-1px;
 z-index:9;
-min-width:199px;
 float:none;
-background-color:#FFF;
 padding:11px;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
 border-style:solid;
 border-width:1px;
-border-color:#DDDDDD;
--moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
 }
 
 .dialogbox legend {
 display:block !important;
 margin-right:18px;
+margin-bottom:18px;
 }
 
 .dialogbox button.close {
@@ -1130,11 +1286,22 @@ right:3px;
 top:3px;
 }
 
+.dialogbox .form_guide {
+font-weight:normal;
+padding:0;
+}
+
 .dialogbox .submit_dialogbox {
 font-weight:bold;
 text-indent:0;
 min-width:46px;
 }
+.dialogbox input {
+padding-left:4px;
+}
+.dialogbox fieldset {
+margin-bottom:0;
+}
 
 #wrap form.processing input.submit,
 .entity_actions a.processing,
@@ -1144,6 +1311,12 @@ outline:none;
 text-indent:-9999px;
 }
 
+.form_repeat.dialogbox {
+top:-4px;
+right:29px;
+min-width:199px;
+}
+
 .notice-options {
 position:relative;
 font-size:0.95em;
@@ -1214,17 +1387,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 {
@@ -1256,7 +1431,7 @@ margin-bottom:0;
 padding:11px;
 min-height:auto;
 }
-#jOverlayContent .external span {
+#jOverlayContent .entry-title {
 display:block;
 margin-bottom:11px;
 }
@@ -1475,12 +1650,18 @@ text-align:center;
 }
 .aside .tag-cloud {
 font-size:0.8em;
+word-wrap:break-word;
 }
 .tag-cloud li {
 display:inline;
 margin-right:7px;
 line-height:1.25;
 }
+
+.tag-cloud li:before {
+content:'\0009';
+}
+
 .aside .tag-cloud li {
 line-height:1.5;
 }
@@ -1601,3 +1782,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*/