You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2012/12/31 02:28:38 UTC
[2/9] git commit: Restore the Silk icons used by the Tapestry
client-side console
Restore the Silk icons used by the Tapestry client-side console
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/ac34f392
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/ac34f392
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/ac34f392
Branch: refs/heads/master
Commit: ac34f392a776413129c7cea9fff0b6cca4102c97
Parents: 89f9bce
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Sun Dec 30 17:14:41 2012 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Sun Dec 30 17:14:41 2012 -0800
----------------------------------------------------------------------
tapestry-core/NOTICE.txt | 3 +++
.../META-INF/assets/tapestry5/silk/accept.png | Bin 0 -> 781 bytes
.../META-INF/assets/tapestry5/silk/cancel.png | Bin 0 -> 587 bytes
.../META-INF/assets/tapestry5/silk/delete.png | Bin 0 -> 715 bytes
.../META-INF/assets/tapestry5/silk/error.png | Bin 0 -> 666 bytes
.../META-INF/assets/tapestry5/silk/information.png | Bin 0 -> 778 bytes
.../META-INF/assets/tapestry5/tapestry-console.css | 6 +++---
7 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/ac34f392/tapestry-core/NOTICE.txt
----------------------------------------------------------------------
diff --git a/tapestry-core/NOTICE.txt b/tapestry-core/NOTICE.txt
index 6342190..89c403f 100644
--- a/tapestry-core/NOTICE.txt
+++ b/tapestry-core/NOTICE.txt
@@ -13,6 +13,9 @@ http://json.org/
This product includes the WebFX DatePicker, a JavaScript library released under the Apache Software License 2.0
http://webfx.eae.net/dhtml/datepicker/datepicker.html
+This product includes images from the Silk icon set, distributed under the terms of the Creative Commons Attribution 2.5 License.
+http://www.famfamfam.com/lab/icons/silk/
+
This product includes Underscore.js.
http://documentcloud.github.com/underscore/
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/ac34f392/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/accept.png
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/accept.png b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/accept.png
new file mode 100644
index 0000000..89c8129
Binary files /dev/null and b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/accept.png differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/ac34f392/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/cancel.png
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/cancel.png b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/cancel.png
new file mode 100644
index 0000000..c149c2b
Binary files /dev/null and b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/cancel.png differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/ac34f392/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/delete.png
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/delete.png b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/delete.png
new file mode 100644
index 0000000..08f2493
Binary files /dev/null and b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/delete.png differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/ac34f392/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/error.png
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/error.png b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/error.png
new file mode 100644
index 0000000..628cf2d
Binary files /dev/null and b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/error.png differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/ac34f392/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/information.png
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/information.png b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/information.png
new file mode 100644
index 0000000..12cd1ae
Binary files /dev/null and b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/silk/information.png differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/ac34f392/tapestry-core/src/main/resources/META-INF/assets/tapestry5/tapestry-console.css
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/tapestry-console.css b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/tapestry-console.css
index eae678e..b38156d 100644
--- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/tapestry-console.css
+++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/tapestry-console.css
@@ -18,19 +18,19 @@ DIV.t-console-entry {
}
DIV.t-console DIV.t-err {
- background: red url("../../../org/apache/tapestry5/silk/error.png") no-repeat;
+ background: red url("silk/error.png") no-repeat;
color: white;
padding-left: 22px;
}
DIV.t-console DIV.t-warn {
- background: #f4da5b url("../../../org/apache/tapestry5/silk/error.png") no-repeat;
+ background: #f4da5b url("silk/error.png") no-repeat;
color: black;
padding-left: 22px;
}
DIV.t-console DIV.t-info {
- background: green url("../../../org/apache/tapestry5/silk/information.png") no-repeat;
+ background: green url("silk/information.png") no-repeat;
color: white;
padding-left: 22px;
}