You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by je...@apache.org on 2018/12/13 19:32:54 UTC
[sling-site] branch master updated: SLING-8175 - updated side bar
This is an automated email from the ASF dual-hosted git repository.
jeb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-site.git
The following commit(s) were added to refs/heads/master by this push:
new c346047 SLING-8175 - updated side bar
c346047 is described below
commit c346047cdfb0d8d7a254deb513e2d5b0a77b7bc7
Author: JE Bailey <ja...@sas.com>
AuthorDate: Thu Dec 13 14:32:17 2018 -0500
SLING-8175 - updated side bar
---
src/main/jbake/assets/res/css/site.css | 20 +++--
src/main/jbake/templates/menu.tpl | 145 +++++++++++++++++----------------
2 files changed, 90 insertions(+), 75 deletions(-)
diff --git a/src/main/jbake/assets/res/css/site.css b/src/main/jbake/assets/res/css/site.css
index be85974..60982e1 100644
--- a/src/main/jbake/assets/res/css/site.css
+++ b/src/main/jbake/assets/res/css/site.css
@@ -75,6 +75,11 @@ img {
padding: 0.5em
}
+ul {
+ margin-block-end: 0em;
+ margin-inline-end: 0em;
+}
+
.title {
position: absolute;
left: 1px;
@@ -125,14 +130,19 @@ img {
.menu ul,.menu p {
background-color: #fdf5d9;
list-style: none;
- padding-left: 4em;
- margin-top: 0px;
- padding-top: 2em;
- padding-bottom: 2em;
+ padding-left: 1em;
+ margin-top: 0px;
+ padding-bottom: .5em;
margin-left: 0px;
color: #4a4a43
}
+.menu > ul {
+ padding-top: 1em;
+ margin-block-end: 0px;
+ margin-inline-end: 0px;
+}
+
.menu p {
font-size: 90%;
margin: 0px;
@@ -148,8 +158,6 @@ img {
.menu img {
display: block;
- margin-left: auto;
- margin-right: auto;
}
.main {
diff --git a/src/main/jbake/templates/menu.tpl b/src/main/jbake/templates/menu.tpl
index 4d87100..77c0736 100644
--- a/src/main/jbake/templates/menu.tpl
+++ b/src/main/jbake/templates/menu.tpl
@@ -1,75 +1,82 @@
// TODO read links from a Markdown or other definition file?
-div(class:"menu"){
-
- p() {
- strong(){a(href:"${config.site_contextPath}documentation.html", "Documentation")} br() newLine()
- a(href:"${config.site_contextPath}documentation/getting-started.html", "Getting Started") br() newLine()
- a(href:"${config.site_contextPath}documentation/the-sling-engine.html", "The Sling Engine") br() newLine()
- a(href:"${config.site_contextPath}documentation/development.html", "Development") br() newLine()
- a(href:"${config.site_contextPath}documentation/bundles.html", "Bundles") br() newLine()
- a(href:"${config.site_contextPath}documentation/tutorials-how-tos.html", "Tutorials & How-Tos") br() newLine()
- a(href:"http://sling.apache.org/components/", "Maven Plugins") br() newLine()
- a(href:"${config.site_contextPath}documentation/configuration.html", "Configuration") newLine()
- }
-
- p(){
- a(href:"http://s.apache.org/sling.wiki", "Wiki") br() newLine()
- a(href:"http://s.apache.org/sling.faq", "FAQ") br() newLine()
- }
-
- p(){
- strong("API Docs") br() newLine()
- a(href:"${config.site_contextPath}apidocs/sling11/index.html", "Sling 11") br() newLine()
- a(href:"${config.site_contextPath}apidocs/sling10/index.html", "Sling 10") br() newLine()
- a(href:"${config.site_contextPath}apidocs/sling9/index.html", "Sling 9") br() newLine()
- a(href:"${config.site_contextPath}documentation/apidocs.html", "All versions") br() newLine()
- }
-
- p(){
- strong("Project Info") br() newLine()
- a(href:"${config.site_contextPath}downloads.cgi", "Downloads") br() newLine()
- a(href:"http://www.apache.org/licenses/", "License") br() newLine()
- a(href:"${config.site_contextPath}news.html", "News") br() newLine()
- a(href:"${config.site_contextPath}releases.html", "Releases") br() newLine()
- a(href:"https://issues.apache.org/jira/browse/SLING", "Issue Tracker") br() newLine()
- a(href:"${config.site_contextPath}links.html", "Links") br() newLine()
- a(href:"${config.site_contextPath}contributing.html", "Contributing") br() newLine()
- a(href:"${config.site_contextPath}project-information.html", "Project Information") br() newLine()
- a(href:"${config.site_contextPath}project-information/security.html", "Security") br() newLine()
- }
-
- p(){
- strong("Source") br() newLine()
- a(href:"https://github.com/apache/?utf8=%E2%9C%93&q=sling", "GitHub") br() newLine()
- a(href:"https://gitbox.apache.org/repos/asf?s=sling", "Git at Apache") br() newLine()
- }
-
- p(){
- strong(){a(href:"${config.site_contextPath}sitemap.html", "Site Map")}
- }
-
- p(){
- strong("Apache Software Foundation") br() newLine()
- a(href:"http://www.apache.org/foundation/thanks.html", "Thanks!") br() newLine()
- a(href:"http://www.apache.org/foundation/sponsorship.html", "Become a Sponsor") br() newLine()
- a(href:"http://www.apache.org/foundation/buy_stuff.html", "Buy Stuff") br() newLine()
- a(href:"https://www.apache.org/events/current-event.html") {
- img(
- border:"0",
- alt:"Current ASF Events",
- src:"https://www.apache.org/events/current-event-125x125.png",
- width:"125px"
- )
+nav(class:"menu"){
+
+ ul() {
+ li(){
+ strong("Documentation")
+ ul() {
+ li(){a(href:"${config.site_contextPath}documentation.html", "Main")}
+ li(){a(href:"${config.site_contextPath}documentation/getting-started.html", "Getting Started")}
+ li(){a(href:"${config.site_contextPath}documentation/the-sling-engine.html", "The Sling Engine")}
+ li(){a(href:"${config.site_contextPath}documentation/development.html", "Development")}
+ li(){a(href:"${config.site_contextPath}documentation/bundles.html", "Bundles")}
+ li(){a(href:"${config.site_contextPath}documentation/tutorials-how-tos.html", "Tutorials & How-Tos")}
+ li(){a(href:"http://sling.apache.org/components/", "Maven Plugins")}
+ li(){a(href:"${config.site_contextPath}documentation/configuration.html", "Configuration")}
+ }
+ }
+ li(){
+ strong("API Docs")
+ ul() {
+ li(){a(href:"${config.site_contextPath}apidocs/sling11/index.html", "Sling 11")}
+ li(){a(href:"${config.site_contextPath}apidocs/sling10/index.html", "Sling 10")}
+ li(){a(href:"${config.site_contextPath}apidocs/sling9/index.html", "Sling 9")}
+ li(){a(href:"${config.site_contextPath}documentation/apidocs.html", "All versions")}
+ }
}
- a(href:"http://apache.org/foundation/contributing.html") {
- img(
- border:"0",
- alt:"Support the Apache Software Foundation!",
- src:"${config.site_contextPath}res/images/SupportApache-small.png",
- width:"125px"
- )
+ li(){
+ strong("Support")
+ ul() {
+ li(){a(href:"http://s.apache.org/sling.wiki", "Wiki")}
+ li(){a(href:"http://s.apache.org/sling.faq", "FAQ")}
+ li(){a(href:"${config.site_contextPath}sitemap.html", "Site Map")}
+ }
+ }
+ li(){
+ strong("Project Info")
+ ul() {
+ li(){a(href:"${config.site_contextPath}downloads.cgi", "Downloads")}
+ li(){a(href:"http://www.apache.org/licenses/", "License")}
+ li(){a(href:"${config.site_contextPath}news.html", "News")}
+ li(){a(href:"${config.site_contextPath}releases.html", "Releases")}
+ li(){a(href:"https://issues.apache.org/jira/browse/SLING", "Issue Tracker")}
+ li(){a(href:"${config.site_contextPath}links.html", "Links")}
+ li(){a(href:"${config.site_contextPath}contributing.html", "Contributing")}
+ li(){a(href:"${config.site_contextPath}project-information.html", "Project Information")}
+ li(){a(href:"${config.site_contextPath}project-information/security.html", "Security")}
+ }
+ }
+ li(){
+ strong("Source")
+ ul() {
+ li(){a(href:"https://github.com/apache/?utf8=%E2%9C%93&q=sling", "GitHub")}
+ li(){a(href:"https://gitbox.apache.org/repos/asf?s=sling", "Git at Apache")}
+ }
+ }
+ li(){
+ strong("Apache Software Foundation")
+ ul() {
+ li(){a(href:"http://www.apache.org/foundation/thanks.html", "Thanks!")}
+ li(){a(href:"http://www.apache.org/foundation/sponsorship.html", "Become a Sponsor")}
+ li(){a(href:"http://www.apache.org/foundation/buy_stuff.html", "Buy Stuff")}
+ li(){a(href:"https://www.apache.org/events/current-event.html") {
+ img(
+ border:"0",
+ alt:"Current ASF Events",
+ src:"https://www.apache.org/events/current-event-125x125.png",
+ width:"125"
+ )
+ }}
+ li(){a(href:"http://apache.org/foundation/contributing.html") {
+ img(
+ border:"0",
+ alt:"Support the Apache Software Foundation!",
+ src:"${config.site_contextPath}res/images/SupportApache-small.png",
+ width:"125"
+ )
+ }}
+ }
}
}
-
}