Merge branch 'master' of /var/www/trunk

2 files changed, 42 insertions, 78 deletions

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 91789f4f1..44dbff5da 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -36,7 +36,7 @@ font-weight:bold;
 }
 
 legend {
-font-weight:bold; 
+font-weight:bold;
 font-size:1.3em;
 text-transform:uppercase;
 }
@@ -99,9 +99,6 @@ display:none;
 margin-left:11px;
 }
 
-
-
-
 /* FORM SETTINGS */
 .form_settings fieldset {
 margin-bottom:29px;
@@ -111,7 +108,6 @@ margin-bottom:29px;
 font-style:italic;
 }
 
-
 .form_settings .form_data li {
 width:100%;
 float:left;
@@ -179,7 +175,6 @@ width:90%;
 margin-left:0;
 }
 
-
 .form_settings .form_note {
 border-radius:4px;
 -moz-border-radius:4px;
@@ -187,13 +182,8 @@ border-radius:4px;
 padding:0 7px;
 }
 
-
-
 /* FORM SETTINGS */
 
-
-
-
 address {
 float:left;
 margin-bottom:18px;
@@ -206,7 +196,6 @@ address .fn {
 font-weight:bold;
 }
 
-
 #header {
 width:100%;
 position:relative;
@@ -225,7 +214,6 @@ display:inline;
 margin-left:11px;
 }
 
-
 .system_notice dt {
 font-weight:bold;
 text-transform:uppercase;
@@ -244,17 +232,12 @@ clear:both;
 margin-bottom:18px;
 }
 
-
-
-
 #footer {
 float:left;
 width:64%;
 padding:18px;
 }
 
-
-
 #site_nav_local_views {
 width:100%;
 float:left;
@@ -286,7 +269,6 @@ float:left;
 width:100%;
 }
 
-
 #site_nav_global_primary dt,
 #site_nav_global_secondary dt {
 display:none;
@@ -315,8 +297,6 @@ padding-left:30px;
 padding-left:28px;
 }
 
-
-
 #export_data ul {
 display:inline;
 }
@@ -329,8 +309,6 @@ margin-left:11px;
 margin-left:0;
 }
 
-
-
 #licenses {
 font-size:0.9em;
 }
@@ -353,7 +331,6 @@ vertical-align:top;
 margin-right:4px;
 }
 
-
 #wrap {
 	float:left;
 	margin:0 auto;
@@ -361,7 +338,6 @@ margin-right:4px;
     width:71.714em;
 }
 
-
 #core {
 position:relative;
 width:100%;
@@ -396,9 +372,6 @@ border-radius:7px;
 -webkit-border-radius:7px;
 }
 
-
-
-
 /*Start: FORM NOTICE*/
 #form_notice {
 width:384px;
@@ -501,10 +474,6 @@ float:left;
 
 /*end FORM NOTICE*/
 
-
-
-
-
 /* entity_profile */
 .entity_profile {
 position:relative;
@@ -575,10 +544,6 @@ display:none;
 
 /* entity_profile */
 
-
-
-
-
 /*entity_actions*/
 .entity_actions {
 float:right;
@@ -617,8 +582,6 @@ font-weight:bold;
 display:block;
 }
 
-
-
 .form_user_block input.submit,
 .form_user_unblock input.submit,
 #entity_send-a-message a,
@@ -633,8 +596,6 @@ padding-left:20px;
 padding:4px 4px 4px 23px;
 }
 
-
-
 .entity_tags ul {
 list-style-type:none;
 }
@@ -644,8 +605,6 @@ margin-right:1em;
 float:left;
 }
 
-
-
 .aside .section {
 margin-bottom:29px;
 clear:both;
@@ -665,7 +624,6 @@ display:inline;
 content: ":";
 }
 
-
 #user_subscriptions,
 #user_subscribers,
 #user_groups, {
@@ -692,23 +650,25 @@ display:none;
 clear:both;
 }
 
-
-
 .profile .entity_profile {
 margin-bottom:0;
 min-height:60px;
 }
 
+
+.profile .form_group_join,
+.profile .form_group_leave,
 .profile .form_user_subscribe,
 .profile .form_user_unsubscribe {
 float:right;
 }
+.profile .form_group_join legend,
+.profile .form_group_leave legend,
 .profile .form_user_subscribe legend,
 .profile .form_user_unsubscribe legend {
 display:none;
 }
 
-
 .profiles {
 list-style-type:none;
 }
@@ -723,12 +683,25 @@ display:inline;
 float:none;
 }
 .profile .entity_profile .entity_note,
-.profile .entity_profile .entity_url {
+.profile .entity_profile .entity_url,
+.profile .entity_profile .entity_tags,
+.profile .entity_profile .form_subcription_edit {
 margin-left:59px;
 clear:none;
 display:block;
 width:auto;
 }
+.profile .entity_profile .entity_tags dt {
+display:inline;
+margin-right:11px;
+}
+
+
+.profile .entity_profile .form_subcription_edit label {
+font-weight:normal;
+margin-right:11px;
+}
+
 
 
 
@@ -756,7 +729,6 @@ border-radius:4px;
 -webkit-border-radius:4px;
 }
 
-
 /* NOTICES */
 #notices_primary {
 float:left;
@@ -773,7 +745,6 @@ display:block;
 padding-left:28px;
 }
 
-
 .notice .author {
 margin-right:11px;
 }
@@ -783,6 +754,14 @@ margin-right:11px;
 /*content:":";*/
 }
 
+.notice .author .fn {
+font-weight:bold;
+}
+
+.notice .author .photo {
+margin-bottom:0;
+}
+
 .vcard .photo {
 display:inline;
 margin-right:11px;
@@ -802,7 +781,6 @@ font-style:italic;
 
 }
 
-
 .notice .entry-title {
 float:left;
 width:100%;
@@ -836,7 +814,7 @@ border-radius:4px;
 /*border:1px solid blue;*/
 clear:left;
 float:left;
-width:48%;
+/*width:48%;*/
 font-size:0.95em;
 }
 .notice div.entry-content a,
@@ -859,6 +837,10 @@ font-size:1.025em;
 .notice div.entry-content dd {
 display:inline;
 }
+.notice div.entry-content .timestamp {
+margin-left:59px;
+}
+
 .notice div.entry-content .timestamp dt,
 .notice div.entry-content .response dt {
 display:none;
@@ -877,6 +859,9 @@ text-transform:lowercase;
 
 
 
+
+
+
 .notice-data {
 position:absolute;
 top:18px;
@@ -899,6 +884,8 @@ float:left;
 width:50%;
 position:relative;
 font-size:0.95em;
+width:12.5%;
+float:right;
 }
 
 .notice-options a {
@@ -966,10 +953,6 @@ padding:0;
 
 /*END: NOTICES */
 
-
-
-
-
 .pagination dt {
 font-weight:bold;
 display:none;
@@ -1010,11 +993,8 @@ padding-right:20px;
 border-right:0;
 }
 
-
 /* END: NOTICE */
 
-
-
 /*If there is hentry on #content_inner, then this doesn't need to be specific to #doc or any other section */
 .hentry .entry-content p {
 margin-bottom:18px;
@@ -1030,7 +1010,6 @@ margin-bottom:18px;
 margin-left:18px;
 }
 
-
 /*START: LOAD ALONG WITH JS*/
 .notice .in-reply-to {
 	width:98%;
@@ -1046,8 +1025,6 @@ background-color:#E4E9F0;
 background-color:#D1D9E4;
 }
 
-
-
 .entity_actions #user_subscribe .form_note,
 .entity_actions #user_subscribe .form_data,
 .entity_actions #user_subscribe .form_actions label {
@@ -1079,8 +1056,6 @@ background-color:#fff;
 
 /*END: LOAD ALONG WITH JS*/
 
-
-
 /* TOP_POSTERS */
 #top-posters caption {
 text-align:left;
@@ -1106,8 +1081,6 @@ height:24px;
 width:24px;
 }
 
-
-
 /* tagcloud */
 .tag-cloud {
 list-style-type:none;
@@ -1150,20 +1123,15 @@ font-size:4em;
 display:none;
 }
 
-
-
-
 #form_settings_photo .form_data {
 clear:both;
 }
 
-
-
 #form_settings_avatar li {
 width:auto;
 }
 #form_settings_avatar input {
-margin-left:0; 
+margin-left:0;
 }
 #avatar_original,
 #avatar_preview {
@@ -1188,8 +1156,6 @@ clear:both;
 margin-bottom:0;
 }
 
-
-
 #groups_related ul,
 #users_featured ul {
 list-style-type:none;
@@ -1223,8 +1189,6 @@ display:none;
 font-weight:bold;
 }
 
-
-
 #home.logged_out h1 {
 display:none;
 }
@@ -1267,7 +1231,6 @@ font-weight:bold;
 text-align:center;
 }
 
-
 #testimonials {
 clear:both;
 }
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 1df14a7f1..5d07cfd9a 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -58,8 +58,7 @@ background-color:#fcfffc;
 
 #aside_primary,
 #entity_subscribe a,
-#TB_window input.submit,
-.form_user_subscribe input.submit {
+#TB_window input.submit {
 background-color:#CEE1E9;
 }
 
@@ -215,9 +214,11 @@ background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-re
 background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 }
 
+div.entry-content,
 div.notice-options {
 opacity:0.3;
 }
+.notices li.hover div.entry-content,
 .notices li.hover div.notice-options {
 opacity:1;
 }