Merge commit 'refs/top-bases/sass' into sass

Conflicts:
	blueview/style.css
	default/_ikiwiki.scss
	goldtype/style.css

3 files changed, 59 insertions, 2 deletions

diff --git a/actiontabs/style.scss b/actiontabs/style.scss
index 84d4f51..e8037a3 100644
--- a/actiontabs/style.scss
+++ b/actiontabs/style.scss
@@ -159,3 +159,8 @@ div.recentchanges {
 	padding: 0 0 0 2ex;
 	border-color: #999;
 }
+
+.pageheader .trails {
+	/* allow space for the action tabs */
+	margin-bottom: 2em;
+}
diff --git a/blueview/style.scss b/blueview/style.scss
index 4557adb..8640a9d 100644
--- a/blueview/style.scss
+++ b/blueview/style.scss
@@ -314,14 +314,15 @@ h1, h2, h3, h4, h5, h6 {
 	font-weight: bold;
 }
 
-.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span, .pageheader #otherlanguages ul li {
+.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span, .pageheader #otherlanguages ul li, .pageheader .trailprev, .pageheader .trailnext, .pageheader .trailup {
 	padding: 0.25em 0.25em 0.25em 0.25em;
 	background-image: url("background_darkness.png");
 	background-repeat: repeat;
 	color: white;
 }
 
-.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a, .pageheader #otherlanguages ul li a {
+.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a, .pageheader #otherlanguages ul li a, .pageheader a, .pageheader .trail a {
+	font-weight: bold;
 	color: white;
 	text-decoration: none;
 }
diff --git a/default/_ikiwiki.scss b/default/_ikiwiki.scss
index a3e748a..0187d3e 100644
--- a/default/_ikiwiki.scss
+++ b/default/_ikiwiki.scss
@@ -356,6 +356,10 @@ div.progress-done {
 		display: none;
 	}
 
+	.trails {
+		display: none;
+	}
+
 	.feedbutton {
 		display: none;
 	}
@@ -727,6 +731,46 @@ a.openid_large_btn:focus {
 .fileupload-content .ui-progressbar-value {
 	background: url(ikiwiki/images/pbar-ani.gif);
 }
+
+@mixin ikiwiki-plugin-trail {
+.trails {
+	margin-top: 1em;
+	margin-bottom: 1em;
+}
+.trail {
+	display: block;
+	clear: both;
+	position: relative;
+}
+
+.trailprev {
+	display: block;
+	text-align: left;
+	position: absolute;
+	top: 0%;
+	left: 3%;
+	width: 30%;
+}
+
+.trailup {
+	display: block;
+	text-align: center;
+	margin-left: 35%;
+	margin-right: 35%;
+}
+
+.trailnext {
+	display: block;
+	text-align: right;
+	position: absolute;
+	top: 0%;
+	width: 30%;
+	right: 3%;
+}
+
+.trailsep {
+	display: none;
+}
 }
 
 // all styles in same order as original Ikiwiki stylesheet
@@ -770,6 +814,7 @@ a.openid_large_btn:focus {
 	@include ikiwiki-plugin-flattr;
 	@include ikiwiki-plugin-openid;
 	@include ikiwiki-plugin-attachment;
+	@include ikiwiki-plugin-trail;
 }
 
 @mixin ikiwiki-site {
@@ -789,6 +834,7 @@ a.openid_large_btn:focus {
 	@include ikiwiki-tags;
 	@include ikiwiki-backlinks;
 	@include ikiwiki-authorship;
+	@include ikiwiki-plugin-trail;
 	// aside
 	@include ikiwiki-plugin-sidebar;
 }
@@ -834,3 +880,8 @@ a.openid_large_btn:focus {
 	@include ikiwiki-reset;
 	@include ikiwiki-style-legacy;
 }
+
+.pageheader .trails {
+	/* allow space for the action tabs */
+	margin-bottom: 2em;
+}