summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2009-11-26 20:38:06 +0000
committerSarven Capadisli <csarven@status.net>2009-11-26 20:38:06 +0000
commit2755a6d3cfdd654657b00cf701af57c45ef05471 (patch)
tree71da1270428c58099343349208176d0c13bb86f5
parent5f5a107991478824133c6e0d67aeb1a7efb8e213 (diff)
Moved moderation styles out of UserFlag and put it into core. Updated
icons.
-rw-r--r--plugins/UserFlag/userflag.css51
-rw-r--r--theme/base/css/display.css29
-rw-r--r--theme/base/images/icons/icons-01.gifbin2913 -> 3097 bytes
-rw-r--r--theme/base/images/icons/twotone/green/badge.gif (renamed from plugins/UserFlag/icon_badge.gif)bin105 -> 105 bytes
-rw-r--r--theme/base/images/icons/twotone/green/sandbox.gif (renamed from plugins/UserFlag/icon_sandbox.gif)bin104 -> 104 bytes
-rw-r--r--theme/base/images/icons/twotone/green/silence.gif (renamed from plugins/UserFlag/icon_silence.gif)bin103 -> 103 bytes
-rw-r--r--theme/base/images/icons/twotone/green/skull.gif (renamed from plugins/UserFlag/icon_skull.gif)bin85 -> 85 bytes
-rw-r--r--theme/default/css/display.css31
-rw-r--r--theme/identica/css/display.css31
9 files changed, 81 insertions, 61 deletions
diff --git a/plugins/UserFlag/userflag.css b/plugins/UserFlag/userflag.css
index d69c2467f..98da24cc9 100644
--- a/plugins/UserFlag/userflag.css
+++ b/plugins/UserFlag/userflag.css
@@ -2,54 +2,3 @@
.entity_flag p {
background:url(icon_flag.gif) 5px 5px no-repeat;
}
-.entity_sandbox input.submit,
-.entity_sandbox p {
-background:url(icon_sandbox.gif) 5px 5px no-repeat;
-}
-.entity_silence input.submit,
-.entity_silence p {
-background:url(icon_silence.gif) 5px 5px no-repeat;
-}
-.entity_delete input.submit,
-.entity_delete p {
-background:url(icon_skull.gif) 5px 5px no-repeat;
-}
-
-.entity_moderation {
-position:relative;
-}
-.entity_moderation p {
-background:transparent url(icon_badge.gif) 5px 5px no-repeat;
-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
--moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
--webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.25);
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-font-weight:bold;
-padding-bottom:2px;
-margin-bottom:7px;
-
-color:#002FA7;
-}
-.entity_moderation ul {
-display:none;
-}
-.entity_moderation:hover ul {
-display:block;
-background-color:#FFFFFF;
-min-width:21%;
-width:100%;
-border:1px solid #DDDDDD;
-padding:11px;
-position:absolute;
-top:-1px;
-right:-1px;
-z-index:1;
-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
--moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
--webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.25);
-border-radius:7px;
--moz-border-radius:7px;
--webkit-border-radius:7px;
-}
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 33d5ba07e..c9aa81cfb 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -750,6 +750,35 @@ display:none;
text-align:center;
}
+.entity_moderation {
+position:relative;
+}
+.entity_moderation p {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+font-weight:bold;
+padding-bottom:2px;
+margin-bottom:7px;
+}
+.entity_moderation ul {
+display:none;
+}
+.entity_moderation:hover ul {
+display:block;
+min-width:21%;
+width:100%;
+padding:11px;
+position:absolute;
+top:-1px;
+right:-1px;
+z-index:1;
+border-width:1px;
+border-style:solid;
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+}
.entity_tags ul {
list-style-type:none;
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
index f19d6a3f6..e910c86c0 100644
--- a/theme/base/images/icons/icons-01.gif
+++ b/theme/base/images/icons/icons-01.gif
Binary files differ
diff --git a/plugins/UserFlag/icon_badge.gif b/theme/base/images/icons/twotone/green/badge.gif
index 2dca5b99f..2dca5b99f 100644
--- a/plugins/UserFlag/icon_badge.gif
+++ b/theme/base/images/icons/twotone/green/badge.gif
Binary files differ
diff --git a/plugins/UserFlag/icon_sandbox.gif b/theme/base/images/icons/twotone/green/sandbox.gif
index 17031962a..17031962a 100644
--- a/plugins/UserFlag/icon_sandbox.gif
+++ b/theme/base/images/icons/twotone/green/sandbox.gif
Binary files differ
diff --git a/plugins/UserFlag/icon_silence.gif b/theme/base/images/icons/twotone/green/silence.gif
index 8c624acdd..8c624acdd 100644
--- a/plugins/UserFlag/icon_silence.gif
+++ b/theme/base/images/icons/twotone/green/silence.gif
Binary files differ
diff --git a/plugins/UserFlag/icon_skull.gif b/theme/base/images/icons/twotone/green/skull.gif
index 033506732..033506732 100644
--- a/plugins/UserFlag/icon_skull.gif
+++ b/theme/base/images/icons/twotone/green/skull.gif
Binary files differ
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 00cac0ea3..4b1c26967 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -40,7 +40,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 +62,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 +91,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,7 +147,11 @@ 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;
@@ -169,7 +176,8 @@ 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;
}
@@ -252,7 +260,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);
@@ -271,6 +280,18 @@ background-position: 5px -918px;
.form_make_admin input.submit {
background-position: 5px -983px;
}
+.entity_moderation p {
+background-position: 5px -1313px;
+}
+.form_user_sandbox input.submit {
+background-position: 5px -1380px;
+}
+.form_user_silence input.submit {
+background-position: 5px -1445px;
+}
+.form_user_deleteuser input.submit {
+background-position: 5px -1511px;
+}
/* NOTICES */
.notice .attachment {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 12541341d..8bacd7673 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -40,7 +40,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 +62,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 +91,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,7 +147,11 @@ 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;
@@ -169,7 +176,8 @@ 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;
}
@@ -251,7 +259,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 +279,18 @@ background-position: 5px -918px;
.form_make_admin input.submit {
background-position: 5px -983px;
}
+.entity_moderation p {
+background-position: 5px -1313px;
+}
+.form_user_sandbox input.submit {
+background-position: 5px -1380px;
+}
+.form_user_silence input.submit {
+background-position: 5px -1445px;
+}
+.form_user_deleteuser input.submit {
+background-position: 5px -1511px;
+}
/* NOTICES */
.notice .attachment {