From b065628fb1ffa6edf8f35a690931c2d56d26ab3e Mon Sep 17 00:00:00 2001 From: Thomas Letan Date: Thu, 27 Aug 2020 15:05:29 +0200 Subject: Simplify the theme --- .gitignore | 47 +-- Makefile | 49 --- site/cleopatra/coq.org | 64 +-- site/cleopatra/org.org | 55 +-- site/cleopatra/soupault.org | 44 +- site/cleopatra/theme.org | 284 ++++--------- site/index.org | 43 +- site/news/index.html | 2 - site/posts/MiniHTTPServer.v | 999 -------------------------------------------- 9 files changed, 184 insertions(+), 1403 deletions(-) delete mode 100644 Makefile delete mode 100644 site/posts/MiniHTTPServer.v diff --git a/.gitignore b/.gitignore index 2d03d68..3425c78 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1,29 @@ # begin generated files .cleopatra -coq.mk site/style/coq.sass +coq.mk .emacs +site/style/org.sass +org.mk scripts/export-org.el scripts/packages.el -org.mk -site/style/org.sass package-lock.json node_modules/ -soupault.conf +scripts/katex.js +soupault.mk +katex.mk +package.json +scripts/history.sh +templates/history.html +site/style/plugins.sass plugins/external-urls.lua plugins/urls-rewriting.lua plugins/fix-org-urls.lua -site/style/plugins.sass -templates/history.html -scripts/history.sh -package.json -soupault.mk -katex.mk -scripts/katex.js -theme.mk -templates/main.html +soupault.conf site/style/main.sass +templates/main.html +theme.mk build.log *.vo *.vok @@ -31,26 +31,25 @@ build.log .*.aux *.glob .lia.cache -site/posts/AlgebraicDatatypes.html -site/posts/StronglySpecifiedFunctionsProgram.html -site/posts/MiniHTTPServer.html -site/posts/ClightIntroduction.html -site/posts/StronglySpecifiedFunctions.html site/posts/RewritingInCoq.html -site/posts/Ltac101.html +site/posts/StronglySpecifiedFunctions.html +site/posts/AlgebraicDatatypes.html site/posts/MixingLtacAndGallina.html -site/index.html +site/posts/Ltac101.html +site/posts/ClightIntroduction.html +site/posts/StronglySpecifiedFunctionsProgram.html site/news/ColorlessThemes-0.2.html site/cleopatra/soupault.html -site/cleopatra/theme.html site/cleopatra/org.html site/cleopatra/coq.html -site/cleopatra.html -site/posts/Thanks.html -site/posts/DiscoveringCommonLisp.html +site/cleopatra/theme.html site/posts/ExtensibleTypeSafeErrorHandling.html +site/posts/DiscoveringCommonLisp.html site/posts/MonadTransformers.html site/posts/CleopatraV1.html +site/posts/Thanks.html +site/cleopatra.html +site/index.html build/ site/style/main.css # end generated files diff --git a/Makefile b/Makefile deleted file mode 100644 index 2682086..0000000 --- a/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -ROOT := $(shell pwd) -CLEODIR := site/cleopatra - -ARTIFACTS := build.log -CONFIGURE := - -EMACSBIN := emacs -EMACS := ROOT="${ROOT}" ${EMACSBIN} -TANGLE := --batch \ - --load="${ROOT}/scripts/tangle-org.el" \ - 2>> build.log - -define emacs-tangle = -echo " tangle $<" -${EMACS} $< ${TANGLE} -endef - -default : postbuild ignore - -init : - @rm -f build.log - -prebuild : init - -build : prebuild - -postbuild : build - -.PHONY : init prebuild build postbuild ignore - -include bootstrap.mk - -prebuild : bootstrap-prebuild -build : bootstrap-build -postbuild : bootstrap-postbuild - -bootstrap-prebuild : bootstrap.mk scripts/update-gitignore.sh -bootstrap-build : bootstrap-prebuild -bootstrap-postbuild : bootstrap-build - -bootstrap.mk scripts/update-gitignore.sh &:\ - ${CLEODIR}/Bootstrap.org - @$(emacs-tangle) - -CONFIGURE += bootstrap.mk scripts/update-gitignore.sh - -.PHONY : bootstrap-prebuild \ - bootstrap-build \ - bootstrap-postbuild diff --git a/site/cleopatra/coq.org b/site/cleopatra/coq.org index 51b0ecb..7f617e8 100644 --- a/site/cleopatra/coq.org +++ b/site/cleopatra/coq.org @@ -28,80 +28,52 @@ COQDOCARG := --no-index --charset utf8 --short \ #+END_SRC #+BEGIN_SRC sass :tangle site/style/coq.sass -@mixin patchy-centered($inc: 0rem) - width : 100vw - position: relative - @media screen and (min-width : $document-width) - padding-left : calc(50vw - #{$document-width} / 2) - right : calc(50vw - #{$document-width} / 2) - @media screen and (max-width : $document-width) - padding-left : 1rem - right : 1rem - div.code white-space: nowrap + line-height : 140% -.coq-text-block - @include patchy-centered - padding-top: 1rem - padding-bottom: 1rem - -.doc - @include padding-centered - margin-top : 1em - margin-bottom : 1em - - pre - @include patchy-centered - padding-top : 1rem - padding-bottom : 1rem - background : $bg-verbatim - overflow-x : auto +div.code, +span.inlinecode + font-family : 'Fira Code', monospace + font-size : 80% -.code - @include padding-centered - @include code-block - -.inlinecode - @include code-font +div.doc + max-width : 35rem + line-height : 140% -h1, h2, h3, h4, h5, h6 - .inlinecode - font-size: 100% +.paragraph + margin-bottom : .8em +#+END_SRC +#+BEGIN_SRC sass :tangle site/style/coq.sass .code .id[title="keyword"] - color : #ff6188 + color : #d73a49 .id[title="definition"], .id[title="projection"], .id[title="theorem"], .id[title="lemma"] - color : #a9dc76 + color : #6f42c1 .id[title="inductive"], .id[title="record"], .id[title="axiom"], .id[title="class"] - color : #78dce8 + color : #005cc5 .id[title="constructor"] - color : #ab9df2 + color : #e36209 a[href] color : inherit text-decoration : none - background : #403e41 - padding : .05rem .15rem .05rem .15rem + background : #f7f7f7 + padding : .1rem .15rem .1rem .15rem border-radius : 15% .url-mark display: none - -.paragraph - margin-top: 1em - margin-bottom: 1em - #+END_SRC # Local Variables: diff --git a/site/cleopatra/org.org b/site/cleopatra/org.org index b846ee8..df6c513 100644 --- a/site/cleopatra/org.org +++ b/site/cleopatra/org.org @@ -9,9 +9,9 @@ (use-package haskell-mode :ensure t :defer t) (use-package toml-mode :ensure t :defer t) (use-package json-mode :ensure t :defer t) -(use-package monokai-pro-theme :ensure t :defer t +(use-package github-modern-theme :ensure t :defer t :init - (load-theme 'monokai-pro t)) + (load-theme 'github-modern t)) #+END_SRC #+BEGIN_SRC emacs-lisp :tangle scripts/export-org.el @@ -97,21 +97,8 @@ INIT := --batch --load="${ROOT}/scripts/packages.el" \ #+END_SRC #+BEGIN_SRC sass :tangle site/style/org.sass -.org-src-container - @include code-block - padding-top : .1rem - padding-bottom : .1rem - -.org-src-tangled-to, .org-src-name - @include padding-centered(4rem) - -.example - @include verbatim-block - // this is hacky, but it works: no need for a padding-bottom - padding-top : 1rem - -.footdef - @include padding-centered +#text-footnotes + max-width : 35rem .footpara display: inline @@ -127,27 +114,23 @@ INIT := --batch --load="${ROOT}/scripts/packages.el" \ display: none dl - dt - font-weight: bold - dd p - margin-top: 0 + dt + font-weight: bold + dd p + margin-top: 0 .footnotes - font-size : 1rem + font-size : 1rem .org-literate-programming - padding-top : 1rem - padding-bottom : 1rem - .org-src-name - @include code-font - font-weight: bold - - .org-src-tangled-to:before - content: "\f054" - font : normal normal normal 14px/1 ForkAwesome - - .org-src-tangled-to - @include code-font - font-weight: bold - text-align: right + .org-src-tangled-to:before + content: "\f054" + font : normal normal normal 11px/1 ForkAwesome + + .org-src-tangled-to, + .org-src-name + font-family : 'Fira Code', monospace + font-size : 70% + font-weight: bold + color : #444 #+END_SRC diff --git a/site/cleopatra/soupault.org b/site/cleopatra/soupault.org index fb2c57c..0675ae7 100644 --- a/site/cleopatra/soupault.org +++ b/site/cleopatra/soupault.org @@ -361,7 +361,14 @@ https://code.soap.coffee/writing/lthms.git {{#history}} - @@ -377,26 +384,21 @@ https://code.soap.coffee/writing/lthms.git #+END_SRC #+BEGIN_SRC sass :tangle site/style/plugins.sass -#history - table - @include margin-centered(2rem) - border-top: 2px solid $primary-color - border-bottom: 2px solid $primary-color - border-collapse: collapse; - - td - border-bottom: 1px solid $primary-color - padding: .5em - vertical-align: top - - td.commit - font-size: smaller - - td.commit - font-family: 'Fira Code', monospace - color: $code-fg-color - font-size: 80% - white-space: nowrap; +table + border-top : 2px solid black + border-bottom : 2px solid black + border-collapse : collapse + max-width : 35rem + +td + border-bottom : 1px solid black + padding : .5em + +#history .commit + font-size : smaller + font-family : 'Fira Code', monospace + width : 7em + text-align : center #+END_SRC *** Implementation diff --git a/site/cleopatra/theme.org b/site/cleopatra/theme.org index 35f13b4..4c2ea26 100644 --- a/site/cleopatra/theme.org +++ b/site/cleopatra/theme.org @@ -29,35 +29,24 @@ ARTIFACTS += ${CSS} #+NAME: head #+BEGIN_SRC html :noweb no-export - <> - <> + + <> <> #+END_SRC -*** Encoding - -#+NAME: encoding -#+BEGIN_SRC html - -#+END_SRC - -*** Viewport - -#+NAME: viewport -#+BEGIN_SRC html - -#+END_SRC - *** Assets Loading #+NAME: syncloading_html #+BEGIN_SRC html + - + #+END_SRC #+NAME: asyncloading_js @@ -71,13 +60,13 @@ noscript.parentNode.removeChild(noscript); #+BEGIN_SRC html
+ {{date}} {{subject}}