Updated the styles for action icons

6 files changed, 89 insertions, 38 deletions

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index ee94b9e5e..abc3423ed 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -618,7 +618,7 @@ font-style:italic;
 .entity_actions {
 float:right;
 margin-left:2.35%;
-max-width:25%;
+width:22%;
 }
 .entity_actions h2 {
 display:none;
@@ -627,7 +627,7 @@ display:none;
 list-style-type:none;
 }
 .entity_actions li {
-margin-bottom:4px;
+margin-bottom:7px;
 }
 .entity_actions li:first-child {
 border-top:0;
@@ -662,23 +662,17 @@ border-radius:4px;
 -webkit-border-radius:4px;
 }
 
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_send-a-message a,
-.entity_edit a,
-.form_user_nudge input.submit,
-.entity_nudge p,
-.form_make_admin input.submit {
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
 border:0;
-padding-left:20px;
+padding-left:23px;
 }
 
 .entity_edit a,
 .entity_send-a-message a,
 .entity_nudge p {
-padding:4px 4px 4px 23px;
+padding:4px 4px 4px 26px;
 }
 
 .entity_remote_subscribe {
@@ -696,8 +690,8 @@ margin-bottom:18px;
 
 .entity_send-a-message button {
 position:absolute;
-top:0;
-right:0;
+top:3px;
+right:3px;
 }
 
 .entity_send-a-message .form_notice {
diff --git a/theme/base/images/icons/icons-01.png b/theme/base/images/icons/icons-01.png
index f83c30177..c0f087a21 100644
--- a/theme/base/images/icons/icons-01.png
+++ b/theme/base/images/icons/icons-01.png
diff --git a/theme/base/images/icons/twotone/green/minus.gif b/theme/base/images/icons/twotone/green/minus.gif
new file mode 100644
index 000000000..461cd8cb2
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/minus.gif
diff --git a/theme/base/images/icons/twotone/green/plus.gif b/theme/base/images/icons/twotone/green/plus.gif
new file mode 100644
index 000000000..4407d0b2d
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/plus.gif
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 8472fb079..c1bc8a79f 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -41,15 +41,28 @@ input.submit,
 .form_notice.warning #notice_text-count,
 .form_settings .form_note,
 .entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
+background-color:#9BB43E;
+}
+input.submit,
+.form_notice.warning #notice_text-count,
+.form_settings .form_note,
+.entity_remote_subscribe,
 .entity_actions a,
 .entity_actions input,
-.entity_actions p {
+.entity_actions p,
+button.close {
 background-color:#9BB43E;
 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.3);
 }
-
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
+border-color:transparent;
+background-color:transparent;
+}
 input:focus, textarea:focus, select:focus,
 .form_notice.warning #notice_data-text,
 .form_notice.warning #notice_text-count,
@@ -58,7 +71,8 @@ input:focus, textarea:focus, select:focus,
 border-color:#9BB43E;
 }
 input.submit,
-.entity_remote_subscribe {
+.entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
 color:#FFFFFF;
 }
 
@@ -72,7 +86,10 @@ div.notice-options input,
 .form_user_nudge input.submit,
 .entity_nudge p,
 .form_settings input.form_action-primary,
-.form_make_admin input.submit {
+.form_make_admin input.submit,
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
 color:#002FA7;
 }
 
@@ -122,7 +139,11 @@ opacity:0;
 #new_group a,
 .pagination .nav_prev a,
 .pagination .nav_next a,
-button.close {
+button.close,
+.form_group_leave input.submit,
+.form_user_unsubscribe input.submit,
+.form_group_join input.submit,
+.form_user_subscribe input.submit {
 background-image:url(../../base/images/icons/icons-01.png);
 background-repeat:no-repeat;
 background-color:transparent;
@@ -201,7 +222,7 @@ background-position:0 1px;
 }
 
 .form_group_join input.submit,
-.form_group_leave input.submit
+.form_group_leave input.submit,
 .form_user_subscribe input.submit,
 .form_user_unsubscribe input.submit {
 background-color:#9BB43E;
@@ -212,12 +233,20 @@ color:#FFFFFF;
 .form_user_authorization input.reject {
 background-color:#87B4C8;
 }
+.form_group_leave input.submit,
+.form_user_unsubscribe input.submit {
+background-position:5px -1246px;
+}
+.form_group_join input.submit,
+.form_user_subscribe input.submit {
+background-position:5px -1181px;
+}
 
 .entity_edit a {
-background-position: 0 -718px;
+background-position: 5px -718px;
 }
 .entity_send-a-message a {
-background-position: 0 -849px;
+background-position: 5px -849px;
 }
 .entity_send-a-message .form_notice {
 box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
@@ -227,16 +256,16 @@ box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
 
 .entity_nudge p,
 .form_user_nudge input.submit {
-background-position: 0 -785px;
+background-position: 5px -785px;
 }
 .form_user_block input.submit,
 .form_user_unblock input.submit,
 .form_group_block input.submit,
 .form_group_unblock input.submit {
-background-position: 0 -918px;
+background-position: 5px -918px;
 }
 .form_make_admin input.submit {
-background-position: 0 -983px;
+background-position: 5px -983px;
 }
 
 /* NOTICES */
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 3647e21fd..064653ae5 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -41,15 +41,27 @@ input.submit,
 .form_notice.warning #notice_text-count,
 .form_settings .form_note,
 .entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
+background-color:#9BB43E;
+}
+input.submit,
+.form_notice.warning #notice_text-count,
+.form_settings .form_note,
+.entity_remote_subscribe,
 .entity_actions a,
 .entity_actions input,
-.entity_actions p {
-background-color:#9BB43E;
+.entity_actions p,
+button.close {
 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.3);
 }
-
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
+border-color:transparent;
+background-color:transparent;
+}
 input:focus, textarea:focus, select:focus,
 .form_notice.warning #notice_data-text,
 .form_notice.warning #notice_text-count,
@@ -58,7 +70,8 @@ input:focus, textarea:focus, select:focus,
 border-color:#9BB43E;
 }
 input.submit,
-.entity_remote_subscribe {
+.entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
 color:#FFFFFF;
 }
 
@@ -72,7 +85,10 @@ div.notice-options input,
 .form_user_nudge input.submit,
 .entity_nudge p,
 .form_settings input.form_action-primary,
-.form_make_admin input.submit {
+.form_make_admin input.submit,
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
 color:#002FA7;
 }
 
@@ -122,7 +138,11 @@ opacity:0;
 #new_group a,
 .pagination .nav_prev a,
 .pagination .nav_next a,
-button.close {
+button.close,
+.form_group_leave input.submit,
+.form_user_unsubscribe input.submit,
+.form_group_join input.submit,
+.form_user_subscribe input.submit {
 background-image:url(../../base/images/icons/icons-01.png);
 background-repeat:no-repeat;
 background-color:transparent;
@@ -201,7 +221,7 @@ background-position:0 1px;
 }
 
 .form_group_join input.submit,
-.form_group_leave input.submit
+.form_group_leave input.submit,
 .form_user_subscribe input.submit,
 .form_user_unsubscribe input.submit {
 background-color:#9BB43E;
@@ -212,12 +232,20 @@ color:#FFFFFF;
 .form_user_authorization input.reject {
 background-color:#87B4C8;
 }
+.form_group_leave input.submit,
+.form_user_unsubscribe input.submit {
+background-position:5px -1246px;
+}
+.form_group_join input.submit,
+.form_user_subscribe input.submit {
+background-position:5px -1181px;
+}
 
 .entity_edit a {
-background-position: 0 -718px;
+background-position: 5px -718px;
 }
 .entity_send-a-message a {
-background-position: 0 -849px;
+background-position: 5px -849px;
 }
 .entity_send-a-message .form_notice {
 box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
@@ -227,16 +255,16 @@ box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
 
 .entity_nudge p,
 .form_user_nudge input.submit {
-background-position: 0 -785px;
+background-position: 5px -785px;
 }
 .form_user_block input.submit,
 .form_user_unblock input.submit,
 .form_group_block input.submit,
 .form_group_unblock input.submit {
-background-position: 0 -918px;
+background-position: 5px -918px;
 }
 .form_make_admin input.submit {
-background-position: 0 -983px;
+background-position: 5px -983px;
 }
 
 /* NOTICES */