Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk

1 files changed, 21 insertions, 5 deletions

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 45affbaf6..e49f27dfb 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -655,10 +655,15 @@ 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;
@@ -678,12 +683,27 @@ 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;
+}
+
+
+
 
 /* NOTICE */
 .notice,
@@ -1195,7 +1215,3 @@ text-align:center;
 #testimonials {
 clear:both;
 }
-
-.entity_tags dt {
-display:block;
-}
\ No newline at end of file