diff --git a/hakyll-bootstrap/Main.hs b/hakyll-bootstrap/Main.hs index ecdbc37d5f21634c35443327acc3720ac18a9184..59dbe7332e46603d167c26fd9a777f5867e4de62 100644 --- a/hakyll-bootstrap/Main.hs +++ b/hakyll-bootstrap/Main.hs @@ -50,6 +50,7 @@ main = hakyllWith cfg $ do .||. "js/*" .||. "reveal.js/dist/**" .||. "reveal.js/plugin/**" + .||. "cours/prog_seq/slides/figs/*" .||. "cours/math_tech_info/figs/*" .||. "cours/math_tech_info/cours.pdf" .||. "cours/isc_physics/cours.pdf" @@ -100,7 +101,7 @@ main = hakyllWith cfg $ do >>= relativizeUrls -- Phys app posts - match "cours/prog_seq/base_1.md" $ do + match "cours/prog_seq/slides/*.markdown" $ do route $ setExtension "html" compile $ pandocRevealCompiler >>= loadAndApplyTemplate "templates/reveal.html" postCtx @@ -110,7 +111,7 @@ main = hakyllWith cfg $ do create ["prog_seq.html"] $ do route idRoute compile $ do - posts <- recentFirst =<< loadAll ("cours/prog_seq/base_1.md" .&&. hasNoVersion) + posts <- recentFirst =<< loadAll "cours/prog_seq/slides/*.markdown" makeItem "" >>= loadAndApplyTemplate "templates/archive.html" (courseCtx posts "Programmation séquentielle" "cours/isc_physics/cours.pdf") >>= relativizeUrls @@ -224,6 +225,11 @@ courseCtx posts title pdfurl = `mappend` constField "title" title `mappend` constField "pdfurl" pdfurl `mappend` defaultContext + +courseRevealCtx posts title = + listField "posts" postCtx (return posts) + `mappend` constField "title" title + `mappend` defaultContext researchCtx posts = listField "posts" postCtx (return posts) diff --git a/hakyll-bootstrap/Makefile b/hakyll-bootstrap/Makefile index 925a3cb1714e0e1db8464eb83cd41b910426aecc..1c0e0c971063ccc735fdb932b596487acb0cecdc 100644 --- a/hakyll-bootstrap/Makefile +++ b/hakyll-bootstrap/Makefile @@ -13,3 +13,4 @@ clean: rm -rf _cache _site make clean -C cours/math_tech_info make clean -C cours/isc_physics + make clean -C cours/prog_seq/slides diff --git a/hakyll-bootstrap/cours/prog_seq b/hakyll-bootstrap/cours/prog_seq index 6361d1b616343c5ae0a2d5a4833ecf814f0b7b10..94bd5d4d14b8b09d7850b5e5296d17f0c31b565c 160000 --- a/hakyll-bootstrap/cours/prog_seq +++ b/hakyll-bootstrap/cours/prog_seq @@ -1 +1 @@ -Subproject commit 6361d1b616343c5ae0a2d5a4833ecf814f0b7b10 +Subproject commit 94bd5d4d14b8b09d7850b5e5296d17f0c31b565c diff --git a/hakyll-bootstrap/reveal.js/css/theme/source/white.scss b/hakyll-bootstrap/reveal.js/css/theme/source/white.scss index 19162ffa74f4c1f66807a4aeff81ea276469513f..ea5e1fdaa91c120d18726f0df3503fba90746bc8 100644 --- a/hakyll-bootstrap/reveal.js/css/theme/source/white.scss +++ b/hakyll-bootstrap/reveal.js/css/theme/source/white.scss @@ -21,7 +21,7 @@ $backgroundColor: #fff; $mainColor: #222; $headingColor: #222; -$mainFontSize: 20px; +$mainFontSize: 15px; $mainFont: 'Source Sans Pro', Helvetica, sans-serif; $headingFont: 'Source Sans Pro', Helvetica, sans-serif; $headingTextShadow: none; diff --git a/hakyll-bootstrap/templates/reveal.html b/hakyll-bootstrap/templates/reveal.html index 048ef4711943137a671f6625f611b001d6854fd0..6675acc4ff3bd0979ddaabf985c6792e7c477bb8 100644 --- a/hakyll-bootstrap/templates/reveal.html +++ b/hakyll-bootstrap/templates/reveal.html @@ -19,7 +19,7 @@ $endif$ $if(theme)$ <link rel="stylesheet" href="$revealjs-url$/dist/theme/$theme$.css" id="theme"> $else$ - <link rel="stylesheet" href="$revealjs-url$/dist/theme/black.css" id="theme"> + <link rel="stylesheet" href="$revealjs-url$/dist/theme/white.css" id="theme"> $endif$ $if(math)$ $math$