Notice search markup and style

diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 970d7cf88210fcd146e325a16c42f095c2a5c244..a0d723b1235d7425b31eb1d79247960f442eb4bb 100644 (file)
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -193,9 +193,7 @@ class NoticesearchAction extends SearchAction
         $this->elementEnd('a');
         $this->elementEnd('dd');
         $this->elementEnd('dl');
-        $this->elementEnd('div');
 
-        $this->elementStart('div', 'notice-options');
         if ($notice->reply_to) {
             $replyurl = common_local_url('shownotice',
                                          array('notice' => $this->notice->reply_to));
@@ -208,6 +206,9 @@ class NoticesearchAction extends SearchAction
             $this->elementEnd('dd');
             $this->elementEnd('dl');
         }
+        $this->elementEnd('div');
+
+        $this->elementStart('div', 'notice-options');
 
         $reply_url = common_local_url('newnotice',
                                       array('replyto' => $profile->nickname));

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 367396338fd99ee030fc5eb6a8cb0c619fc81805..17700e64e345b3214b70a0012f254e4fcc984ae5 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -374,7 +374,6 @@ margin-bottom:1em;
 
 #content {
 width:644px;
-width:46em;
 padding:18px;
 float:left;
 border-radius:7px;
@@ -391,11 +390,10 @@ float:left;
 }
 
 #aside_primary {
-width:300px;
-width:21.429em;
+width:286px;
 float:left;
 margin-left:2px;
-padding:18px 4px 18px 18px;
+padding:18px;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
@@ -661,8 +659,8 @@ content: ":";
 }
 
 .section ul.entities {
-width:280px;
 float:left;
+width:100%;
 }
 .section .entities li {
 list-style-type:none;
@@ -761,7 +759,6 @@ border-radius:4px;
 #notices_primary {
 float:left;
 width:644px;
-width:46em;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;