Refine the theme to be more readable

9 files changed, 43 insertions, 38 deletions

diff --git a/commands.mk b/commands.mk
index 1554901..c34297f 100644
--- a/commands.mk
+++ b/commands.mk
@@ -3,6 +3,6 @@ serve :
 	@cd out && python -m http.server
 
 update :
-	@scripts/pretty-echo "Updating" "OCaml dependencies"
+	@pretty-echo.sh "Updating" "OCaml dependencies"
 	@opam update
 	@opam upgrade -y
diff --git a/coq.mk b/coq.mk
index c55526e..54ce8ae 100644
--- a/coq.mk
+++ b/coq.mk
@@ -23,7 +23,7 @@ COQDOCARG := --no-index --charset utf8 --short \
              --external "https://lysxia.github.io/coq-simple-io" SimpleIO
 
 %.html : %.v coq.mk _opam/init
-	@scripts/pretty-echo.sh Exporting  "$*.v"
+	@pretty-echo.sh Exporting  "$*.v"
 	@coqc ${COQCARG} $<
 	@coqdoc ${COQDOCARG} -d $(shell dirname $<) $<
 	@rm -f $(shell dirname $<)/coqdoc.css
diff --git a/dependencies.mk b/dependencies.mk
index f79c5ad..736c508 100644
--- a/dependencies.mk
+++ b/dependencies.mk
@@ -2,16 +2,16 @@ OCAML_VERSION := 4.12.0
 OCAML := ocaml-base-compiler.${OCAML_VERSION}
 
 _opam/init :
-	@scripts/pretty-echo.sh "Creating" "a local Opam switch"
+	@pretty-echo.sh "Creating" "a local Opam switch"
 	@opam switch create . ${OCAML} --repos default,coq-released || true
-	@scripts/pretty-echo.sh "Installing" "OCaml dependencies"
+	@pretty-echo.sh "Installing" "OCaml dependencies"
 	@opam install dune.2.9.0 coq-coqffi.1.0.0~beta7 coq-simple-io.1.5.0 soupault.4.0.1 coq.8.13.2 coq-compcert.3.8 -y
 	@touch $@
 
 CONFIGURE += _opam
 
 package-lock.json : package.json
-	@scripts/pretty-echo.sh "Installing" "frontend dependencies"
+	@pretty-echo.sh "Installing" "frontend dependencies"
 	@npm install
 
 CONFIGURE += package-lock.json node_modules
diff --git a/literate-programming.mk b/literate-programming.mk
index 4ce5374..7a3142b 100644
--- a/literate-programming.mk
+++ b/literate-programming.mk
@@ -1,5 +1,5 @@
 literate-programming-prebuild : site/posts/CoqffiEcho.org
-	@scripts/pretty-echo.sh "Tangling" "literate programming project"
+	@pretty-echo.sh "Tangling" "literate programming project"
 	@capture.sh tangling-lp ${EMACS} --eval "(cleopatra:export-lp)"
 
 ARTIFACTS += lp/ site/posts/deps.svg
@@ -7,13 +7,13 @@ ARTIFACTS += lp/ site/posts/deps.svg
 COQFFI_ARCHIVE := site/files/coqffi-tutorial.tar.gz
 
 ${COQFFI_ARCHIVE} : literate-programming-prebuild _opam/init
-	@scripts/pretty-echo.sh "Building" "coqffi tutorial"
+	@pretty-echo.sh "Building" "coqffi tutorial"
 	@cd lp/coqffi-tutorial; dune build --display quiet
-	@scripts/pretty-echo.sh "Archiving" "coqffi tutorial"
+	@pretty-echo.sh "Archiving" "coqffi tutorial"
 	@rm -f ${COQFFI_ARCHIVE}
 	@capture.sh coqffi-tutorial tar --exclude="_build" -C lp/ -czvf ${COQFFI_ARCHIVE} coqffi-tutorial
 
 literate-programming-build : ${COQFFI_ARCHIVE}
-soupault-build : literate-programming-build
+soupault-build : ${COQFFI_ARCHIVE}
 
 ARTIFACTS += ${COQFFI_ARCHIVE}
diff --git a/makefile b/makefile
index 3b516a5..e869bee 100644
--- a/makefile
+++ b/makefile
@@ -16,14 +16,14 @@ init : ${PROCS_DEPS} needs-emacs
 	@make ${CMD}
 
 needs-emacs :
-	@scripts/pretty-echo.sh "Starting" "emacs daemon"
+	@pretty-echo.sh "Starting" "emacs daemon"
 	@${EMACS} -s ${EMACS_NAME} --eval "(kill-emacs)" 2> /dev/null || true
 	@ROOT=$(shell pwd) capture.sh "start-server" emacs --daemon=${EMACS_NAME} -Q --load="scripts/init.el"
 
 .PHONY : needs-emacs
 
 .%.deps : %.mk makefile
-	@scripts/gen-deps.sh $< $@
+	@gen-deps.sh $< $@
 
 -include ${PROCS_DEPS}
 
@@ -32,9 +32,9 @@ build : prebuild
 postbuild : build
 
 postbuild :
-	@scripts/pretty-echo.sh "Updating" ".gitignore"
-	@scripts/update-gitignore.sh $(sort ${CONFIGURE} ${ARTIFACTS} ${PROCS_DEPS})
-	@scripts/pretty-echo.sh "Killing" "emacs daemon"
+	@pretty-echo.sh "Updating" ".gitignore"
+	@update-gitignore.sh $(sort ${CONFIGURE} ${ARTIFACTS} ${PROCS_DEPS})
+	@pretty-echo.sh "Killing" "emacs daemon"
 	@${EMACS} -s ${EMACS_NAME} --eval "(kill-emacs)"
 	@rm -f $(wildcard .*.deps)
 
diff --git a/org.mk b/org.mk
index 1d42db7..0421a59 100644
--- a/org.mk
+++ b/org.mk
@@ -10,5 +10,5 @@ ARTIFACTS += ${ORG_OUT} .emacs.d/cache
 site/index.html : site/haskell.org site/miscellaneous.org site/meta.org site/coq.org
 
 %.html : %.org org.mk
-	@scripts/pretty-echo.sh  Exporting "$*.org"
+	@pretty-echo.sh  Exporting "$*.org"
 	@capture.sh "$@" ${EMACS} --eval "(cleopatra:export-org \"$<\")"
diff --git a/soupault.mk b/soupault.mk
index a30e541..988edef 100644
--- a/soupault.mk
+++ b/soupault.mk
@@ -4,5 +4,5 @@ ARTIFACTS += out
 soupault-prebuild : _opam/init
 
 soupault-build : dependencies-prebuild style.min.css
-	@scripts/pretty-echo.sh "Executing" "soupault"
+	@pretty-echo.sh "Executing" "soupault"
 	@soupault
diff --git a/style.css b/style.css
index f93664a..35e836f 100644
--- a/style.css
+++ b/style.css
@@ -1,8 +1,7 @@
 :root {
-    --main-width: 35rem;
+    --main-width: 42rem;
     --gutter-width: 3rem;
     --margin-width: 13rem;
-    --code-width: calc(var(--main-width) + var(--gutter-width) + var(--margin-width));
     --body-width: calc(var(--main-width) + 2 * (var(--gutter-width) + var(--margin-width)));
 }
 
@@ -14,31 +13,37 @@
     media queries. As a consequnece, for our theme to be responsive,
     the full width of the page content is
 
-       2 * (margin_width + gutter_width) + content_width = 67rem
+       2 * (margin_width + gutter_width) + content_width = 74rem
 
  */
 
 /* See {{Note: width}} */
-@media (max-width: 67rem) {
+@media (max-width: 74rem) {
     :root {
         --body-width: var(--main-width);
-        --code-width: var(--main-width);
+        --width: var(--main-width);
     }
 }
 
-* {
-    box-sizing: border-box;
+figure, figcaption {
+    text-align: center;
+    margin-left:0;
+    margin-right:0;
 }
 
-.fullwidth {
-    width: var(--body-width);
+* {
+    box-sizing: border-box;
 }
 
 /* See {{Note: width}} */
-@media (min-width: 67rem) {
-    .fullwidth {
+@media (min-width: 74rem) {
+    .fullwidth, figure {
         margin-left: calc(-1 * (var(--margin-width) + var(--gutter-width)));
     }
+
+    figure, figcaption, .fullwidth {
+        width: var(--body-width);
+    }
 }
 
 html {
@@ -183,7 +188,6 @@ label.margin-toggle:not(.sidenote-number) {
 
 div.code,
 pre {
-    width: var(--code-width);
     overflow-x: auto;
     overflow-y: hidden;
     padding: 1rem 2rem;
@@ -254,7 +258,7 @@ td.commit {
 }
 
 /* See {{Note: width}} */
-@media (max-width: 67rem) {
+@media (max-width: 74rem) {
     body {
         padding: 2rem;
         margin: auto;
@@ -301,8 +305,8 @@ td.commit {
     --bg-plus: #f7f7f7;
     --current-line: #fbfbfb;
     --fade: #cfcecb;
-    --fg: #3c3c3c;
-    --fg-plus: #575757;
+    --fg: black;
+    --fg-plus: black;
     --doc: black;
     --warning: #bd745e;
     --red: #b3534b;
@@ -348,6 +352,7 @@ div.code,
 span.inlinecode,
 tt {
     color: var(--doc);
+    background: var(--bg-plus);
 }
 
 div.code {
@@ -364,7 +369,7 @@ span.inlinecode {
 }
 
 .code a[href] {
-    color : inherit;
+    color : black !important;
     text-decoration : none;
     background : var(--bg-plus);
     padding : .1rem .15rem .1rem .15rem;
@@ -383,19 +388,19 @@ span.inlinecode {
 }
 
 a[href], .margin-toggle {
-    color: #0000ee;
+    color: black;
 }
 
 a[href] .icon svg {
-    fill: #0000ee;
+    fill: black;
 }
 
 a[href]:visited {
-    color: #25008b;
+    color: #555;
 }
 
 a[href]:visited .icon svg {
-    fill: #25008b;
+    fill: #555;
 }
 
 .url-mark.fa {
diff --git a/theme.mk b/theme.mk
index 3d26423..6dc306a 100644
--- a/theme.mk
+++ b/theme.mk
@@ -1,6 +1,6 @@
 style.min.css : style.css dependencies-prebuild
-	@scripts/pretty-echo.sh "Minifying" "CSS"
-	@scripts/css.sh
+	@pretty-echo.sh "Minifying" "CSS"
+	@css.sh
 
 ARTIFACTS += style.min.css