Merge branch 'master' of ../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 716f3256f523317d6477dac83052ea4191190988..59429cf726464e88874356d1f82aeb0ec005786a 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -114,17 +114,17 @@ font-style:italic;
 }
 
 
-.form_settings .form_datas li {
+.form_settings .form_data li {
 width:100%;
 float:left;
 }
 
-.form_settings .form_datas label {
+.form_settings .form_data label {
 float:left;
 }
-.form_settings .form_datas textarea,
-.form_settings .form_datas select,
-.form_settings .form_datas input {
+.form_settings .form_data textarea,
+.form_settings .form_data select,
+.form_settings .form_data input {
 margin-left:11px;
 float:left;
 }
@@ -149,7 +149,7 @@ font-weight:bold;
 display:none;
 }
 
-.form_settings .form_datas p.form_guide {
+.form_settings .form_data p.form_guide {
 clear:both;
 margin-left:163px;
 margin-bottom:0;
@@ -195,11 +195,12 @@ float:left;
 margin-bottom:18px;
 margin-left:18px;
 }
-address .fn,
-address .email {
-display:none;
+address.vcard img.logo {
+margin-right:0;
+}
+address .fn {
+font-weight:bold;
 }
-
 
 
 #header {
@@ -213,6 +214,7 @@ margin-bottom:29px;
 #site_nav_global_primary {
 float:right;
 margin-right:18px;
+margin-bottom:11px;
 }
 #site_nav_global_primary ul li {
 display:inline;
@@ -398,7 +400,6 @@ border-radius:7px;
 width:384px;
 width:458px;
 float:left;
-margin-left:68px;
 position:relative;
 line-height:1;
 }
@@ -417,14 +418,14 @@ width:377px;
 width:370px;
 height:86px;
 line-height:1.5;
-padding:7px 7px 14px 7px;
+padding:7px 7px 16px 7px;
 }
 #form_notice label {
 display:block;
 font-size:1.3em;
 margin-bottom:7px;
 }
-#form_notice .form_datas li {
+#form_notice .form_data li {
 float:left;
 }
 
@@ -440,7 +441,7 @@ margin-left:4px;
 
 #form_notice .form_note {
 position:absolute;
-top:116px;
+top:120px;
 right:98px;
 z-index:9;
 }
@@ -695,6 +696,12 @@ border-top:1px dashed #D1D9E4;
 list-style-type:none;
 /*margin-bottom:11px;*/
 }
+.notices li.hover {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
+
 
 /* NOTICES */
 #notices_primary {
@@ -760,20 +767,17 @@ display:inline;
 #laconicat .notice p.entry-content {
 /*margin-left:199px;*/
 }
-.notice p.entry-content a {
-
-}
-.notice p.entry-content a:hover {
-
-}
-.notice p.entry-content .tag a {
-
+.notice p.entry-content a:visited {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
-.notice p.entry-content .tag a:hover {
-
+.notice p.entry-content .vcard a {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
 
-
 .notice div.entry-content {
 /*border:1px solid blue;*/
 clear:left;
@@ -979,12 +983,12 @@ background-color:#D1D9E4;
 
 
 #user_actions #user_subscribe .form_note,
-#user_actions #user_subscribe .form_datas,
+#user_actions #user_subscribe .form_data,
 #user_actions #user_subscribe .form_actions label {
 display:none;
 }
 #form_user-relationship .form_note,
-#form_user-relationship .form_datas,
+#form_user-relationship .form_data,
 #form_user-relationship .form_actions label {
 display:block;
 }
@@ -992,7 +996,7 @@ display:block;
 #user_actions #user-relationship_submit {
 margin-bottom:0;
 }
-#form_user-relationship .form_datas li label {
+#form_user-relationship .form_data li label {
 margin-right:11px;
 }
 
@@ -1070,7 +1074,7 @@ font-size:2.2em;
 
 
 
-#form_settings_photo .form_datas {
+#form_settings_photo .form_data {
 clear:both;
 }