Merge branch '0.9.x' into testing

1 files changed, 3 insertions, 14 deletions

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 44d1d0300..e88e1f222 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -112,7 +112,6 @@ border-style:solid;
 line-height:0;
 }
 
-
 .form_settings input.remove {
 margin-left:11px;
 }
@@ -246,7 +245,6 @@ margin-left:11px;
 width:auto;
 }
 
-
 address {
 float:left;
 margin-bottom:18px;
@@ -672,8 +670,7 @@ display:block;
 text-align:left;
 width:100%;
 }
-.entity_actions a,
-.entity_remote_subscribe {
+.entity_actions a {
 text-decoration:none;
 font-weight:bold;
 display:block;
@@ -688,7 +685,8 @@ border-radius:4px;
 .entity_actions a,
 .entity_actions input,
 .entity_actions p {
-border:0;
+border-width:2px;
+border-style:solid;
 padding-left:23px;
 }
 
@@ -697,19 +695,10 @@ padding-left:23px;
 padding:2px 4px 1px 26px;
 }
 
-.entity_remote_subscribe {
-padding:4px;
-border-width:2px;
-border-style:solid;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-}
 .entity_actions .accept {
 margin-bottom:18px;
 }
 
-
 .entity_send-a-message button {
 position:absolute;
 top:3px;