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/10/06 09:46:03 UTC
[2/3] sling-site git commit: Move last modified info into the footer
Move last modified info into the footer
Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/97849807
Tree: http://git-wip-us.apache.org/repos/asf/sling-site/tree/97849807
Diff: http://git-wip-us.apache.org/repos/asf/sling-site/diff/97849807
Branch: refs/heads/master
Commit: 978498072cba79b7630deef94061bbeb2272a6bb
Parents: 07544fc
Author: Bertrand Delacretaz <bd...@apache.org>
Authored: Fri Oct 6 11:33:12 2017 +0200
Committer: Bertrand Delacretaz <bd...@apache.org>
Committed: Fri Oct 6 11:33:12 2017 +0200
----------------------------------------------------------------------
src/main/jbake/assets/res/css/site.css | 9 +--------
src/main/jbake/templates/footer.tpl | 13 +++++++------
src/main/jbake/templates/layout/main.tpl | 7 ++++---
3 files changed, 12 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sling-site/blob/97849807/src/main/jbake/assets/res/css/site.css
----------------------------------------------------------------------
diff --git a/src/main/jbake/assets/res/css/site.css b/src/main/jbake/assets/res/css/site.css
index fe2b007..2b2c921 100644
--- a/src/main/jbake/assets/res/css/site.css
+++ b/src/main/jbake/assets/res/css/site.css
@@ -257,8 +257,7 @@ td {
text-align: right;
}
-/** Trademark text at the bottom of each page */
-.trademarkFooter {
+.footer {
font-size: 80%;
font-style: italic;
margin-top: 10px;
@@ -314,10 +313,4 @@ pre {
.taglink {
margin-left:2em;
-}
-
-.revisionInfo {
- text-align:center;
- font-size:80%;
- font-style:italic;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/sling-site/blob/97849807/src/main/jbake/templates/footer.tpl
----------------------------------------------------------------------
diff --git a/src/main/jbake/templates/footer.tpl b/src/main/jbake/templates/footer.tpl
index 51425a4..555c601 100644
--- a/src/main/jbake/templates/footer.tpl
+++ b/src/main/jbake/templates/footer.tpl
@@ -1,7 +1,8 @@
-div(class:"footer") {
- div(class:"trademarkFooter") {
- yield "Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project "
- yield "logo are trademarks of The Apache Software Foundation. All other marks mentioned "
- yield "may be trademarks or registered trademarks of their respective owners."
- }
+p() {
+ yield "Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project "
+ yield "logo are trademarks of The Apache Software Foundation. All other marks mentioned "
+ yield "may be trademarks or registered trademarks of their respective owners."
+}
+p() {
+ yield "Copyright © 2011-2017 The Apache Software Foundation."
}
http://git-wip-us.apache.org/repos/asf/sling-site/blob/97849807/src/main/jbake/templates/layout/main.tpl
----------------------------------------------------------------------
diff --git a/src/main/jbake/templates/layout/main.tpl b/src/main/jbake/templates/layout/main.tpl
index cb21be8..962ef36 100644
--- a/src/main/jbake/templates/layout/main.tpl
+++ b/src/main/jbake/templates/layout/main.tpl
@@ -24,10 +24,11 @@ html(lang:'en'){
newLine()
tags()
newLine()
- lastModified()
- newLine()
- include template: 'footer.tpl'
+ div(class:"footer") {
+ lastModified()
+ include template: 'footer.tpl'
+ }
newLine()
}
}