Merge branch 'issue101-css' into development

rundeck · Nov 30, 2010 · 9c1242a · 9c1242a
2 parents 22d0d8b + 43dea77
commit 9c1242a
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 14 deletions.
diff --git a/docs/en/Makefile b/docs/en/Makefile
@@ -12,10 +12,13 @@ dist :
 man : 
 	$(MAKE) -C manpages
 
-html :
-	pandoc --number-sections --toc -s 0[1-9]-*/*.md --css=$(CSS) -o $(DIST)/html/RunDeck-Guide.html
+$(DIST)/html : dist
+	mkdir -p $(DIST)/html
+
+html : $(DIST)/html
+	pandoc --number-sections --toc -s 0[1-9]-*/*.md --css=$(CSS) --template=templates/html.template --include-before=templates/before.html --include-after=templates/after.html -o $(DIST)/html/RunDeck-Guide.html
 	cp $(CSS) $(DIST)/html
 
 clean :
 	rm -r $(DIST)
-	$(MAKE) -C manpages clean
+	$(MAKE) -C manpages clean
diff --git a/docs/en/RunDeck-Guide.css b/docs/en/RunDeck-Guide.css
@@ -1,14 +1,25 @@
 
 body {
-    background-color:#FFFFFF;
-    font-family:arial, sans;
+    background-color:#aaa;
+    font-family:"Helvetica Neue", Helvetica, Arial, sans-serif;
     font-size:100%;
-    margin:1em 2em;
+    margin:0; 
+    padding:0;
+    border:0;
+    padding: 20px;
+}
+#docbody{
+    margin: 0 auto;
+    background:white;
+    padding:10px 20px;
+    width: 700px;
 }
 
 h1 {
+    border-bottom:0.5em solid red;
     font-size:	2.18em;
     letter-spacing:-0.01em;
+    margin:0 0 0.67em 0;
 }			
 
 h2 {
@@ -17,30 +28,46 @@ h2 {
 }
 
 a:link {
-    color:#669966;
+    color:#444;
+    font-weight:bold;
 }
 
 a:visited {
-    color:       #336633;
+    color: #444;
 }
 
 a:hover {
     text-decoration:  none;
     color:       #FFFFFF;
-    background-color:  #669966;
+    background-color:  red;
+}
+h1 a{
+    text-decoration:none;
+    color:black;
 }
 
 ul {
-  margin: 20px;
+  margin: 10px 0px;
 }
 
 ol {
-  margin: 20px;
+  margin: 10px 0px;
+}
+
+ol li, ul li{
+    margin: 10px 0px;
 }
 
-body pre {
-  margin: 10px;
-  font-weight: bold;
+pre {
+    font-family: courier,monspace;
+    margin: 10px;
+    overflow:auto;
+    max-width:700px;
+    color: black;
+    border:1px solid #ddd;
+    border-width: 5px 2px 2px 5px;
+    background: #eee;
+    padding: 10px;
 }
 
 pre.xml {
@@ -50,3 +77,11 @@ pre.xml {
 pre.bash {
    /* bash syntax highlight here*/
 }  
+
+span.header-section-number:after{
+    content:" - ";
+}
+
+span.toc-section-number:after{
+    content:" - ";
+}
diff --git a/docs/en/templates/after.html b/docs/en/templates/after.html
@@ -0,0 +1 @@
+</div>
diff --git a/docs/en/templates/before.html b/docs/en/templates/before.html
@@ -0,0 +1 @@
+<div id="docbody">
diff --git a/docs/en/templates/html.template b/docs/en/templates/html.template
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <title>$if(title-prefix)$$title-prefix$ - $endif$$if(pagetitle)$$pagetitle$$endif$</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta name="generator" content="pandoc" />
+$for(author)$
+  <meta name="author" content="$author$" />
+$endfor$
+$if(date)$
+  <meta name="date" content="$date$" />
+$endif$
+$if(highlighting-css)$
+  <style type="text/css">
+$highlighting-css$
+  </style>
+$endif$
+$for(css)$
+  <link rel="stylesheet" href="$css$" type="text/css" />
+$endfor$
+$if(math)$
+  $math$
+$endif$
+$for(header-includes)$
+  $header-includes$
+$endfor$
+</head>
+<body>
+$for(include-before)$
+$include-before$
+$endfor$
+$if(title)$
+<h1 class="title">$title$</h1>
+$endif$
+$if(toc)$
+$toc$
+$endif$
+$body$
+$for(include-after)$
+$include-after$
+$endfor$
+</body>
+</html>