You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2017/06/20 14:26:42 UTC
[1/2] sling-site git commit: Restore missing CSS icons
Repository: sling-site
Updated Branches:
refs/heads/master f1fa8044b -> 08947a4c0
Restore missing CSS icons
Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/081c2924
Tree: http://git-wip-us.apache.org/repos/asf/sling-site/tree/081c2924
Diff: http://git-wip-us.apache.org/repos/asf/sling-site/diff/081c2924
Branch: refs/heads/master
Commit: 081c2924a9aa193063b3ed9204bf64bf45f69e95
Parents: f1fa804
Author: Bertrand Delacretaz <bd...@apache.org>
Authored: Tue Jun 20 16:22:13 2017 +0200
Committer: Bertrand Delacretaz <bd...@apache.org>
Committed: Tue Jun 20 16:22:13 2017 +0200
----------------------------------------------------------------------
OLD-from-apache-cms/assets/icons/check.gif | Bin 604 -> 0 bytes
OLD-from-apache-cms/assets/icons/forbidden.gif | Bin 613 -> 0 bytes
OLD-from-apache-cms/assets/icons/information.gif | Bin 1005 -> 0 bytes
OLD-from-apache-cms/assets/icons/warning.gif | Bin 569 -> 0 bytes
assets/res/css/icons/check.gif | Bin 0 -> 604 bytes
assets/res/css/icons/forbidden.gif | Bin 0 -> 613 bytes
assets/res/css/icons/information.gif | Bin 0 -> 1005 bytes
assets/res/css/icons/warning.gif | Bin 0 -> 569 bytes
8 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sling-site/blob/081c2924/OLD-from-apache-cms/assets/icons/check.gif
----------------------------------------------------------------------
diff --git a/OLD-from-apache-cms/assets/icons/check.gif b/OLD-from-apache-cms/assets/icons/check.gif
deleted file mode 100644
index 28bb999..0000000
Binary files a/OLD-from-apache-cms/assets/icons/check.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/sling-site/blob/081c2924/OLD-from-apache-cms/assets/icons/forbidden.gif
----------------------------------------------------------------------
diff --git a/OLD-from-apache-cms/assets/icons/forbidden.gif b/OLD-from-apache-cms/assets/icons/forbidden.gif
deleted file mode 100644
index c6acdec..0000000
Binary files a/OLD-from-apache-cms/assets/icons/forbidden.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/sling-site/blob/081c2924/OLD-from-apache-cms/assets/icons/information.gif
----------------------------------------------------------------------
diff --git a/OLD-from-apache-cms/assets/icons/information.gif b/OLD-from-apache-cms/assets/icons/information.gif
deleted file mode 100644
index 072ab66..0000000
Binary files a/OLD-from-apache-cms/assets/icons/information.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/sling-site/blob/081c2924/OLD-from-apache-cms/assets/icons/warning.gif
----------------------------------------------------------------------
diff --git a/OLD-from-apache-cms/assets/icons/warning.gif b/OLD-from-apache-cms/assets/icons/warning.gif
deleted file mode 100644
index 1c9883b..0000000
Binary files a/OLD-from-apache-cms/assets/icons/warning.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/sling-site/blob/081c2924/assets/res/css/icons/check.gif
----------------------------------------------------------------------
diff --git a/assets/res/css/icons/check.gif b/assets/res/css/icons/check.gif
new file mode 100644
index 0000000..28bb999
Binary files /dev/null and b/assets/res/css/icons/check.gif differ
http://git-wip-us.apache.org/repos/asf/sling-site/blob/081c2924/assets/res/css/icons/forbidden.gif
----------------------------------------------------------------------
diff --git a/assets/res/css/icons/forbidden.gif b/assets/res/css/icons/forbidden.gif
new file mode 100644
index 0000000..c6acdec
Binary files /dev/null and b/assets/res/css/icons/forbidden.gif differ
http://git-wip-us.apache.org/repos/asf/sling-site/blob/081c2924/assets/res/css/icons/information.gif
----------------------------------------------------------------------
diff --git a/assets/res/css/icons/information.gif b/assets/res/css/icons/information.gif
new file mode 100644
index 0000000..072ab66
Binary files /dev/null and b/assets/res/css/icons/information.gif differ
http://git-wip-us.apache.org/repos/asf/sling-site/blob/081c2924/assets/res/css/icons/warning.gif
----------------------------------------------------------------------
diff --git a/assets/res/css/icons/warning.gif b/assets/res/css/icons/warning.gif
new file mode 100644
index 0000000..1c9883b
Binary files /dev/null and b/assets/res/css/icons/warning.gif differ
[2/2] sling-site git commit: Fix favicon
Posted by bd...@apache.org.
Fix favicon
Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/08947a4c
Tree: http://git-wip-us.apache.org/repos/asf/sling-site/tree/08947a4c
Diff: http://git-wip-us.apache.org/repos/asf/sling-site/diff/08947a4c
Branch: refs/heads/master
Commit: 08947a4c019cd840a28e4e6f4e55dbfea7c8781f
Parents: 081c292
Author: Bertrand Delacretaz <bd...@apache.org>
Authored: Tue Jun 20 16:25:45 2017 +0200
Committer: Bertrand Delacretaz <bd...@apache.org>
Committed: Tue Jun 20 16:25:45 2017 +0200
----------------------------------------------------------------------
OLD-from-apache-cms/assets/favicon.ico | Bin 1150 -> 0 bytes
assets/res/favicon.ico | Bin 0 -> 1150 bytes
content/favicon.ico | Bin 1150 -> 0 bytes
templates/header.tpl | 1 +
4 files changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sling-site/blob/08947a4c/OLD-from-apache-cms/assets/favicon.ico
----------------------------------------------------------------------
diff --git a/OLD-from-apache-cms/assets/favicon.ico b/OLD-from-apache-cms/assets/favicon.ico
deleted file mode 100644
index a36e242..0000000
Binary files a/OLD-from-apache-cms/assets/favicon.ico and /dev/null differ
http://git-wip-us.apache.org/repos/asf/sling-site/blob/08947a4c/assets/res/favicon.ico
----------------------------------------------------------------------
diff --git a/assets/res/favicon.ico b/assets/res/favicon.ico
new file mode 100644
index 0000000..a36e242
Binary files /dev/null and b/assets/res/favicon.ico differ
http://git-wip-us.apache.org/repos/asf/sling-site/blob/08947a4c/content/favicon.ico
----------------------------------------------------------------------
diff --git a/content/favicon.ico b/content/favicon.ico
deleted file mode 100644
index a36e242..0000000
Binary files a/content/favicon.ico and /dev/null differ
http://git-wip-us.apache.org/repos/asf/sling-site/blob/08947a4c/templates/header.tpl
----------------------------------------------------------------------
diff --git a/templates/header.tpl b/templates/header.tpl
index 9d413b4..b5a84b1 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -5,6 +5,7 @@ title("${config.blog_title}") newLine()
// For now, try to reproduce the layout of the current website, to be able to compare pages
link(rel:"stylesheet", href:"${config.site_contextPath}res/css/site.css") newLine()
+link(rel:"icon", href:"${config.site_contextPath}res/favicon.ico") newLine()
div(class:"title") {
div(class:"logo") {