summaryrefslogtreecommitdiff
path: root/theme
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-02-05 02:08:37 +0000
committerZach Copley <zach@status.net>2010-02-05 02:08:37 +0000
commit8d320d7cc2998a4977c5de4ba571ea4f95b21dce (patch)
treeeb8903c9a07126b88e4112de5d83a22dba2a1073 /theme
parent10dfcde0b2099a169ccd3af0ecfbf2de9da551d6 (diff)
parent509c8fc51589a4cc6a3281e012ce759ab9bed532 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'theme')
-rw-r--r--theme/base/images/icons/icons-01.gifbin3758 -> 3870 bytes
-rw-r--r--theme/base/images/icons/twotone/green/against.gifbin0 -> 85 bytes
-rw-r--r--theme/base/images/icons/twotone/green/checkmark.gifbin0 -> 76 bytes
-rw-r--r--theme/default/css/display.css9
-rw-r--r--theme/identica/css/display.css9
5 files changed, 16 insertions, 2 deletions
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
index 01a729c10..6f284f023 100644
--- a/theme/base/images/icons/icons-01.gif
+++ b/theme/base/images/icons/icons-01.gif
Binary files differ
diff --git a/theme/base/images/icons/twotone/green/against.gif b/theme/base/images/icons/twotone/green/against.gif
new file mode 100644
index 000000000..ca796c8a3
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/against.gif
Binary files differ
diff --git a/theme/base/images/icons/twotone/green/checkmark.gif b/theme/base/images/icons/twotone/green/checkmark.gif
new file mode 100644
index 000000000..892429d48
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/checkmark.gif
Binary files differ
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 6954de7ba..82eb13531 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -192,7 +192,8 @@ button.minimize,
.form_reset_key input.submit,
.entity_clear input.submit,
.entity_flag input.submit,
-.entity_flag p {
+.entity_flag p,
+.entity_subscribe input.submit {
background-image:url(../../base/images/icons/icons-01.gif);
background-repeat:no-repeat;
background-color:transparent;
@@ -348,6 +349,12 @@ background-position: 5px -2039px;
.entity_flag p {
background-position: 5px -2105px;
}
+.entity_subscribe input.accept {
+background-position: 5px -2171px;
+}
+.entity_subscribe input.reject {
+background-position: 5px -2237px;
+}
/* NOTICES */
.notice .attachment {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 9ac2730bd..44ae4953b 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -192,7 +192,8 @@ button.minimize,
.form_reset_key input.submit,
.entity_clear input.submit,
.entity_flag input.submit,
-.entity_flag p {
+.entity_flag p,
+.entity_subscribe input.submit {
background-image:url(../../base/images/icons/icons-01.gif);
background-repeat:no-repeat;
background-color:transparent;
@@ -347,6 +348,12 @@ background-position: 5px -2039px;
.entity_flag p {
background-position: 5px -2105px;
}
+.entity_subscribe input.accept {
+background-position: 5px -2171px;
+}
+.entity_subscribe input.reject {
+background-position: 5px -2237px;
+}
/* NOTICES */
.notice .attachment {