Merge branch '0.7.x' into 0.8.x

3 files changed, 24 insertions, 26 deletions

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 4c9b52254..8ea2befb4 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -83,12 +83,13 @@ left:0;
 border:0;
 }
 
-#page_notice .error,
-#page_notice .success {
+.error,
+.success {
 padding:4px 7px;
 border-radius:4px;
 -moz-border-radius:4px;
 -webkit-border-radius:4px;
+margin-bottom:18px;
 }
 form label.submit {
 display:none;
@@ -384,6 +385,7 @@ margin-bottom:1em;
 
 #content {
 width:64.009%;
+min-height:259px;
 padding:1.795%;
 float:left;
 border-radius:7px;
@@ -403,8 +405,9 @@ float:left;
 
 #aside_primary {
 width:27.917%;
+min-height:259px;
 float:left;
-margin-left:0.395%;
+margin-left:0.385%;
 padding:1.795%;
 border-radius:7px;
 -moz-border-radius:7px;
@@ -469,7 +472,7 @@ bottom:0;
 right:0;
 }
 #form_notice label[for=to] {
-margin-top:11px;
+margin-top:7px;
 }
 #form_notice select[id=to] {
 margin-bottom:7px;
@@ -1143,4 +1146,16 @@ clear:both;
 margin-bottom:0;
 }
 
-
+.instructions ul {
+list-style-position:inside;
+}
+.instructions p,
+.instructions ul {
+margin-bottom:18px;
+}
+.help dt {
+display:none;
+}
+.guide {
+clear:both;
+}
\ No newline at end of file
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index bf46fc6bf..42e29374f 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -37,7 +37,6 @@ background:none;
 
 input.submit,
 #form_notice.warning #notice_text-count,
-#nav_register a,
 .form_settings .form_note,
 .entity_remote_subscribe {
 background-color:#A9BF4F;
@@ -48,7 +47,6 @@ input:focus, textarea:focus, select:focus,
 border-color:#A9BF4F;
 }
 input.submit,
-#nav_register a,
 .entity_remote_subscribe {
 color:#fff;
 }
@@ -97,13 +95,6 @@ cursor:wait;
 text-indent:-9999px;
 }
 
-
-#nav_register a {
-text-decoration:none;
-font-weight:bold;
-padding:2px 4px;
-}
-
 #content,
 #site_nav_local_views a,
 #aside_primary {
@@ -122,10 +113,10 @@ background-color:rgba(255, 255, 255, 0.7);
 }
 
 
-#page_notice .error {
+.error {
 background-color:#F7E8E8;
 }
-#page_notice .success {
+.success {
 background-color:#EFF3DC;
 }
 
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 9e7c10ac5..8edb005a6 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -37,7 +37,6 @@ background:none;
 
 input.submit,
 #form_notice.warning #notice_text-count,
-#nav_register a,
 .form_settings .form_note,
 .entity_remote_subscribe {
 background-color:#9BB43E;
@@ -48,7 +47,6 @@ input:focus, textarea:focus, select:focus,
 border-color:#9BB43E;
 }
 input.submit,
-#nav_register a,
 .entity_remote_subscribe {
 color:#fff;
 }
@@ -97,12 +95,6 @@ cursor:wait;
 text-indent:-9999px;
 }
 
-#nav_register a {
-text-decoration:none;
-font-weight:bold;
-padding:2px 4px;
-}
-
 #content,
 #site_nav_local_views a,
 #aside_primary {
@@ -121,10 +113,10 @@ background-color:rgba(255, 255, 255, 0.7);
 }
 
 
-#page_notice .error {
+.error {
 background-color:#F7E8E8;
 }
-#page_notice .success {
+.success {
 background-color:#EFF3DC;
 }