diff --git a/Makefile b/Makefile index 9ba91bff92593adf233c475974c6988ee8d104fb..9192ae6fb4d3da6e2afa9cf9f452a8b5e7b6a726 100644 --- a/Makefile +++ b/Makefile @@ -27,18 +27,30 @@ public/session_1.html: public/ session_1/session_1.Rmd public/www/style_Rmd.css ## Test docker in local -test : local/session_1.html \ - local/index.html +test : local/index.html \ + local/session_1.html + local/: mkdir -p local + mkdir -p local/www + mkdir -p local/img -local/session_1.html: local/ session_1/session_1.Rmd www/style_Rmd.css - docker run --rm -ti -v ${PWD}:/work -w /work rocker/r-rmd \ +local/www/github-pandoc.css: local/ www/github-pandoc.css + cp www/github-pandoc.css local/www/github-pandoc.css + +local/www/style_Rmd.css: local/ www/style_Rmd.css + cp www/style_Rmd.css local/www/style_Rmd.css + +local/www/*.ttf: local/ www/Raleway-Regular.ttf www/YanoneKaffeesatz-Bold.ttf + cp www/*ttf local/www/ + +local/session_1.html: local/ session_1/session_1.Rmd local/www/style_Rmd.css + docker run --rm -ti -v ${PWD}:/work -w /work rocker/tidyverse \ Rscript -e 'install.packages("rmdformats"); rmarkdown::render("session_1/session_1.Rmd", output_dir = "local/")' -local/index.html: local/ index.md www/github-pandoc.css - docker run --rm -ti -v ${PWD}:/work -w /work rocker/r-rmd \ +local/index.html: local/ index.md local/www/github-pandoc.css + docker run --rm -ti -v ${PWD}:/work -w /work rocker/tidyverse \ pandoc -s -c www/github-pandoc.css index.md -o local/index.html clean: diff --git a/session_1/session_1.Rmd b/session_1/session_1.Rmd index 687873ca72aabffe38fcda5b85e233e31a5db339..105dec2a7e1160a4471296036e062924f555de49 100644 --- a/session_1/session_1.Rmd +++ b/session_1/session_1.Rmd @@ -8,7 +8,7 @@ output: use_bookdown: true default_style: "light" lightbox: true - css: "www/style_Rmd.css" + css: "../www/style_Rmd.css" --- ```{r setup, include=FALSE} diff --git a/www/style_Rmd.css b/www/style_Rmd.css index fae03273e26de5ae315a435df210ab1757959ebc..efc67ae172ef854d13bde46595f8f43e67d25664 100644 --- a/www/style_Rmd.css +++ b/www/style_Rmd.css @@ -16,11 +16,11 @@ html, body { @font-face { font-family: 'Yanone Kaffeesatz'; - src:url("../src/YanoneKaffeesatz-Bold.ttf"); + src:url("../www/YanoneKaffeesatz-Bold.ttf"); } @font-face { font-family: 'Raleway'; - src:url("../src/Raleway-Regular.ttf"); + src:url("../www/Raleway-Regular.ttf"); } @import url('https://fonts.googleapis.com/css2?family=Yanone+Kaffeesatz&display=swap');