Merge branch 'master' of ../trunk

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

diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 877c833fe50fe4a73c223269e510809fb4b55108..c16dc9fd7034b77310c51c80d18a277fe1d7daa4 100644 (file)
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -8,6 +8,13 @@ body {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 font-size:1em;
 }
+address {
+margin-right:71px;
+}
+address .fn {
+display:none;
+}
+
 input, textarea, select, option {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 }
@@ -15,6 +22,7 @@ input, textarea, select {
 border-color:#aaa;
 }
 
+
 input.submit,
 #form_notice.warning #notice_text-count,
 #nav_register a,
@@ -32,27 +40,25 @@ color:#fff;
 }
 
 a,
-div.notice-options input {
+div.notice-options input,
+.form_user_block input.submit,
+.form_user_unblock input.submit,
+#entity_send-a-message a,
+.form_user_nudge input.submit,
+#entity_nudge p {
 color:#002E6E;
 }
 
 .notice p.entry-content a:visited {
 background-color:#fcfcfc;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
 }
 .notice p.entry-content .vcard a {
 background-color:#fcfffc;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
 }
 
 #aside_primary,
-#user_subscribe a,
-#TB_window input.submit,
-.form_user_subscribe input.submit {
+#entity_subscribe a,
+#TB_window input.submit {
 background-color:#CEE1E9;
 }
 
@@ -60,8 +66,7 @@ background-color:#CEE1E9;
 #notice_text-count {
 color:#333;
 }
-#form_notice.warning #notice_text-count,
-#user_actions a {
+#form_notice.warning #notice_text-count {
 color:#000;
 }
 
@@ -78,8 +83,16 @@ font-weight:bold;
 padding:2px 4px;
 }
 
+#content,
 #site_nav_local_views a {
 border-color:#fff;
+}
+#content,
+#site_nav_local_views .current a {
+background-color:#fff;
+}
+
+#site_nav_local_views a {
 background-color:rgba(255, 255, 255, 0.2);
 }
 #site_nav_local_views a:hover {
@@ -87,10 +100,6 @@ background-color:rgba(255, 255, 255, 0.7);
 }
 
 
-#content,
-#site_nav_local_views .current a {
-background-color:#fff;
-}
 
 
 #page_notice .error {
@@ -120,30 +129,45 @@ background-image:url(../../base/images/icons/icon_vcard.gif);
 
 /*user_actions*/
 #user_actions li {
-border-top-color:#eee;
+/*border-top-color:#eee;*/
 }
-#user_subscribe a,
-#TB_window input.submit,
-.form_user_subscribe input.submit {
-background-image: url(../images/icons/twotone/green/shield.gif);
-background-position: 0 45%;
+
+
+#entity_send-a-message a,
+.form_user_nudge input.submit,
+.form_user_block input.submit,
+.form_user_unblock input.submit,
+#entity_nudge p {
+background-position: 0 40%;
 background-repeat: no-repeat;
+background-color:transparent;
 }
+.form_group_join input.submit,
+.form_group_leave input.submit
+.form_user_subscribe input.submit,
 .form_user_unsubscribe input.submit {
-background-color:#647819;
+background-color:#A9BF4F;
 color:#fff;
 }
-#user_send-a-message a {
-background:url(../images/icons/twotone/green/quote.gif) 0 45% no-repeat;
+.form_user_unsubscribe input.submit,
+.form_group_leave input.submit {
+background-color:#97BFD1;
 }
+
+#entity_send-a-message a {
+background-image:url(../images/icons/twotone/green/quote.gif);
+}
+#entity_nudge p,
 .form_user_nudge input.submit {
-background:url(../images/icons/twotone/green/mail.gif) 0 45% no-repeat;
+background-image:url(../images/icons/twotone/green/mail.gif);
 }
-.form_user_block input.submit {
-background:url(../images/icons/twotone/green/against.gif) 0 45% no-repeat;
+.form_user_block input.submit,
+.form_user_unblock input.submit {
+background-image:url(../images/icons/twotone/green/shield.gif);
 }
 
 
+
 /* NOTICES */
 .notices li.over {
 background-color:#fcfcfc;
@@ -190,10 +214,14 @@ background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-re
 background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 }
 
-div.notice-options {
+.notices div.entry-content,
+.notices div.notice-options {
 opacity:0.3;
 }
-
+.notices li.hover div.entry-content,
+.notices li.hover div.notice-options {
+opacity:1;
+}
 div.entry-content {
 color:#333;
 }
@@ -204,11 +232,6 @@ font-family:sans-serif;
 .notices li.hover {
 background-color:#fcfcfc;
 }
-.notices li.hover div.entry-content,
-.notices li.hover div.notice-options {
-opacity:1;
-}
-
 /*END: NOTICES */
 
 
@@ -240,4 +263,4 @@ background-color:#0f0;
 }
 #home #intro #step_create-a-community a {
 background-color:#00f;
-}
\ No newline at end of file
+}