From 6d61daa8421d8d5abd0279ffcd52dc76f6d8ae50 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Sun, 16 May 2021 03:05:10 +0300 Subject: [PATCH] refactor: some docs, refactor basic template a lil bit --- examples/site.nix | 3 +++ flake.nix | 4 ++++ templaters/basic.nix | 20 +++++++++++++------- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/examples/site.nix b/examples/site.nix index 49b5d9b..dfced44 100644 --- a/examples/site.nix +++ b/examples/site.nix @@ -6,7 +6,10 @@ in htmlNix.mkServeFromSite (htmlNix.mkSiteFrom { inherit src; templater = context: pkgs.lib.pipe context [ + # Add basic template lib.templaters.basic + + # Add about page ({ site, mkPage, ... }@result: { site = site // { "about.html" = with lib.tags; mkPage [ diff --git a/flake.nix b/flake.nix index 97b6805..22f2245 100644 --- a/flake.nix +++ b/flake.nix @@ -10,10 +10,14 @@ utils = import ./utils.nix; lib = { + # Convert Nix expressions to HTML tags = import ./tags.nix { inherit utils; }; + # Convert Nix expressions to CSS css = import ./css.nix { inherit utils; }; + # Various site templaters templaters = { + # Basic templater with purecss, mobile responsive layout and supports posts basic = import ./templaters/basic.nix; }; }; diff --git a/templaters/basic.nix b/templaters/basic.nix index 0399824..e7e6d33 100644 --- a/templaters/basic.nix +++ b/templaters/basic.nix @@ -3,7 +3,11 @@ let inherit (utils) readFile mapAttrsToList tags fetchGit map; inherit (pkgs.lib) flatten optional length; - stylesheets = map tags.mkStylesheet [ "https://unpkg.com/purecss@2.0.6/build/pure-min.css" "https://unpkg.com/purecss@2.0.6/build/grids-responsive-min.css" "mine.css" ]; + stylesheets = map tags.mkStylesheet [ + "https://unpkg.com/purecss@2.0.6/build/pure-min.css" + "https://unpkg.com/purecss@2.0.6/build/grids-responsive-min.css" + "mine.css" + ]; renderPost = name: value: with tags; article [ (a { href = "#${name}"; class = "postheader"; } (h3 { id = name; } ("## " + name))) @@ -37,6 +41,12 @@ let stylesheet = with utils.css; + let + marginMobile = { + margin-left = "3%"; + margin-right = "3%"; + }; + in css [ (css { body = { @@ -71,14 +81,10 @@ let "nav.sidebar" = { position = "relative"; margin-top = "5%"; - margin-left = "3%"; - margin-right = "3%"; - }; + } // marginMobile; "div.content" = { margin-top = 0; - margin-left = "3%"; - margin-right = "3%"; - }; + } // marginMobile; }) ]; in