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:04 UTC
[3/3] sling-site git commit: Move tags back up, next to breadcrumbs
Move tags back up, next to breadcrumbs
Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/7b75613d
Tree: http://git-wip-us.apache.org/repos/asf/sling-site/tree/7b75613d
Diff: http://git-wip-us.apache.org/repos/asf/sling-site/diff/7b75613d
Branch: refs/heads/master
Commit: 7b75613d97811c3f52c0f6a9bc31276ec707d52c
Parents: 9784980
Author: Bertrand Delacretaz <bd...@apache.org>
Authored: Fri Oct 6 11:45:49 2017 +0200
Committer: Bertrand Delacretaz <bd...@apache.org>
Committed: Fri Oct 6 11:45:49 2017 +0200
----------------------------------------------------------------------
src/main/jbake/assets/res/css/site.css | 20 +++++++++++++-------
src/main/jbake/templates/layout/main.tpl | 9 ++++++---
2 files changed, 19 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sling-site/blob/7b75613d/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 2b2c921..3f3283a 100644
--- a/src/main/jbake/assets/res/css/site.css
+++ b/src/main/jbake/assets/res/css/site.css
@@ -245,11 +245,6 @@ td {
padding: 5px 5px 5px 28px;
}
-/** Breadcrump at the top of each page */
-.breadcrump {
- font-size: 80%;
-}
-
/** Last modification information at the botton of each page */
.timestamp {
margin-top: 30px;
@@ -301,13 +296,24 @@ pre {
margin-left: 3px;
}
+.pagenav {
+ overflow:hidden
+ font-size: 70%;
+ clear:both;
+ padding-bottom:1em;
+}
+
+.breadcrumbs {
+ float:left;
+}
+
.tags {
- font-size:80%;
+ float:right;
}
.tags a {
background-color: #EEE;
- padding: 0.5em;
+ padding: 0.2em;
text-decoration: none;
}
http://git-wip-us.apache.org/repos/asf/sling-site/blob/7b75613d/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 962ef36..7c3e9b1 100644
--- a/src/main/jbake/templates/layout/main.tpl
+++ b/src/main/jbake/templates/layout/main.tpl
@@ -8,7 +8,12 @@ html(lang:'en'){
include template: 'menu.tpl'
div(class:"main") {
- breadcrumbs()
+ div(class:"pagenav") {
+ breadcrumbs()
+ newLine()
+ tags()
+ newLine()
+ }
if(content && content.title) {
h1(class:"pagetitle") {
@@ -22,8 +27,6 @@ html(lang:'en'){
}
bodyContents()
newLine()
- tags()
- newLine()
div(class:"footer") {
lastModified()