From a97b4cf58496ddb9889329c2dd9807a5e6957d6a Mon Sep 17 00:00:00 2001 From: flupe Date: Thu, 11 Nov 2021 00:30:10 +0100 Subject: [PATCH] added draft on intersection observer --- content/assets/theme.css | 23 +++++++++++++++---- .../achille/pages/4-examples.markdown | 9 ++++---- content/quid.rst | 2 +- src/Main.hs | 5 ++-- src/Posts.hs | 5 ++-- src/Projects.hs | 9 ++++---- src/Templates.hs | 2 +- 7 files changed, 36 insertions(+), 19 deletions(-) diff --git a/content/assets/theme.css b/content/assets/theme.css index b807e22..5360b7c 100644 --- a/content/assets/theme.css +++ b/content/assets/theme.css @@ -70,6 +70,9 @@ main ::selection { font-weight: 400; } +section.footnotes { + margin-top: 3em; +} a.footnote-ref sup::before { content: '[' } a.footnote-ref sup::after { content: ']' } @@ -91,7 +94,7 @@ a { color: inherit; font-weight: 400; text-decoration: none; - box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + box-shadow: 0 1px 0 #999; } /* a:hover {text-decoration: underline} */ @@ -195,7 +198,7 @@ main header {margin: 0 0 2em} main ul li { padding: 0 0 0 0 } main ul { padding: 0 0 0 1.5em } -main ul.projects a { text-decoration: none } +main ul.projects a { text-decoration: none; box-shadow: none } main ul.projects { padding: 0; @@ -249,7 +252,7 @@ header.project ul li { main blockquote { border-left: 2px solid var(--darker); - margin: 1em 0; + margin: 1.5em 0; padding: 0 1em; opacity: 0.8; line-height: 1.5; @@ -268,24 +271,34 @@ dt {text-align: right; font-weight: 500;} dd {margin:0} dd p {margin:0} -code, pre.Agda {font: 1em "Source Code Pro", monospace} +code, pre.Agda {font: 1em monospace} pre.Agda a {font-weight: inherit; text-decoration: none} pre.Agda a[href]:hover { box-shadow: 0 2px 0 var(--yellow) } code { display: inline-block; padding: 0 .3em; + background: var(--dark); } pre > code {display: block} -pre { +pre, div.sourceCode { margin:1.5em 0; padding: .8em 0; line-height: 1; overflow: auto; } +div.sourceCode { + background: var(--dark); +} + +div.sourceCode > pre { + margin: 0; + padding: 0; +} + pre.Agda { margin: 1.5em 0; padding: .8em 1em; diff --git a/content/projects/achille/pages/4-examples.markdown b/content/projects/achille/pages/4-examples.markdown index fe3c141..87e5da2 100644 --- a/content/projects/achille/pages/4-examples.markdown +++ b/content/projects/achille/pages/4-examples.markdown @@ -4,9 +4,10 @@ title: Examples ## Achille in the wild -**achille** is very new and has not been advertised much. +**achille** is very new, obscure and ill-documented. Therefore there are currently few concrete examples to show how people use it. +I pretty much am the only user. -Using **achille** on your own site? Make a PR to add it to the list! - -- https://acatalepsie.fr ([source](https://github.com/flupe/site)) +- [acatalepsie.fr](https://acatalepsie.fr) ([source](https://github.com/flupe/site)) +- [sbi.re](https://sbi.re) +- [lucas.escot.me](https://lucas.escot.me) diff --git a/content/quid.rst b/content/quid.rst index 7cf92ef..e48d1f0 100644 --- a/content/quid.rst +++ b/content/quid.rst @@ -7,7 +7,7 @@ otherwise. In other words, you are free to copy, redistribute and edit this content, provided you: give appropriate credit; indicate where changes were made and do not do so for commercial purposes. -This website is hosted on a 2014 RPi Model B+ somewhere in France. +This website is self-hosted on a server somewhere in Lyon, France. The domain name `acatalepsie.fr `_ has been registered at `gandi.net `_. diff --git a/src/Main.hs b/src/Main.hs index 6a918dc..79aa8ab 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -47,7 +47,7 @@ main = customExecParser p opts >>= \case desc = "acatalepsie & co" -build :: ShowDrafts -> Task IO String +build :: ShowDrafts -> Task IO () build showDrafts = do -- static assets match_ "assets/*" copyFile @@ -63,4 +63,5 @@ build showDrafts = do lastImages <- Visual.build Projects.build Posts.build showDrafts lastImages - Readings.build + -- Readings.build + return () diff --git a/src/Posts.hs b/src/Posts.hs index b2c8340..1c83c06 100644 --- a/src/Posts.hs +++ b/src/Posts.hs @@ -6,8 +6,9 @@ import Data.Time (UTCTime, defaultTimeLocale) import Data.Time.Clock (getCurrentTime) import Data.Time.Format (rfc822DateFormat, formatTime) import Data.List (isPrefixOf) +import Data.Foldable (for_) import GHC.Generics -import Lucid +import Lucid hiding (for_) import Text.Atom.Feed as Atom import Text.Feed.Types (Feed(..)) @@ -141,7 +142,7 @@ renderIndex imgs posts content = toHtmlRaw content section_ [class_ "visual tiny"] $ - forM_ imgs \Image{..} -> + for_ imgs \Image{..} -> figure_ $ a_ [href_ $ fromString imgPath] $ img_ [ src_ (fromString imgThumbPath) , width_ (fromString $ show imgThumbWidth) diff --git a/src/Projects.hs b/src/Projects.hs index b0a3e9d..006668e 100644 --- a/src/Projects.hs +++ b/src/Projects.hs @@ -1,8 +1,9 @@ module Projects (build) where import Lucid -import Data.Char (digitToInt) +import Data.Char (digitToInt, isDigit) import qualified Data.Map.Strict as Map +import Control.Monad (unless) import Common import Route @@ -10,7 +11,7 @@ import Types import Config import Templates -data Project = Project +data Project = Project { title :: Text , subtitle :: Text , year :: Text @@ -73,7 +74,7 @@ renderProject Project{..} children content = a_ [href_ $ "https://github.com/" <> v] $ toHtml v else toHtml v - when (length children > 0) $ + unless (null children) $ ol_ [class_ "pages"] $ forM_ children \(title, path) -> li_ $ a_ [href_ (fromString path)] (toHtml title) toHtmlRaw content @@ -98,7 +99,7 @@ getKey :: String -> (Int, String) getKey xs = getKey' 0 xs where getKey' :: Int -> String -> (Int, String) - getKey' k (x : xs) | x >= '0' && x <= '9' = + getKey' k (x : xs) | isDigit x = getKey' (k * 10 + digitToInt x) xs getKey' k ('-' : xs) = (k, xs) getKey' k xs = (k, xs) diff --git a/src/Templates.hs b/src/Templates.hs index bc9914b..91a9257 100644 --- a/src/Templates.hs +++ b/src/Templates.hs @@ -75,7 +75,7 @@ outerWith SiteConfig{title,route,..} content = doctypehtml_ do section_ $ nav_ do a_ [ href_ "/projects.html" ] "Projects" a_ [ href_ "/visual.html" ] "Visual" - a_ [ href_ "/readings.html" ] "Readings" + -- a_ [ href_ "/readings.html" ] "Readings" a_ [ href_ "/quid.html" ] "Quid" breadcrumb route