menu

branches/Makefile

@@ -5,10 +5,10 @@ all: ../tmp/branches.html ../tmp/branches_slides.html
 	cp *.png *.svg ../tmp
 
 ../tmp/branches.html: branches.md 
-	pandoc --template ../www/template.html --css template.css --toc --toc-depth 1 --include-before ../tmp/before.html -s -o $@ $<
+	pandoc --template ../www/template.html --toc --toc-depth 1 --include-before ../tmp/before.html -s -o $@ $<
 
 ../tmp/branches_slides.html: branches.md 
-	pandoc --css slidy.css --template ../www/template_slidy.html --toc --toc-depth 1 -t slidy -s -o $@ $<
+	pandoc --template ../www/template_slidy.html --toc-depth 1 -t slidy -s -o $@ $<
 
 clean:
 

depot_distant/Makefile

@@ -5,10 +5,10 @@ all: ../tmp/depot_distant.html ../tmp/depot_distant_slides.html
 	cp *.png *.svg ../tmp
 
 ../tmp/depot_distant.html: depot_distant.md 
-	pandoc --template ../www/template.html --css template.css --toc --toc-depth 1 --include-before ../tmp/before.html -s -o $@ $<
+	pandoc --template ../www/template.html --toc --toc-depth 1 --include-before ../tmp/before.html -s -o $@ $<
 
 ../tmp/depot_distant_slides.html: depot_distant.md 
-	pandoc --css slidy.css --template ../www/template_slidy.html --toc --toc-depth 1 -t slidy -s -o $@ $<
+	pandoc --template ../www/template_slidy.html --toc-depth 1 -t slidy -s -o $@ $<
 
 clean:
 

depot_local/Makefile

@@ -5,10 +5,10 @@ all: ../tmp/depot_local.html ../tmp/depot_local_slides.html
 	cp *.png *.svg ../tmp
 
 ../tmp/depot_local.html: depot_local.md 
-	pandoc --template ../www/template.html --css template.css --toc --toc-depth 1 --include-before ../tmp/before.html -s -o $@ $<
+	pandoc --template ../www/template.html --toc --toc-depth 1 --include-before ../tmp/before.html -s -o $@ $<
 
 ../tmp/depot_local_slides.html: depot_local.md 
-	pandoc --css slidy.css --template ../www/template_slidy.html --toc --toc-depth 1 -t slidy -s -o $@ $<
+	pandoc --template ../www/template_slidy.html --toc-depth 1 -t slidy -s -o $@ $<
 
 clean:
 

forks/Makefile

@@ -5,10 +5,10 @@ all: ../tmp/forks.html ../tmp/forks_slides.html
 	cp *.png ../tmp
 
 ../tmp/forks.html: forks.md 
-	pandoc --template ../www/template.html --css template.css --toc --toc-depth 1 --include-before ../tmp/before.html -s -o $@ $<
+	pandoc --template ../www/template.html --toc --toc-depth 1 --include-before ../tmp/before.html -s -o $@ $<
 
 ../tmp/forks_slides.html: forks.md 
-	pandoc --css slidy.css --template ../www/template_slidy.html --toc --toc-depth 1 -t slidy -s -o $@ $<
+	pandoc --template ../www/template_slidy.html --toc-depth 1 -t slidy -s -o $@ $<
 
 clean:
 

installation/Makefile

@@ -5,10 +5,10 @@ all: ../tmp/installation.html ../tmp/installation_slides.html
 	cp *.png ../tmp
 
 ../tmp/installation.html: installation.md 
-	pandoc --template ../www/template.html --css template.css --toc --toc-depth 1 --include-before ../tmp/before.html -s -o $@ $<
+	pandoc --template ../www/template.html --toc --toc-depth 1 --include-before ../tmp/before.html -s -o $@ $<
 
 ../tmp/installation_slides.html: installation.md 
-	pandoc --css slidy.css --template ../www/template_slidy.html --toc --toc-depth 1 -t slidy -s -o $@ $<
+	pandoc --template ../www/template_slidy.html --toc-depth 1 -t slidy -s -o $@ $<
 
 clean:
 

www/Makefile

@@ -11,10 +11,10 @@ all: ../tmp ../tmp/before.html ../tmp/index.html ../tmp/index_slides.html
 	pandoc -o $@ $<
 
 ../tmp/index.html: index.md 
-	pandoc --template template.html --css template.css --toc --toc-depth 1 --include-before ../tmp/before.html -s -o $@ $<
+	pandoc --template template.html --toc --toc-depth 1 --include-before ../tmp/before.html -s -o $@ $<
 
 ../tmp/index_slides.html: index.md 
-	pandoc --css slidy.css --template template_slidy.html --toc --toc-depth 1 -t slidy -s -o $@ $<
+	pandoc --template template_slidy.html --toc-depth 1 -t slidy -s -o $@ $<
 
 clean:
 

www/before.md

@@ -5,6 +5,7 @@
 - [Dépôt distant](depot_distant.html) 
 - [Branches](branches.html) 
 - [Forks](forks.html) 
+- \ 
 - [Introduction (slides)](index_slides.html) 
 - [Installation et configuration (slides)](installation_slides.html) 
 - [Dépôt local (slides)](depot_local_slides.html) 

www/template.html

@@ -23,6 +23,7 @@ $endif$
 $for(css)$
   <link rel="stylesheet" href="$css$" $if(html5)$$else$type="text/css" $endif$/>
 $endfor$
+  <link rel="stylesheet" href="template.css" $if(html5)$$else$type="text/css" $endif$/>
 $if(math)$
   $math$
 $endif$

www/template_slidy.html

@@ -19,8 +19,6 @@ $if(highlighting-css)$
 $highlighting-css$
   </style>
 $endif$
-  <link rel="stylesheet" type="text/css" media="screen, projection, print"
-    href="$slidy-url$/styles/slidy.css" />
 $for(css)$
   <link rel="stylesheet" type="text/css" media="screen, projection, print"
    href="$css$" />
@@ -33,6 +31,8 @@ $for(header-includes)$
 $endfor$
 
 <!-- <script src="$slidy-url$/scripts/slidy.js" -->
+  <link rel="stylesheet" type="text/css" media="screen, projection, print"
+    href="slidy.css" />
   <script src="slidy.js"
     charset="utf-8" type="text/javascript"></script>
 $if(duration)$