Merge commit 'origin/0.9.x' into 0.9.x

2 files changed, 37 insertions, 9 deletions

diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 12541341d..d5a5d38de 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -20,7 +20,13 @@ font-size:1em;
 address {
 margin-right:7.2%;
 }
-
+input, textarea, select {
+border-width:2px;
+border-style: solid;
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
 input, textarea, select, option {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 }
@@ -40,7 +46,8 @@ box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
 .entity_send-a-message .form_notice,
 .pagination .nav_prev a,
 .pagination .nav_next a,
-.form_settings fieldset fieldset {
+.form_settings fieldset fieldset,
+.entity_moderation:hover ul {
 border-color:#DDDDDD;
 }
 
@@ -61,6 +68,7 @@ input.submit,
 .entity_remote_subscribe,
 .entity_actions a,
 .entity_actions input,
+.entity_moderation p,
 button {
 box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
@@ -89,7 +97,8 @@ a,
 .form_settings input.form_action-primary,
 .notice-options input,
 .entity_actions a,
-.entity_actions input {
+.entity_actions input,
+.entity_moderation p {
 color:#002FA7;
 }
 
@@ -144,13 +153,18 @@ button.close,
 .form_user_unsubscribe input.submit,
 .form_group_join input.submit,
 .form_user_subscribe input.submit,
-.entity_subscribe a {
+.entity_subscribe a,
+.entity_moderation p,
+.entity_sandbox input.submit,
+.entity_silence input.submit,
+.entity_delete input.submit {
 background-image:url(../../base/images/icons/icons-01.gif);
 background-repeat:no-repeat;
 background-color:transparent;
 }
 
-#wrap form.processing input.submit {
+#wrap form.processing input.submit,
+.entity_actions a.processing {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
 text-indent:-9999px;
@@ -169,11 +183,12 @@ border-color:transparent;
 }
 #content,
 #site_nav_local_views .current a,
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
 background-color:#FFFFFF;
 }
 
-#site_nav_local_views li {
+#site_nav_local_views li.current {
 box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
 -moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
 -webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
@@ -251,7 +266,8 @@ background-position: 5px -718px;
 .entity_send-a-message a {
 background-position: 5px -852px;
 }
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
 box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
 -moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
 -webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
@@ -270,6 +286,18 @@ background-position: 5px -918px;
 .form_make_admin input.submit {
 background-position: 5px -983px;
 }
+.entity_moderation p {
+background-position: 5px -1313px;
+}
+.entity_sandbox input.submit {
+background-position: 5px -1380px;
+}
+.entity_silence input.submit {
+background-position: 5px -1445px;
+}
+.entity_delete input.submit {
+background-position: 5px -1511px;
+}
 
 /* NOTICES */
 .notice .attachment {
diff --git a/theme/identica/css/ie.css b/theme/identica/css/ie.css
index 9ede1e324..f69c13ae7 100644
--- a/theme/identica/css/ie.css
+++ b/theme/identica/css/ie.css
@@ -7,7 +7,7 @@ color:#FFFFFF;
 background-color:#D9DADB;
 }
 .form_notice .form_note + label {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px;
+background:transparent url(../../base/images/icons/icons-01.gif) no-repeat 0 -328px;
 }
 .form_notice #notice_data-attach {
 filter: alpha(opacity=0);