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

[quix0rs-gnu-social.git] / theme / base / css / display.css

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 54a5b883325b7e2f3c8ac73ea6c03325128d99c7..5cafd8c1fe39b87c6a640c15057a59bf13079fb2 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -40,8 +40,6 @@ font-weight:bold;
 font-size:1.3em;
 text-transform:uppercase;
 }
-form {
-}
 input, textarea, select, option {
 padding:4px;
 font-family:sans-serif;
@@ -95,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;
@@ -143,7 +144,8 @@ font-weight:bold;
 #form_password legend,
 #form_settings_avatar legend,
 #newgroup legend,
-#editgroup legend {
+#editgroup legend,
+#form_tag_user legend {
 display:none;
 }
 
@@ -182,7 +184,7 @@ border-radius:4px;
 padding:0 7px;
 }
 
-/* FORM SETTINGS */
+
 
 address {
 float:left;
@@ -347,6 +349,7 @@ margin-bottom:1em;
 
 #content {
 width:644px;
+width:46em;
 padding:18px;
 float:left;
 border-radius:7px;
@@ -364,6 +367,7 @@ float;left;
 
 #aside_primary {
 width:300px;
+width:21.429em;
 float:left;
 margin-left:2px;
 padding:18px 4px 18px 18px;
@@ -705,6 +709,7 @@ margin-right:11px;
 
 
 
+
 /* NOTICE */
 .notice,
 .profile {
@@ -713,8 +718,6 @@ padding-top:11px;
 padding-bottom:11px;
 clear:both;
 float:left;
-width:644px;
-width:96.699%;
 width:100%;
 border-top-width:1px;
 border-top-style:dashed;
@@ -734,6 +737,7 @@ border-radius:4px;
 #notices_primary {
 float:left;
 width:644px;
+width:46em;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;