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 35a146fa74520e5f2d3b177d0f17d6df3bb56da8..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;
 }
 
@@ -162,6 +163,12 @@ margin-top:0;
 margin-left:0;
 }
 
+
+.form_settings .form_note {
+-moz-border-radius:4px;
+padding:0 7px;
+}
+
 /* FORM SETTINGS */
 
 
@@ -742,6 +749,7 @@ display:inline;
 clear:left;
 float:left;
 width:48%;
+font-size:0.95em;
 }
 .notice div.entry-content a,
 .notice .notice-options a,
@@ -751,6 +759,7 @@ width:48%;
 .notice .notice-options a,
 .notice .notice-options input {
 float:left;
+font-size:1.025em;
 }
 
 #laconicat .notice div.entry-content {
@@ -767,7 +776,7 @@ display:inline;
 display:none;
 }
 .notice div.entry-content .timestamp a {
-
+display:inline-block;
 }
 .notice div.entry-content .device dt {
 text-transform:lowercase;
@@ -800,13 +809,29 @@ outline:none;
 padding-left:2%;
 float:left;
 width:50%;
+position:relative;
+font-size:0.95em;
 }
-.notice-options .notice_reply,
-.notice-options .notice_favorite {
+
+.notice-options a {
 float:left;
-margin-right:11px;
+}
+.notice-options .notice_delete,
+.notice-options .notice_reply,
+.notice-options .form_favor,
+.notice-options .form_disfavor {
+position:absolute;
+top:0;
+}
+.notice-options .form_favor,
+.notice-options .form_disfavor {
+left:0;
 }
 .notice-options .notice_reply {
+left:29px;
+}
+.notice-options .notice_delete {
+left:76px;
 }
 .notice-options .notice_reply dt {
 display:none;
@@ -815,6 +840,7 @@ display:none;
 .notice-options input,
 .notice-options a {
 text-indent:-9999px;
+outline:none;
 }
 
 .notice-options .notice_reply a,
@@ -825,24 +851,24 @@ border:0;
 .notice-options .notice_reply a,
 .notice-options .notice_delete a {
 text-decoration:none;
-padding-left:20px;
+padding-left:16px;
 }
 
 .notice-options .notice_delete {
-float:right;
+
 }
 
 .notice-options form input.submit {
 cursor:pointer;
-padding:2px 0 2px 17px;
+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;
 }