Merge branch 'master' into 0.7.x

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

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 638b095207ff4e59ab0e5605659308909ca554ee..a10ec0223ca1e7ca34423f966e932c0a2a159bec 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -22,13 +22,11 @@ line-height:1.65;
 position:relative;
 }
 h1,h2,h3,h4,h5,h6 {
-text-transform:uppercase;
 margin-bottom:7px;
 overflow:hidden;
 }
 h1 {
 font-size:1.4em;
-line-height:1;
 margin-bottom:18px;
 }
 h2 { font-size:1.3em; }
@@ -43,7 +41,6 @@ font-weight:bold;
 legend {
 font-weight:bold;
 font-size:1.3em;
-text-transform:uppercase;
 }
 input, textarea, select, option {
 padding:4px;
@@ -152,7 +149,10 @@ font-weight:bold;
 #form_remote_subscribe legend,
 #form_openid_login legend,
 #form_search legend,
-#form_invite legend {
+#form_invite legend,
+#form_notice_delete legend,
+#form_password_recover legend,
+#form_password_change legend {
 display:none;
 }
 
@@ -179,6 +179,7 @@ float:left;
 width:90%;
 }
 
+
 #form_login p.form_guide,
 #form_register #settings_rememberme p.form_guide,
 #form_openid_login #settings_rememberme p.form_guide,
@@ -194,12 +195,16 @@ border-radius:4px;
 padding:0 7px;
 }
 
+
+.form_settings input.form_action-secondary {
+margin-left:29px;
+padding:0;
+}
+
 #form_search .submit {
 margin-left:11px;
 }
 
-
-
 address {
 float:left;
 margin-bottom:18px;
@@ -294,7 +299,7 @@ padding:4px 11px;
 border-width:1px;
 border-style:solid;
 border-bottom:0;
-text-shadow: 4px 4px 4px #ddd;
+text-shadow: 2px 2px 2px #ddd;
 font-weight:bold;
 }
 #site_nav_local_views .nav {
@@ -361,7 +366,6 @@ margin-right:4px;
 
 #wrap {
 margin:0 auto;
-width:71.714em;
 width:1003px;
 overflow:hidden;
 }
@@ -898,7 +902,7 @@ left:0;
 left:29px;
 }
 .notice-options .notice_delete {
-left:76px;
+right:0;
 }
 .notice-options .notice_reply dt {
 display:none;
@@ -941,7 +945,7 @@ padding:0;
 
 
 
-#new_group {
+#new_group, #group_search {
 margin-bottom:18px;
 }
 #new_group a {
@@ -1078,6 +1082,10 @@ border-top:0;
 .section .notice:first-child {
 padding-top:0;
 }
+
+.section .notice .author {
+margin-right:0;
+}
 .section .notice .author .fn {
 display:none;
 }
@@ -1165,3 +1173,4 @@ clear:both;
 margin-bottom:0;
 }
 
+