Merge branch 'uiredesign' of /var/www/trunk into uiredesign

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

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 789eaee4ce86f3fca142158e2f81401215efac54..7433a45e46a0f064b4c28b154aacc6d6aa1873d4 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -16,30 +16,30 @@ margin:0 auto;
 width:1004px;
 width:71.714em;
 }
+h1,h2,h3,h4,h5,h6 {
+       text-transform:uppercase;
+       margin-bottom:7px;
+}
 h1 {
-font-size:1.7em;
-line-height:1.1;
-margin-bottom:0.25em;
+font-size:1.4em;
+line-height:1;
+margin-bottom:18px;
 }
 h2 { font-size:1.3em; }
 h3 { font-size:1.2em; }
 h4 { font-size:1.1em; }
 h5 { font-size:1em; }
 h6 { font-size:0.9em; }
-h1,h2,h3,h4,h5,h6 {
-       text-transform:uppercase;
-       margin-bottom:7px;
-}
+
 caption {
 font-weight:bold;
 }
 .opened { display: block !important;}
 .closed { display: none !important;}
 
-
 legend {
 font-weight:bold; 
-font-size:1.5em;
+font-size:1.3em;
 text-transform:uppercase;
 }
 form {
@@ -135,7 +135,8 @@ display:inline;
 font-weight:bold;
 }
 
-#form_settings_profile legend {
+#form_settings_profile legend,
+#form_login legend {
 display:none;
 }
 
@@ -817,11 +818,13 @@ float:left;
 }
 .notice-options .notice_delete,
 .notice-options .notice_reply,
-.notice-options .notice_favorite {
+.notice-options .form_favor,
+.notice-options .form_disfavor {
 position:absolute;
 top:0;
 }
-.notice-options .notice_favorite {
+.notice-options .form_favor,
+.notice-options .form_disfavor {
 left:0;
 }
 .notice-options .notice_reply {
@@ -861,11 +864,11 @@ padding:2px 0 2px 10px;
 }
 
 .notice-options .notice_delete dt,
-.notice-options .notice_favorite legend {
+.notice-options .form_favor legend {
 display:none;
 }
 .notice-options .notice_delete fieldset,
-.notice-options .notice_favorite fieldset {
+.notice-options .form_favor fieldset {
 border:0;
 padding:0;
 }