Merge branch '0.8.x' into userdesign

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

diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 8edb005a68ae7b74b79c9619eae7c36e5a7dfd25..f7abac482364621572b2da6c541834b6c90c9ea9 100644 (file)
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -7,6 +7,8 @@
  * @link      http://laconi.ca/
  */
 
+@import url(../../base/css/display.css);
+
 html,
 body,
 a:active {
@@ -31,7 +33,7 @@ border-color:#aaa;
 border-color:#ddd;
 }
 
-.form_settings input.form_action-secondary {
+.form_settings input.form_action-primary {
 background:none;
 }
 
@@ -58,7 +60,7 @@ div.notice-options input,
 .entity_send-a-message a,
 .form_user_nudge input.submit,
 .entity_nudge p,
-.form_settings input.form_action-secondary {
+.form_settings input.form_action-primary {
 color:#002E6E;
 }
 
@@ -70,19 +72,10 @@ border-top-color:#CEE1E9;
 border-top-color:#87B4C8;
 }
 
-
-#content .notice p.entry-content a:visited {
-background-color:#fcfcfc;
-}
-#content .notice p.entry-content .vcard a {
-background-color:#fcfffc;
-}
-
 #aside_primary {
 background-color:#CEE1E9;
 }
 
-
 #notice_text-count {
 color:#333;
 }
@@ -112,7 +105,6 @@ background-color:rgba(135, 180, 200, 0.3);
 background-color:rgba(255, 255, 255, 0.7);
 }
 
-
 .error {
 background-color:#F7E8E8;
 }
@@ -120,7 +112,6 @@ background-color:#F7E8E8;
 background-color:#EFF3DC;
 }
 
-
 #anon_notice {
 background-color:#87B4C8;
 color:#fff;
@@ -131,7 +122,6 @@ border-color:#fff;
 background-color:#9BB43E;
 }
 
-
 #export_data li a {
 background-repeat:no-repeat;
 background-position:0 45%;
@@ -164,51 +154,48 @@ background-color:#9BB43E;
 color:#fff;
 }
 .form_user_unsubscribe input.submit,
-.form_group_leave input.submit {
+.form_group_leave input.submit,
+.form_user_authorization input.reject {
 background-color:#87B4C8;
 }
 
 .entity_edit a {
-background-image:url(../images/icons/twotone/green/edit.gif);
+background-image:url(../../base/images/icons/twotone/green/edit.gif);
 }
 .entity_send-a-message a {
-background-image:url(../images/icons/twotone/green/quote.gif);
+background-image:url(../../base/images/icons/twotone/green/quote.gif);
 }
 .entity_nudge p,
 .form_user_nudge input.submit {
-background-image:url(../images/icons/twotone/green/mail.gif);
+background-image:url(../../base/images/icons/twotone/green/mail.gif);
 }
 .form_user_block input.submit,
 .form_user_unblock input.submit {
-background-image:url(../images/icons/twotone/green/shield.gif);
+background-image:url(../../base/images/icons/twotone/green/shield.gif);
 }
 
-
-
 /* NOTICES */
-.notices li.over {
-background-color:#fcfcfc;
-}
-
 .notice-options .notice_reply a,
 .notice-options form input.submit {
 background-color:transparent;
 }
 .notice-options .notice_reply a {
-background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%;
 }
 .notice-options form.form_favor input.submit {
-background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
 }
 .notice-options form.form_disfavor input.submit {
-background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
 }
 .notice-options .notice_delete a {
-background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 }
 
 .notices div.entry-content,
-.notices div.notice-options {
+.notices div.notice-options,
+.notices li.hover .notices div.entry-content,
+.notices li.hover .notices div.notice-options {
 opacity:0.4;
 }
 .notices li.hover div.entry-content,
@@ -225,15 +212,23 @@ font-family:sans-serif;
 .notices li.hover {
 background-color:#fcfcfc;
 }
-/*END: NOTICES */
 
+.notices .notices {
+background-color:rgba(200, 200, 200, 0.050);
+}
+.notices .notices .notices {
+background-color:rgba(200, 200, 200, 0.100);
+}
+.notices .notices .notices .notices {
+background-color:rgba(200, 200, 200, 0.150);
+}
+.notices .notices .notices .notices .notices {
+background-color:rgba(200, 200, 200, 0.300);
+}
+/*END: NOTICES */
 
 #new_group a {
-background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
-}
-#usergroups #new_group {
-float: left;
-margin-right: 2em;
+background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%;
 }
 
 .pagination .nav_prev a,
@@ -242,10 +237,10 @@ background-repeat:no-repeat;
 border-color:#CEE1E9;
 }
 .pagination .nav_prev a {
-background-image:url(../images/icons/twotone/green/arrow-left.gif);
+background-image:url(../../base/images/icons/twotone/green/arrow-left.gif);
 background-position:10% 45%;
 }
 .pagination .nav_next a {
-background-image:url(../images/icons/twotone/green/arrow-right.gif);
+background-image:url(../../base/images/icons/twotone/green/arrow-right.gif);
 background-position:90% 45%;
 }