From 940b40688a7cf595eee061b696187e2fe4a578e2 Mon Sep 17 00:00:00 2001 From: Jieiku Date: Mon, 22 May 2023 22:31:34 -0700 Subject: Json-Index and config.toml optional --- sass/include/_embedded.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sass/include/_embedded.scss') diff --git a/sass/include/_embedded.scss b/sass/include/_embedded.scss index 93de17d..fc1dd3c 100644 --- a/sass/include/_embedded.scss +++ b/sass/include/_embedded.scss @@ -2,13 +2,13 @@ .yvi {//youtube and vimeo iframe position: absolute; top: 0; - left: 0; + left: 0 } .yv {//youtube and vimeo div position: relative; padding-bottom: 56.25%; height: 0; - overflow: hidden; + overflow: hidden } img, video, -- cgit v1.3.1 From 6c5915c04659a992635742074b2ad92d3e97a9df Mon Sep 17 00:00:00 2001 From: Jieiku Date: Mon, 1 May 2023 15:08:23 -0700 Subject: Replace import with use --- config.toml | 11 +++--- sass/_imports.scss | 59 ++++++++++++++-------------- sass/_variables.scss | 10 ++--- sass/include/_button.scss | 4 +- sass/include/_code.scss | 4 +- sass/include/_document.scss | 4 +- sass/include/_embedded.scss | 4 +- sass/include/_form.scss | 4 +- sass/include/_grid.scss | 3 +- sass/include/_hr.scss | 2 +- sass/include/_icons.scss | 89 +++++++++++++++++++++--------------------- sass/include/_nav.scss | 5 ++- sass/include/_search.scss | 9 ++++- sass/include/_sectioning.scss | 40 +++++++++---------- sass/include/_table.scss | 8 ++-- sass/include/_toc.scss | 10 ++++- sass/include/_top.scss | 5 ++- sass/include/_typography.scss | 8 ++-- sass/include/_zola.scss | 3 ++ templates/categories/list.html | 2 +- templates/macros/head.html | 2 +- templates/shortcodes/note.html | 30 ++++++++++++++ templates/tags/list.html | 2 +- 23 files changed, 191 insertions(+), 127 deletions(-) create mode 100644 templates/shortcodes/note.html (limited to 'sass/include/_embedded.scss') diff --git a/config.toml b/config.toml index 09a7c0d..c2f6e26 100644 --- a/config.toml +++ b/config.toml @@ -83,6 +83,7 @@ flag.en = "🇬🇧" flag.fr = "🇫🇷" #flag.es = "🇪🇸" + ############################################################################### ### Layout & Format ### position: top, bottom, both, false(hidden) @@ -187,7 +188,7 @@ js_copycode = true # The copy button on code blocks that allows you to copy them search_library = 'elasticlunr' -js_search_index = "search_index.en.json" # Separate Always, generated each build +#js_search_index = "search_index.en.json" # Separate Always, generated each build #js_theme = "theme.min.js" # Separate Always, comment out if using -auto/-light/-dark stylesheet. (required for switcher) #js_themeButton = "theme_button.js"# Bundleable - light/dark switcher button #js_prestyle = "prestyle.js"# Bundleable - used to preload: FontAwesome, Katex, external Google Fonts @@ -195,12 +196,12 @@ js_search_index = "search_index.en.json" # Separate Always, generated each build #js_email = "email.js"# Bundleable - obfuscates email address in footer ########## Switcher ########## (comment this block out if NOT using switcher): -stylesheets = [ "abridge.css" ] # Orange Automatic Dark/Light Theme based on browser/system preference with switcher +stylesheets = [ "abridge.css" ] # Automatic Dark/Light Theme based on browser/system preference with switcher ########## No Switcher ########## -#stylesheets = [ "abridge-auto.css" ] # Orange Automatic Dark/Light Theme based on browser/system preference -#stylesheets = [ "abridge-dark.css" ] # Orange Dark Theme -#stylesheets = [ "abridge-light.css" ] # Orange Light Theme +#stylesheets = [ "abridge-auto.css" ] # Automatic Dark/Light Theme based on browser/system preference +#stylesheets = [ "abridge-dark.css" ] # Dark Theme +#stylesheets = [ "abridge-light.css" ] # Light Theme ############################################################################### diff --git a/sass/_imports.scss b/sass/_imports.scss index d4d2e5d..6fd04b1 100644 --- a/sass/_imports.scss +++ b/sass/_imports.scss @@ -1,4 +1,4 @@ -/* +/** * 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) @@ -13,41 +13,40 @@ */ // Config -@import "variables"; +@use "variables"; -@import "colors/orange" -//@import "colors/blue" -//@import "colors/blueshade" +// Includes - Sorted by importance/category (includes at top are needed most frequently) +@use "include/document"; // html +@use "include/typography"; // a, headings, p, ul, blockquote, ... +@use "include/sectioning"; // body, header, main, footer +@use "include/nav"; // Nav -//@import "fonts/Roboto"; -//@import "fonts/Roboto-Mono"; // Monospaced -//@import "fonts/Arimo"; -//@import "fonts/Lato"; -//@import "fonts/FiraCode"; // Monospaced -//@import "fonts/Abridge"; // Icon Font (don't recommend, CSS only icons are in my opinion better.) +@use "include/embedded"; // iframe(youtube/vimeo), audio, canvas, img, svg, video +@use "include/table"; // table, tr, td, ... +@use "include/code"; // pre, code, ... +@use "include/hr"; // hr -// Includes - Sorted by importance/category (includes at top are needed most frequently) -@import "include/document"; // html -@import "include/typography"; // a, headings, p, ul, blockquote, ... -@import "include/sectioning"; // body, header, main, footer -@import "include/nav"; // Nav +@use "include/scroller"; // figure +@use "include/button"; // button, a[role=button], type=button, type=submit ... +@use "include/form"; // input, select, textarea, label, fieldset, legend (If you import this, you should also import button) +@use "include/top"; // back to top button using only CSS -@import "include/embedded"; // iframe(youtube/vimeo), audio, canvas, img, svg, video -@import "include/table"; // table, tr, td, ... -@import "include/code"; // pre, code, ... -@import "include/hr"; // hr +@use "include/search"; // Zola Search - elasticlunr site-wide search +@use "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/top"; // back to top button using only CSS +@use "include/icons"; // svg icons -@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) +@use "include/zola"; // Zola spacing and layout classes -@import "include/icons"; // svg icons +//@use "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 +//@use "include/misc"; // template, [hidden], dialog, canvas -@import "include/zola"; // Zola spacing and layout classes +//@use "fonts/Roboto"; +//@use "fonts/Roboto-Mono"; // Monospaced +//@use "fonts/Arimo"; +//@use "fonts/FiraCode"; // Monospaced +//@use "fonts/Abridge"; // Icon Font (don't recommend, CSS only icons are in my opinion better.) -//@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 +@import "colors/orange"; +//@import "colors/blue"; +//@import "colors/blueshade"; diff --git a/sass/_variables.scss b/sass/_variables.scss index 839528a..dcadf82 100644 --- a/sass/_variables.scss +++ b/sass/_variables.scss @@ -1,4 +1,4 @@ -/* +/** * 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) @@ -113,12 +113,12 @@ $icon-moon: false !default;// dark moon $icon-sun: false !default;// light sun // add an icon link to an html template like this: -$font-main : "Roboto", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Noto Sans", Helvetica, Arial, sans-serif !default; -$font-code : 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 !default; +$font: "Roboto", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Noto Sans", Helvetica, Arial, sans-serif !default; +$font-mono: 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 !default; :root { - #{--ff}: $font-main; - #{--fm}: $font-code; + #{--ff}: $font; + #{--fm}: $font-mono;//code // Spacings --s1: .5rem; diff --git a/sass/include/_button.scss b/sass/include/_button.scss index d725120..974502f 100644 --- a/sass/include/_button.scss +++ b/sass/include/_button.scss @@ -1,4 +1,6 @@ -// Form elements (button) +/** + * Form elements (button) + */ button, input, select, diff --git a/sass/include/_code.scss b/sass/include/_code.scss index fd9eb97..85bedf1 100644 --- a/sass/include/_code.scss +++ b/sass/include/_code.scss @@ -1,4 +1,6 @@ -// Code +/** + * Code + */ pre, code, kbd, diff --git a/sass/include/_document.scss b/sass/include/_document.scss index a5f91db..de2701f 100644 --- a/sass/include/_document.scss +++ b/sass/include/_document.scss @@ -1,4 +1,6 @@ -// Document: Content-box & Responsive typography +/** + * Document: Content-box & Responsive typography + */ // Change from `box-sizing: content-box` so that `width` is not affected by `padding` or `border` *, diff --git a/sass/include/_embedded.scss b/sass/include/_embedded.scss index fc1dd3c..cff161e 100644 --- a/sass/include/_embedded.scss +++ b/sass/include/_embedded.scss @@ -1,4 +1,6 @@ -// Embedded content +/** + * Embedded content + */ .yvi {//youtube and vimeo iframe position: absolute; top: 0; diff --git a/sass/include/_form.scss b/sass/include/_form.scss index 3087ad6..1eca892 100644 --- a/sass/include/_form.scss +++ b/sass/include/_form.scss @@ -1,4 +1,6 @@ -// Form elements (non-button) +/** + * Form elements (non-button) + */ fieldset { padding: .5rem .75rem; border: var(--bw) solid var(--c3); diff --git a/sass/include/_grid.scss b/sass/include/_grid.scss index 1ced06b..a8d46e1 100644 --- a/sass/include/_grid.scss +++ b/sass/include/_grid.scss @@ -1,4 +1,5 @@ -/* Infinity Grid +/** + * Infinity Grid * https://github.com/vladocar/Basic.css */ diff --git a/sass/include/_hr.scss b/sass/include/_hr.scss index aaa9f4e..d6215dc 100644 --- a/sass/include/_hr.scss +++ b/sass/include/_hr.scss @@ -1,5 +1,5 @@ /** - * HR + * HR - Horizontal Rule * https://github.com/picocss/pico */ diff --git a/sass/include/_icons.scss b/sass/include/_icons.scss index df0f5d3..511905d 100644 --- a/sass/include/_icons.scss +++ b/sass/include/_icons.scss @@ -7,10 +7,11 @@ * https://jakearchibald.github.io/svgomg/ * https://codepen.io/yoksel/pen/MWKeKK */ +@use "../variables" as variables; @function icon($icon-name,$stroke,$stroke-width: 1,$fill:'none'){ $sc:"%23888";//stroke color - @if $ic { + @if variables.$ic { $sc: $stroke } $p: ( @@ -67,49 +68,49 @@ $icon: map-get($icons, $icon-name); @return url("data:image/svg+xml,#{$icon}"); } -@if $enable-icons { - @if $icon-adjust {.adjust { -webkit-mask: icon(adjust, "none", 1, "%23000") ; background: var(--f2) }}//theme switcher - @if $icon-angl {.angl { -webkit-mask: icon(angl, "%23000", 3, "none") ; background: var(--f2) }}//angle left - @if $icon-angll {.angll { -webkit-mask: icon(angll, "%23000", 3, "none") ; background: var(--f2) }}//angle left left - @if $icon-angr {.angr { -webkit-mask: icon(angr, "%23000", 3, "none") ; background: var(--f2) }}//angle right - @if $icon-angrr {.angrr { -webkit-mask: icon(angrr, "%23000", 3, "none") ; background: var(--f2) }}//angle right right - @if $icon-angu {.angu { -webkit-mask: icon(angu, "%23000", 3, "none") ; background: var(--f2) }}//angle up - @if $icon-search {.search { -webkit-mask: icon(search, "%23000", 3, "none") ; background: var(--f2) }}//search - @if $icon-bitbucket {.bitbucket { background-image: icon(bitbucket, "%2328f", 2, "none") }} - @if $icon-buymeacoffee {.buymeacoffee { background-image: icon(buymeacoffee, "%23777", 1, "%23fd0") }} - @if $icon-check {.check { background-image: icon(check, "%23888", 2, "none") }} - @if $icon-chevron {.chevron { background-image: icon(chevron, "%23888", 2, "none") }} - @if $icon-clock {.clock { background-image: icon(clock, "%23888", 2, "none") }} - @if $icon-codeberg {.codeberg { background-image: icon(codeberg, "%23555", 2, "%23aaa") }} - @if $icon-date {.date { background-image: icon(date, "%23888", 2, "none") }} - @if $icon-discord {.discord { background-image: icon(discord, "none", 1, "%2356f") }} - @if $icon-docker {.docker { background-image: icon(docker, "%2329e", 2, "none") }} - @if $icon-element {.element { background-image: icon(element, "none", 1, "%231c8") }} - @if $icon-facebook {.facebook { background-image: icon(facebook, "%23359", 2, "none") }} - @if $icon-folder {.folder { background-image: icon(folder, "%23888", 2, "none") }} - @if $icon-github {.github { background-image: icon(github, "%23888", 2, "none") }} - @if $icon-github-sponsor {.github-sponsor { background-image: icon(github-sponsor, "%23c49", 2, "none") }} - @if $icon-gitlab {.gitlab { background-image: icon(gitlab, "%23e62", 2, "none") }} - @if $icon-globe {.globe { background-image: icon(globe, "%23888", 2, "none") }} - @if $icon-home {.home { background-image: icon(home, "%23888", 2, "none") }} - @if $icon-instagram {.instagram { background-image: icon(instagram, "%23e07", 2, "none") }} - @if $icon-linkedin {.linkedin { background-image: icon(linkedin, "%2326a", 2, "none") }} - @if $icon-mail {.mail { background-image: icon(mail, "%23888", 2, "none") }} - @if $icon-mastodon {.mastodon { background-image: icon(mastodon, "none", 1, "%2328c") }} - @if $icon-matrix {.matrix { background-image: icon(matrix, "%23888", 2, "none") }} - @if $icon-minus {.minus { background-image: icon(minus, "%23888", 2, "none") }} - @if $icon-moon {.moon { background-image: icon(moon, "%23888", 2, "none") }} - @if $icon-pinterest {.pinterest { background-image: icon(pinterest, "%23b01", 2, "none") }} - @if $icon-python {.python { background-image: icon(python, "%23fc1", 2, "%2326a") }} - @if $icon-researchgate {.researchgate { background-image: icon(researchgate, "none", 2, "%230db") }} - @if $icon-rss {.rss { background-image: icon(rss, "%23e94", 2, "none") }} - @if $icon-stack {.stack { background-image: icon(stack, "%23e72", 2, "none") }} - @if $icon-sun {.sun { background-image: icon(sun, "%23888", 2, "none") }} - @if $icon-tag {.tag { background-image: icon(tag, "%23888", 2, "none") }} - @if $icon-twitch {.twitch { background-image: icon(twitch, "%23a7f", 2, "none") }} - @if $icon-twitter {.twitter { background-image: icon(twitter, "%232ad", 2, "none") }} - @if $icon-x {.x { background-image: icon(x, "%23f00", 3, "none") }} - @if $icon-youtube {.youtube { background-image: icon(youtube, "%23f00", 2, "none") }} +@if variables.$enable-icons { + @if variables.$icon-adjust {.adjust { -webkit-mask: icon(adjust, "none", 1, "%23000") ; background: var(--f2) }}//theme switcher + @if variables.$icon-angl {.angl { -webkit-mask: icon(angl, "%23000", 3, "none") ; background: var(--f2) }}//angle left + @if variables.$icon-angll {.angll { -webkit-mask: icon(angll, "%23000", 3, "none") ; background: var(--f2) }}//angle left left + @if variables.$icon-angr {.angr { -webkit-mask: icon(angr, "%23000", 3, "none") ; background: var(--f2) }}//angle right + @if variables.$icon-angrr {.angrr { -webkit-mask: icon(angrr, "%23000", 3, "none") ; background: var(--f2) }}//angle right right + @if variables.$icon-angu {.angu { -webkit-mask: icon(angu, "%23000", 3, "none") ; background: var(--f2) }}//angle up + @if variables.$icon-search {.search { -webkit-mask: icon(search, "%23000", 3, "none") ; background: var(--f2) }}//search + @if variables.$icon-bitbucket {.bitbucket { background-image: icon(bitbucket, "%2328f", 2, "none") }} + @if variables.$icon-buymeacoffee {.buymeacoffee { background-image: icon(buymeacoffee, "%23777", 1, "%23fd0") }} + @if variables.$icon-check {.check { background-image: icon(check, "%23888", 2, "none") }} + @if variables.$icon-chevron {.chevron { background-image: icon(chevron, "%23888", 2, "none") }} + @if variables.$icon-clock {.clock { background-image: icon(clock, "%23888", 2, "none") }} + @if variables.$icon-codeberg {.codeberg { background-image: icon(codeberg, "%23555", 2, "%23aaa") }} + @if variables.$icon-date {.date { background-image: icon(date, "%23888", 2, "none") }} + @if variables.$icon-discord {.discord { background-image: icon(discord, "none", 1, "%2356f") }} + @if variables.$icon-docker {.docker { background-image: icon(docker, "%2329e", 2, "none") }} + @if variables.$icon-element {.element { background-image: icon(element, "none", 1, "%231c8") }} + @if variables.$icon-facebook {.facebook { background-image: icon(facebook, "%23359", 2, "none") }} + @if variables.$icon-folder {.folder { background-image: icon(folder, "%23888", 2, "none") }} + @if variables.$icon-github {.github { background-image: icon(github, "%23888", 2, "none") }} + @if variables.$icon-github-sponsor {.github-sponsor { background-image: icon(github-sponsor, "%23c49", 2, "none") }} + @if variables.$icon-gitlab {.gitlab { background-image: icon(gitlab, "%23e62", 2, "none") }} + @if variables.$icon-globe {.globe { background-image: icon(globe, "%23888", 2, "none") }} + @if variables.$icon-home {.home { background-image: icon(home, "%23888", 2, "none") }} + @if variables.$icon-instagram {.instagram { background-image: icon(instagram, "%23e07", 2, "none") }} + @if variables.$icon-linkedin {.linkedin { background-image: icon(linkedin, "%2326a", 2, "none") }} + @if variables.$icon-mail {.mail { background-image: icon(mail, "%23888", 2, "none") }} + @if variables.$icon-mastodon {.mastodon { background-image: icon(mastodon, "none", 1, "%2328c") }} + @if variables.$icon-matrix {.matrix { background-image: icon(matrix, "%23888", 2, "none") }} + @if variables.$icon-minus {.minus { background-image: icon(minus, "%23888", 2, "none") }} + @if variables.$icon-moon {.moon { background-image: icon(moon, "%23888", 2, "none") }} + @if variables.$icon-pinterest {.pinterest { background-image: icon(pinterest, "%23b01", 2, "none") }} + @if variables.$icon-python {.python { background-image: icon(python, "%23fc1", 2, "%2326a") }} + @if variables.$icon-researchgate {.researchgate { background-image: icon(researchgate, "none", 2, "%230db") }} + @if variables.$icon-rss {.rss { background-image: icon(rss, "%23e94", 2, "none") }} + @if variables.$icon-stack {.stack { background-image: icon(stack, "%23e72", 2, "none") }} + @if variables.$icon-sun {.sun { background-image: icon(sun, "%23888", 2, "none") }} + @if variables.$icon-tag {.tag { background-image: icon(tag, "%23888", 2, "none") }} + @if variables.$icon-twitch {.twitch { background-image: icon(twitch, "%23a7f", 2, "none") }} + @if variables.$icon-twitter {.twitter { background-image: icon(twitter, "%232ad", 2, "none") }} + @if variables.$icon-x {.x { background-image: icon(x, "%23f00", 3, "none") }} + @if variables.$icon-youtube {.youtube { background-image: icon(youtube, "%23f00", 2, "none") }} .svg { width: 1.8rem; height: 1.8rem; diff --git a/sass/include/_nav.scss b/sass/include/_nav.scss index be98892..efad0ec 100644 --- a/sass/include/_nav.scss +++ b/sass/include/_nav.scss @@ -2,6 +2,7 @@ * Horizontal Nav * https://github.com/raj457036/attriCSS */ +@use "../variables" as variables; main nav a, main nav a:visited {//pagination link styling @@ -118,8 +119,8 @@ footer nav { } } // breakpoint makes header responsive for mobile layouts -@if map-get($breakpoints, "md") { - @media (max-width: map-get($breakpoints, "md")) { +@if map-get(variables.$breakpoints, "md") { + @media (max-width: map-get(variables.$breakpoints, "md")) { header nav { display: flex; flex-direction: column; diff --git a/sass/include/_search.scss b/sass/include/_search.scss index ccc403e..c0e3a8d 100644 --- a/sass/include/_search.scss +++ b/sass/include/_search.scss @@ -1,3 +1,8 @@ +/** + * Search - Zola Search - elasticlunr site-wide search + */ +@use "../variables" as variables; + div:empty { display: none; } @@ -58,8 +63,8 @@ nav > div > form > div:last-of-type {//parent div of suggestions div .searchd > button { margin-left: -2.4rem;//inlayed search icon } -@if map-get($breakpoints, "md") { - @media (max-width: map-get($breakpoints, "md")) { +@if map-get(variables.$breakpoints, "md") { + @media (max-width: map-get(variables.$breakpoints, "md")) { .searchd > input { max-width: 100%; flex-grow: 1; diff --git a/sass/include/_sectioning.scss b/sass/include/_sectioning.scss index dd1026e..36b0a8e 100644 --- a/sass/include/_sectioning.scss +++ b/sass/include/_sectioning.scss @@ -2,7 +2,7 @@ * Sectioning: Container and responsive spacings for header, main, footer * https://github.com/picocss/pico */ - +@use "../variables" as variables; // Render the `main` element consistently in IE main { display: flex; @@ -27,21 +27,21 @@ footer { margin-left: auto; // Semantic container - @if $enable-semantic-container { + @if variables.$enable-semantic-container { padding: var(--s1); // Centered viewport max-width only - @if $enable-maxwidth { - @media (min-width: $mb) { - min-width: $mb; - max-width: $mw; + @if variables.$enable-maxwidth { + @media (min-width: variables.$mb) { + min-width: variables.$mb; + max-width: variables.$mw; } } // Centered viewport - @else if $enable-viewport { - @if map-get($breakpoints, "sm") and $enable-viewport { - @media (min-width: map-get($breakpoints, "sm")) { - max-width: map-get($viewports, "sm"); + @else if variables.$enable-viewport { + @if map-get(variables.$breakpoints, "sm") and variables.$enable-viewport { + @media (min-width: map-get(variables.$breakpoints, "sm")) { + max-width: map-get(variables.$viewports, "sm"); //padding-right: 0; //padding-left: 0; .toc { @@ -49,19 +49,19 @@ footer { } } } - @if map-get($breakpoints, "md") and $enable-viewport { - @media (min-width: map-get($breakpoints, "md")) { - max-width: map-get($viewports, "md"); + @if map-get(variables.$breakpoints, "md") and variables.$enable-viewport { + @media (min-width: map-get(variables.$breakpoints, "md")) { + max-width: map-get(variables.$viewports, "md"); } } - @if map-get($breakpoints, "lg") and $enable-viewport { - @media (min-width: map-get($breakpoints, "lg")) { - max-width: map-get($viewports, "lg"); + @if map-get(variables.$breakpoints, "lg") and variables.$enable-viewport { + @media (min-width: map-get(variables.$breakpoints, "lg")) { + max-width: map-get(variables.$viewports, "lg"); } } - @if map-get($breakpoints, "xl") and $enable-viewport { - @media (min-width: map-get($breakpoints, "xl")) { - max-width: map-get($viewports, "xl"); + @if map-get(variables.$breakpoints, "xl") and variables.$enable-viewport { + @media (min-width: map-get(variables.$breakpoints, "xl")) { + max-width: map-get(variables.$viewports, "xl"); } } } @@ -85,4 +85,4 @@ footer{ hr, p { margin: 0.1rem 0 .3rem } -} \ No newline at end of file +} diff --git a/sass/include/_table.scss b/sass/include/_table.scss index 0ed3eea..e91c483 100644 --- a/sass/include/_table.scss +++ b/sass/include/_table.scss @@ -1,8 +1,10 @@ -// Table +/** + * Table - table specific elements + */ table { border-collapse: collapse; width: 100%; - text-indent: 0; /* Remove text indentation from table contents in Chrome, Edge, and Safari. */ + text-indent: 0; // Remove text indentation from table contents in Chrome, Edge, and Safari. caption { margin-bottom: .5rem; } @@ -24,4 +26,4 @@ tbody tr:nth-child(even) { thead tr { border-top: var(--bw) solid var(--c3); background-color: var(--c2); -} \ No newline at end of file +} diff --git a/sass/include/_toc.scss b/sass/include/_toc.scss index 5d37a64..b3ad2c4 100644 --- a/sass/include/_toc.scss +++ b/sass/include/_toc.scss @@ -1,3 +1,9 @@ +/** + * TOC - Table of Contents + * used as a page index, recent posts block + */ +@use "../variables" as variables; + main { .toc { max-width: 15rem; @@ -35,8 +41,8 @@ main { max-height: 100vh; overflow: auto; } -@if map-get($breakpoints, "md") { - @media (max-width: map-get($breakpoints, "md")) { +@if map-get(variables.$breakpoints, "md") { + @media (max-width: map-get(variables.$breakpoints, "md")) { .toc { display: none; } diff --git a/sass/include/_top.scss b/sass/include/_top.scss index 5d09238..0c1f729 100644 --- a/sass/include/_top.scss +++ b/sass/include/_top.scss @@ -1,3 +1,6 @@ +/** + * Top - back to top button using only CSS + */ .topout { position: sticky; bottom: 1px; @@ -25,4 +28,4 @@ background: var(--c2); opacity: 1; } -} \ No newline at end of file +} diff --git a/sass/include/_typography.scss b/sass/include/_typography.scss index ede2aa0..8eaa7f9 100644 --- a/sass/include/_typography.scss +++ b/sass/include/_typography.scss @@ -1,4 +1,6 @@ -// Typography +/** + * Typography - a, headings, p, ul, blockquote + */ .c { text-align: center;// The
does not pass validation, use:
} @@ -84,7 +86,7 @@ small { .footnote-definition sup, .footnote-definition p { display: inline; } -/* Prevent `sub` and `sup` elements from affecting the line height in all browsers. */ +// Prevent sub and sup elements from affecting the line height in all browsers. sub, sup { font-size: .75em; @@ -116,7 +118,7 @@ ul { font-size: var(--fs); } -/* Lists */ +// Lists ul, ol { padding-right: 0; diff --git a/sass/include/_zola.scss b/sass/include/_zola.scss index 301ce61..2dd0b70 100644 --- a/sass/include/_zola.scss +++ b/sass/include/_zola.scss @@ -1,3 +1,6 @@ +/** + * Zola Specific + */ .sum, .sum p {margin: .2rem 0} .s95 {font-size: .95em} .s90 {font-size: .90em} diff --git a/templates/categories/list.html b/templates/categories/list.html index a237591..eca6da3 100644 --- a/templates/categories/list.html +++ b/templates/categories/list.html @@ -19,7 +19,7 @@

{{ terms | length }} {%- if lang != config.default_language %} {{ trans(key="Categories" | safe, lang=lang) }} {% else %} Categories {% endif %}

-

{% for term in terms %} [{{ term.name }}] {% endfor %}

+

{% for term in terms %} [{{ term.name }}]{{ term.pages | length }} {% endfor %}

{%- for term in terms %}

{{ term.name }}

diff --git a/templates/macros/head.html b/templates/macros/head.html index 0690bc1..88c9781 100644 --- a/templates/macros/head.html +++ b/templates/macros/head.html @@ -96,7 +96,7 @@ {%- if js_theme %} {%- set js_themeButton=config.extra.js_themeButton | default(value="theme_button.js") -%} {%- if js_themeButton %} - + {%- endif %} {%- endif %} {%- endif %} diff --git a/templates/shortcodes/note.html b/templates/shortcodes/note.html new file mode 100644 index 0000000..b2420e9 --- /dev/null +++ b/templates/shortcodes/note.html @@ -0,0 +1,30 @@ +{# note shortcode with icon and border + + type: ok / info / warning / error / neutral / other + display: block / icon / both + size: small / medium / large + markdown: true / false + + example: + + {% note(type="ok", display="block", size="small" markdown=true) %} + *Sample* "ok" note. With display "block" + And **markdown** content. + {% end %} +#} + +{# define defaults #} +{% if not type %}{% set type="neutral" %}{% endif %} +{% if not display %}{% set display="block" %}{% endif %} +{% if not size %}{% set size="small" %}{% endif %} +{% if not markdown %}{% set markdown=true %}{% endif %} + +
+{% if markdown %}{{ body | markdown | safe }} +{% else %}{{ body | safe }} +{% endif %} +
diff --git a/templates/tags/list.html b/templates/tags/list.html index 2184cba..c703761 100644 --- a/templates/tags/list.html +++ b/templates/tags/list.html @@ -19,7 +19,7 @@

{{ terms | length }} {%- if lang != config.default_language %} {{ trans(key="Tags" | safe, lang=lang) }} {% else %} Tags {% endif %}

-

{% for term in terms %} #{{ term.name }} {% endfor %}

+

{% for term in terms %} #{{ term.name }}{{ term.pages | length }} {% endfor %}

{%- for term in terms %}

#{{ term.name }}

-- cgit v1.3.1 From d9fb3248650404ad6d078eba39b8b91381b1ebed Mon Sep 17 00:00:00 2001 From: Jieiku Date: Mon, 22 May 2023 23:07:56 -0700 Subject: Fixes for uglyurls --- config.toml | 5 ++-- content/overview-code-blocks.fr.md | 51 +++++++++++++++++++++++++++++--------- content/overview-code-blocks.md | 51 +++++++++++++++++++++++++++++--------- sass/_font-extend-COPY-ME.sass | 8 +++--- sass/_font-extend.sass | 16 ++++++------ sass/_imports.scss | 20 +++++++-------- sass/function/_font.sass | 4 +-- sass/include/_embedded.scss | 4 +-- sass/include/_hr.scss | 2 +- sass/include/_icons.scss | 2 +- sass/include/_nav.scss | 2 +- sass/include/_sectioning.scss | 4 +-- sass/include/_typography.scss | 2 +- sass/include/_zola.scss | 4 +-- static/search.js | 8 +++++- templates/base.html | 12 ++++----- templates/categories/list.html | 4 +-- templates/categories/single.html | 2 +- templates/page.html | 4 +-- templates/posts.html | 2 +- templates/tags/list.html | 4 +-- templates/tags/single.html | 2 +- 22 files changed, 136 insertions(+), 77 deletions(-) (limited to 'sass/include/_embedded.scss') diff --git a/config.toml b/config.toml index c2f6e26..8e53830 100644 --- a/config.toml +++ b/config.toml @@ -1,6 +1,6 @@ -# do NOT include a trailing slash on the base URL for web urls +# do NOT include a trailing slash on the base URL base_url = "https://abridge.netlify.app" -#base_url = "/home/jieiku/.dev/abridge/public/" # Usable site directly from disk, also set in [extra] uglyurls = true +#base_url = "/home/jieiku/.dev/abridge/public" # Usable site directly from disk, also set in [extra] uglyurls = true, and integrity = false default_language = "en" compile_sass = true minify_html = false @@ -79,6 +79,7 @@ uglyurls = false # if set to true then links are generated with the full path. e ### https://tera.netlify.app/docs#date ############################################################################### date_locale = "en_US" +language_code = "en-US" flag.en = "🇬🇧" flag.fr = "🇫🇷" #flag.es = "🇪🇸" diff --git a/content/overview-code-blocks.fr.md b/content/overview-code-blocks.fr.md index e527251..c8fbdf2 100644 --- a/content/overview-code-blocks.fr.md +++ b/content/overview-code-blocks.fr.md @@ -25,19 +25,46 @@ Voir [les docs](https://www.getzola.org/documentation/content/syntax-highlightin Si nous voulons, nous pouvons aussi `spécifier le code en ligne` ce qui est utile pour `les petites choses`. ### rust -```rust,linenos,hl_lines=3 -//! jelly-actix-web-starter - Un modèle de démarrage pour les projets actix-web qui ressemble beaucoup à Django. Évitez les trucs ennuyeux et avancez plus vite. - -use jelly::actix_web; -use mainlib; -use std::io; - -#[actix_web::main] -async fn main() -> io::Result<()> { - mainlib::main().await +```rust +fn main() { + let greetings = ["Hello", "Hola", "Bonjour", + "Ciao", "こんにちは", "안녕하세요", + "Cześć", "Olá", "Здравствуйте", + "Chào bạn", "您好", "Hallo", + "Hej", "Ahoj", "سلام", + "Hej", "Hallo", "Hei", + "Helló", "Hallo", "Buna ziua", + "Merhaba"]; + + for (num, greeting) in greetings.iter().enumerate() { + print!("{} : ", greeting); + match num { + 0 => println!("This code is editable and runnable!"),//en English + 1 => println!("¡Este código es editable y ejecutable!"),//es Spanish + 2 => println!("Ce code est modifiable et exécutable !"),//fr French + 3 => println!("Questo codice è modificabile ed eseguibile!"),//it Italian + 4 => println!("このコードは編集して実行出来ます！"),//jp Japanese + 5 => println!("여기에서 코드를 수정하고 실행할 수 있습니다!"),//ko Korean + 6 => println!("Ten kod można edytować oraz uruchomić!"),//pl Polish + 7 => println!("Este código é editável e executável!"),//pt Portuguese + 8 => println!("Этот код можно отредактировать и запустить!"),//ru Russian + 9 => println!("Bạn có thể edit và run code trực tiếp!"),//vi Vietnamese + 10 => println!("这段代码是可以编辑并且能够运行的！"),//zh Chinese + 11 => println!("Dieser Code kann bearbeitet und ausgeführt werden!"),//de German + 12 => println!("Den här koden kan redigeras och köras!"),//sv Swedish + 13 => println!("Tento kód můžete upravit a spustit"),//cs Czech + 14 => println!("این کد قابلیت ویرایش و اجرا دارد!"),//fa Persian + 15 => println!("Denne kode kan redigeres og køres!"),//da Danish + 16 => println!("Deze code is bewerkbaar en uitvoerbaar!"),//du Dutch + 17 => println!("Tämä koodi on muokattavissa ja ajettavissa!"),//fi Finnish + 18 => println!("Ez a kód szerkeszthető és futtatható!"),//hu Hungarian + 19 => println!("Denne koden er redigerbar og kjørbar!"),//no Norwegian + 20 => println!("Acest cod este editabil și rulabil!"),//ro Romanian + 21 => println!("Bu kod düzenlenebilir ve çalıştırılabilir!"),//tr Turkish + _ => {}, + } + } } - -let context = Context::new(); ``` ### TOML diff --git a/content/overview-code-blocks.md b/content/overview-code-blocks.md index 7c09e5b..d38ac9e 100644 --- a/content/overview-code-blocks.md +++ b/content/overview-code-blocks.md @@ -25,19 +25,46 @@ See [the docs](https://www.getzola.org/documentation/content/syntax-highlighting If we want, we can also `specify inline code` which is useful for `the small stuff`. ### rust -```rust,linenos,hl_lines=3 -//! jelly-actix-web-starter - A starter template for actix-web projects that feels very Django-esque. Avoid the boring stuff and move faster. - -use jelly::actix_web; -use mainlib; -use std::io; - -#[actix_web::main] -async fn main() -> io::Result<()> { - mainlib::main().await +```rust +fn main() { + let greetings = ["Hello", "Hola", "Bonjour", + "Ciao", "こんにちは", "안녕하세요", + "Cześć", "Olá", "Здравствуйте", + "Chào bạn", "您好", "Hallo", + "Hej", "Ahoj", "سلام", + "Hej", "Hallo", "Hei", + "Helló", "Hallo", "Buna ziua", + "Merhaba"]; + + for (num, greeting) in greetings.iter().enumerate() { + print!("{} : ", greeting); + match num { + 0 => println!("This code is editable and runnable!"),//en English + 1 => println!("¡Este código es editable y ejecutable!"),//es Spanish + 2 => println!("Ce code est modifiable et exécutable !"),//fr French + 3 => println!("Questo codice è modificabile ed eseguibile!"),//it Italian + 4 => println!("このコードは編集して実行出来ます！"),//jp Japanese + 5 => println!("여기에서 코드를 수정하고 실행할 수 있습니다!"),//ko Korean + 6 => println!("Ten kod można edytować oraz uruchomić!"),//pl Polish + 7 => println!("Este código é editável e executável!"),//pt Portuguese + 8 => println!("Этот код можно отредактировать и запустить!"),//ru Russian + 9 => println!("Bạn có thể edit và run code trực tiếp!"),//vi Vietnamese + 10 => println!("这段代码是可以编辑并且能够运行的！"),//zh Chinese + 11 => println!("Dieser Code kann bearbeitet und ausgeführt werden!"),//de German + 12 => println!("Den här koden kan redigeras och köras!"),//sv Swedish + 13 => println!("Tento kód můžete upravit a spustit"),//cs Czech + 14 => println!("این کد قابلیت ویرایش و اجرا دارد!"),//fa Persian + 15 => println!("Denne kode kan redigeres og køres!"),//da Danish + 16 => println!("Deze code is bewerkbaar en uitvoerbaar!"),//du Dutch + 17 => println!("Tämä koodi on muokattavissa ja ajettavissa!"),//fi Finnish + 18 => println!("Ez a kód szerkeszthető és futtatható!"),//hu Hungarian + 19 => println!("Denne koden er redigerbar og kjørbar!"),//no Norwegian + 20 => println!("Acest cod este editabil și rulabil!"),//ro Romanian + 21 => println!("Bu kod düzenlenebilir ve çalıştırılabilir!"),//tr Turkish + _ => {}, + } + } } - -let context = Context::new(); ``` ### TOML diff --git a/sass/_font-extend-COPY-ME.sass b/sass/_font-extend-COPY-ME.sass index 658ebbd..148f883 100644 --- a/sass/_font-extend-COPY-ME.sass +++ b/sass/_font-extend-COPY-ME.sass @@ -6,10 +6,10 @@ // or : import it with '@use "_font-extend-COPY-ME"' in whatever existing sass file you already load // delete the following two lines if you want to prepend your fonts... -$findFont-Main : "Segoe UI" // ← append custom MAIN font(s) AFTER this (full list @ '_variables.scss') -$findFont-Code : "Segoe UI Mono" // ← append custom CODE font(s) AFTER this -$fontExt-Main : ("MAIN FONT 1", "MAIN FONT 2") // list of custom MAIN font(s) to append -$fontExt-Code : ("CODE FONT 1", "CODE FONT 2") // list of custom CODE font(s) to append +$findFont-Main : "Segoe UI" // ← append custom MAIN font(s) AFTER this (full list @ '_variables.scss') +$findFont-Code : "Segoe UI Mono" // ← append custom CODE font(s) AFTER this +$fontExt-Main : ("MAIN FONT 1", "MAIN FONT 2") // list of custom MAIN font(s) to append +$fontExt-Code : ("CODE FONT 1", "CODE FONT 2") // list of custom CODE font(s) to append // ...and delete the corresponding variables ↓ @use "../themes/abridge/sass/font-extend" with($findFont-Main:$findFont-Main, $findFont-Code:$findFont-Code,$fontExt-Main:$fontExt-Main,$fontExt-Code:$fontExt-Code) diff --git a/sass/_font-extend.sass b/sass/_font-extend.sass index 35f7a50..9c612c4 100644 --- a/sass/_font-extend.sass +++ b/sass/_font-extend.sass @@ -1,14 +1,14 @@ @use "sass:meta" -@use "variables" as var -@use "function/font" as f +@use "variables" as var +@use "function/font" as f -$findFont-Main : null !default -$findFont-Code : null !default -$fontExt-Main : null !default -$fontExt-Code : null !default +$findFont-Main : null !default +$findFont-Code : null !default +$fontExt-Main : null !default +$fontExt-Code : null !default -$typeMain : meta.type-of($fontExt-Main) -$typeCode : meta.type-of($fontExt-Code) +$typeMain : meta.type-of($fontExt-Main) +$typeCode : meta.type-of($fontExt-Code) @if ($typeMain == 'string') or ($typeMain == 'list') @if ($findFont-Main == null) // prepend diff --git a/sass/_imports.scss b/sass/_imports.scss index b615533..95a58e3 100644 --- a/sass/_imports.scss +++ b/sass/_imports.scss @@ -15,6 +15,16 @@ // Config @forward "variables" as var-*; +@forward "colors/orange" as colors-*; +//@forward "colors/blue" as colors-*; +//@forward "colors/blueshade" as colors-*; + +//@use "fonts/Roboto"; +//@use "fonts/Roboto-Mono"; // Monospaced +//@use "fonts/Arimo"; +//@use "fonts/FiraCode"; // Monospaced +//@use "fonts/Abridge"; // Icon Font (don't recommend, CSS only icons are in my opinion better.) + // Includes - Sorted by importance/category (includes at top are needed most frequently) @use "include/document"; // html @use "include/typography"; // a, headings, p, ul, blockquote, ... @@ -40,13 +50,3 @@ //@use "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 //@use "include/misc"; // template, [hidden], dialog, canvas - -//@use "fonts/Roboto"; -//@use "fonts/Roboto-Mono"; // Monospaced -//@use "fonts/Arimo"; -//@use "fonts/FiraCode"; // Monospaced -//@use "fonts/Abridge"; // Icon Font (don't recommend, CSS only icons are in my opinion better.) - -@forward "colors/orange" as colors-*; -//@forward "colors/blue" as colors-*; -//@forward "colors/blueshade" as colors-*; diff --git a/sass/function/_font.sass b/sass/function/_font.sass index 95704c9..45f8fc3 100644 --- a/sass/function/_font.sass +++ b/sass/function/_font.sass @@ -2,8 +2,8 @@ @use "sass:list" @function font-append($base, $ext, $font-sep) - $base-pre : () - $base-pos : () + $base-pre : () + $base-pos : () $iFontSep : index($base, $font-sep) @if not $iFontSep // didn't find the font separator, return @debug "⚠ Failed to find '#{$font-sep}' in the list of '#{$base}'" diff --git a/sass/include/_embedded.scss b/sass/include/_embedded.scss index cff161e..bd1dbb8 100644 --- a/sass/include/_embedded.scss +++ b/sass/include/_embedded.scss @@ -4,13 +4,13 @@ .yvi {//youtube and vimeo iframe position: absolute; top: 0; - left: 0 + left: 0; } .yv {//youtube and vimeo div position: relative; padding-bottom: 56.25%; height: 0; - overflow: hidden + overflow: hidden; } img, video, diff --git a/sass/include/_hr.scss b/sass/include/_hr.scss index d6215dc..501bdf0 100644 --- a/sass/include/_hr.scss +++ b/sass/include/_hr.scss @@ -10,6 +10,6 @@ hr { height: 0; // 1 overflow: visible; // 2 border: none; - border-top: 1px solid var(--f1) + border-top: 1px solid var(--f1); } header hr, footer hr {border-top: 1px solid var(--c4)} diff --git a/sass/include/_icons.scss b/sass/include/_icons.scss index 511905d..907bcda 100644 --- a/sass/include/_icons.scss +++ b/sass/include/_icons.scss @@ -117,7 +117,7 @@ display: inline-block; //overflow: hidden; text-align: center; - vertical-align: middle + vertical-align: middle; } .svgs { width: var(--fs); diff --git a/sass/include/_nav.scss b/sass/include/_nav.scss index efad0ec..537f23d 100644 --- a/sass/include/_nav.scss +++ b/sass/include/_nav.scss @@ -128,7 +128,7 @@ footer nav { margin: var(--s2) 0 var(--s1); } div { - margin: auto // keeps top menu/search centered in mobile view + margin: auto; // keeps top menu/search centered in mobile view } } } diff --git a/sass/include/_sectioning.scss b/sass/include/_sectioning.scss index 36b0a8e..a84842d 100644 --- a/sass/include/_sectioning.scss +++ b/sass/include/_sectioning.scss @@ -77,12 +77,12 @@ header, main { padding-bottom: 0; margin-bottom: 0; hr { - margin:0.1rem 0 + margin:0.1rem 0; } } footer{ line-height: var(--lhh); hr, p { - margin: 0.1rem 0 .3rem + margin: 0.1rem 0 .3rem; } } diff --git a/sass/include/_typography.scss b/sass/include/_typography.scss index 8eaa7f9..7ed6096 100644 --- a/sass/include/_typography.scss +++ b/sass/include/_typography.scss @@ -46,7 +46,7 @@ a:hover { } h1 a, h2 a, main nav a { color: var(--f2); - text-decoration:none; + text-decoration: none; &:hover { color: var(--a3); text-decoration: none; diff --git a/sass/include/_zola.scss b/sass/include/_zola.scss index 2dd0b70..2b29a58 100644 --- a/sass/include/_zola.scss +++ b/sass/include/_zola.scss @@ -10,9 +10,7 @@ .s70 {font-size: .70em} .hpad {padding: 0 .2rem} .rpad {padding-right: .2rem} -.si { - font-size: 1.5em -} +.si {font-size: 1.5em} pre code[data-lang]::before { color: var(--f1); text-transform: uppercase; diff --git a/static/search.js b/static/search.js index 6aa7019..544ca07 100644 --- a/static/search.js +++ b/static/search.js @@ -166,6 +166,12 @@ Source: */ (function(){ var lang = document.documentElement.getAttribute("lang"); + var langOnly = lang.substring(0, 2); + var baseUrl = document.querySelector("meta[name='base']").getAttribute("content"); + if (baseUrl.slice(-1) == "/") { + baseUrl = baseUrl.slice(0, -1); + } + var index; searchinput.addEventListener('input', show_results, true); suggestions.addEventListener('click', accept_suggestion, true); @@ -173,7 +179,7 @@ Source: async function show_results(){ var initIndex = async function () { if (index === undefined) { - index = fetch("/search_index." + lang + ".json") + index = fetch(baseUrl + '/search_index.' + langOnly + '.json') .then( async function(response) { return await elasticlunr.Index.load(await response.json()); diff --git a/templates/base.html b/templates/base.html index 6a6927a..c29fe6e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -3,7 +3,7 @@ {%- import "macros/page.html" as page_macros %} {%- import "macros/macros.html" as macros %} - + {{- macros_head::theme(config=config) }} {{- macros_head::stylesheets(config=config) }} @@ -37,16 +37,16 @@
diff --git a/templates/categories/single.html b/templates/categories/single.html index 1f5e48c..9e667b4 100644 --- a/templates/categories/single.html +++ b/templates/categories/single.html @@ -21,7 +21,7 @@ {%- for year, posts in term.pages | group_by(attribute="year") %}

{{ year }}

{%- for page in posts %} -

{{ page.title }} -

+

{{ page.title }} -

{%- endfor %} {%- endfor %}
diff --git a/templates/page.html b/templates/page.html index 6d5188d..ba2b451 100644 --- a/templates/page.html +++ b/templates/page.html @@ -60,12 +60,12 @@

{%- if lang != config.default_language %}{{ trans(key="Index" | safe, lang=lang) }}{% else %}Index{% endif %}

{%- for h in toc %}
- {{ h.title }} + {{ h.title }}
{%- if h.children %} {%- for h2 in h.children %}
- - {{ h2.title }} + - {{ h2.title }}
{%- endfor %} {%- endif %} diff --git a/templates/posts.html b/templates/posts.html index a353d15..92c07dc 100644 --- a/templates/posts.html +++ b/templates/posts.html @@ -27,7 +27,7 @@ {%- for year, posts in section_item.pages | group_by(attribute="year") %}

{{ year }}

{%- for post in posts %} -

{{ post.title }} -

+

{{ post.title }} -

{%- endfor %} {%- endfor %} diff --git a/templates/tags/list.html b/templates/tags/list.html index c703761..a24ef09 100644 --- a/templates/tags/list.html +++ b/templates/tags/list.html @@ -22,9 +22,9 @@

{% for term in terms %} #{{ term.name }}{{ term.pages | length }} {% endfor %}

{%- for term in terms %} -

#{{ term.name }}

+

#{{ term.name }}

{%- for page in term.pages %} -

{{ page.title }} -

+

{{ page.title }} -

{%- endfor %} {%- endfor %} diff --git a/templates/tags/single.html b/templates/tags/single.html index ad8caeb..8984219 100644 --- a/templates/tags/single.html +++ b/templates/tags/single.html @@ -21,7 +21,7 @@ {%- for year, posts in term.pages | group_by(attribute="year") %}

{{ year }}

{%- for page in posts %} -

{{ page.title }} -

+

{{ page.title }} -

{%- endfor %} {%- endfor %} -- cgit v1.3.1 From f81a42045e29cc396af78b5d87ead874ba26fa18 Mon Sep 17 00:00:00 2001 From: Jieiku Date: Mon, 22 May 2023 23:12:14 -0700 Subject: All Variables Easy Override --- COPY-FILES-TO-ROOT-SITE-SASS/abridge.scss | 128 ++ highlight_themes/abridge-dark.tmTheme | 1025 --------------- highlight_themes/abridge-light.tmTheme | 1025 --------------- highlight_themes/ayu-dark-abridge.tmTheme | 1025 --------------- highlight_themes/ayu-light-abridge.tmTheme | 1025 --------------- highlight_themes/ayu_mirage-dark-abridge.tmTheme | 1025 --------------- highlight_themes/ayu_mirage-light-abridge.tmTheme | 1025 --------------- highlight_themes/charcoal-dark-abridge.tmTheme | 330 ----- highlight_themes/charcoal-light-abridge.tmTheme | 330 ----- highlight_themes/dracula-dark-abridge.tmTheme | 938 -------------- highlight_themes/dracula-light-abridge.tmTheme | 938 -------------- highlight_themes/material-dark-abridge.tmTheme | 1011 --------------- highlight_themes/material-light-abridge.tmTheme | 1011 --------------- sass/_colors.scss | 50 + sass/_font-extend-COPY-ME.sass | 19 - sass/_font-extend.sass | 35 - sass/_functions.scss | 122 ++ sass/_includes.scss | 58 - sass/_syntax.scss | 39 + sass/_variables.scss | 192 --- sass/abridge-auto.scss | 20 - sass/abridge-dark.scss | 12 - sass/abridge-light.scss | 12 - sass/abridge.scss | 1407 ++++++++++++++++++++- sass/colors/_blue.scss | 26 - sass/colors/_blueshade.scss | 26 - sass/colors/_orange.scss | 26 - sass/colors/_syntax.scss | 21 - sass/function/_font.sass | 28 - sass/include/_button.scss | 46 - sass/include/_code.scss | 35 - sass/include/_document.scss | 39 - sass/include/_embedded.scss | 32 - sass/include/_form.scss | 38 - sass/include/_grid.scss | 15 - sass/include/_hr.scss | 15 - sass/include/_icons.scss | 134 -- sass/include/_misc.scss | 15 - sass/include/_nav.scss | 135 -- sass/include/_scroller.scss | 17 - sass/include/_search.scss | 78 -- sass/include/_sectioning.scss | 88 -- sass/include/_syntax.scss | 200 --- sass/include/_table.scss | 29 - sass/include/_toc.scss | 50 - sass/include/_top.scss | 31 - sass/include/_typography.scss | 144 --- sass/include/_zola.scss | 68 - 48 files changed, 1736 insertions(+), 12402 deletions(-) create mode 100644 COPY-FILES-TO-ROOT-SITE-SASS/abridge.scss delete mode 100644 highlight_themes/abridge-dark.tmTheme delete mode 100644 highlight_themes/abridge-light.tmTheme delete mode 100644 highlight_themes/ayu-dark-abridge.tmTheme delete mode 100644 highlight_themes/ayu-light-abridge.tmTheme delete mode 100644 highlight_themes/ayu_mirage-dark-abridge.tmTheme delete mode 100644 highlight_themes/ayu_mirage-light-abridge.tmTheme delete mode 100644 highlight_themes/charcoal-dark-abridge.tmTheme delete mode 100644 highlight_themes/charcoal-light-abridge.tmTheme delete mode 100644 highlight_themes/dracula-dark-abridge.tmTheme delete mode 100644 highlight_themes/dracula-light-abridge.tmTheme delete mode 100644 highlight_themes/material-dark-abridge.tmTheme delete mode 100644 highlight_themes/material-light-abridge.tmTheme create mode 100644 sass/_colors.scss delete mode 100644 sass/_font-extend-COPY-ME.sass delete mode 100644 sass/_font-extend.sass create mode 100644 sass/_functions.scss delete mode 100644 sass/_includes.scss create mode 100644 sass/_syntax.scss delete mode 100644 sass/_variables.scss delete mode 100644 sass/abridge-auto.scss delete mode 100644 sass/abridge-dark.scss delete mode 100644 sass/abridge-light.scss delete mode 100644 sass/colors/_blue.scss delete mode 100644 sass/colors/_blueshade.scss delete mode 100644 sass/colors/_orange.scss delete mode 100644 sass/colors/_syntax.scss delete mode 100644 sass/function/_font.sass delete mode 100644 sass/include/_button.scss delete mode 100644 sass/include/_code.scss delete mode 100644 sass/include/_document.scss delete mode 100644 sass/include/_embedded.scss delete mode 100644 sass/include/_form.scss delete mode 100644 sass/include/_grid.scss delete mode 100644 sass/include/_hr.scss delete mode 100644 sass/include/_icons.scss delete mode 100644 sass/include/_misc.scss delete mode 100644 sass/include/_nav.scss delete mode 100644 sass/include/_scroller.scss delete mode 100644 sass/include/_search.scss delete mode 100644 sass/include/_sectioning.scss delete mode 100644 sass/include/_syntax.scss delete mode 100644 sass/include/_table.scss delete mode 100644 sass/include/_toc.scss delete mode 100644 sass/include/_top.scss delete mode 100644 sass/include/_typography.scss delete mode 100644 sass/include/_zola.scss (limited to 'sass/include/_embedded.scss') diff --git a/COPY-FILES-TO-ROOT-SITE-SASS/abridge.scss b/COPY-FILES-TO-ROOT-SITE-SASS/abridge.scss new file mode 100644 index 0000000..a552adc --- /dev/null +++ b/COPY-FILES-TO-ROOT-SITE-SASS/abridge.scss @@ -0,0 +1,128 @@ +@use '../themes/abridge/sass/abridge' with ( + /// LINES HERE END WITH COMMA AFTER THE VALUE! + $abridgeMode:"switcher",//valid values: switcher, auto, dark, light + + /// Enable a centered viewport for
,
,