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 b0a41cede8eba0a8ef3fb6033747a606b11f9442..9146a2bf54d0b19a3bcddd2bc2a9ec5a148d4f0a 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -17,7 +17,7 @@ width:1004px;
 width:71.714em;
 }
 h1 {
-font-size:2.1em;
+font-size:1.7em;
 line-height:1.1;
 margin-bottom:0.25em;
 }
@@ -39,7 +39,7 @@ font-weight:bold;
 
 legend {
 font-weight:bold; 
-font-size:1.6em;
+font-size:1.5em;
 text-transform:uppercase;
 }
 form {
@@ -109,9 +109,21 @@ margin-bottom:29px;
 font-style:italic;
 }
 
-.form_login label,
-.form_settings label {
+
+.form_settings .form_datas li {
+width:100%;
+float:left;
+}
+
+.form_settings .form_datas label,
+.form_settings .form_datas input {
 margin-right:11px;
+float:left;
+}
+
+.form_settings label {
+margin-top:7px;
+width:123px;
 }
 
 .form_actions label {
@@ -123,16 +135,37 @@ display:inline;
 font-weight:bold;
 }
 
-.form_settings p {
-margin-bottom:18px;
+#form_settings_profile legend {
+display:none;
 }
 
-#settings_email_address {
-margin-bottom:29px;
+.form_settings .form_datas p.form_guide {
+clear:both;
+margin-left:134px;
+margin-bottom:0;
 }
 
+.form_settings p {
+margin-bottom:11px;
+}
+
+.form_settings input.checkbox {
+margin-top:3px;
+}
 .form_settings label.checkbox {
 font-weight:normal;
+width:auto;
+margin-top:0;
+}
+
+#form_login p.form_guide {
+margin-left:0;
+}
+
+
+.form_settings .form_note {
+-moz-border-radius:4px;
+padding:0 7px;
 }
 
 /* FORM SETTINGS */
@@ -715,6 +748,7 @@ display:inline;
 clear:left;
 float:left;
 width:48%;
+font-size:0.95em;
 }
 .notice div.entry-content a,
 .notice .notice-options a,
@@ -724,6 +758,7 @@ width:48%;
 .notice .notice-options a,
 .notice .notice-options input {
 float:left;
+font-size:1.025em;
 }
 
 #laconicat .notice div.entry-content {
@@ -740,7 +775,7 @@ display:inline;
 display:none;
 }
 .notice div.entry-content .timestamp a {
-
+display:inline-block;
 }
 .notice div.entry-content .device dt {
 text-transform:lowercase;
@@ -773,17 +808,40 @@ 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;
 }
+
+.notice-options input,
+.notice-options a {
+text-indent:-9999px;
+outline:none;
+}
+
 .notice-options .notice_reply a,
 .notice-options form input.submit {
 display:block;
@@ -792,24 +850,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;
 }