From 62a9e9a000bd01f1a5b9d336d30a27381f31dbd4 Mon Sep 17 00:00:00 2001 From: Hendrik Kleinwaechter Date: Fri, 7 Jul 2023 13:38:56 +0200 Subject: [PATCH] Style improvements website (#138) * Improve general CSS for website * Update github flow --- .github/workflows/main.yml | 9 ++- book/makefile | 2 - book/style.css | 147 ++++++++++++++++++++----------------- 3 files changed, 87 insertions(+), 71 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 90624a3..f7f29a7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,6 @@ jobs: mv kindlegen /usr/bin cd book make bake - make website - name: Release baked book to S3 uses: shallwefootball/s3-upload-action@master with: @@ -28,7 +27,13 @@ jobs: aws_bucket: ${{ secrets.AWS_BUCKET_BOOK }} source_dir: book/release destination_dir: release - - name: Release website + - name: Bake the website + uses: xu-cheng/texlive-action/full@v1 + with: + run: | + apk add make zip tidyhtml + make website + - name: Release baked website to S3 uses: shallwefootball/s3-upload-action@master with: aws_key_id: ${{ secrets.AWS_KEY_ID }} diff --git a/book/makefile b/book/makefile index e362f4e..f08873f 100644 --- a/book/makefile +++ b/book/makefile @@ -229,8 +229,6 @@ website: mv $(WEBSITE_DIR)/book.html $(WEBSITE_DIR)/index.html sed -r -i -e 's||The Sourdough Framework|g' $(WEBSITE_DIR)/index.html - - # Debug Stuff from now on .PHONY: show_tools_version show_tools_version: # Show version of tools used on the build machine diff --git a/book/style.css b/book/style.css index 5913f21..723f23d 100644 --- a/book/style.css +++ b/book/style.css @@ -1,25 +1,15 @@ -/* -Color scheme -#bab5a9; -#d5e3c6 +@import url('https://fonts.googleapis.com/css2?family=Raleway:wght@400;500;700;900&family=Ubuntu+Mono&display=swap'); - */ - -/* ************** */ -/* *** Fonts *** */ -/* ************** */ - -/* Font size tricks from https://www.madebymike.com.au/writing/precise-control-responsive-typography/ - * The font size will be adjusted to the screen size. - * */ :root{ - font-size: 16px; + --ff-sans: 'Raleway', sans-serif; + --ff-mono: 'Ubuntu Mono', monospace; + --fw-regular: 400; + --fw-medium: 500; + --fw-bold: 700; + --fw-black: 900; + --f-lh: 28px; } -/* the min width is calculated as: - * font-size / ( number of viewport units / 100 ) - * it means 16 / (1.5/100) - */ @media (min-width: 1200px){ :root { font-size: 1.5vw; @@ -39,11 +29,11 @@ Color scheme /* ************** */ body{ - /* max-width:52rem; */ margin:0; padding:0; - /* display:grid; */ - /* grid-auto-rows: auto; */ + font-family: var(--ff-sans); + font-weight: var(--fw-medium); + font-size: 16px; } @media screen and (min-width: 57rem) { @@ -81,7 +71,6 @@ figure pre.listings{font-size: 1em;} .chapterToc, .sectionToc, .subsectionToc{margin:0;padding:0;} nav.TOC{ - padding:0.5rem; font-size:0; /* trick to remove vertical space above TOC entries */ } @@ -92,6 +81,46 @@ nav.TOC span{ display:block; margin-top:0; font-size:0.8rem; + padding:0.5rem; + display: flex; + justify-content: flex-start; +} + +/* HACKZS since table of contents number is not in HTML Tag */ +/* nav.TOC span { + letter-spacing: 10px; +} + +nav.TOC span a { + letter-spacing: normal; + flex-grow: 1; +} + +nav.TOC span.sectionToc { + letter-spacing: normal; +} + +nav.TOC span.sectionToc a { + margin-left: 10px; +} + +nav.TOC span.subsectionToc { + letter-spacing: normal; +} + +nav.TOC span.subsectionToc a { + margin-left: 10px; +} + + +/* END HACKZS */ + +nav.TOC span a { + flex-grow: 1; +} + +nav.TOC span a:only-child { + margin-left: 10px; } nav.TOC a, nav.TOC a:visited{ @@ -103,64 +132,48 @@ nav.TOC a, nav.TOC a:visited{ /* ************** */ -/* body{background-color:#dce8d0;} */ -/* It seems that dark background is better to my eyes */ -body{background-color:#B8CDA3;} +body{ + background-color:#F5F2EF; +} + +a { + color: #5D9FF0; +} main.main-content, div.footnotes, main.titlepage{ background-color:white; } nav.TOC,nav.TOC a, nav.TOC a:visited{ - background-color:#22211f; - color:#cec1aa; + background-color:#F5F2EF; + color:#000000; } nav.TOC span:hover, nav.TOC span:hover *{ - background-color:#66635d; + background-color:#dad5ca; } - - figure.texsource, figure.shellcommand, figure.htmlsource, figure.luasource, figure.textsource{ - border:1px solid #cec1aa; + border:1px solid #cec1aa; background-color:#d5e3c6; } -/* ***************** */ -/* *** Dark mode *** */ -/* ***************** */ - -/* Code from https://ar.al/2021/08/24/implementing-dark-mode-in-a-handful-of-lines-of-css-with-css-filters/ */ - -@media (prefers-color-scheme: dark) { - /* Invert all elements on the body while attempting to not alter the hue substantially. */ - body { - filter: invert(100%) hue-rotate(180deg); - } - - /* Workarounds and optical adjustments. */ - - /* Firefox workaround: Set the background colour for the html - element separately because, unlike other browsers, Firefox - doesn’t apply the filter to the root element’s background. */ - html { - background-color: #111; - } - - /* Do not invert media (revert the invert). */ - img, video, iframe { - filter: invert(100%) hue-rotate(180deg); - } - - - /* Re-enable code block backgrounds. */ - pre { - filter: invert(6%); - } - - /* Improve contrast on list item markers. */ - li::marker { - color: #666; - } +.main-content { + line-height: var(--f-lh); +} + +div.footnotes { + border: none; +} + +.footnote-mark { + margin-right: 3px; +} + +table.tabular { + width: 100%; +} + +.chapterHead .titlemark { + display: block; }