From 0c213684ead5d3c4a14a17d2e06a6a31188b6a55 Mon Sep 17 00:00:00 2001 From: Jieiku Date: Tue, 31 May 2022 02:54:13 -0700 Subject: Add UglyUrls for Local Build, Restructure SCSS --- README.md | 4 +-- config.toml | 4 ++- sass/_imports.scss | 24 ++++++++++++---- sass/_variables.scss | 14 ++++++++++ sass/abridge-blue.scss | 62 +++++++++++++++++++++++++++++------------- sass/abridge-bluelight.scss | 41 ++++++++++++++++------------ sass/abridge-bluenight.scss | 41 ++++++++++++++++------------ sass/abridge-dark.scss | 41 ++++++++++++++++------------ sass/abridge-light.scss | 41 ++++++++++++++++------------ sass/abridge.scss | 60 +++++++++++++++++++++++++++------------- sass/skins/_abridge-auto.scss | 40 --------------------------- sass/skins/_abridge-dark.scss | 25 ----------------- sass/skins/_abridge-light.scss | 25 ----------------- sass/skins/_abridge_fonts.scss | 19 ------------- sass/skins/_blue-auto.scss | 42 ---------------------------- sass/skins/_blue-dark.scss | 25 ----------------- sass/skins/_blue-light.scss | 25 ----------------- templates/404.html | 2 +- templates/base.html | 11 ++++---- templates/index.html | 2 +- templates/macros/macros.html | 20 +++++++------- templates/macros/page.html | 2 +- 22 files changed, 237 insertions(+), 333 deletions(-) delete mode 100644 sass/skins/_abridge-auto.scss delete mode 100644 sass/skins/_abridge-dark.scss delete mode 100644 sass/skins/_abridge-light.scss delete mode 100644 sass/skins/_abridge_fonts.scss delete mode 100644 sass/skins/_blue-auto.scss delete mode 100644 sass/skins/_blue-dark.scss delete mode 100644 sass/skins/_blue-light.scss diff --git a/README.md b/README.md index 867bd7b..9574e44 100644 --- a/README.md +++ b/README.md @@ -133,9 +133,9 @@ Abridge comes with two "Skins" each with their own auto, dark, and light modes. Auto mode automatically displays a dark or light version depending on browser/OS settings. The skin used on [the Demo](https://abridge.netlify.app/) uses primarily orange colors. -It is defined here: `/themes/abridge/sass/abridge.scss` and imports: `/themes/abridge/sass/skins/_abridge-auto.scss` +It is defined here: `/themes/abridge/sass/abridge.scss` -There is also other variations, that you will see defined in these same directories. +There is also other variations, that you will see defined in this same directory. To change colors or fonts all you need to do is edit these files or duplicate them and create your own skin. Then in the root of your site type `zola build` which will regenerate your site, this is similar to what zola serve does, except it does not facilitate serving the site. diff --git a/config.toml b/config.toml index f35f60c..3103346 100644 --- a/config.toml +++ b/config.toml @@ -1,4 +1,5 @@ -base_url = "https://abridge.netlify.app" # do NOT include a trailing slash on the base URL +base_url = "https://abridge.netlify.app" # do NOT include a trailing slash on the base URL for web urls +#base_url = "/home/jieiku/.dev/abridge/public/" # used for locally usable build directly from disk, also set below extra.uglyurls = true title = "Abridge" description = "Abridge is a fast and lightweight Zola theme using semantic html, abridge.css class-light CSS, and No JS." default_language = "en" @@ -35,6 +36,7 @@ external_links_no_referrer = false # rel="noreferrer" smart_punctuation = false # `...` to `…`, `"quote"` to `“curly”` etc [extra] +uglyurls = false # if set to true then links are generated with the full path. eg https://abridge.netlify.app/index.html language_code = "en-US" title_separator = "|" # Separator between title and title_addition, set as |, -, _, etc # To disable title_addition but keep built in page additions eg, Posts page: "Posts | Abridge" set title_addition to an empty string diff --git a/sass/_imports.scss b/sass/_imports.scss index 579081d..eee4a91 100644 --- a/sass/_imports.scss +++ b/sass/_imports.scss @@ -1,3 +1,17 @@ +/* + * Forked from Bamboo: https://github.com/rilwis/bamboo (MIT) + * which was forked from new.css (MIT) + * Supplemented code from Pico.css: https://github.com/picocss/pico (MIT) + * Supplemented code from Basic.css: https://github.com/vladocar/Basic.css (MIT) + * Supplemented code from AttriCSS: https://github.com/raj457036/attriCSS (MIT) + * Feather Icons: https://github.com/feathericons/feather (MIT) + * Tabler Icons: https://github.com/tabler/tabler-icons/find/master (MIT) + * + * Bamboo, New, Pico: based on Normalize.css & Sanitize.css + * Normalize: https://github.com/necolas/normalize.css (MIT) + * Sanitize: https://github.com/csstools/sanitize.css (CC0 1.0 Universal) + */ + // Config @import "variables"; @@ -12,14 +26,14 @@ @import "include/code"; // pre, code, ... @import "include/hr"; // hr -@import "include/search"; // Zola Search - elasticlunr site-wide search - -@import "include/toc"; // Zola TOC - Table of Content Menu (recent posts & index), sticky (floats top right) - @import "include/scroller"; // figure @import "include/button"; // button, a[role=button], type=button, type=submit ... @import "include/form"; // input, select, textarea, label, fieldset, legend (If you import this, you should also import button) +@import "include/grid"; // section infinite grid -- test/rework this similar to hnav and milligram in that it should collapse to a single column as the page becomes narrow + +@import "include/search"; // Zola Search - elasticlunr site-wide search +@import "include/toc"; // Zola TOC - Table of Content Menu (recent posts & index), sticky (floats top right) @import "include/icons"; // svg icons -@import "include/grid"; // section infinite grid -- test/rework this similar to hnav and milligram in that it should collapse to a single column as the page becomes narrow + //@import "include/misc"; // template, [hidden], dialog, canvas diff --git a/sass/_variables.scss b/sass/_variables.scss index 409c2f0..0f65c61 100644 --- a/sass/_variables.scss +++ b/sass/_variables.scss @@ -1,3 +1,17 @@ +/* + * Forked from Bamboo: https://github.com/rilwis/bamboo (MIT) + * which was forked from new.css (MIT) + * Supplemented code from Pico.css: https://github.com/picocss/pico (MIT) + * Supplemented code from Basic.css: https://github.com/vladocar/Basic.css (MIT) + * Supplemented code from AttriCSS: https://github.com/raj457036/attriCSS (MIT) + * Feather Icons: https://github.com/feathericons/feather (MIT) + * Tabler Icons: https://github.com/tabler/tabler-icons/find/master (MIT) + * + * Bamboo, New, Pico: based on Normalize.css & Sanitize.css + * Normalize: https://github.com/necolas/normalize.css (MIT) + * Sanitize: https://github.com/csstools/sanitize.css (CC0 1.0 Universal) + */ + // Config // –––––––––––––––––––– diff --git a/sass/abridge-blue.scss b/sass/abridge-blue.scss index ea2ed2a..3c2dd78 100644 --- a/sass/abridge-blue.scss +++ b/sass/abridge-blue.scss @@ -1,20 +1,44 @@ -/* - * Forked from Bamboo: https://github.com/rilwis/bamboo (MIT) - * which was forked from new.css (MIT) - * Supplemented code from Pico.css: https://github.com/picocss/pico (MIT) - * Supplemented code from Basic.css: https://github.com/vladocar/Basic.css (MIT) - * Supplemented code from AttriCSS: https://github.com/raj457036/attriCSS (MIT) - * Feather Icons: https://github.com/feathericons/feather (MIT) - * Tabler Icons: https://github.com/tabler/tabler-icons/find/master (MIT) - * - * Bamboo, New, Pico: based on Normalize.css & Sanitize.css - * Normalize: https://github.com/necolas/normalize.css (MIT) - * Sanitize: https://github.com/csstools/sanitize.css (CC0 1.0 Universal) - */ - -@import "variables"; //config - -@import "skins/blue-auto"; // Blue Automatic Dark/Light Theme based on browser/system preference -@import "skins/abridge_fonts.scss"; // Local Fonts - +@import "variables"; // config @import "imports"; // html + +//@import "fonts/Arimo"; +//@import "fonts/Lato"; +@import "fonts/Roboto"; +//@import "fonts/FiraCode"; // Monospaced + +:root { + --ff: "Roboto", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Noto Sans", Helvetica, Arial, sans-serif; + --fm: ui-monospace, Menlo, Monaco, Consolas, "SF Mono", "Cascadia Mono", "Segoe UI Mono", "DejaVu Sans Mono", "Liberation Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Ubuntu Mono", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New", Courier, monospace; + + --f1: #111; // Primary Font color + --f2: #222; // Headers Font color + + --c1: #fafafa; // Primary Background Color + --c2: #def; // Secondary Background Color + --c3: #137; // Table Rows, Block quote edge, Borders + --c4: #013; // Disabled Buttons, Borders, mark background + + --a1: #06e; // accent color 1 links + --a2: #09f; // accent color 2 hover,focus + --a3: #07f; // accent color 3 h1-h2 hover,focus + + --cg: #483; // ins green, success + --cr: #c22; // del red, errors +} +@media (prefers-color-scheme: dark) { + :root { + --f1: #ccc; // Primary Font color + --f2: #ddd; // Headers Font color + + --c1: #111; // Primary Background Color + --c2: #123; // Secondary Background Color + --c3: #345; // Table Rows, Block quote edge, Borders + --c4: #789; // Disabled Buttons, Borders, mark background + + --a1: #09f; // accent color 1 links + --a2: #0bf; // accent color 2 hover,focus + --a3: #0af; // accent color 3 h1-h2 hover,focus + + --cr: #e33; // del red, errors + } +} diff --git a/sass/abridge-bluelight.scss b/sass/abridge-bluelight.scss index 6730b11..f076cec 100644 --- a/sass/abridge-bluelight.scss +++ b/sass/abridge-bluelight.scss @@ -1,20 +1,27 @@ -/* - * Forked from Bamboo: https://github.com/rilwis/bamboo (MIT) - * which was forked from new.css (MIT) - * Supplemented code from Pico.css: https://github.com/picocss/pico (MIT) - * Supplemented code from Basic.css: https://github.com/vladocar/Basic.css (MIT) - * Supplemented code from AttriCSS: https://github.com/raj457036/attriCSS (MIT) - * Feather Icons: https://github.com/feathericons/feather (MIT) - * Tabler Icons: https://github.com/tabler/tabler-icons/find/master (MIT) - * - * Bamboo, New, Pico: based on Normalize.css & Sanitize.css - * Normalize: https://github.com/necolas/normalize.css (MIT) - * Sanitize: https://github.com/csstools/sanitize.css (CC0 1.0 Universal) - */ +@import "variables"; // config +@import "imports"; // html -@import "variables"; //config +//@import "fonts/Arimo"; +//@import "fonts/Lato"; +@import "fonts/Roboto"; +//@import "fonts/FiraCode"; // Monospaced -@import "skins/blue-light"; // Blue Light Theme -@import "skins/abridge_fonts.scss"; // Local Fonts +:root { + --ff: "Roboto", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Noto Sans", Helvetica, Arial, sans-serif; + --fm: ui-monospace, Menlo, Monaco, Consolas, "SF Mono", "Cascadia Mono", "Segoe UI Mono", "DejaVu Sans Mono", "Liberation Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Ubuntu Mono", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New", Courier, monospace; -@import "imports"; // html + --f1: #111; // Primary Font color + --f2: #222; // Headers Font color + + --c1: #fafafa; // Primary Background Color + --c2: #def; // Secondary Background Color + --c3: #137; // Table Rows, Block quote edge, Borders + --c4: #013; // Disabled Buttons, Borders, mark background + + --a1: #06e; // accent color 1 links + --a2: #09f; // accent color 2 hover,focus + --a3: #07f; // accent color 3 h1-h2 hover,focus + + --cg: #483; // ins green, success + --cr: #c22; // del red, errors +} diff --git a/sass/abridge-bluenight.scss b/sass/abridge-bluenight.scss index 0b2f680..626a8bf 100644 --- a/sass/abridge-bluenight.scss +++ b/sass/abridge-bluenight.scss @@ -1,20 +1,27 @@ -/* - * Forked from Bamboo: https://github.com/rilwis/bamboo (MIT) - * which was forked from new.css (MIT) - * Supplemented code from Pico.css: https://github.com/picocss/pico (MIT) - * Supplemented code from Basic.css: https://github.com/vladocar/Basic.css (MIT) - * Supplemented code from AttriCSS: https://github.com/raj457036/attriCSS (MIT) - * Feather Icons: https://github.com/feathericons/feather (MIT) - * Tabler Icons: https://github.com/tabler/tabler-icons/find/master (MIT) - * - * Bamboo, New, Pico: based on Normalize.css & Sanitize.css - * Normalize: https://github.com/necolas/normalize.css (MIT) - * Sanitize: https://github.com/csstools/sanitize.css (CC0 1.0 Universal) - */ +@import "variables"; // config +@import "imports"; // html -@import "variables"; //config +//@import "fonts/Arimo"; +//@import "fonts/Lato"; +@import "fonts/Roboto"; +//@import "fonts/FiraCode"; // Monospaced -@import "skins/blue-dark"; // Blue Dark Theme -@import "skins/abridge_fonts.scss"; // Local Fonts +:root { + --ff: "Roboto", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Noto Sans", Helvetica, Arial, sans-serif; + --fm: ui-monospace, Menlo, Monaco, Consolas, "SF Mono", "Cascadia Mono", "Segoe UI Mono", "DejaVu Sans Mono", "Liberation Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Ubuntu Mono", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New", Courier, monospace; -@import "imports"; // html + --f1: #ccc; // Primary Font color + --f2: #ddd; // Headers Font color + + --c1: #111; // Primary Background Color + --c2: #123; // Secondary Background Color + --c3: #345; // Table Rows, Block quote edge, Borders + --c4: #789; // Disabled Buttons, Borders, mark background + + --a1: #09f; // accent color 1 links + --a2: #0bf; // accent color 2 hover,focus + --a3: #0af; // accent color 3 h1-h2 hover,focus + + --cg: #483; // ins green, success + --cr: #e33; // del red, errors +} diff --git a/sass/abridge-dark.scss b/sass/abridge-dark.scss index 961e7ac..f7f7b67 100644 --- a/sass/abridge-dark.scss +++ b/sass/abridge-dark.scss @@ -1,20 +1,27 @@ -/* - * Forked from Bamboo: https://github.com/rilwis/bamboo (MIT) - * which was forked from new.css (MIT) - * Supplemented code from Pico.css: https://github.com/picocss/pico (MIT) - * Supplemented code from Basic.css: https://github.com/vladocar/Basic.css (MIT) - * Supplemented code from AttriCSS: https://github.com/raj457036/attriCSS (MIT) - * Feather Icons: https://github.com/feathericons/feather (MIT) - * Tabler Icons: https://github.com/tabler/tabler-icons/find/master (MIT) - * - * Bamboo, New, Pico: based on Normalize.css & Sanitize.css - * Normalize: https://github.com/necolas/normalize.css (MIT) - * Sanitize: https://github.com/csstools/sanitize.css (CC0 1.0 Universal) - */ +@import "variables"; // config +@import "imports"; // html -@import "variables"; //config +//@import "fonts/Arimo"; +//@import "fonts/Lato"; +@import "fonts/Roboto"; +//@import "fonts/FiraCode"; // Monospaced -@import "skins/abridge-dark"; // Dark Theme -@import "skins/abridge_fonts.scss"; // Local Fonts +:root { + --ff: "Roboto", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Noto Sans", Helvetica, Arial, sans-serif; + --fm: ui-monospace, Menlo, Monaco, Consolas, "SF Mono", "Cascadia Mono", "Segoe UI Mono", "DejaVu Sans Mono", "Liberation Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Ubuntu Mono", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New", Courier, monospace; -@import "imports"; // html + --f1: #ccc; // Primary Font color + --f2: #ddd; // Headers Font color + + --c1: #111; // Primary Background Color + --c2: #222; // Secondary Background Color + --c3: #333; // Table Rows, Block quote edge, Borders + --c4: #888; // Disabled Buttons, Borders, mark background + + --a1: #f90; // accent color 1 links + --a2: #fb0; // accent color 2 hover,focus + --a3: #f90; // accent color 3 h1-h2 hover,focus + + --cg: #483; // ins green, success + --cr: #d33; // del red, errors +} diff --git a/sass/abridge-light.scss b/sass/abridge-light.scss index 49a065c..f06d246 100644 --- a/sass/abridge-light.scss +++ b/sass/abridge-light.scss @@ -1,20 +1,27 @@ -/* - * Forked from Bamboo: https://github.com/rilwis/bamboo (MIT) - * which was forked from new.css (MIT) - * Supplemented code from Pico.css: https://github.com/picocss/pico (MIT) - * Supplemented code from Basic.css: https://github.com/vladocar/Basic.css (MIT) - * Supplemented code from AttriCSS: https://github.com/raj457036/attriCSS (MIT) - * Feather Icons: https://github.com/feathericons/feather (MIT) - * Tabler Icons: https://github.com/tabler/tabler-icons/find/master (MIT) - * - * Bamboo, New, Pico: based on Normalize.css & Sanitize.css - * Normalize: https://github.com/necolas/normalize.css (MIT) - * Sanitize: https://github.com/csstools/sanitize.css (CC0 1.0 Universal) - */ +@import "variables"; // config +@import "imports"; // html -@import "variables"; //config +//@import "fonts/Arimo"; +//@import "fonts/Lato"; +@import "fonts/Roboto"; +//@import "fonts/FiraCode"; // Monospaced -@import "skins/abridge-light"; // Light Theme -@import "skins/abridge_fonts.scss"; // Local Fonts +:root { + --ff: "Roboto", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Noto Sans", Helvetica, Arial, sans-serif; + --fm: ui-monospace, Menlo, Monaco, Consolas, "SF Mono", "Cascadia Mono", "Segoe UI Mono", "DejaVu Sans Mono", "Liberation Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Ubuntu Mono", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New", Courier, monospace; -@import "imports"; // html + --f1: #444; // Primary Font color + --f2: #333; // Headers Font color + + --c1: #fff; // Primary Background Color + --c2: #eee; // Secondary Background Color + --c3: #ddd; // Table Rows, Block quote edge, Borders + --c4: #767676; // Disabled Buttons, Borders, mark background + + --a1: #c40; // accent color 1 links + --a2: #e60; // accent color 2 hover,focus + --a3: #e60; // accent color 3 h1-h2 hover,focus + + --cg: #483; // ins green, success + --cr: #d33; // del red, errors +} diff --git a/sass/abridge.scss b/sass/abridge.scss index 8d3aa25..322c16a 100644 --- a/sass/abridge.scss +++ b/sass/abridge.scss @@ -1,20 +1,42 @@ -/* - * Forked from Bamboo: https://github.com/rilwis/bamboo (MIT) - * which was forked from new.css (MIT) - * Supplemented code from Pico.css: https://github.com/picocss/pico (MIT) - * Supplemented code from Basic.css: https://github.com/vladocar/Basic.css (MIT) - * Supplemented code from AttriCSS: https://github.com/raj457036/attriCSS (MIT) - * Feather Icons: https://github.com/feathericons/feather (MIT) - * Tabler Icons: https://github.com/tabler/tabler-icons/find/master (MIT) - * - * Bamboo, New, Pico: based on Normalize.css & Sanitize.css - * Normalize: https://github.com/necolas/normalize.css (MIT) - * Sanitize: https://github.com/csstools/sanitize.css (CC0 1.0 Universal) - */ - -@import "variables"; //config - -@import "skins/abridge-auto"; // Automatic Dark/Light Theme based on browser/system preference -@import "skins/abridge_fonts.scss"; // Local Fonts - +@import "variables"; // config @import "imports"; // html + +//@import "fonts/Arimo"; +//@import "fonts/Lato"; +@import "fonts/Roboto"; +//@import "fonts/FiraCode"; // Monospaced + +:root { + --ff: "Roboto", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Noto Sans", Helvetica, Arial, sans-serif; + --fm: ui-monospace, Menlo, Monaco, Consolas, "SF Mono", "Cascadia Mono", "Segoe UI Mono", "DejaVu Sans Mono", "Liberation Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Ubuntu Mono", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New", Courier, monospace; + + --f1: #444; // Primary Font color + --f2: #333; // Headers Font color + + --c1: #fff; // Primary Background Color + --c2: #eee; // Secondary Background Color + --c3: #ddd; // Table Rows, Block quote edge, Borders + --c4: #767676; // Disabled Buttons, Borders, mark background + + --a1: #c40; // accent color 1 links + --a2: #e60; // accent color 2 hover,focus + --a3: #e60; // accent color 3 h1-h2 hover,focus + + --cg: #483; // ins green, success + --cr: #d33; // del red, errors +} +@media (prefers-color-scheme: dark) { + :root { + --f1: #ccc; // Primary Font color + --f2: #ddd; // Headers Font color + + --c1: #111; // Primary Background Color + --c2: #222; // Secondary Background Color + --c3: #333; // Table Rows, Block quote edge, Borders + --c4: #888; // Disabled Buttons, Borders, mark background + + --a1: #f90; // accent color 1 links + --a2: #fb0; // accent color 2 hover,focus + --a3: #f90; // accent color 3 h1-h2 hover,focus + } +} diff --git a/sass/skins/_abridge-auto.scss b/sass/skins/_abridge-auto.scss deleted file mode 100644 index 43be24d..0000000 --- a/sass/skins/_abridge-auto.scss +++ /dev/null @@ -1,40 +0,0 @@ -:root { - // Regular Fonts used by default: - --ff: "Roboto", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Noto Sans", Helvetica, Arial, sans-serif; - //Good CLS, sorted by Size: Arimo(0.002), Roboto(0.002), Lato(0.002) - - // Monospace Fonts used for code: - --fm: ui-monospace, Menlo, Monaco, Consolas, "SF Mono", "Cascadia Mono", "Segoe UI Mono", "DejaVu Sans Mono", "Liberation Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Ubuntu Mono", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New", Courier, monospace; - // https://qwtel.com/posts/software/the-monospaced-system-ui-css-font-stack/ - - // Colors - --f1: #444; //font color 1 - --f2: #333; //font color 2 - - --c1: #fff; //color 1 - --c2: #eee; //color 2 - --c3: #ddd; //color 3 - --c4: #767676; //color 4 - - --a1: #c40; //accent color 1 link - --a2: #e60; //accent color 2 hover,focus - --a3: #e60; //accent color 3 h1-h2 hover,focus - - --cg: #483; //ins green - --cr: #d33; //del red -} -@media (prefers-color-scheme: dark) { - :root { - --f1: #ccc; //font color 1 - --f2: #ddd; //font color 2 - - --c1: #111; //color 1 - --c2: #222; //color 2 - --c3: #333; //color 3 - --c4: #888; //color 4 - - --a1: #f90; //accent color 1 link - --a2: #fb0; //accent color 2 hover,focus - --a3: #f90; //accent color 3 h1-h2 hover,focus - } -} diff --git a/sass/skins/_abridge-dark.scss b/sass/skins/_abridge-dark.scss deleted file mode 100644 index c1a248e..0000000 --- a/sass/skins/_abridge-dark.scss +++ /dev/null @@ -1,25 +0,0 @@ -:root { - // Regular Fonts used by default: - --ff: "Roboto", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Noto Sans", Helvetica, Arial, sans-serif; - //Good CLS, sorted by Size: Arimo(0.002), Roboto(0.002), Lato(0.002) - - // Monospace Fonts used for code: - --fm: ui-monospace, Menlo, Monaco, Consolas, "SF Mono", "Cascadia Mono", "Segoe UI Mono", "DejaVu Sans Mono", "Liberation Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Ubuntu Mono", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New", Courier, monospace; - // https://qwtel.com/posts/software/the-monospaced-system-ui-css-font-stack/ - - // Colors - --f1: #ccc; //font color 1 - --f2: #ddd; //font color 2 - - --c1: #111; //color 1 - --c2: #222; //color 2 - --c3: #333; //color 3 - --c4: #888; //color 4 - - --a1: #f90; //accent color 1 link - --a2: #fb0; //accent color 2 hover,focus - --a3: #f90; //accent color 3 h1-h2 hover,focus - - --cg: #483; //ins green - --cr: #d33; //del red -} diff --git a/sass/skins/_abridge-light.scss b/sass/skins/_abridge-light.scss deleted file mode 100644 index 1dfff5b..0000000 --- a/sass/skins/_abridge-light.scss +++ /dev/null @@ -1,25 +0,0 @@ -:root { - // Regular Fonts used by default: - --ff: "Roboto", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Noto Sans", Helvetica, Arial, sans-serif; - //Good CLS, sorted by Size: Arimo(0.002), Roboto(0.002), Lato(0.002) - - // Monospace Fonts used for code: - --fm: ui-monospace, Menlo, Monaco, Consolas, "SF Mono", "Cascadia Mono", "Segoe UI Mono", "DejaVu Sans Mono", "Liberation Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Ubuntu Mono", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New", Courier, monospace; - // https://qwtel.com/posts/software/the-monospaced-system-ui-css-font-stack/ - - // Colors - --f1: #444; //font color 1 - --f2: #333; //font color 2 - - --c1: #fff; //color 1 - --c2: #eee; //color 2 - --c3: #ddd; //color 3 - --c4: #767676; //color 4 - - --a1: #c40; //accent color 1 link - --a2: #e60; //accent color 2 hover,focus - --a3: #e60; //accent color 3 h1-h2 hover,focus - - --cg: #483; //ins green - --cr: #d33; //del red -} diff --git a/sass/skins/_abridge_fonts.scss b/sass/skins/_abridge_fonts.scss deleted file mode 100644 index c079490..0000000 --- a/sass/skins/_abridge_fonts.scss +++ /dev/null @@ -1,19 +0,0 @@ -// ## Local Fonts ## -//@import "../fonts/Arimo"; -//@import "../fonts/Bitter"; -//@import "../fonts/DroidSans"; -//@import "../fonts/Jost"; -//@import "../fonts/Lato"; -//@import "../fonts/Montserrat"; -//@import "../fonts/OpenSans"; -//@import "../fonts/OpenSansCondensed"; -//@import "../fonts/PTSans"; -//@import "../fonts/PTSansNarrow"; -@import "../fonts/Roboto"; -//@import "../fonts/RobotoCondensed"; -//@import "../fonts/RobotoSlab"; -//@import "../fonts/SourceSansPro"; -//@import "../fonts/Ubuntu"; - -// ## Local Fonts Monospaced ## -//@import "../fonts/FiraCode"; diff --git a/sass/skins/_blue-auto.scss b/sass/skins/_blue-auto.scss deleted file mode 100644 index bc6041b..0000000 --- a/sass/skins/_blue-auto.scss +++ /dev/null @@ -1,42 +0,0 @@ -:root { - // Regular Fonts used by default: - --ff: "Roboto", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Noto Sans", Helvetica, Arial, sans-serif; - //Good CLS, sorted by Size: Arimo(0.002), Roboto(0.002), Lato(0.002) - - // Monospace Fonts used for code: - --fm: ui-monospace, Menlo, Monaco, Consolas, "SF Mono", "Cascadia Mono", "Segoe UI Mono", "DejaVu Sans Mono", "Liberation Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Ubuntu Mono", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New", Courier, monospace; - // https://qwtel.com/posts/software/the-monospaced-system-ui-css-font-stack/ - - // Colors - --f1: #111; //font color 1 - --f2: #222; //font color 2 - - --c1: #fafafa; //color 1 - --c2: #def; //color 2 - --c3: #137; //color 3 - --c4: #013; //color 4 - - --a1: #06e; //accent color 1 link - --a2: #09f; //accent color 2 hover,focus - --a3: #07f; //accent color 3 h1-h2 hover,focus - - --cg: #483; //ins green - --cr: #c22; //del red -} -@media (prefers-color-scheme: dark) { - :root { - --f1: #ccc; //font color 1 - --f2: #ddd; //font color 2 - - --c1: #111; //color 1 - --c2: #123; //color 2 - --c3: #345; //color 3 - --c4: #789; //color 4 - - --a1: #09f; //accent color 1 link - --a2: #0bf; //accent color 2 hover,focus - --a3: #0af; //accent color 3 h1-h2 hover,focus - - --cr: #e33; //del red - } -} diff --git a/sass/skins/_blue-dark.scss b/sass/skins/_blue-dark.scss deleted file mode 100644 index c753124..0000000 --- a/sass/skins/_blue-dark.scss +++ /dev/null @@ -1,25 +0,0 @@ -:root { - // Regular Fonts used by default: - --ff: "Roboto", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Noto Sans", Helvetica, Arial, sans-serif; - //Good CLS, sorted by Size: Arimo(0.002), Roboto(0.002), Lato(0.002) - - // Monospace Fonts used for code: - --fm: ui-monospace, Menlo, Monaco, Consolas, "SF Mono", "Cascadia Mono", "Segoe UI Mono", "DejaVu Sans Mono", "Liberation Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Ubuntu Mono", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New", Courier, monospace; - // https://qwtel.com/posts/software/the-monospaced-system-ui-css-font-stack/ - - // Colors - --f1: #ccc; //font color 1 - --f2: #ddd; //font color 2 - - --c1: #111; //color 1 - --c2: #123; //color 2 - --c3: #345; //color 3 - --c4: #789; //color 4 - - --a1: #09f; //accent color 1 link - --a2: #0bf; //accent color 2 hover,focus - --a3: #0af; //accent color 3 h1-h2 hover,focus - - --cg: #483; //ins green - --cr: #e33; //del red -} diff --git a/sass/skins/_blue-light.scss b/sass/skins/_blue-light.scss deleted file mode 100644 index 79611db..0000000 --- a/sass/skins/_blue-light.scss +++ /dev/null @@ -1,25 +0,0 @@ -:root { - // Regular Fonts used by default: - --ff: "Roboto", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Noto Sans", Helvetica, Arial, sans-serif; - //Good CLS, sorted by Size: Arimo(0.002), Roboto(0.002), Lato(0.002) - - // Monospace Fonts used for code: - --fm: ui-monospace, Menlo, Monaco, Consolas, "SF Mono", "Cascadia Mono", "Segoe UI Mono", "DejaVu Sans Mono", "Liberation Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Ubuntu Mono", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New", Courier, monospace; - // https://qwtel.com/posts/software/the-monospaced-system-ui-css-font-stack/ - - // Colors - --f1: #111; //font color 1 - --f2: #222; //font color 2 - - --c1: #fafafa; //color 1 - --c2: #def; //color 2 - --c3: #137; //color 3 - --c4: #013; //color 4 - - --a1: #06e; //accent color 1 link - --a2: #09f; //accent color 2 hover,focus - --a3: #07f; //accent color 3 h1-h2 hover,focus - - --cg: #483; //ins green - --cr: #c22; //del red -} diff --git a/templates/404.html b/templates/404.html index f2de753..f72c54f 100644 --- a/templates/404.html +++ b/templates/404.html @@ -19,6 +19,6 @@
{%- endblock content %} diff --git a/templates/base.html b/templates/base.html index ac6356d..0bbd48d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -31,17 +31,17 @@