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

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d829b71e47c807457bbfd15620cef7d3c66ecd8f..5cafd8c1fe39b87c6a640c15057a59bf13079fb2 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -40,9 +40,6 @@ font-weight:bold;
 font-size:1.3em;
 text-transform:uppercase;
 }
-form {
-clear:both;
-}
 input, textarea, select, option {
 padding:4px;
 font-family:sans-serif;
@@ -96,14 +93,17 @@ border-radius:4px;
 form label.submit {
 display:none;
 }
-.form_settings input.remove {
-margin-left:11px;
+
+.form_settings {
+clear:both;
 }
 
-/* FORM SETTINGS */
 .form_settings fieldset {
 margin-bottom:29px;
 }
+.form_settings input.remove {
+margin-left:11px;
+}
 
 .form_guide {
 font-style:italic;
@@ -184,7 +184,7 @@ border-radius:4px;
 padding:0 7px;
 }
 
-/* FORM SETTINGS */
+
 
 address {
 float:left;