~jan0sch/darcs-book

Showing details for patch e95dc83351d0ed728db1bc94b8731b0feb3013f2.
2018-07-03 (Tue), 7:18 PM - - e95dc83351d0ed728db1bc94b8731b0feb3013f2

work a bit on html styling

Summary of changes
1 files added
  • img/header.jpg
3 files modified with 86 lines added and 32 lines removed
  • Makefile with 7 added and 7 removed lines
  • html/book.css with 45 added and 7 removed lines
  • html/template.html with 34 added and 18 removed lines
diff -rN -u old-darcs-book/html/book.css new-darcs-book/html/book.css
--- old-darcs-book/html/book.css	2024-11-23 23:55:59.638636581 +0000
+++ new-darcs-book/html/book.css	2024-11-23 23:55:59.638636581 +0000
@@ -1,3 +1,4 @@
+
 h1 {
     font-size: 60px;
     line-height: 60px;
@@ -18,7 +19,9 @@
     font-size: 14px;
     line-height: 25px;
     font-family: Arial, sans-serif;
-    background-color: white;
+    background-image: url(../img/header.jpg);
+    margin: 0;
+    padding: 0;
 }
 
 p {
@@ -37,9 +40,11 @@
   font-family: "Consolas", monospace;
   font-size: 14px;
   margin: 20px 0px 20px 0px;
+  border-radius: 0.5em;
+  box-shadow: 0px 2px 4px 1px hsl(0, 0%, 80%);
 }
 
-blockquote{
+blockquote {
   display:block;
   background: #fff;
   padding: 15px 20px 15px 45px;
@@ -63,7 +68,7 @@
   box-shadow: 2px 2px 15px #ccc;
 }
 
-blockquote::before{
+blockquote::before {
   content: "\201C"; /*Unicode for Left Double Quote*/
 
   /*Font*/
@@ -78,12 +83,12 @@
   top:5px;
 }
 
-blockquote::after{
+blockquote::after {
   /*Reset to make sure*/
   content: "";
 }
 
-blockquote a{
+blockquote a {
   text-decoration: none;
   background: #eee;
   cursor: pointer;
@@ -91,11 +96,11 @@
   color: #c76c0c;
 }
 
-blockquote a:hover{
+blockquote a:hover {
  color: #666;
 }
 
-blockquote em{
+blockquote em {
   font-style: italic;
 }
 
@@ -103,3 +108,36 @@
   width: 800px;
   margin: 0px auto;
 }
+
+.bgwrapper {
+  background-color: white;
+  margin-top: 70px;
+  margin-bottom: 50px;
+  padding: 2em;
+}
+
+.prevlink {
+    padding-left: 20px;
+    background-position: 0px 3px;
+    background-repeat: no-repeat;
+}
+
+.nextlink {
+    padding-right: 20px;
+    background-position: top right;
+    background-repeat: no-repeat;
+}
+
+.navigation {
+  display: table;
+  width: 100%;
+}
+
+.navigation ul {
+    display: table-row;
+}
+
+.navigation ul li {
+    display: table-cell;
+    width: 33%;
+}
diff -rN -u old-darcs-book/html/template.html new-darcs-book/html/template.html
--- old-darcs-book/html/template.html	2024-11-23 23:55:59.638636581 +0000
+++ new-darcs-book/html/template.html	2024-11-23 23:55:59.638636581 +0000
@@ -42,30 +42,46 @@
 $endfor$
 </head>
 <body>
+<div class=bgwrapper>
+<div id=content>
 $for(include-before)$
 $include-before$
 $endfor$
-$if(title)$
-<header>
-<h1 class="title">$title$</h1>
-$if(subtitle)$
-<p class="subtitle">$subtitle$</p>
-$endif$
-$for(author)$
-<p class="author">$author$</p>
-$endfor$
-$if(date)$
-<p class="date">$date$</p>
-$endif$
-</header>
-$endif$
+<div class="navigation">
+  <ul>
+    $if(prev)$
+    <li style="text-align:left">
+      <a class="prevlink" href="$prev$.html">Back</a>
+    </li>
+    $endif$
+    $if(next)$
+    <li style="text-align:right">
+      <a class="nextlink" href="$next$.html">Next</a>
+    </li>
+    $endif$
+  </ul>
+</div>
 $if(toc)$
-<nav id="$idprefix$TOC">
-$table-of-contents$
-</nav>
+<div class="toc">
+$toc$
+</div>
 $endif$
-<div id=content>
 $body$
+<div class="navigation">
+  <ul>
+    $if(prev)$
+    <li style="text-align:left">
+      <a class="prevlink" href="$prev$.html">Back</a>
+    </li>
+    $endif$
+    $if(next)$
+    <li style="text-align:right">
+      <a class="nextlink" href="$next$.html">Next</a>
+    </li>
+    $endif$
+  </ul>
+</div>
+</div>
 </div>
 $for(include-after)$
 $include-after$
Binary files old-darcs-book/img/header.jpg and new-darcs-book/img/header.jpg differ
diff -rN -u old-darcs-book/Makefile new-darcs-book/Makefile
--- old-darcs-book/Makefile	2024-11-23 23:55:59.638636581 +0000
+++ new-darcs-book/Makefile	2024-11-23 23:55:59.638636581 +0000
@@ -1,25 +1,25 @@
-PANDOC=pandoc -s --css ../html/book.css --template html/template.html -f markdown -t html5
+PANDOC=pandoc -s --css ../html/book.css --template html/template.html -f markdown -t html --toc
 
 dist:
 	mkdir dist
 
 dist/chapter01.html: dist
-	${PANDOC} en/01-introduction.md -o dist/chapter01.html
+	${PANDOC} -V next:chapter02 en/01-introduction.md -o dist/chapter01.html
 
 dist/chapter02.html: dist
-	${PANDOC} en/02-getting-started.md -o dist/chapter02.html
+	${PANDOC} -V prev:chapter01 -V next:chapter03 en/02-getting-started.md -o dist/chapter02.html
 
 dist/chapter03.html: dist
-	${PANDOC} en/03-working-locally.md -o dist/chapter03.html
+	${PANDOC} -V prev:chapter02 -V next:chapter04 en/03-working-locally.md -o dist/chapter03.html
 
 dist/chapter04.html: dist
-	${PANDOC} en/04-happy-little-accidents.md -o dist/chapter04.html
+	${PANDOC} -V prev:chapter03 -V next:chapter05 en/04-happy-little-accidents.md -o dist/chapter04.html
 
 dist/chapter05.html: dist
-	${PANDOC} en/05-a-little-help-from-my-friends.md -o dist/chapter05.html
+	${PANDOC} -V prev:chapter04 -V next:chapter06 en/05-a-little-help-from-my-friends.md -o dist/chapter05.html
 
 dist/chapter06.html: dist
-	${PANDOC} en/06-conflict-management.md -o dist/chapter06.html
+	${PANDOC} -V prev:chapter05 en/06-conflict-management.md -o dist/chapter06.html
 
 all: dist/chapter01.html dist/chapter02.html dist/chapter03.html dist/chapter04.html dist/chapter05.html dist/chapter06.html