diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | README.md | 204 | ||||
| -rw-r--r-- | config.toml | 5 | ||||
| -rw-r--r-- | content/pages/about.md | 2 | ||||
| -rw-r--r-- | sass/abridge.scss | 6 | ||||
| -rw-r--r-- | sass/include/_button.scss | 40 | ||||
| -rw-r--r-- | sass/include/_code.scss | 26 | ||||
| -rw-r--r-- | sass/include/_embedded.scss | 16 | ||||
| -rw-r--r-- | sass/include/_form.scss | 36 | ||||
| -rw-r--r-- | sass/include/_nav.scss | 14 | ||||
| -rw-r--r-- | sass/include/_table.scss | 16 | ||||
| -rw-r--r-- | sass/include/_typography.scss | 51 | ||||
| -rw-r--r-- | sass/themes/_auto.scss | 23 | ||||
| -rw-r--r-- | sass/themes/_dark.scss | 19 | ||||
| -rw-r--r-- | sass/themes/_light.scss | 13 | ||||
| -rw-r--r-- | static/favicon.png | bin | 0 -> 116 bytes | |||
| -rw-r--r-- | static/processed_images/199de027950a8f4800.jpg | bin | 0 -> 37494 bytes | |||
| -rw-r--r-- | templates/404.html | 2 | ||||
| -rw-r--r-- | templates/base.html | 6 | ||||
| -rw-r--r-- | templates/macros/macros.html | 2 | ||||
| -rw-r--r-- | templates/macros/social.html | 2 | ||||
| -rw-r--r-- | theme.toml | 2 |
22 files changed, 349 insertions, 138 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4636c6c --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +public +themes @@ -1,3 +1,205 @@ # Abridge Zola Theme -[abridge](https://github.com/jieiku/abridge) is a fast and lightweight Zola theme using semantic html, class-light [abridge.css](https://github.com/jieiku/abridge.css), and No JS. +Abridge is a fast and lightweight Zola theme using semantic html, class-light [abridge.css](https://github.com/jieiku/abridge.css), and No JS. + +## Demo + +[https://jieiku.github.io/abridge-demo/](https://jieiku.github.io/abridge-demo/) + +## Requirements + +This theme requires version 0.14.1 or later of [Zola](https://www.getzola.org/documentation/getting-started/installation/) + +## Quick Start + +```bash +git clone https://github.com/jieiku/abridge +cd abridge +zola serve +# open http://127.0.0.1:1111/ in the browser +``` + +## Installation +The Quick Start example shows you how to run the theme directly as a site. +Next we will use abridge as a theme to a NEW site. + +### Step 1: Create a new zola site + +```bash +zola init mysite +``` + +### Step 2: Install abridge + +Download this theme to your themes directory: + +```bash +cd mysite/themes +git clone https://github.com/jieiku/abridge.git +``` + +Or install as a submodule: + +```bash +cd mysite +git init # if your project is a git repository already, ignore this command +git submodule add https://github.com/jieiku/abridge.git themes/abridge +``` + +### Step 3: Configuration + +Enable the theme in your `config.toml` in the site directory: + +```toml +theme = "abridge" +``` + +Or copy the `config.toml` from the theme directory to your project's +root directory, and uncomment the theme line: + +```bash +cp themes/abridge/config.toml config.toml +sed -i 's/^#theme = "abridge"/theme = "abridge"/' config.toml +``` + +### Step 4: Add new content + +You can copy the content from the theme directory to your project: + +```bash +cp -r themes/abridge/content . +``` + +You can modify or add new posts in the content directory as needed. + +### Step 5: Run the project + +Just run `zola serve` in the root path of the project: + +```bash +zola serve +``` + +Zola will start the development web server making your site accessible by default at +`http://127.0.0.1:1111`. Saved changes will live reload in the browser. + +## Customization + +You can customize your configurations, templates and content for yourself. Look +at the `config.toml`, `content` files, and templates files in this +repo for an idea. + +### Global Configuration + +There are some configuration options that you can customize in `config.toml`. + +#### Configuration options before `extra` options + +Set the authors's taxonomies for the site. + +```toml +taxonomies = [ + {name = "authors"}, +] +``` + +Use search function for the content. + +```toml +build_search_index = true +``` + +Currently this theme has not yet implemented a search, there are however several themes that have. +For the moment you can look at how those other themes have implemented their search. +I plan to implement a search field eventually, but am still weighing my options. +I would prefer a self hosted search method that works even if javascript is disabled in the browser. (open an issue report if you know of one.) + +#### Configuration options under the `extra` + +The following options should be under the `[extra]` in `config.toml` + +- `recent = true` - This enabled the Recent posts box visible on the top right. +- `recent_items = 9` - The number of items to display in the recent posts box +- `footer_credit = true` - This enables the powered by zola and abridge line in the footer. +- `textlogo` - The Text based logo in the top left corner +- `sitedesc` - This add the site description just below the text based logo. +- `author` - Used for articles to denote the author. +- `keywords` - This is used for SEO, I am however still working on the SEO related fields, they are likely not 100% correct yet. +- `banner` - Image to use in seo related cards, this will be the fallback image if the individual articles does not provide one, still a work in progress. +- `menu` - This is an array of links to display at the top right corner of the page +- `menu_footer` - This is an array of links to display in the footer of the page +- `extra.social` - These are the options for the social icons in the footer, and a couple are also used in SEO related meta tags, still a work in progress. + +Additionally you should configure which social icons you plan to use. (makes the css file size smaller) + +open `themes/abridge/sass/_variables.scss` + +To simply turn them all off you can set `$enable-icons: false` +Otherwise to turn on only the ones you need you would set `$enable-icons: true` +Then enable only the icons you need, eg for mail you would set `$icon-mail: true` +You should then disable all the icons that you do not use, as this will decrease the final size of your css file. +The difference in size is NOT a lot, without icons its ~4kb, with all the social icons its ~12kb. +There are also some general purpose icons you can use, they are disabled by default. + +The theme requires tags and categories taxonomies to be enabled in your `config.toml`: + +```toml +taxonomies = [ + # You can enable/disable RSS + {name = "categories", rss = true}, + {name = "tags", rss = true}, +] +``` + +### Top and Footer menus +Set a field in `extra` with a key of `menu` and `menu_footer`. +If a link should have a trailing slash at the end of the url set `slash = true`. + +```toml +# This is the default menu +menu = [ + {url = "/", name = "Home", slash = true}, + {url = "/about/", name = "About", slash = true}, + {url = "/posts/", name = "Posts", slash = true}, + {url = "/categories/", name = "Categories", slash = true}, + {url = "/tags/", name = "Tags", slash = true}, +] +menu_footer = [ + {url = "/", name = "Home", slash = true}, + {url = "/about/", name = "About", slash = true}, + {url = "/contact/", name = "Contact", slash = true}, + {url = "/privacy/", name = "Privacy", slash = true}, + {url = "/sitemap.xml", name = "Sitemap", slash = false}, +] +``` + +### SEO and Header Tags + +Some SEO Tags have been added as well as some important head tags for browser compatibility. + +you can review them in the head section of templates/base.html, all configurable values should be in config.toml under config.extra + +SEO is still a work in progress, will be performing more testing and updates as time allows. + +### Templates + +All pages are extend to the `base.html`, and you can customize them as need. + +## Reporting Issues + +We use GitHub Issues as the official bug tracker for **abridge**. Please +search [existing issues](https://github.com/jieiku/abridge/issues). It’s +possible someone has already reported the same problem. + +If your problem or idea is not addressed yet, [open a new issue](https://github.com/jieiku/abridge/issues/new). + +## Contributing + +We'd love your help! Especially with fixes to issues. +The overall idea behind abridge is to be lightweight and fast, and to use zero javascript. +The only place that I may eventually add javascript will be for the site search, but hopefully I can find another way. + +## License + +**abridge** is distributed under the terms of the +[MIT license](https://github.com/jieiku/abridge/blob/master/LICENSE). diff --git a/config.toml b/config.toml index f591494..9657dec 100644 --- a/config.toml +++ b/config.toml @@ -1,4 +1,4 @@ -base_url = "https://jieiku.github.io/abridge/" +base_url = "https://jieiku.github.io/abridge-demo/" title = "abridge - Zola Theme" description = "abridge is a fast and lightweight Zola theme using semantic html, abridge.css class-light CSS, and No JS." default_language = "en" @@ -54,9 +54,12 @@ menu_footer = [ {url = "/privacy/", name = "Privacy", slash = true}, {url = "/sitemap.xml", name = "Sitemap", slash = false}, ] +# meta tags +twitter = "your-user-name" # Footer social links; full options listed in macros/social.html [extra.social] +feed = true mail = "name@example.com" mastodon = "@your-user-name" element = "matrix.example.com" diff --git a/content/pages/about.md b/content/pages/about.md index 97ed9dd..1e7d7e7 100644 --- a/content/pages/about.md +++ b/content/pages/about.md @@ -6,7 +6,7 @@ template = "pages.html" This site provides a demo for the [abridge theme](https://github.com/Jieiku/abridge) for [Zola](https://www.getzola.org/) the static site generator. -Abridge was created by [Jake G (jieiku)](https://github.com/Jieiku) to be fast and lightweight, using semantic html, [abridge.css](https://github.com/Jieiku/abridge-css) class-light CSS, and No JS. +Abridge was created by [Jake G (jieiku)](https://github.com/Jieiku) to be fast and lightweight, using semantic html, [abridge.css](https://github.com/Jieiku/abridge.css) class-light CSS, and No JS. Some fun facts about the theme: diff --git a/sass/abridge.scss b/sass/abridge.scss index 29dc988..d69bd5d 100644 --- a/sass/abridge.scss +++ b/sass/abridge.scss @@ -1,6 +1,6 @@ /* * Forked from Bamboo: https://github.com/rilwis/bamboo (MIT) - * which was forked from new.css (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) @@ -8,8 +8,8 @@ * 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) + * Normalize: https://github.com/necolas/normalize.css (MIT) + * Sanitize: https://github.com/csstools/sanitize.css (CC0 1.0 Universal) */ // Config diff --git a/sass/include/_button.scss b/sass/include/_button.scss index 257e8c6..7152a0c 100644 --- a/sass/include/_button.scss +++ b/sass/include/_button.scss @@ -3,39 +3,39 @@ button, input, select, textarea { - margin: 0; - padding: .5rem .75rem; - max-width: 100%; - background: var(--c2); - border: 0; - border-radius: .25rem; - font: inherit; - line-height: 1.125; - color: var(--f1); + margin: 0; + padding: .5rem .75rem; + max-width: 100%; + background: var(--c2); + border: 0; + border-radius: .25rem; + font: inherit; + line-height: 1.125; + color: var(--f1); } button, [type="button" i], [type="submit" i], [type="reset" i] { - -webkit-appearance: button; - display: inline-block; - text-align: center; - white-space: nowrap; - background: var(--c2); - color: var(--f1); - border: 0; - cursor: pointer; - transition: opacity .25s; + -webkit-appearance: button; + display: inline-block; + text-align: center; + white-space: nowrap; + background: var(--c2); + color: var(--f1); + border: 0; + cursor: pointer; + transition: opacity .25s; } button:hover, [type="button" i]:hover, [type="submit" i]:hover, [type="reset" i]:hover { - opacity: .75; + opacity: .75; } button[disabled], [type="button" i][disabled], [type="submit" i][disabled], [type="reset" i][disabled] { - opacity: .5; + opacity: .5; } diff --git a/sass/include/_code.scss b/sass/include/_code.scss index bd72a32..fd9eb97 100644 --- a/sass/include/_code.scss +++ b/sass/include/_code.scss @@ -5,22 +5,22 @@ kbd, samp, tt, var { - border-radius: var(--br); - background: var(--c2); - font-family: var(--fm); - line-height: initial; - font-size: .8rem; - padding: .3rem .2rem; + border-radius: var(--br); + background: var(--c2); + font-family: var(--fm); + line-height: initial; + font-size: .8rem; + padding: .3rem .2rem; } pre { display: block; - overflow-x: auto; + overflow-x: auto; -ms-overflow-style: scrollbar; - white-space: pre; + white-space: pre; > code { - display: block; - background: transparent; - } + display: block; + background: transparent; + } } // kbd @@ -28,6 +28,6 @@ kbd { background-color: var(--f2); color: var(--c1); vertical-align: baseline; - font-size: 1rem; - padding: .2rem; + font-size: 1rem; + padding: .2rem; } diff --git a/sass/include/_embedded.scss b/sass/include/_embedded.scss index 48282f7..d2d6890 100644 --- a/sass/include/_embedded.scss +++ b/sass/include/_embedded.scss @@ -2,18 +2,18 @@ img, video, svg { - max-width: 100%; - height: auto; + max-width: 100%; + height: auto; } embed, iframe, object { - max-width: 100%; + max-width: 100%; } iframe { - border-style: none; - width: 100%; - height: 100%; - border: 0; - overflow: hidden; + border-style: none; + width: 100%; + height: 100%; + border: 0; + overflow: hidden; } diff --git a/sass/include/_form.scss b/sass/include/_form.scss index 5761c3f..3087ad6 100644 --- a/sass/include/_form.scss +++ b/sass/include/_form.scss @@ -1,36 +1,36 @@ // Form elements (non-button) fieldset { - padding: .5rem .75rem; - border: var(--bw) solid var(--c3); - border-radius: .25rem; + padding: .5rem .75rem; + border: var(--bw) solid var(--c3); + border-radius: .25rem; } legend { - padding: 0 .25rem; + padding: 0 .25rem; } label { - cursor: pointer; - display: block; - margin-bottom: .25rem; + cursor: pointer; + display: block; + margin-bottom: .25rem; } select, input:not([size]):not([type="button" i]):not([type="submit" i]):not([type="reset" i]):not([type="checkbox" i]):not([type="radio" i]) { - width: 100%; + width: 100%; } [type="color" i] { - min-height: 2.125rem; + min-height: 2.125rem; } select:not([multiple]):not([size]) { - padding-right: 1.5rem; - background-repeat: no-repeat; - background-position: right .5rem center; - -moz-appearance: none; - -webkit-appearance: none; - appearance: none; + padding-right: 1.5rem; + background-repeat: no-repeat; + background-position: right .5rem center; + -moz-appearance: none; + -webkit-appearance: none; + appearance: none; } textarea { - width: 100%; - resize: vertical; + width: 100%; + resize: vertical; } textarea:not([rows]) { - height: 8rem; + height: 8rem; } diff --git a/sass/include/_nav.scss b/sass/include/_nav.scss index 9dd4dac..543d88c 100644 --- a/sass/include/_nav.scss +++ b/sass/include/_nav.scss @@ -4,11 +4,11 @@ */ main nav a, main nav a:visited { - font-weight: var(--fh); + font-weight: var(--fh); border: .1rem solid var(--f2); border-radius: var(--br); padding: .3rem var(--s1); - margin: var(--s1); + margin: var(--s1); } main nav a:hover { border-color: var(--a3); @@ -18,11 +18,11 @@ nav { display: flex; justify-content: space-between; div { - ul { - line-height: 0; - margin-top: 0; - padding-bottom: var(--s1); - } + ul { + line-height: 0; + margin-top: 0; + padding-bottom: var(--s1); + } display: block; margin-left: auto } diff --git a/sass/include/_table.scss b/sass/include/_table.scss index 7b9ddbf..e141b7e 100644 --- a/sass/include/_table.scss +++ b/sass/include/_table.scss @@ -1,21 +1,21 @@ // Table table { - border-collapse: collapse; - width: 100%; - text-indent: 0; /* Remove text indentation from table contents in Chrome, Edge, and Safari. */ + border-collapse: collapse; + width: 100%; + text-indent: 0; /* Remove text indentation from table contents in Chrome, Edge, and Safari. */ } table caption { - margin-bottom: .5rem; + margin-bottom: .5rem; } tr { - border-bottom: var(--bw) solid var(--c3); + border-bottom: var(--bw) solid var(--c3); } td, th { - padding: var(--s1); + padding: var(--s1); } th { - text-align: left; + text-align: left; } // Striped @@ -24,7 +24,7 @@ table { background-color: var(--c2); } thead tr { - border-top: var(--bw) solid var(--c3); + border-top: var(--bw) solid var(--c3); background-color: var(--c2); } } diff --git a/sass/include/_typography.scss b/sass/include/_typography.scss index f9f0caa..256dd90 100644 --- a/sass/include/_typography.scss +++ b/sass/include/_typography.scss @@ -6,44 +6,45 @@ h4, h5, h6 { padding-left: 0; - color: var(--f2); + color: var(--f2); margin-bottom: var(--s1); - margin-top: var(--s2); + margin-top: var(--s2); font-weight: var(--fh); font-size: var(--fs); + line-height: var(--lhh); } h1 { - font-size: 2rem; + font-size: 2rem; } h2 { - font-size: 1.75rem; + font-size: 1.75rem; } h3 { - font-size: 1.5rem; + font-size: 1.5rem; } h4 { - font-size: 1.25rem; + font-size: 1.25rem; } h5 { - font-size: 1.125rem; + font-size: 1.125rem; } header h1 { - margin-top: 0; + margin-top: 0; } a { - color: var(--a1); - text-decoration: none; + color: var(--a1); + text-decoration: none; } a:hover { color: var(--a2); - text-decoration: underline; + text-decoration: underline; } h1 a, h2 a, main nav a { color: var(--f2); text-decoration:none; &:hover { - color: var(--a3); - text-decoration: none; + color: var(--a3); + text-decoration: none; } } article { @@ -63,33 +64,33 @@ mark { background-color: var(--c4); color: var(--c1); vertical-align: baseline; - padding: .1rem .4rem; + padding: .1rem .4rem; } blockquote { - margin-left: 0; - padding: .5rem 0 .5rem 1.5rem; - border-left: .25rem solid var(--c3); + margin-left: 0; + padding: .5rem 0 .5rem 1.5rem; + border-left: .25rem solid var(--c3); } blockquote > :last-child { - margin-bottom: 0; + margin-bottom: 0; } small { - font-size: .875rem; + font-size: .875rem; } /* Prevent `sub` and `sup` elements from affecting the line height in all browsers. */ sub, sup { - font-size: .75em; - line-height: 0; - position: relative; - vertical-align: baseline; + font-size: .75em; + line-height: 0; + position: relative; + vertical-align: baseline; } sub { - bottom: -.25em; + bottom: -.25em; } sup { - top: -.5em; + top: -.5em; } address, diff --git a/sass/themes/_auto.scss b/sass/themes/_auto.scss index 0997d76..012aa9b 100644 --- a/sass/themes/_auto.scss +++ b/sass/themes/_auto.scss @@ -3,22 +3,23 @@ --ff: system-ui, -apple-system, "Segoe UI", Roboto, Ubuntu, Cantarell, "Noto Sans", sans-serif; --fm: Menlo, Consolas, "Roboto Mono", "Ubuntu Monospace", "Noto Mono", "Oxygen Mono", "Liberation Mono", monospace; --lh: 1.5; //line-height + --lhh: 1.2; //line-height headers --fs: 1rem; //font-size --fw: 400; //font-weight --fh: 700; //font-weight h1-h6 // Colors - --f1: #555; //font color 1 bbb ccc - --f2: #333; //font color 2 fff eee + --f1: #555; //font color 1 bbb ccc + --f2: #333; //font color 2 fff eee - --c1: #fff; //color 1 111 + --c1: #fff; //color 1 111 --c2: #eee; //color 2 222 --c3: #ddd; //color 3 333 --c4: #777; //color 4 888 - --a1: #f90; //accent color 1 link - --a2: #fb0; //accent color 2 hover,focus - --a3: #fb0; //accent color 3 h1-h2 hover,focus + --a1: #f90; //accent color 1 link + --a2: #fb0; //accent color 2 hover,focus + --a3: #fb0; //accent color 3 h1-h2 hover,focus --cg: #483; //ins green --cr: #d33; //del red @@ -58,15 +59,15 @@ } } @media (prefers-color-scheme: dark) { - :root { - --f1: #ccc; //font color 1 - --f2: #ddd; //font color 2 + :root { + --f1: #ccc; //font color 1 + --f2: #ddd; //font color 2 - --c1: #111; //color 1 + --c1: #111; //color 1 --c2: #222; //color 2 --c3: #333; //color 3 --c4: #888; //color 4 - } + } } // Responsives spacings diff --git a/sass/themes/_dark.scss b/sass/themes/_dark.scss index d05c111..1fef7c3 100644 --- a/sass/themes/_dark.scss +++ b/sass/themes/_dark.scss @@ -3,22 +3,23 @@ --ff: system-ui, -apple-system, "Segoe UI", Roboto, Ubuntu, Cantarell, "Noto Sans", sans-serif; --fm: Menlo, Consolas, "Roboto Mono", "Ubuntu Monospace", "Noto Mono", "Oxygen Mono", "Liberation Mono", monospace; --lh: 1.5; //line-height + --lhh: 1.2; //line-height headers --fs: 1rem; //font-size --fw: 400; //font-weight --fh: 700; //font-weight h1-h6 // Colors - --f1: #ccc; //font color 1 - --f2: #ddd; //font color 2 + --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 + --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: #fb0; //accent color 3 h1-h2 hover,focus + --a1: #f90; //accent color 1 link + --a2: #fb0; //accent color 2 hover,focus + --a3: #fb0; //accent color 3 h1-h2 hover,focus --cg: #483; //ins green --cr: #d33; //del red diff --git a/sass/themes/_light.scss b/sass/themes/_light.scss index 2538391..127073c 100644 --- a/sass/themes/_light.scss +++ b/sass/themes/_light.scss @@ -3,22 +3,23 @@ --ff: system-ui, -apple-system, "Segoe UI", Roboto, Ubuntu, Cantarell, "Noto Sans", sans-serif; --fm: Menlo, Consolas, "Roboto Mono", "Ubuntu Monospace", "Noto Mono", "Oxygen Mono", "Liberation Mono", monospace; --lh: 1.5; //line-height + --lhh: 1.2; //line-height headers --fs: 1rem; //font-size --fw: 400; //font-weight --fh: 700; //font-weight h1-h6 // Colors - --f1: #555; //font color 1 bbb ccc - --f2: #333; //font color 2 fff eee + --f1: #555; //font color 1 bbb ccc + --f2: #333; //font color 2 fff eee - --c1: #fff; //color 1 111 + --c1: #fff; //color 1 111 --c2: #eee; //color 2 222 --c3: #ddd; //color 3 333 --c4: #777; //color 4 888 - --a1: #f90; //accent color 1 link - --a2: #fb0; //accent color 2 hover,focus - --a3: #fb0; //accent color 3 h1-h2 hover,focus + --a1: #f90; //accent color 1 link + --a2: #fb0; //accent color 2 hover,focus + --a3: #fb0; //accent color 3 h1-h2 hover,focus --cg: #483; //ins green --cr: #d33; //del red diff --git a/static/favicon.png b/static/favicon.png Binary files differnew file mode 100644 index 0000000..10dd64a --- /dev/null +++ b/static/favicon.png diff --git a/static/processed_images/199de027950a8f4800.jpg b/static/processed_images/199de027950a8f4800.jpg Binary files differnew file mode 100644 index 0000000..51d50a8 --- /dev/null +++ b/static/processed_images/199de027950a8f4800.jpg diff --git a/templates/404.html b/templates/404.html index 1857f55..22e8791 100644 --- a/templates/404.html +++ b/templates/404.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {# Title #} -{% block title %}<title>Sorry! the page doesn't exist</title>{% endblock title %} +{% block title %}<title>Sorry! Page not found.</title>{% endblock title %} {% block current_url %} <meta property="og:url" content="{{ get_url(path='/') }}"> <meta name="twitter:url" content="{{ get_url(path='/') }}"> diff --git a/templates/base.html b/templates/base.html index 83f5278..53cde0d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -40,7 +40,7 @@ <meta name="apple-mobile-web-app-status-bar-style" content="default"> {% block css %}<link rel="stylesheet" href="{{ get_url(path="abridge.css", trailing_slash=false, cachebust=true) }}">{% endblock css %} - <link rel="shortcut icon" href="/favicon.png" sizes="16x16" type="image/png"/> + <link rel="shortcut icon" href="{{ get_url(path="favicon.png", trailing_slash=false) }}" sizes="16x16" type="image/png"/> <link rel="canonical" href="{{ get_url(path="/") }}"> {% if config.generate_feed %}<link rel="alternate" type="application/rss+xml" title="RSS" href="{{ get_url(path="atom.xml") }}">{% endif %} {% block ogp_head %} @@ -62,8 +62,8 @@ <meta name="twitter:url" content="{{ current_url | safe }}">{% endblock current_url %} {% if config.extra.social.twitter %} - <meta name="twitter:site" content="@{{ config.extra.social.twitter }}"> - <meta name="twitter:creator" content="@{{ config.extra.social.twitter }}"> + <meta name="twitter:site" content="@{{ config.extra.twitter }}"> + <meta name="twitter:creator" content="@{{ config.extra.twitter }}"> {% endif %} {% if page.extra.thumbnail %} diff --git a/templates/macros/macros.html b/templates/macros/macros.html index f0fc531..a470bb0 100644 --- a/templates/macros/macros.html +++ b/templates/macros/macros.html @@ -1,5 +1,5 @@ {% macro title(page) %} <h1><a href="{{ page.permalink | safe }}">{{ page.title }}</a></h1> - <span>{{ page.date | date(format="%B %d, %Y") }}{% if page.taxonomies.categories %} <span> [{% for cat in page.taxonomies.categories %}<a href="{{ get_taxonomy_url(kind="categories", name=cat) | safe }}">{{ cat }}</a>{% endfor %}] </span> {% endif %} + <span>{{ page.date | date(format="%B %d, %Y") }}{% if page.taxonomies.categories %} [{% for cat in page.taxonomies.categories %}<a href="{{ get_taxonomy_url(kind="categories", name=cat) | safe }}">{{ cat }}</a>{% endfor %}] </span> {% endif %} {% if page.taxonomies.tags %} <span>{% for tag in page.taxonomies.tags %} #<a href="{{ get_taxonomy_url(kind="tags", name=tag) | safe }}">{{ tag }}</a> {% endfor %}</span>{% endif %} {% endmacro title %} {% macro footer(page) %} diff --git a/templates/macros/social.html b/templates/macros/social.html index 2fbee61..824b5d3 100644 --- a/templates/macros/social.html +++ b/templates/macros/social.html @@ -1,5 +1,5 @@ {% macro social_links(social_config) %}<span>{% set base_url = get_url(path="", lang=lang) %} -{% if config.generate_feed %} <a href="{{ get_url(path="atom.xml") }}" target="_blank"><span class="svg rss" title="Rss"></span></a>{% endif %} +{% if config.generate_feed %}{% if config.extra.social.feed %} <a href="{{ get_url(path="atom.xml") }}" target="_blank"><span class="svg rss" title="Rss"></span></a>{% endif %}{% endif %} {% if social_config.mail %} <a href="mailto:{{ social_config.mail }}" target="_blank"><span class="svg mail" title="Mail"></span></a>{% endif %} {% if social_config.mastodon %} <a href="https://mastodon.social/{{ social_config.mastodon }}/" target="_blank"><span class="svg mastodon" title="Mastodon"></span></a>{% endif %} @@ -3,7 +3,7 @@ description = "A fast and lightweight Zola theme using semantic html, abridge.cs license = "MIT" homepage = "https://github.com/jieiku/abridge" min_version = "0.14.1" -demo = "https://jieiku.github.io/abridge/" +demo = "https://jieiku.github.io/abridge-demo/" [extra] |
