Merge branch '0.8.x' into design_reset

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

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index e1b92edce03c279369ffb0fbe1398c27aa0698f7..d685230205dc17b7e3609878e37809c6ef0fab81 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -12,7 +12,7 @@ img { display:block; border:0; }
 a abbr { cursor: pointer; border-bottom:0; }
 table { border-collapse:collapse; }
 ol { list-style-position:inside; }
-html { font-size: 87.5%; height:100%; }
+html { font-size: 87.5%; }
 body {
 background-color:#FFFFFF;
 color:#000;
@@ -206,7 +206,10 @@ border-radius:4px;
 padding:0 7px;
 }
 
-
+.form_settings input.form_action-default {
+margin-right:11px;
+}
+.form_settings input.form_action-default,
 .form_settings input.form_action-primary {
 padding:0;
 }
@@ -270,7 +273,6 @@ clear:both;
 margin-bottom:18px;
 }
 
-
 #anon_notice {
 float:left;
 width:43.2%;
@@ -285,7 +287,6 @@ font-size:1.1em;
 font-weight:bold;
 }
 
-
 #footer {
 float:left;
 width:64%;
@@ -510,13 +511,26 @@ margin-bottom:7px;
 margin-left:18px;
 float:left;
 }
-#form_notice .error {
+#form_notice .error,
+#form_notice .success {
 float:left;
 clear:both;
-width:96.9%;
+width:81.5%;
 margin-bottom:0;
 line-height:1.618;
 }
+#form_notice #notice_data-attach_selected code {
+float:left;
+width:90%;
+display:block;
+font-size:1.1em;
+line-height:1.8;
+overflow:auto;
+}
+#form_notice #notice_data-attach_selected button {
+float:right;
+font-size:0.8em;
+}
 
 /* entity_profile */
 .entity_profile {
@@ -548,7 +562,8 @@ margin-bottom:18px;
 .entity_profile .entity_location,
 .entity_profile .entity_url,
 .entity_profile .entity_note,
-.entity_profile .entity_tags {
+.entity_profile .entity_tags,
+.entity_profile .entity_aliases {
 margin-left:113px;
 margin-bottom:4px;
 }
@@ -574,16 +589,16 @@ font-weight:normal;
 content: ")";
 font-weight:normal;
 }
-
-.entity_profile dt {
-display:none;
-}
+.entity_profile dt,
 .entity_profile h2 {
 display:none;
 }
+.entity_profile .role {
+margin-left:11px;
+font-style:italic;
+}
 /* entity_profile */
 
-
 /*entity_actions*/
 .entity_actions {
 float:right;
@@ -712,7 +727,6 @@ margin-bottom:0;
 min-height:60px;
 }
 
-
 .profile .form_group_join legend,
 .profile .form_group_leave legend,
 .profile .form_user_subscribe legend,
@@ -747,13 +761,11 @@ display:inline;
 margin-right:11px;
 }
 
-
 .profile .entity_profile .form_subscription_edit label {
 font-weight:normal;
 margin-right:11px;
 }
 
-
 /* NOTICE */
 .notice,
 .profile {
@@ -776,7 +788,6 @@ width:95%;
 float:left;
 }
 
-
 /* NOTICES */
 #notices_primary {
 float:left;
@@ -948,7 +959,6 @@ border:0;
 padding:0;
 }
 
-
 .notice .attachment {
 position:relative;
 padding-left:16px;
@@ -1018,6 +1028,22 @@ border-radius:7px;
 -webkit-border-radius:7px;
 }
 
+#attachment_view #oembed_info {
+margin-top:11px;
+}
+#attachment_view #oembed_info dt,
+#attachment_view #oembed_info dd {
+float:left;
+}
+#attachment_view #oembed_info dt {
+clear:left;
+margin-right:11px;
+font-weight:bold;
+}
+#attachment_view #oembed_info dt:after {
+content: ":";
+}
+
 #usergroups #new_group {
 float: left;
 margin-right: 2em;
@@ -1029,7 +1055,6 @@ margin-bottom:18px;
 padding-left:20px;
 }
 
-
 #filter_tags {
 margin-bottom:11px;
 float:left;
@@ -1075,8 +1100,6 @@ top:3px;
 left:3px;
 }
 
-
-
 .pagination {
 float:left;
 clear:both;
@@ -1122,7 +1145,6 @@ padding-right:30px;
 }
 /* END: NOTICE */
 
-
 .hentry .entry-content p {
 margin-bottom:18px;
 }
@@ -1139,7 +1161,6 @@ margin-bottom:18px;
 margin-left:18px;
 }
 
-
 /* TOP_POSTERS */
 .section tbody td {
 padding-right:18px;
@@ -1167,7 +1188,6 @@ margin-right:0;
 display:none;
 }
 
-
 /* tagcloud */
 .tag-cloud {
 list-style-type:none;
@@ -1250,6 +1270,10 @@ clear:both;
 margin-bottom:0;
 }
 
+#form_settings_design #settings_design_background-image img {
+max-width:480px;
+}
+
 #form_settings_design #settings_design_color .form_data,
 #form_settings_design #color-picker {
 float:left;