From 05f6e1e022e69bf04b316b090f7b8d6e81add671 Mon Sep 17 00:00:00 2001 From: Magic_RB Date: Wed, 31 Mar 2021 12:46:21 +0200 Subject: [PATCH] Update templates, add homepage and navbar Signed-off-by: Magic_RB --- .gitignore | 5 + assets/css/style.css | 55 ++++ assets/icons/nix-flake.svg | 89 ++++++ assets/icons/nix-ng.svg | 557 +++++++++++++++++++++++++++++++++++++ home/index.org | 0 make.el | 49 ++-- templates/blog.html | 1 + templates/head.html | 2 +- templates/index.html | 38 ++- templates/navbar.html | 20 ++ 10 files changed, 792 insertions(+), 24 deletions(-) create mode 100644 assets/icons/nix-flake.svg create mode 100644 assets/icons/nix-ng.svg create mode 100644 home/index.org create mode 100644 templates/navbar.html diff --git a/.gitignore b/.gitignore index 01a4042..cdd2b1b 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,8 @@ flycheck_*.el # network security /network-security.data + +### + +public_html/ +*/sitemap.inc diff --git a/assets/css/style.css b/assets/css/style.css index 4525ed8..1a55dd1 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -46,6 +46,8 @@ pre { display: block; padding: 0.5rem; font-family: "Ubuntu Mono"; + + overflow-x: auto; } #table-of-contents { @@ -89,3 +91,56 @@ pre { flex-basis: 10%; } } + +.card-toplevel { + display: flex; + flex-direction: column; +} + +.card-link { + text-decoration: none; + margin: 1rem 0 1rem 0; +} + +.card-separator { + width: 0.1rem; + background-color: black; + margin: 0 1rem 0 0; +} + +.card-entry { + display: flex; + flex-direction: row; + padding: 1.0rem 1.0rem 1.0rem 1.0rem; + + border-radius: 0.5rem; + border: 0.1rem solid black; + box-shadow: 0rem 0.1875rem 0.1875rem 0.0625rem rgba(0, 0, 0, 0.25); +} + +.card-icon { + max-width: 10rem; + margin: 0 1rem 0 0; +} + +.card-body { + color: black; +} + +.card-heading { + +} + +.card-content { + +} + +#navbar-toplevel { + display: flex; + flex-direction: row; + justify-content: space-around; +} + +.navbar-item { + padding: 1rem 0rem 1rem 0rem; +} diff --git a/assets/icons/nix-flake.svg b/assets/icons/nix-flake.svg new file mode 100644 index 0000000..a40c4f7 --- /dev/null +++ b/assets/icons/nix-flake.svg @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/icons/nix-ng.svg b/assets/icons/nix-ng.svg new file mode 100644 index 0000000..e5b9fab --- /dev/null +++ b/assets/icons/nix-ng.svg @@ -0,0 +1,557 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + NG + + diff --git a/home/index.org b/home/index.org new file mode 100644 index 0000000..e69de29 diff --git a/make.el b/make.el index a3010ee..6f29cd7 100644 --- a/make.el +++ b/make.el @@ -32,17 +32,16 @@ (defvar org-publish-project-alist) (setq org-publish-project-alist - `(("blog-org" - :base-directory ,(expand-file-name "blog/") + `(("blog-content" + :base-directory ,(expand-file-name "./blog/") :base-extension "org" - :publishing-directory ,(expand-file-name "public_html/") + :publishing-directory ,(expand-file-name "./public_html/blog") :recursive t :section-numbers nil :with-toc nil :with-date nil - :html-template ,(templated-html-load-template "templates/blog.html") + :html-template ,(templated-html-load-template "./templates/blog.html") :publishing-function org-html-publish-to-templated-html - ;; :htmlized-source t :headline-levels 5 :exclude "^\\(index.org\\|*.inc\\)" :auto-preamble t @@ -52,29 +51,41 @@ :sitemap-title "Magic_RB's blog" :sitemap-filename "sitemap.inc" :sitemap-sort-files anti-chronologically) - ("blog-assets" - :base-directory ,(expand-file-name "assets/") - :publishing-directory ,(expand-file-name "public_html/") - :recursive t - :base-extension "\\(ttf\\|jpg\\|gif\\|png\\|css\\|js\\|el\\|nb\\|ipynb\\|pdf\\|xml\\)" - :publishing-function org-publish-attachment) - ("homepage" - :base-directory ,(expand-file-name "./blog") - :root-directory ,(expand-file-name "./") + ("blog-index" + :base-directory ,(expand-file-name "./blog/") + :root-directory ,(expand-file-name "./blog/") :recursive t :base-extension "org" + :exclude "^.*$" :include ("index.org") - :exclude ,(regexp-opt '("blog" "assets" "org-thtml")) - :publishing-directory ,(expand-file-name "public_html/") + :publishing-directory ,(expand-file-name "./public_html/blog/") :section-numbers nil :with-toc nil :with-date nil - :html-template ,(templated-html-load-template "templates/index.html") + :html-template ,(templated-html-load-template "./templates/blog.html") :publishing-function org-html-publish-to-templated-html) ("blog" - :components ("blog-org" "blog-assets" "homepage")))) + :components ("blog-content" "blog-index")) + ("homepage" + :base-directory ,(expand-file-name "./home") + :recursive nil + :base-extension "org" + :exclude "^.*$" + :include ("index.org") + :with-toc nil + :publishing-directory ,(expand-file-name "./public_html/") + :html-template ,(templated-html-load-template "./templates/index.html") + :publishing-function org-html-publish-to-templated-html) + ("assets" + :base-directory ,(expand-file-name "./assets/") + :publishing-directory ,(expand-file-name "./public_html/") + :recursive t + :base-extension "\\(ttf\\|svg\\|jpg\\|gif\\|png\\|css\\|js\\|el\\|nb\\|ipynb\\|pdf\\|xml\\)" + :publishing-function org-publish-attachment) + ("publish" + :components ("blog" "assets" "homepage")))) -(org-publish "blog" t) +(org-publish "publish" t) (provide 'make) ;;; make.el ends here diff --git a/templates/blog.html b/templates/blog.html index f2f9819..6431bf7 100644 --- a/templates/blog.html +++ b/templates/blog.html @@ -5,6 +5,7 @@
{{org-html-toc 2 info}}
+ {{:include "navbar.html"}} {{:if with-title}}

{{title}}

{{:endif}} {{:if date}}
Published on {{format-time-string "%b %d, %Y" date}}
{{:endif}} {{contents}} diff --git a/templates/head.html b/templates/head.html index 3dc882b..60c0af8 100644 --- a/templates/head.html +++ b/templates/head.html @@ -1,5 +1,5 @@ {{title}} - + diff --git a/templates/index.html b/templates/index.html index f2f9819..1f219c1 100644 --- a/templates/index.html +++ b/templates/index.html @@ -3,11 +3,41 @@ {{:include "head.html"}} diff --git a/templates/navbar.html b/templates/navbar.html new file mode 100644 index 0000000..5e279d4 --- /dev/null +++ b/templates/navbar.html @@ -0,0 +1,20 @@ +