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

2 files changed, 22 insertions, 1 deletions

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index e49f27dfb..44dbff5da 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -754,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;
@@ -806,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,
@@ -829,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;
@@ -845,6 +857,11 @@ text-transform:lowercase;
 .notice div.entry-content a:hover {
 }
 
+
+
+
+
+
 .notice-data {
 position:absolute;
 top:18px;
@@ -867,6 +884,8 @@ float:left;
 width:50%;
 position:relative;
 font-size:0.95em;
+width:12.5%;
+float:right;
 }
 
 .notice-options a {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 66ee3c25d..5d07cfd9a 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -214,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;
 }