Merge branch 'master' into groups

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

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index ec193b9b60962dc7cbfccd21ae1a8ee9437cb08b..c60097145ac7d89ac39b2a7f788eb9209fb2d923 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -62,7 +62,9 @@ font-weight:bold;
 textarea {
 overflow:auto;
 }
-select, option {
+select {
+}
+option {
 padding-bottom:0;
 }
 fieldset {
@@ -480,6 +482,20 @@ padding:8px;
 #form_notice li {
 margin-bottom:0;
 }
+
+#form_notice #notice_to {
+margin-bottom:7px;
+}
+
+#notice_to label {
+float:left;
+margin-right:18px;
+margin-top:11px;
+}
+#notice_to select {
+float:left;
+}
+
 /*end FORM NOTICE*/
 
 
@@ -526,14 +542,13 @@ clear:none;
 }
 #user_profile .user_fn {
 margin-left:11px;
-margin-left:4px;
 margin-right:4px;
 }
 #user_profile .user_fn .fn {
 font-weight:bold;
 font-style:normal;
 }
-#user_profile .user_nickname .nickname {
+#user_profile .nickname {
 font-style:italic;
 font-weight:bold;
 }
@@ -553,8 +568,13 @@ display:none;
 #user_profile h2 {
 display:none;
 }
+
 /* user_profile */
 
+
+
+
+
 /*user_actions*/
 #user_actions {
 clear:left;
@@ -591,16 +611,25 @@ width:100%;
 }
 #user_actions a {
 text-decoration:none;
+font-weight:bold;
+width:100%;
+display:block;
 }
 
 
 
 .form_user_block input.submit,
-.form_user_unblock input.submit {
+.form_user_unblock input.submit,
+#user_send-a-message a,
+.form_user_nudge input.submit {
 border:0;
 padding-left:20px;
 }
 
+#user_send-a-message a {
+padding:4px 4px 4px 23px;
+
+}
 
 
 #user_subscribe input.submit,
@@ -611,13 +640,9 @@ padding-left:20px;
 
 
 #user_send-a-message form {
-clear:left;
-width:322px;
-margin-top:18px;
 }
 
 #user_send-a-message textarea {
-width:96%;
 }
 
 .user_tags ul {
@@ -677,12 +702,40 @@ clear:both;
 
 
 
+.profile #user_profile {
+margin-bottom:0;
+min-height:60px;
+}
 
+.profile .form_user_unsubscribe {
+float:right;
+}
+.profiles {
+list-style-type:none;
+}
+.profile #user_profile .user_location {
+width:auto;
+clear:none;
+margin-left:11px;
+}
+.profile #user_profile dl,
+.profile #user_profile dd {
+display:inline;
+float:none;
+}
+.profile #user_profile .user_note,
+.profile #user_profile .user_url {
+margin-left:59px;
+clear:none;
+display:block;
+width:auto;
+}
 
 
 
 /* NOTICE */
-.notice {
+.notice,
+.profile {
 position:relative;
 padding-top:18px;
 padding-bottom:18px;
@@ -733,8 +786,8 @@ margin-right:11px;
 
 .vcard .photo {
 display:inline;
-margin-right:7px;
-margin-bottom:7px;
+margin-right:11px;
+margin-bottom:11px;
 float:left;
 }
 .vcard .url {
@@ -963,12 +1016,20 @@ border-right:0;
 
 
 
+/*If there is hentry on #content_inner, this doesn't need to be specific to #doc */
 #doc #content_inner p {
 margin-bottom:18px;
 }
+#doc #content_inner ol,
 #doc #content_inner ul {
 list-style-position:inside;
 }
+#doc #content_inner li {
+margin-bottom:18px;
+}
+#doc #content_inner li li {
+margin-left:18px;
+}
 
 
 /*START: LOAD ALONG WITH JS*/