From a0b8eab744cedec41bd81e3a138146931f0445f8 Mon Sep 17 00:00:00 2001
From: "Yann Esposito (Yogsototh)" <yann.esposito@gmail.com>
Date: Sat, 22 Feb 2020 20:52:52 +0000
Subject: [PATCH] still css fixes

---
 project.el                           |  42 +++++++++++++++-----
 project.el.sig                       | Bin 586 -> 586 bytes
 src/css/mk.css                       |   6 +--
 src/posts/0010-Haskell-Now/index.org |  56 +++++++++++++--------------
 4 files changed, 64 insertions(+), 40 deletions(-)

diff --git a/project.el b/project.el
index bcb586b..78fd4d8 100644
--- a/project.el
+++ b/project.el
@@ -266,15 +266,27 @@ Return output file name."
          :sitemap-format-entry date-format-entry
          :sitemap-function org-blog-posts-sitemap-fn)
 
-
-        ("assets"
+        ("css"
          :base-directory ,assets-dir
-         :base-extension ".*"
-         :exclude ".*\.org$"
+         :base-extension "css"
          :publishing-directory ,publish-assets-dir
          :publishing-function org-blog-publish-attachment
          :recursive t)
 
+        ("img"
+         :base-directory ,assets-dir
+         :base-extension "(jpg|png|gif|jpeg)"
+         :publishing-directory ,publish-assets-dir
+         :publishing-function org-blog-publish-attachment
+         :recursive t)
+
+        ("files"
+         :base-directory ,assets-dir
+         :base-extension ".*"
+         :exclude ".*\.(org|css|jpg|png|gif|jpeg)$"
+         :publishing-directory ,publish-assets-dir
+         :publishing-function org-blog-publish-attachment
+         :recursive t)
 
         ("draft-org-files"
          :base-directory ,base-dir
@@ -294,18 +306,30 @@ Return output file name."
          :htmlized-source t
          :html-head-extra ,org-blog-head
          :html-preamble org-blog-preamble
-         :html-postamble org-blog-postamble
-
-         )
-        ("draft-assets"
+         :html-postamble org-blog-postamble)
+        ("draft-css"
+         :base-directory ,assets-dir
+         :base-extension "css"
+         :publishing-directory ,draft-publish-assets-dir
+         :publishing-function org-blog-publish-attachment
+         :recursive t)
+        ("draft-img"
+         :base-directory ,assets-dir
+         :base-extension "(jpg|png|gif|jpeg)"
+         :publishing-directory ,draft-publish-assets-dir
+         :publishing-function org-blog-publish-attachment
+         :recursive t)
+        ("draft-files"
          :base-directory ,assets-dir
          :base-extension ".*"
-         :exclude ".*\.org$"
+         :include ".*\.(org|css|jpg|png|gif|jpeg)$"
          :publishing-directory ,draft-publish-assets-dir
          :publishing-function org-blog-publish-attachment
          :recursive t)
 
+        ("assets" :components ("css" "img" "files"))
         ("blog" :components ("orgfiles" "assets"))
+        ("draft-assets" :components ("draft-css" "draft-img" "draft-files"))
         ("draft" :components ("draft-org-files" "draft-assets"))))
 
 ;; add target=_blank and rel="noopener noreferrer" to all links by default
diff --git a/project.el.sig b/project.el.sig
index b25385fbbffe7d32e43178f2a23f4f7c31aa016e..2515641b9809ca438717ef9b3d276c0346ea37d2 100644
GIT binary patch
delta 533
zcmV+w0_y$B1j+=EBm$I|ktQI2eSr`EU}<psu-Q)#=m)04clN`s9-#p}5<BxQ)LW)e
zlA1i)tyC+~C9BpAi<BdagZT3$my48->F*p5)gTJ&3x*R|?d2}5e6f&NB)|d03a{!O
zOz;Xo#Z+|<#gVIl>y9cH8R*m;LOE$TIVIZ9zyF(OVQGe1h53qB7B8HCbiJ)D;Iqh9
zrMGB8K#DwU4H}E(4hix}$`UV$&okUqaFmag9KX!2_sHzy2Bp(?IRLGMj3gB~CLKJK
zvq}@1Xz1kW;jxp?gv6nkQ9r4R<Z-peoaq&mDq;3w8_u(MJTj^Ld%j$0IDY|#g`~Ja
zD<OGE!6`4<NeniSa%5V6;mF%CQZv95ninWuE>5Rfz($kDj^RYoHo$Kc-LOO`%l=?O
zc_XBMR7X5VXq$}%5{g{Cbsu&Q6vf_{A=ZbeZZ0$V(CXFm4I8Flb2N*(%1`F9O%OGQ
zL}YAf8|i%>x&V><7)(Tge{suZEZeAdJ^RSvdJvvmq8m~8A`V-Bl@lS0h=S+Zj7E(e
z$>TpaUJeC(hvBbVmklfqkQ1=vTOf<OeDV1w$@n@!rj~&x|Ac&RdG+e!{R2Y%s)G3U
zN+^NCy7v|(i|Y>dw&nB+*79sZV3cnYh`i0&YCnCJSCaeY@PY}#@#l5$pSqLm2aw^%
XLe$~S^g=jwH1Ws?CiAx1zdP>2)P)I#

delta 533
zcmV+w0_y$B1j+=EBm!a3ktQI26+{pJeA8mNxFJ$(eS71w(5QpqBsYOQq&+wA(@woI
z%ec>eIvZWCOAe@(>aLLw8^(?f&!AMwYG5fDxrA>18RIW7QmUv)Jf-7mmuJws0OlkO
zb9OSMSj5%{kH07B<Rk~~QYjz|v{myU-dn4&M_(kk&?z+S7S3S<PO4vj`vE=?)40p+
z<|B~V(n>K;Dp2`Jf2zssE3J^`nxs`Foo9P4M#bL3;HB&RhMrO{fOHw&Wy^s~8u<}#
zuQ-e8Q}gU(BR-D3e>d~u_2QvdL^g!yU0+zrGudOal_CN>;gxpLtHj}Gt1~GRy?23s
zZaXye)jr|O2Xup8_&0fffiKM@N#DM%=oO~Lb(v1j2`!vYaNHK*Mhzu+E|>mR-i!Xi
zNP3RB8iedbl7*!3|2<gMvOj(vI96i2jk?|((YHS>R<5Uqtas{{4Nm#5A(>`orwio2
zVJ2ZUwu`+U3;KOCvuG!5alFngLYc=Ir2jy8xHPjN*F=1CLb!&1B$<vg1XT@GPdY_+
zr8E$1F=?@bal2qHlm7Fd4Q1sl2{={lZz;$86pzRz$#QL?9pcfbk~hjbM&u0~9o_lC
zPI;q4w^0@&&+d%5P$1GC!4T1piCNgbK6qJK1hg|Ad#^zG*^zJR+lFdjX*H_Y=79JI
Xll<pQ9$_z183SMl@F}Q4|8|iROmzig

diff --git a/src/css/mk.css b/src/css/mk.css
index 897e623..1180a25 100644
--- a/src/css/mk.css
+++ b/src/css/mk.css
@@ -285,7 +285,7 @@ img {
     :root {
         /* Dark */
         --bg: var(--b03);
-        --fg: var(--b0);
+        --fg: var(--b1);
         --fg0: var(--b00);
         --bg2: var(--b02);
         --fg2: var(--b1);
@@ -302,7 +302,7 @@ img {
 
 #d:checked ~ .main, #d:checked ~ #labels {
     --bg: var(--b03);
-    --fg: var(--b0);
+    --fg: var(--b1);
     --fg0: var(--b00);
     --bg2: var(--b02);
     --fg2: var(--b1);
@@ -476,7 +476,7 @@ code, .main code {
 .org-outshine-level-1, .org-outshine-level-2, .org-outshine-level-3,
 .org-outshine-level-4, .org-outshine-level-5, .org-outshine-level-6,
 .org-outshine-level-7, .org-outshine-level-8, .org-outshine-level-9 {
-    color:var(--fg2);
+    color:var(--fg0);
 }
 
 .org-highlight-numbers-number, .org-highlight-number-number
diff --git a/src/posts/0010-Haskell-Now/index.org b/src/posts/0010-Haskell-Now/index.org
index 47dd8e4..5a44d33 100644
--- a/src/posts/0010-Haskell-Now/index.org
+++ b/src/posts/0010-Haskell-Now/index.org
@@ -179,32 +179,32 @@ The article contains five parts:
 
    {{{lnk(shell.nix)}}}
    #+begin_src nix :tangle shell.nix
-   { nixpkgs ? import (fetchTarball https://github.com/NixOS/nixpkgs/archive/19.09.tar.gz) {} }:
-   let
-     inherit (nixpkgs) pkgs;
-     inherit (pkgs) haskellPackages;
+{ nixpkgs ? import (fetchTarball https://github.com/NixOS/nixpkgs/archive/19.09.tar.gz) {} }:
+let
+  inherit (nixpkgs) pkgs;
+  inherit (pkgs) haskellPackages;
 
-     haskellDeps = ps: with ps; [
-       base
-       protolude
-       containers
-     ];
+  haskellDeps = ps: with ps; [
+    base
+    protolude
+    containers
+  ];
 
-     ghc = haskellPackages.ghcWithPackages haskellDeps;
+  ghc = haskellPackages.ghcWithPackages haskellDeps;
 
-     nixPackages = [
-       ghc
-       pkgs.gdb
-       haskellPackages.cabal-install
-     ];
-   in
-   pkgs.stdenv.mkDerivation {
-     name = "env";
-     buildInputs = nixPackages;
-     shellHook = ''
-        export PS1="\n\[[hs:\033[1;32m\]\W\[\033[0m\]]> "
-     '';
-   }
+  nixPackages = [
+    ghc
+    pkgs.gdb
+    haskellPackages.cabal-install
+  ];
+in
+pkgs.stdenv.mkDerivation {
+  name = "env";
+  buildInputs = nixPackages;
+  shellHook = ''
+     export PS1="\n\[[hs:\033[1;32m\]\W\[\033[0m\]]> "
+  '';
+}
    #+end_src
 
 5. In the =hsenv= directory, in a terminal, run =nix-shell --pure=.
@@ -220,11 +220,11 @@ The article contains five parts:
    something like this:
 
    #+begin_src
-   ~/hsenv> nix-shell
-   [nix-shell:~/hsenv]$ ghci
-   GHCi, version 8.6.5: http://www.haskell.org/ghc/  :? for help
-   Prelude> import Protolude
-   Prelude Protolude>
+~/hsenv> nix-shell
+[nix-shell:~/hsenv]$ ghci
+GHCi, version 8.6.5: http://www.haskell.org/ghc/  :? for help
+Prelude> import Protolude
+Prelude Protolude>
    #+end_src
 
 Congratulations you should be ready to start now.