Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 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 47afdabe309d5c568623b2fe57bb67637abeb382..380975e32486fc27206d2d210c47fcf4dad579c1 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -73,7 +73,7 @@ input.checkbox,
 input.radio {
 position:relative;
 top:2px;
-left:0;
+left:auto;
 border:0;
 }
 
@@ -177,7 +177,8 @@ font-weight:bold;
 #form_password_recover legend,
 #form_password_change legend,
 .form_entity_block legend,
-#form_filter_bytag legend {
+#form_filter_bytag legend,
+#apioauthauthorize_allowdeny {
 display:none;
 }
 
@@ -287,7 +288,7 @@ margin-left:18px;
 }
 #site_nav_global_primary li {
 display:inline;
-margin-left:11px;
+margin-left:18px;
 }
 
 .system_notice dt {
@@ -369,7 +370,7 @@ margin-bottom:11px;
 
 #site_nav_global_secondary ul li {
 display:inline;
-margin-right:11px;
+margin-right:18px;
 }
 #export_data li a {
 padding-left:20px;
@@ -382,15 +383,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 {
@@ -554,28 +553,21 @@ width:81.5%;
 margin-bottom:0;
 line-height:1.618;
 }
-.form_notice #notice_data-attach_selected code,
-.form_notice #notice_data-location_name {
+.form_notice #notice_data-attach_selected code {
 float:left;
 width:80%;
 display:block;
 overflow:auto;
 margin-right:2.5%;
-}
-.form_notice #notice_data-attach_selected code {
 font-size:1.1em;
 }
-.form_notice #notice_data-attach_selected button.close,
-.form_notice #notice_data-geo_selected button.close {
+.form_notice #notice_data-attach_selected button.close {
 float:right;
 font-size:0.8em;
 }
 
-.form_notice #notice_data-geo_selected button.minimize {
-float:left;
-}
-
-.form_notice #notice_data-location_wrap label {
+.form_notice #notice_data-geo_wrap label,
+.form_notice #notice_data-geo_wrap input {
 position:absolute;
 top:25px;
 right:4px;
@@ -585,19 +577,15 @@ width:16px;
 height:16px;
 display:block;
 }
-.form_notice #notice_data-location_wrap input {
-display:none;
+.form_notice #notice_data-geo_wrap input {
+visibility:hidden;
 }
-.form_notice #notice_data-location_wrap label {
+.form_notice #notice_data-geo_wrap label {
 font-weight:normal;
 font-size:1em;
 margin-bottom:0;
 text-indent:-9999px;
 }
-.form_notice #notice_data-location_name {
-display:block;
-padding-left:21px;
-}
 
 button.close,
 button.minimize {
@@ -642,7 +630,8 @@ margin-bottom:18px;
 .entity_profile .entity_url,
 .entity_profile .entity_note,
 .entity_profile .entity_tags,
-.entity_profile .entity_aliases {
+.entity_profile .entity_aliases,
+.entity_profile .entity_statistics {
 margin-left:113px;
 margin-bottom:4px;
 }
@@ -810,8 +799,8 @@ list-style-type:none;
 display:inline;
 }
 .entity_tags li {
-display:inline;
-margin-right:4px;
+float:left;
+margin-right:11px;
 }
 
 .aside .section {
@@ -829,6 +818,7 @@ font-size:1em;
 #entity_statistics dt,
 #entity_statistics dd {
 display:inline;
+margin-right:11px;
 }
 #entity_statistics dt:after {
 content: ":";
@@ -906,9 +896,63 @@ font-weight:normal;
 margin-right:11px;
 }
 
+/*applications*/
+.applications {
+margin-bottom:18px;
+float:left;
+width:100%;
+}
+.applications li {
+list-style-type:none;
+}
+.application img,
+#showapplication .entity_profile img,
+.form_data #application_icon img,
+#apioauthauthorize .form_data img {
+max-width:96px;
+max-height:96px;
+}
+#apioauthauthorize .form_data img {
+margin-right:18px;
+float:left;
+}
+#showapplication .entity_profile {
+width:68%;
+}
+#showapplication .entity_profile .entity_fn {
+margin-left:0;
+}
+#showapplication .entity_profile .entity_fn .fn:before,
+#showapplication .entity_profile .entity_fn .fn:after {
+content:'';
+}
+#showapplication .entity_data {
+clear:both;
+margin-bottom:18px;
+}
+#showapplication .entity_data h2 {
+display:none;
+}
+#showapplication .entity_data dl {
+margin-bottom:18px;
+}
+#showapplication .entity_data dt {
+font-weight:bold;
+}
+#showapplication .entity_data dd {
+margin-left:1.795%;
+font-family:monospace;
+font-size:1.3em;
+}
+.form_data #application_types label.radio,
+.form_data #default_access_types label.radio {
+width:14.5%;
+}
+
 /* NOTICE */
 .notice,
-.profile {
+.profile,
+.application {
 position:relative;
 padding-top:11px;
 padding-bottom:11px;
@@ -951,6 +995,9 @@ padding-left:28px;
 .notice .author {
 margin-right:11px;
 }
+#showstream #content .notice .author {
+display:none;
+}
 
 .fn {
 overflow:hidden;
@@ -968,6 +1015,17 @@ float:left;
 #shownotice .vcard .photo {
 margin-bottom:4px;
 }
+#content .notice .author .photo {
+position:absolute;
+top:11px;
+left:0;
+float:none;
+}
+#content .notice .entry-title {
+margin-left:59px;
+margin-right:7px;
+}
+
 .vcard .url {
 text-decoration:none;
 }
@@ -976,15 +1034,23 @@ text-decoration:underline;
 }
 
 .notice .entry-title {
-float:left;
-width:100%;
 overflow:hidden;
+word-wrap:break-word;
 }
 .notice .entry-title.ov {
 overflow:visible;
 }
+#showstream .notice .entry-title,
+#showstream .notice div.entry-content {
+margin-left:0;
+}
 #shownotice .notice .entry-title {
+margin-left:110px;
 font-size:2.2em;
+min-height:123px;
+}
+#shownotice .notice div.entry-content {
+margin-left:0;
 }
 
 .notice p.entry-content {
@@ -1012,7 +1078,6 @@ max-width:70%;
 }
 #showstream .notice div.entry-content,
 #shownotice .notice div.entry-content {
-margin-left:0;
 max-width:79%;
 }
 
@@ -1039,25 +1104,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 {
@@ -1066,9 +1128,35 @@ right:3px;
 top:3px;
 }
 
+.dialogbox .form_guide {
+font-weight:normal;
+padding:0;
+}
+
 .dialogbox .submit_dialogbox {
-text-indent:0;
 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,
+.dialogbox.processing .submit_dialogbox {
+cursor:wait;
+outline:none;
+text-indent:-9999px;
+}
+
+.form_repeat.dialogbox {
+top:-4px;
+right:29px;
+min-width:199px;
 }
 
 .notice-options {
@@ -1076,6 +1164,7 @@ position:relative;
 font-size:0.95em;
 width:113px;
 float:right;
+margin-top:3px;
 margin-right:4px;
 }
 
@@ -1328,9 +1417,7 @@ padding-right:30px;
 .hentry .entry-content p {
 margin-bottom:18px;
 }
-.system_notice ul,
-.instructions ul,
-.hentry entry-content ol,
+.hentry .entry-content ol,
 .hentry .entry-content ul {
 margin-left:1.795%;
 }
@@ -1340,6 +1427,9 @@ margin-bottom:18px;
 .hentry .entry-content li li {
 margin-left:18px;
 }
+.hentry .entry-content .form_settings ul {
+margin-left:0;
+}
 
 #content #plugin_authors {
 min-width:122px;
@@ -1406,6 +1496,11 @@ display:inline;
 margin-right:7px;
 line-height:1.25;
 }
+
+.tag-cloud li:before {
+content:'\0009';
+}
+
 .aside .tag-cloud li {
 line-height:1.5;
 }
@@ -1502,8 +1597,9 @@ margin-left:0;
 width:auto;
 }
 
+.system_notice ul,
 .instructions ul {
-list-style-position:inside;
+margin-left:1em;
 }
 .instructions p,
 .instructions ul {