diff --git a/mkrss.sh b/mkrss.sh index 0300467..865b17c 100755 --- a/mkrss.sh +++ b/mkrss.sh @@ -50,6 +50,9 @@ tmpdir=$(mktemp -d) typeset -a dates dates=( ) for fic in $postsdir/**/*.html; do + if echo $fic|egrep -- '-(mk|min|sci|modern).html$'>/dev/null; then + continue + fi postfile="$(echo "$fic"|sed 's#^'$postsdir'/##')" blogfile="$(echo "$fic"|sed 's#^'$webdir'/##')" printf "%-30s" $postfile diff --git a/optim-html.sh b/optim-html.sh new file mode 100755 index 0000000..b689a78 --- /dev/null +++ b/optim-html.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i zsh +#!nix-shell -I nixpkgs="https://github.com/NixOS/nixpkgs/archive/19.09.tar.gz" + +webdir="_site" + +debug () { + print -- $* >/dev/null +} + +type -a filelist +setopt extendedglob +if (($#>0)); then + filelist=( $* ) +else + filelist=( $webdir/**/*.html(.) ) +fi + +tmp=$(mktemp) + +for fic in $filelist; do + if echo $fic|egrep -- '-(mk|min|sci|modern).html$'>/dev/null; then + continue + fi + print -n -- "$fic " + cp $fic $tmp; minify --mime text/html $tmp > $fic + print "[OK]" +done diff --git a/project.el b/project.el index 2c189e5..05ddcfa 100644 --- a/project.el +++ b/project.el @@ -154,12 +154,14 @@ "#+AUTHOR: " author-name "\n" "#+EMAIL: " author-email "\n" "#+DESCRIPTION: " descr "\n" - "@@html:" + "" + "@@html:@@" + "\n\n" (mapconcat (lambda (li) (format "%s" (car li))) (seq-filter #'car (cdr list)) "\n"))) diff --git a/project.el.sig b/project.el.sig index f7513b0..7cc0736 100644 Binary files a/project.el.sig and b/project.el.sig differ diff --git a/src/about-me.org b/src/about-me.org index 336401a..6ce3f10 100644 --- a/src/about-me.org +++ b/src/about-me.org @@ -8,6 +8,13 @@ #+OPTIONS: H:5 auto-id:t #+STARTUP: showeverything +@@html:@@ + #+INCLUDE: ../logo-svg.org #+begin_notes diff --git a/src/css/min.css b/src/css/min.css index f16a21b..0035c8d 100644 --- a/src/css/min.css +++ b/src/css/min.css @@ -238,6 +238,9 @@ figure, .figure { #h { float: left; } +.main { + padding-top: 1em; +} #labels { width: 100%; text-align: right; @@ -495,7 +498,6 @@ figure, .figure { body,.main { background: var(--bg); color: var(--fg); - min-height: 100vh; } ::selection, .main ::selection, ::-moz-selection, .main ::-moz-selection { diff --git a/src/css/mk.css b/src/css/mk.css index fb511fe..daa4d03 100644 --- a/src/css/mk.css +++ b/src/css/mk.css @@ -282,10 +282,12 @@ figure, .figure { #h { float: left; } +.main { + padding-top: 1em; +} #labels { width: 100%; text-align: right; - margin-bottom: 1em; } #labels label { text-decoration: underline; diff --git a/src/index.org b/src/index.org index 345d57e..e0eae29 100644 --- a/src/index.org +++ b/src/index.org @@ -8,12 +8,12 @@ #+OPTIONS: H:5 #+STARTUP: showeverything -@@html: +@@html:@@ #+INCLUDE: ../logo-svg.org diff --git a/src/posts/new-blog.org b/src/posts/new-blog.org index d5c85cf..403a2a7 100644 --- a/src/posts/new-blog.org +++ b/src/posts/new-blog.org @@ -354,7 +354,7 @@ date, etc... (defun menu (lst) "Blog menu" (concat - "" + "")) (defun get-from-info (info k) (let ((i (car (plist-get info k)))) @@ -570,7 +570,7 @@ Here is the full code: (defun menu (lst) "Blog menu" (concat - "" + "")) (defun get-from-info (info k) (let ((i (car (plist-get info k)))) diff --git a/src/slides.org b/src/slides.org index 7fee4bc..4573e22 100644 --- a/src/slides.org +++ b/src/slides.org @@ -8,6 +8,13 @@ #+OPTIONS: H:5 #+STARTUP: showeverything +@@html:@@ + * English - [2018-10-25 Thu] [[file:slides/git-project-manager.org][Git Project Manager]] is a talk I made for the "Commission Open Source" diff --git a/update-file-size.sh b/update-file-size.sh index e1cdc83..65171a2 100755 --- a/update-file-size.sh +++ b/update-file-size.sh @@ -57,6 +57,6 @@ for fic in $filelist; do total=$(( htmlsize + imgsize + csssize )) sizeinfos=$(print -- "Size: $(toh $total) (HTML: $(toh $htmlsize), CSS: $(toh $csssize), IMG: $(toh $imgsize))") print -- $sizeinfos - perl -pi -e 's#(
)[^<]*(
)#$1'"$sizeinfos"'$2#' $fic + perl -pi -e 's#(
)[^<]*(
)#$1'"$sizeinfos"'$2#' $fic done rm -rf $tmpdir