modif makefile

CM1/Makefile

@@ -4,7 +4,7 @@ all: ../tmp/CM1.html ../tmp/CM1_slides.html
 	cp *.png ../tmp
 
 ../tmp/CM1.html: CM1.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/CM1_slides.html: CM1.md 
 	pandoc --template ../www/template_slidy.html --toc-depth 1 -t slidy -s -o $@ $<

CM2/Makefile

@@ -10,7 +10,7 @@ all: $(SVG_FILES) ../tmp/CM2.html ../tmp/CM2_slides.html
 	dot -Tsvg -o $@ $<
 
 ../tmp/CM2.html: CM2.md ../tmp/before.html 
-	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/CM2_slides.html: CM2.md ../tmp/before.html 
 	pandoc --template ../www/template_slidy.html --toc-depth 1 -t slidy -s -o $@ $<

CM3/Makefile

@@ -3,7 +3,7 @@
 all: ../tmp/CM3.html ../tmp/CM3_slides.html
 
 ../tmp/CM3.html: CM3.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/CM3_slides.html: CM3.md 
 	pandoc --template ../www/template_slidy.html --toc-depth 1 -t slidy -s -o $@ $<

www/Makefile

@@ -1,14 +1,17 @@
+
 .PHONY: all clean
 
-all: ../tmp/before.html ../tmp/index.html ../tmp/index_slides.html 
+all: ../tmp ../tmp/before.html ../tmp/index.html ../tmp/index_slides.html 
 
-../tmp/before.html: before.md
+../tmp:
 	mkdir -p ../tmp
-	pandoc -o $@ $<
 	cp template.css slidy.css slidy.js ../tmp
 
+../tmp/before.html: before.md
+	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 --template template_slidy.html --toc-depth 1 -t slidy -s -o $@ $<

www/before.md

@@ -1,8 +1,9 @@
 - [Présentation](index.html) 
-- [Présentation (slides)](index_slides.html)
 - [CM1](CM1.html) 
-- [CM1 (slides)](CM1_slides.html)
 - [CM2](CM2.html) 
-- [CM2 (slides)](CM2_slides.html)
 - [CM3](CM3.html) 
+- \ 
+- [Présentation (slides)](index_slides.html)
+- [CM1 (slides)](CM1_slides.html)
+- [CM2 (slides)](CM2_slides.html)
 - [CM3 (slides)](CM3_slides.html)

www/slidy.css

@@ -406,3 +406,9 @@ div.initial_prompt { display: none; visibility: hidden }
 table          { margin: auto 0; }
 table, th, td  { border-collapse: collapse; border: solid 1px black; padding: 3px; }
 body { font-size: 11px; }
+
+code {
+    color: #EC3200;
+    background-color: #E4E5E7;
+}
+

www/template.css

@@ -638,9 +638,7 @@ h6 small {
   line-height: 1;
   color: #999999;
 }
-h1 {
-  line-height: 60px;
-}
+h1,
 h2,
 h3 {
   line-height: 40px;
@@ -3068,7 +3066,11 @@ img {
     margin-bottom: 10px;
 }
 .row { margin-top: 20px; }
-h1 { font-size: 220%; }
+h1 { font-size: 200%; }
 h2 { font-size: 175%; }
 h3 { font-size: 150%; }
 h4 { font-size: 125%; }
+hr {
+  margin: 0;
+  border: 0;
+}

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

@@ -32,7 +32,7 @@ $endfor$
 
 <!-- <script src="$slidy-url$/scripts/slidy.js" -->
   <link rel="stylesheet" type="text/css" media="screen, projection, print"
-   href="slidy.css" />
+    href="slidy.css" />
   <script src="slidy.js"
     charset="utf-8" type="text/javascript"></script>
 $if(duration)$