summaryrefslogtreecommitdiff
path: root/theme
diff options
context:
space:
mode:
Diffstat (limited to 'theme')
-rw-r--r--theme/base/css/display.css51
-rw-r--r--theme/base/images/icons/icons-01.gifbin0 -> 2913 bytes
-rw-r--r--theme/base/images/icons/icons-01.pngbin3422 -> 0 bytes
-rw-r--r--theme/base/images/icons/twotone/green/minus.gifbin0 -> 90 bytes
-rw-r--r--theme/base/images/icons/twotone/green/plus.gifbin0 -> 74 bytes
-rw-r--r--theme/default/css/display.css98
-rw-r--r--theme/identica/css/display.css102
7 files changed, 158 insertions, 93 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 1bab7d965..c3ff4d92c 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -618,7 +618,8 @@ font-style:italic;
.entity_actions {
float:right;
margin-left:2.35%;
-max-width:25%;
+margin-bottom:18px;
+width:21%;
}
.entity_actions h2 {
display:none;
@@ -627,7 +628,7 @@ display:none;
list-style-type:none;
}
.entity_actions li {
-margin-bottom:4px;
+margin-bottom:7px;
}
.entity_actions li:first-child {
border-top:0;
@@ -646,30 +647,29 @@ text-align:left;
width:100%;
}
.entity_actions a,
-.entity_nudge p,
+.entity_actions p,
.entity_remote_subscribe {
text-decoration:none;
font-weight:bold;
display:block;
}
+.entity_actions a,
+.entity_actions input {
+border-radius:4px;
+-moz-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;
+.entity_actions a,
+.entity_actions p {
+padding:1px 4px 1px 26px;
}
.entity_remote_subscribe {
@@ -687,8 +687,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 {
@@ -700,7 +700,7 @@ width:65%;
z-index:2;
border-radius:7px;
-moz-border-radius:7px;
--webkit-radius-border:7px;
+-webkit-border-radius:7px;
border-width:1px;
border-style:solid;
}
@@ -973,11 +973,14 @@ border:0;
.notice-options .notice_reply,
.notice-options .notice_delete {
text-decoration:none;
-padding-left:16px;
}
.notice-options form input.submit {
width:16px;
-padding:2px 0;
+height:16px;
+padding:0;
+border-radius:0;
+-moz-border-radius:0;
+-webkit-border-radius:0;
}
.notice-options .form_favor legend,
.notice-options .form_disfavor legend {
@@ -988,6 +991,10 @@ display:none;
border:0;
padding:0;
}
+.notice-options a {
+width:16px;
+height:16px;
+}
.notice .attachment {
position:relative;
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
new file mode 100644
index 000000000..f19d6a3f6
--- /dev/null
+++ b/theme/base/images/icons/icons-01.gif
Binary files differ
diff --git a/theme/base/images/icons/icons-01.png b/theme/base/images/icons/icons-01.png
deleted file mode 100644
index f83c30177..000000000
--- a/theme/base/images/icons/icons-01.png
+++ /dev/null
Binary files differ
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
Binary files differ
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
Binary files differ
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 910f915a8..fee5316c1 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -29,7 +29,9 @@ input, textarea, select,
border-color:#AAAAAA;
}
#filter_tags ul li,
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.pagination .nav_prev a,
+.pagination .nav_next a {
border-color:#DDDDDD;
}
@@ -40,33 +42,47 @@ background:none;
input.submit,
.form_notice.warning #notice_text-count,
.form_settings .form_note,
-.entity_remote_subscribe {
+.entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
background-color:#9BB43E;
}
-
-input:focus, textarea:focus, select:focus,
-.form_notice.warning #notice_data-text {
-border-color:#9BB43E;
+input.submit,
+.form_notice.warning #notice_text-count,
+.form_settings .form_note,
+.entity_remote_subscribe,
+.entity_actions a,
+.entity_actions input,
+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);
}
-input.submit,
+.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,
+.form_settings .form_note,
.entity_remote_subscribe {
+border-color:#9BB43E;
+}
+input.submit,
+.entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
color:#FFFFFF;
}
a,
-div.notice-options input,
-.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,
-.form_user_nudge input.submit,
-.entity_nudge p,
.form_settings input.form_action-primary,
-.form_make_admin input.submit {
+.notice-options input,
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
color:#002FA7;
}
@@ -116,8 +132,12 @@ opacity:0;
#new_group a,
.pagination .nav_prev a,
.pagination .nav_next a,
-button.close {
-background-image:url(../../base/images/icons/icons-01.png);
+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.gif);
background-repeat:no-repeat;
background-color:transparent;
}
@@ -195,23 +215,26 @@ 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;
+background-color:#AAAAAA;
color:#FFFFFF;
}
-.form_user_unsubscribe input.submit,
.form_group_leave input.submit,
-.form_user_authorization input.reject {
-background-color:#87B4C8;
+.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 -852px;
}
.entity_send-a-message .form_notice {
box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
@@ -221,16 +244,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 */
@@ -241,16 +264,16 @@ background-position:0 -394px;
background:none;
}
.notice-options .notice_reply {
-background-position:0 -589px;
+background-position:0 -592px;
}
.notice-options form.form_favor input.submit {
-background-position:0 -457px;
+background-position:0 -460px;
}
.notice-options form.form_disfavor input.submit {
-background-position:0 -523px;
+background-position:0 -526px;
}
.notice-options .notice_delete {
-background-position:0 -655px;
+background-position:0 -658px;
}
.notices div.entry-content,
@@ -261,9 +284,12 @@ opacity:0.4;
.notices li:hover div.notice-options {
opacity:1;
}
-div.notice-options a,
-div.notice-options input {
+.notice-options a,
+.notice-options input {
font-family:sans-serif;
+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);
}
#content .notices li:hover {
background-color:rgba(240, 240, 240, 0.2);
@@ -293,7 +319,9 @@ background-position:0 -1054px;
.pagination .nav_prev a,
.pagination .nav_next a {
background-repeat:no-repeat;
-border-color:#C8D1D5;
+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);
}
.pagination .nav_prev a {
background-position:10% -187px;
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 2aa087331..ae9cb2b19 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -29,7 +29,9 @@ input, textarea, select,
border-color:#AAAAAA;
}
#filter_tags ul li,
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.pagination .nav_prev a,
+.pagination .nav_next a {
border-color:#DDDDDD;
}
@@ -40,33 +42,46 @@ background:none;
input.submit,
.form_notice.warning #notice_text-count,
.form_settings .form_note,
-.entity_remote_subscribe {
+.entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
background-color:#9BB43E;
}
-
-input:focus, textarea:focus, select:focus,
-.form_notice.warning #notice_data-text {
-border-color:#9BB43E;
+input.submit,
+.form_notice.warning #notice_text-count,
+.form_settings .form_note,
+.entity_remote_subscribe,
+.entity_actions a,
+.entity_actions input,
+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);
}
-input.submit,
+.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,
+.form_settings .form_note,
.entity_remote_subscribe {
+border-color:#9BB43E;
+}
+input.submit,
+.entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
color:#FFFFFF;
}
a,
-div.notice-options input,
-.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,
-.form_user_nudge input.submit,
-.entity_nudge p,
.form_settings input.form_action-primary,
-.form_make_admin input.submit {
+.notice-options input,
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
color:#002FA7;
}
@@ -116,8 +131,13 @@ opacity:0;
#new_group a,
.pagination .nav_prev a,
.pagination .nav_next a,
-button.close {
-background-image:url(../../base/images/icons/icons-01.png);
+button.close,
+.form_group_leave input.submit,
+.form_user_unsubscribe input.submit,
+.form_group_join input.submit,
+.form_user_subscribe input.submit,
+.entity_subscribe a {
+background-image:url(../../base/images/icons/icons-01.gif);
background-repeat:no-repeat;
background-color:transparent;
}
@@ -195,23 +215,28 @@ 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;
+.form_user_unsubscribe input.submit,
+.entity_subscribe a {
+background-color:#AAAAAA;
color:#FFFFFF;
}
-.form_user_unsubscribe input.submit,
.form_group_leave input.submit,
-.form_user_authorization input.reject {
-background-color:#87B4C8;
+.form_user_unsubscribe input.submit {
+background-position:5px -1246px;
+}
+.form_group_join input.submit,
+.form_user_subscribe input.submit,
+.entity_subscribe a {
+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 -852px;
}
.entity_send-a-message .form_notice {
box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
@@ -221,16 +246,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 */
@@ -241,16 +266,16 @@ background-position:0 -394px;
background:none;
}
.notice-options .notice_reply {
-background-position:0 -589px;
+background-position:0 -592px;
}
.notice-options form.form_favor input.submit {
-background-position:0 -457px;
+background-position:0 -460px;
}
.notice-options form.form_disfavor input.submit {
-background-position:0 -523px;
+background-position:0 -526px;
}
.notice-options .notice_delete {
-background-position:0 -655px;
+background-position:0 -658px;
}
.notices div.entry-content,
@@ -261,9 +286,12 @@ opacity:0.4;
.notices li:hover div.notice-options {
opacity:1;
}
-div.notice-options a,
-div.notice-options input {
+.notice-options a,
+.notice-options input {
font-family:sans-serif;
+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);
}
#content .notices li:hover {
background-color:rgba(240, 240, 240, 0.2);
@@ -293,7 +321,9 @@ background-position:0 -1054px;
.pagination .nav_prev a,
.pagination .nav_next a {
background-repeat:no-repeat;
-border-color:#CEE1E9;
+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);
}
.pagination .nav_prev a {
background-position:10% -187px;