diff --git a/config.toml b/config.toml index 34128c9..792a0c6 100644 --- a/config.toml +++ b/config.toml @@ -8,7 +8,6 @@ name = "Noratrieb" [params] contentTypeName = "posts" -themeColor = "orange" centerTheme = true [params.logo] diff --git a/themes/terminal/.eslintrc.yml b/themes/terminal/.eslintrc.yml index d6c937d..7fdea84 100644 --- a/themes/terminal/.eslintrc.yml +++ b/themes/terminal/.eslintrc.yml @@ -18,7 +18,7 @@ rules: - as-needed semi: - 2 - - never + - always class-methods-use-this: 0 comma-dangle: - 2 @@ -33,7 +33,7 @@ rules: func-names: 0 quotes: - 2 - - single + - double - allowTemplateLiterals: true no-underscore-dangle: 0 object-curly-newline: 0 diff --git a/themes/terminal/.gitignore b/themes/terminal/.gitignore index 2603155..ed97239 100644 --- a/themes/terminal/.gitignore +++ b/themes/terminal/.gitignore @@ -88,3 +88,6 @@ typings/ .dynamodb/ # End of https://www.gitignore.io/api/node +public +resources +.hugo_build.lock diff --git a/themes/terminal/.postcssrc.js b/themes/terminal/.postcssrc.js deleted file mode 100644 index e0ea4b5..0000000 --- a/themes/terminal/.postcssrc.js +++ /dev/null @@ -1,27 +0,0 @@ -const url = require("postcss-url"); -const imports = require("postcss-import"); -const nested = require("postcss-nested"); -const postCSSPresetEnv = require("postcss-preset-env"); -const cssnano = require("cssnano"); -const color = require("postcss-color-mod-function"); -const mixins = require("postcss-mixins"); - -module.exports = () => ({ - plugins: [ - url, - imports, - mixins, - nested, - postCSSPresetEnv({ - stage: 1, - preserve: true, - features: { - "custom-properties": true, - }, - }), - cssnano({ - preset: "default", - }), - color, - ], -}); diff --git a/themes/terminal/.prettierrc b/themes/terminal/.prettierrc index dacd6a2..e1cf070 100644 --- a/themes/terminal/.prettierrc +++ b/themes/terminal/.prettierrc @@ -2,6 +2,7 @@ "parser": "babel", "printWidth": 100, "trailingComma": "all", + "arrowParens": "avoid", "overrides": [{ "files": ".html", "options": { diff --git a/themes/terminal/.stylelintrc.json b/themes/terminal/.stylelintrc.json new file mode 100644 index 0000000..300e374 --- /dev/null +++ b/themes/terminal/.stylelintrc.json @@ -0,0 +1,12 @@ +{ + "extends": [ + "stylelint-config-standard-scss", + "stylelint-config-prettier-scss" + ], + "rules": { + "max-empty-lines": 1, + "color-function-notation": null, + "no-descending-specificity": null, + "selector-class-pattern": null + } +} diff --git a/themes/terminal/COMMUNITY-FEATURES.md b/themes/terminal/COMMUNITY-FEATURES.md index 1108747..8b193d5 100644 --- a/themes/terminal/COMMUNITY-FEATURES.md +++ b/themes/terminal/COMMUNITY-FEATURES.md @@ -23,3 +23,7 @@ eg: - **Single Page Website** (https://github.com/justinnuwin/hugo-theme-terminal) - A layout where the homepage can render lists of pages and the navigation menu can link to sections on the homepage. - Justin Nguyen, software and hardware developer. + +- **Support for beautiful *KaTeX* formulae** ([amtoine/hugo-theme-terminal-katex](https://github.com/amtoine/hugo-theme-terminal-katex)) + - SHORT DESCRIPTION + - Antoine Stevan ([@amtoine](https://github.com/amtoine)), software engineer into open source diff --git a/themes/terminal/README.md b/themes/terminal/README.md index 97d6fbd..e3804f1 100644 --- a/themes/terminal/README.md +++ b/themes/terminal/README.md @@ -1,8 +1,14 @@ # Terminal -![Terminal](https://github.com/panr/hugo-theme-terminal/blob/master/images/screenshot.png?raw=true) +**Demo: https://panr.github.io/hugo-theme-terminal-demo/** -### DEMO - https://hugo-terminal.now.sh/ +**Create your own color scheme: https://panr.github.io/terminal-css/** + +![Terminal](https://github.com/panr/hugo-theme-terminal/blob/master/images/terminal-theme.png?raw=true) + +--- + +⚠️ The theme needs at least Hugo **Extended** v0.90.x. --- @@ -14,19 +20,19 @@ - [How to configure](#how-to-configure) - [Post archetype](#post-archetype) - [Add-ons](#add-ons) -- [How to (safely) edit the theme](#how-to-edit) +- [How to edit the theme](#how-to-edit) - [Found a bug?](#bug) - [New cool idea or feature](#feature) - [Terminal theme user?](#terminal-theme-user) -- [Sponsoring](#sponsoring) -- [Licence](#licence) +- [License](#license) ## Features -- **5 duotone themes**, depending on your preferences (orange is default, red, blue, green, pink) +- fully customizable color schemes generated by [**Terminal.css**](https://panr.github.io/terminal-css/). - [**Fira Code**](https://github.com/tonsky/FiraCode) as default monospaced font. It's gorgeous! - **really nice duotone**, custom syntax highlighting based on [**PrismJS**](https://prismjs.com) - fully responsive +- fully based on Hugo ecosystem (Pipes and Modules) #### Built-in shortcodes @@ -82,25 +88,64 @@ A custom syntax highlighting based on PrismJS. All you need to do is to wrap you You can download the theme manually by going to [https://github.com/panr/hugo-theme-terminal.git](https://github.com/panr/hugo-theme-terminal.git) and pasting it to `themes/terminal` in your root directory. -You can also clone it directly to your Hugo folder: +You can also choose **one of the 3 possibilities** to install the theme: +1. as Hugo Module +2. as a standalone local directory +3. as a git submodule + +⚠️ The theme needs at least Hugo **Extended** v0.90.x. + +### Install theme as Hugo Module + +```bash +# If this is the first time you're using Hugo Modules +# in your project. You have to initiate your own module before +# you fetch the theme module. +# +# hugo mod init [your website/module name] +hugo mod get github.com/panr/hugo-theme-terminal/v4 ``` + +and in your config file add: + +```toml +[module] + # this is needed when you fetch the theme as a submodule to your repo. + # replacements = "github.com/panr/hugo-theme-terminal/4 -> themes/terminal" +[[module.imports]] + path = 'github.com/panr/hugo-theme-terminal/v4' +``` + +Keep in mind that the theme by default won't show up in the `themes` directory. This means that you are using the theme as it was on the repository at the moment you fetched it. Your local `go.sum` file keeps all the references. Read more about Hugo Modules in the [official documentation](https://gohugo.io/hugo-modules/). + +### Install theme locally + +```bash git clone https://github.com/panr/hugo-theme-terminal.git themes/terminal ``` -If you don't want to make any radical changes, it's the best option, because you can get new updates when they are available. You can also include it as a git submodule: +This will clone the repository directly to the `themes/terminal` directory. -``` +### Install theme as a submodule + +```bash git submodule add -f https://github.com/panr/hugo-theme-terminal.git themes/terminal ``` -⚠️ **The theme needs at least Hugo version 0.74.x**. +This will install the repository as a sumbodule in the `themes/terminal` directory. + +⚠️ If you encounter any issues with: + +```bash +Error: module "terminal" not found; either add it as a Hugo Module or store it in "[...your custom path]/themes".: module does not exist +``` + +then please try to remove `theme = "terminal"` from your config file. ## How to run your site -If you installed all needed `npm` dependencies, then you can run: - -``` +```bash hugo server -t terminal ``` @@ -113,6 +158,8 @@ The theme doesn't require any advanced configuration. Just copy: ```toml baseurl = "/" languageCode = "en-us" +# Add it only if you keep the theme in the `themes` directory. +# Remove it if you use the theme as a remote Hugo Module. theme = "terminal" paginate = 5 @@ -121,9 +168,6 @@ paginate = 5 # the list of set content will show up on your index page (baseurl). contentTypeName = "posts" - # ["orange", "blue", "red", "green", "pink"] - themeColor = "orange" - # if you set this to 0, only submenu trigger will be visible showMenuItems = 2 @@ -145,15 +189,9 @@ paginate = 5 # If you use git, you can set `enableGitInfo` to `true` and then post will automatically get the last updated showLastUpdated = false - # set a custom favicon (default is a `themeColor` square) - # favicon = "favicon.ico" - # Provide a string as a prefix for the last update date. By default, it looks like this: 2020-xx-xx [Updated: 2020-xx-xx] :: Author # updatedDatePrefix = "Updated" - # set all headings to their default size (depending on browser settings) - # oneHeadingSize = true # default - # whether to show a page's estimated reading time # readingTime = false # default @@ -177,35 +215,45 @@ paginate = 5 [languages.en] languageName = "English" title = "Terminal" - subtitle = "A simple, retro theme for Hugo" - owner = "" - keywords = "" - copyright = "" - menuMore = "Show more" - readMore = "Read more" - readOtherPosts = "Read other posts" - newerPosts = "Newer posts" - olderPosts = "Older posts" - missingContentMessage = "Page not found..." - missingBackButtonLabel = "Back to home page" - [languages.en.params.logo] - logoText = "Terminal" - logoHomeLink = "/" + [languages.en.params] + subtitle = "A simple, retro theme for Hugo" + owner = "" + keywords = "" + copyright = "" + menuMore = "Show more" + readMore = "Read more" + readOtherPosts = "Read other posts" + newerPosts = "Newer posts" + olderPosts = "Older posts" + missingContentMessage = "Page not found..." + missingBackButtonLabel = "Back to home page" + minuteReadingTime = "min read" + words = "words" - [languages.en.menu] - [[languages.en.menu.main]] - identifier = "about" - name = "About" - url = "/about" - [[languages.en.menu.main]] - identifier = "showcase" - name = "Showcase" - url = "/showcase" + [languages.en.params.logo] + logoText = "Terminal" + logoHomeLink = "/" + + [languages.en.menu] + [[languages.en.menu.main]] + identifier = "about" + name = "About" + url = "/about" + [[languages.en.menu.main]] + identifier = "showcase" + name = "Showcase" + url = "/showcase" + +[module] + # In case you would like to make changes to the theme and keep it locally in you repository, + # uncomment the line below (and correct the local path if necessary). + # -- + # replacements = "github.com/panr/hugo-theme-terminal/v4 -> themes/terminal" +[[module.imports]] + path = 'github.com/panr/hugo-theme-terminal/v4' ``` -to `config.toml` file in your Hugo root directory and change params fields. In case you need, here's [a YAML version](https://gist.github.com/panr/9eeea6f595c257febdadc11763e3a6d1). - **NOTE:** Please keep in mind that currently `main menu` doesn't support nesting. ## Post archetype @@ -218,39 +266,11 @@ See the default `post` file params supported by the theme — https://github.com - **Extended Head** — please take a look at `layouts/partials/extended_head.html` https://github.com/panr/hugo-theme-terminal/blob/master/layouts/partials/extended_head.html - **Extended Footer** — please take a look at `layouts/partials/extended_footer.html` https://github.com/panr/hugo-theme-terminal/blob/master/layouts/partials/extended_footer.html -## How to (safely) edit the theme +## How to edit the theme -If you have to override only some of the styles, you can do this easily by adding `static/style.css` in your root directory and point things you want to change. +If you are using as a remote Hugo Module (you don't have the theme files in the `theme/terminal`) and you have to override only some of the styles, you can do this easily by adding `static/style.css` in your root directory and point things you want to change. -To change something directly in the theme, you have to go to `themes/terminal` and modify the files. - -First, you need to install Node dependencies. To do so, go to the theme directory (from your Hugo root directory): - -```bash - cd themes/terminal -``` - - then run: - - ```bash - npm install - npm i yarn - yarn - ``` - -After you modified the files you can run webpack in watch mode: - -```bash -yarn dev -``` - -or rebuild theme - -```bash -yarn build -``` - -To see the changes (remember to restart `hugo server`). +If you have the theme files in the theme directory, then you can directly edit anything in the theme, you just have to go to `themes/terminal` and modify the files. No compilation step needed. ## Found a bug? @@ -277,14 +297,9 @@ Sounds OK? Cool, let's rock! 🤘 I'd be happy to know more about you and what you are doing. If you want to share it, please make a contribution and [add your site to the list](https://github.com/panr/hugo-theme-terminal/blob/master/USERS.md)! 🤗 -## Sponsoring - -If you like my work and want to support the development of the project, now you can! Just: - -Buy Me A Coffee ## License -Copyright © 2019-2020 Radosław Kozieł ([@panr](https://twitter.com/panr)) +Copyright © 2019-2024 Radosław Kozieł ([@panr](https://twitter.com/panr)) The theme is released under the MIT License. Check the [original theme license](https://github.com/panr/hugo-theme-terminal/blob/master/LICENSE.md) for additional licensing information. diff --git a/themes/terminal/USERS.md b/themes/terminal/USERS.md index 871b855..838aa88 100644 --- a/themes/terminal/USERS.md +++ b/themes/terminal/USERS.md @@ -1,27 +1,20 @@ # Meet the users of Terminal theme! + - https://xicode.se **magistern** (Teacher) - https://devmaster64.com **devmaster64** (Software Developer) -- https://mickie1.gitlab.io/blog/ **mickie** (Engineer) - https://calloc.net **Vaibhav Yenamandra** (Software Engineer) - https://potatofrom.space **Kevin Liu** (Software) - https://horochx.org **horochx** (Software Developer) - https://feng.si **Si Feng** (Software Engineer) - https://ben-on-vms.com **Benedikt Frenzel** (Technical Support Engineer) - https://johngazzini.com **John Gazzini** (Software Engineer) -- https://geekx.tech/ **Sagar Ladla** (Student Developer & Cyber Security Specialist) - https://tears.io/ **Alex** (SRE) - https://ayushkarn.me/ **Ayush Karn** (Student Developer) -- https://ssgram.dev **Ramaseshan Parthasarathy** (Software Developer) - https://zaine.me **Amine Zaine** (Cloud Engineer) - https://notes.dmaitre.phyip3.dur.ac.uk/computing-club/ **Ryan Moodie** (Physics PhD student) -- https://thecodecousins.com **Stanley Nguyen** (Software Engineer) & **Hoang Do** (Software & IoT Engineer) -- https://schacherbauer.dev **Markus Schacherbauer** (Student Developer) -- https://rinma.dev **Marvin Dalheimer** (Software Developer) - https://lunar.computer **Lunar Computer** (DevOps Engineer) - https://naxxfish.net **Chris Roberts** (Broadcast Systems Engineer) -- https://security.jtang.dev **Jonathan Tang** (Student & Software Engineer) - https://andreacaravano.net **Andrea Caravano** (Student) -- https://dawsonverboven.com/ **Dawson Verboven** (Student & Software Developer) - https://qbunt.com **Jeremy Bunting** (Software Engineer) - https://smeik.org **Smeik** (Embedded Developer) - https://code.willstocks.co.uk **Will Stocks** (Blogger & Developer) @@ -30,12 +23,9 @@ - https://bgameiro.me/ **Bernardo Gameiro** (Engineer Physicist student) - https://return-to-libc.com/ **elraro** (Cyber Security Specialist) - https://pablart.com/ **Pablo Diaz-Gutierrez** (Software Engineer, General Tinkerer) -- https://waterloos.niflheimr.blue/ **cindrmon** (Student and Aspiring Software Engineer) - https://monocle.rpod.club/ **classx** (DevOps Engineer) -- https://wjdevschool.com/ **Wojciech Bogócki** (Making Things & Teaching / W&J Dev School) -- https://dongzhi.me **Joe** (Software Developer) +- https://erisianrite.com/ **ErisianRite** (Coding, Engineering, Tools for Thought) - https://isaes.com.tr/ **Isa Es** (Software Engineer) -- https://conight.com **Conight Wang** (Software Engineer) - https://blog.m5e.de/ **Christoph Miksche** (Software Developer) - https://mpostument.com/ **Maksym Postument** (DevOps Engineer) - https://mathiejosh.xyz **Josh Mathie** (Electrical Engineering Technology Student/Sales and Engineering Tech) @@ -43,8 +33,6 @@ - https://blog.puvvadi.me **KD Puvvadi** (Software Dev & Cloud Orchestrator) - https://hidden.land/ **Louisload** (Game Developer & Musician) - https://linuxbase.nl **Michael Trip** (DevOps Engineer) -- https://markopolo123.github.io **Markopolo** (DevOps Engineer) -- https://openfoxblog.leven.dev/ **Damon Leven** (Student & Software Developer) - https://blog.sethforprivacy.com **Seth For Privacy** (Security, privacy, and cryptocurrency writer, podcaster) - https://thesprawl.city **crish** (Software and stuff) - https://justinnuwin.com **Justin Nguyen** (Software & Hardware Developer) @@ -54,10 +42,20 @@ - https://biplav.xyz **Biplav's Blog** (Student) - https://santiago.wtf **Nicholas Santiago** (DevOps Engineer) - https://2200g.github.io/ **2200g** (Blogger/Student) -- https://cristiioan.me **Cristian Margine** (Student) - https://they.mint.lgbt **Joey Aliaga** (Software Developer & Student) - https://tatewilhelm.me **Tate Wilhelm** (Student, Programmer & Tinkerer) - https://mikefoden.com **Mike Foden** (Software Developer) +- https://undemalum.github.io/portfolio/ **Mateusz Konat** (Student) +- https://ku0hn.radio **Ben Kuhn** (Ham Radio Operator, InfoSec Engineer, Tinkerer) +- https://www.grumpymetalguy.com **GrumpyMetalGuy** (General Grumper and Developer) +- https://blog.jontes.page **Jonte** (general tech geek) +- https://nazdarthegame.com/ **Michal Skoula** (Software Developer) +- https://1mup.myorange.house **Antonio Garosi** (Street art gallery) +- https://kitchvx.github.io **Nathan Kitching** (IT Student) +- https://dgood.win **Dom Goodwin** (Platform Engineer) +- https://sir-photch.xyz **Sir-Photch** (ComSci-student. German Blog) +- https://drewmorris.info **Drew Morris** (Mathematician && Computer Scientist) +- https://blog.darkiiiiiice.com **MarioMang** (Software Developer) + diff --git a/themes/terminal/assets/css/buttons.css b/themes/terminal/assets/css/buttons.css index b619481..fdf10c7 100644 --- a/themes/terminal/assets/css/buttons.css +++ b/themes/terminal/assets/css/buttons.css @@ -8,54 +8,84 @@ button, .button, a.button { position: relative; - display: flex; + display: inline-flex; align-items: center; justify-content: center; padding: 8px 18px; - margin-bottom: 5px; text-decoration: none; text-align: center; - border-radius: 0; - border: 1px solid var(--accent); - background: var(--accent); + border-radius: 8; font: inherit; font-weight: bold; appearance: none; cursor: pointer; outline: none; +} - &:hover { - background: color-mod(var(--accent) a(90%)); - } +button.outline, +.button.outline, +a.button.outline { + background: transparent; + box-shadow: none; + padding: 8px 18px; +} - /* variants */ +button.outline :hover, +.button.outline :hover, +a.button.outline :hover { + transform: none; + box-shadow: none; +} - &.outline { - background: transparent; - box-shadow: none; - padding: 8px 18px; +button.link, +.button.link, +a.button.link { + background: none; + font-size: 1rem; +} - :hover { - transform: none; - box-shadow: none; - } - } +button.small, +.button.small, +a.button.small { + font-size: 0.8rem; +} - &.link { - background: none; - font-size: 1rem; - } +button.wide, +.button.wide, +a.button.wide { + min-width: 200px; + padding: 14px 24px; +} - /* sizes */ +a.button.inline { + background: none; + color: var(--accent); + padding: initial; + margin: initial; + border: initial; + font-weight: initial; + text-decoration: none; +} - &.small { - font-size: .8rem; - } +a.button.inline:active, +a.button.inline:hover { + background: none; +} - &.wide { - min-width: 200px; - padding: 14px 24px; - } +a.button.inline::before { + content: "[" +} + +a.button.inline::after { + content: "]" +} + +a.button.inline.prev::before { + content: "← [" +} + +a.button.inline.next::after { + content: "] →" } a.read-more, @@ -63,32 +93,31 @@ a.read-more:hover, a.read-more:active { display: inline-flex; border: none; - color: var(--accent); background: none; box-shadow: none; padding: 0; - margin: 20px 0; max-width: 100%; + text-decoration: none; } .code-toolbar { margin-bottom: 20px; - - .toolbar-item a { - position: relative; - display: inline-flex; - align-items: center; - justify-content: center; - padding: 3px 8px; - margin-bottom: 5px; - text-decoration: none; - text-align: center; - font-size: 13px; - font-weight: 500; - border-radius: 8px; - border: 1px solid transparent; - appearance: none; - cursor: pointer; - outline: none; - } +} + +.code-toolbar .toolbar-item a { + position: relative; + display: inline-flex; + align-items: center; + justify-content: center; + padding: 3px 8px; + margin-bottom: 5px; + text-decoration: none; + text-align: center; + font-size: 13px; + font-weight: 500; + border-radius: 8px; + border: 1px solid transparent; + appearance: none; + cursor: pointer; + outline: none; } diff --git a/themes/terminal/assets/css/code.css b/themes/terminal/assets/css/code.css index 8405fa9..fb2fc2d 100644 --- a/themes/terminal/assets/css/code.css +++ b/themes/terminal/assets/css/code.css @@ -1,84 +1,118 @@ -.collapsable-code { - --border-color: color-mod(var(--accent) blend(#999 90%)); +/* _code.scss */ +pre { + margin: 20px 0; +} +.code-toolbar { + position: relative; + margin: 20px 0; + border: 1px solid color-mix(in srgb, var(--accent) 10%, transparent); +} + +.code-toolbar + .code-toolbar, +.code-toolbar + .highlight, +.code-toolbar + .highlight .code-toolbar { + border-top: 0; + margin-top: -20px; +} + +.code-toolbar pre, .code-toolbar code { + border: none; +} + +.code-toolbar code { + display: block; + color: color-mix(in srgb, var(--accent) 50%, var(--foreground)); +} + +.code-toolbar > .toolbar button { + font-size: 0.8em !important; + font-weight: bold !important; + background: var(--accent) !important; + color: var(--background) !important; + border-radius: var(--radius) !important; + box-shadow: none !important; + border: 1px solid var(--background) !important; + margin: 6px !important; + padding: 10px !important; + user-select: none; +} + +.collapsable-code { position: relative; width: 100%; margin: 40px 0; - - input[type="checkbox"] { - position: absolute; - visibility: hidden; - } - - input[type="checkbox"]:checked { - ~ pre, - ~ .code-toolbar pre { - height: 0; - padding: 0; - border-top: none; - } - - ~ .code-toolbar { - padding: 0; - border-top: none; - - .toolbar { - display: none; - } - } - - ~ label .collapsable-code__toggle:after { - content: attr(data-label-expand); - } - } - - label { - position: relative; - display: flex; - justify-content: space-between; - min-width: 30px; - min-height: 30px; - margin: 0; - border-bottom: 1px solid var(--border-color); - cursor: pointer; - } - - &__title { - flex: 1; - color: var(--accent); - padding: 3px 10px; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - } - - &__language { - color: var(--accent); - border: 1px solid var(--border-color); - border-bottom: none; - text-transform: uppercase; - padding: 3px 10px; - } - - &__toggle { - color: var(--accent); - font-size: 16px; - padding: 3px 10px; - - &:after { - content: attr(data-label-collapse); - } - } - - pre { - margin-top: 0; - - &::first-line { - line-height: 0; - } - } - - .code-toolbar { - margin: 0; - } +} + +.collapsable-code input[type=checkbox] { + position: absolute; + visibility: hidden; +} + +.collapsable-code input[type=checkbox]:checked ~ pre, +.collapsable-code input[type=checkbox]:checked ~ .code-toolbar pre { + display: none; +} + +.collapsable-code input[type=checkbox]:checked ~ .code-toolbar { + padding: 0; + border-top: none; +} + +.collapsable-code input[type=checkbox]:checked ~ .code-toolbar .toolbar { + display: none; +} + +.collapsable-code input[type=checkbox]:checked ~ label .collapsable-code__toggle::after { + content: attr(data-label-expand); +} + +.collapsable-code label { + position: relative; + display: flex; + justify-content: space-between; + min-width: 30px; + min-height: 30px; + margin: 0; + border-bottom: 1px solid var(--accent); + cursor: pointer; +} + +.collapsable-code__title { + flex: 1; + color: var(--accent); + padding: 3px 10px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; +} + +.collapsable-code__language { + color: var(--accent); + border: 1px solid var(--accent); + border-bottom: none; + text-transform: uppercase; + padding: 3px 10px; +} + +.collapsable-code__toggle { + color: var(--accent); + font-size: 16px; + padding: 3px 10px; +} + +.collapsable-code__toggle::after { + content: attr(data-label-collapse); +} + +.collapsable-code pre { + margin-top: 0; +} + +.collapsable-code pre::first-line { + line-height: 0; +} + +.collapsable-code .code-toolbar { + margin: 0; } diff --git a/themes/terminal/assets/css/color/blue.css b/themes/terminal/assets/css/color/blue.css deleted file mode 100644 index c83c723..0000000 --- a/themes/terminal/assets/css/color/blue.css +++ /dev/null @@ -1,14 +0,0 @@ -@import '../main.css'; -@import '../header.css'; -@import '../logo.css'; -@import '../pagination.css'; -@import '../post.css'; -@import '../syntax.css'; -@import '../variables.css'; - -:root { - --accent: #23B0FF; - --background: color-mod(var(--accent) blend(#1D1E28 98%)); - --color: white; - --border-color: rgba(255, 255, 255, .1); -} diff --git a/themes/terminal/assets/css/color/green.css b/themes/terminal/assets/css/color/green.css deleted file mode 100644 index 7419172..0000000 --- a/themes/terminal/assets/css/color/green.css +++ /dev/null @@ -1,14 +0,0 @@ -@import '../main.css'; -@import '../header.css'; -@import '../logo.css'; -@import '../pagination.css'; -@import '../post.css'; -@import '../syntax.css'; -@import '../variables.css'; - -:root { - --accent: #78E2A0; - --background: color-mod(var(--accent) blend(#1D1E28 98%)); - --color: white; - --border-color: rgba(255, 255, 255, .1); -} diff --git a/themes/terminal/assets/css/color/pink.css b/themes/terminal/assets/css/color/pink.css deleted file mode 100644 index 7fedad0..0000000 --- a/themes/terminal/assets/css/color/pink.css +++ /dev/null @@ -1,14 +0,0 @@ -@import '../main.css'; -@import '../header.css'; -@import '../logo.css'; -@import '../pagination.css'; -@import '../post.css'; -@import '../syntax.css'; -@import '../variables.css'; - -:root { - --accent: #EE72F1; - --background: color-mod(var(--accent) blend(#1D1E28 98%)); - --color: white; - --border-color: rgba(255, 255, 255, .1); -} diff --git a/themes/terminal/assets/css/color/red.css b/themes/terminal/assets/css/color/red.css deleted file mode 100644 index a58f641..0000000 --- a/themes/terminal/assets/css/color/red.css +++ /dev/null @@ -1,14 +0,0 @@ -@import '../main.css'; -@import '../header.css'; -@import '../logo.css'; -@import '../pagination.css'; -@import '../post.css'; -@import '../syntax.css'; -@import '../variables.css'; - -:root { - --accent: #FF6266; - --background: color-mod(var(--accent) blend(#1D1E28 98%)); - --color: white; - --border-color: rgba(255, 255, 255, .1); -} diff --git a/themes/terminal/assets/css/font.css b/themes/terminal/assets/css/fonts.css similarity index 61% rename from themes/terminal/assets/css/font.css rename to themes/terminal/assets/css/fonts.css index 6bc5f52..9a920b0 100644 --- a/themes/terminal/assets/css/font.css +++ b/themes/terminal/assets/css/fonts.css @@ -1,17 +1,15 @@ +/* _font.scss */ @font-face { font-display: swap; - font-family: 'Fira Code'; - font-style: normal; + font-family: "Fira Code"; + font-style: normal; font-weight: 400; src: url("../fonts/FiraCode-Regular.woff") format("woff"); - font-display: swap; } - @font-face { font-display: swap; - font-family: 'Fira Code'; - font-style: normal; + font-family: "Fira Code"; + font-style: normal; font-weight: 800; src: url("../fonts/FiraCode-Bold.woff") format("woff"); - font-display: swap; } diff --git a/themes/terminal/assets/css/footer.css b/themes/terminal/assets/css/footer.css index bac4ec0..ec64838 100644 --- a/themes/terminal/assets/css/footer.css +++ b/themes/terminal/assets/css/footer.css @@ -1,50 +1,47 @@ +/* _footer.scss */ .footer { padding: 40px 0; flex-grow: 0; - opacity: .5; + opacity: 0.5; +} - &__inner { - display: flex; - align-items: center; - justify-content: space-between; - margin: 0; - width: 760px; - max-width: 100%; +.footer__inner { + display: flex; + align-items: center; + justify-content: space-between; + margin: 0; + width: 760px; + max-width: 100%; +} - @media (--tablet) { - flex-direction: column; - } - } +.footer a { + color: inherit; +} - a { - color: inherit; - } +.footer .copyright { + display: flex; + flex-flow: row wrap; + flex: 1; + align-items: center; + font-size: 1rem; + justify-content: center; +} - .copyright { - display: flex; - flex-direction: row; - align-items: center; - font-size: 1rem; - color: var(--light-color-secondary); +.footer .copyright--user { + margin: auto; + text-align: center; +} - &--user { - margin: auto; - text-align: center; - } +.footer .copyright > *:first-child:not(:only-child) { + margin-right: 10px; +} - & > *:first-child:not(:only-child) { - margin-right: 10px; +.footer .copyright span { + white-space: nowrap; +} - @media (--tablet) { - border: none; - padding: 0; - margin: 0; - } - } - - @media (--tablet) { - flex-direction: column; - margin-top: 10px; - } +@media (max-width: 900px) { + .footer__inner { + flex-direction: column; } } diff --git a/themes/terminal/assets/css/form.css b/themes/terminal/assets/css/form.css deleted file mode 100644 index 5ff4738..0000000 --- a/themes/terminal/assets/css/form.css +++ /dev/null @@ -1,30 +0,0 @@ -input, textarea, select { - background: transparent; - color: var(--accent); - border: 1px solid var(--accent); - border-radius: 0; - padding: 10px; - font: inherit; - appearance: none; - - &:focus, :active { - border-color: var(--color); - outline: 1px solid var(--color); - } - - &:active { - box-shadow: none; - } -} - -select { - background: var(--background); - - option { - background: var(--background); - } -} - -::placeholder { - color: color-mod(var(--accent) a(50%)); -} diff --git a/themes/terminal/assets/css/gist.css b/themes/terminal/assets/css/gist.css index 3ed8145..8a05af5 100644 --- a/themes/terminal/assets/css/gist.css +++ b/themes/terminal/assets/css/gist.css @@ -1,6 +1,5 @@ -body .gist .blob-num /* line numbers */, -body .gist .blob-code-inner -{ - border: none; +/* _gist.scss */ +body .gist .blob-num, +body .gist .blob-code-inner { + border: none; } - diff --git a/themes/terminal/assets/css/header.css b/themes/terminal/assets/css/header.css index cc8098f..aa017af 100644 --- a/themes/terminal/assets/css/header.css +++ b/themes/terminal/assets/css/header.css @@ -1,162 +1,46 @@ -@define-mixin menu { - position: absolute; - background: var(--background); - box-shadow: var(--shadow); - color: white; - border: 2px solid; - margin: 0; - padding: 10px; - list-style: none; - z-index: 99; -} - +/* _header.scss */ .header { display: flex; flex-direction: column; position: relative; +} - @media print { +.header__inner { + display: flex; + align-items: center; + justify-content: space-between; +} + +.header__logo { + display: flex; + flex: 1; +} + +.header__logo::after { + content: ""; + background: repeating-linear-gradient(90deg, var(--accent), var(--accent) 2px, transparent 0, transparent 10px); + display: block; + width: 100%; + right: 10px; +} + +.header__logo a { + flex: 0 0 auto; + max-width: 100%; + text-decoration: none; +} + +.logo { + display: flex; + align-items: center; + text-decoration: none; + background: var(--accent); + color: var(--background); + padding: 5px 10px; +} + +@media print { + .header { display: none; } - - &__inner { - display: flex; - align-items: center; - justify-content: space-between; - } - - &__logo { - display: flex; - flex: 1; - - &:after { - content: ''; - background: repeating-linear-gradient(90deg, var(--accent), var(--accent) 2px, transparent 0, transparent 10px); - display: block; - width: 100%; - right: 10px; - } - - a { - flex: 0 0 auto; - max-width: 100%; - text-decoration: none; - } - } - - .menu { - --shadow-color: color-mod(var(--background) a(80%)); - --shadow: 0 10px var(--shadow-color), -10px 10px var(--shadow-color), 10px 10px var(--shadow-color); - margin: 20px 1px; - - @media (--phone) { - @mixin menu; - top: 50px; - right: 0; - } - - &__inner { - display: flex; - flex-wrap: wrap; - list-style: none; - margin: 0; - padding: 0; - - &--desktop { - @media (--phone) { - display: none; - } - } - - &--mobile { - display: none; - - @media (--phone) { - display: block; - } - } - - li { - &:not(:last-of-type) { - margin-right: 20px; - margin-bottom: 10px; - flex: 0 0 auto; - } - } - - @media (--phone) { - flex-direction: column; - align-items: flex-start; - padding: 0; - - li { - margin: 0; - padding: 5px; - } - } - } - - &__sub-inner { - position: relative; - list-style: none; - padding: 0; - margin: 0; - - &:not(:only-child) { - margin-left: 20px; - } - - &-more { - @mixin menu; - top: 35px; - left: 0; - - &-trigger { - color: var(--accent); - user-select: none; - cursor: pointer; - } - - li { - margin: 0; - padding: 5px; - white-space: nowrap; - } - } - } - - .spacer { - flex-grow: 1; - } - - .language-selector { - position: relative; - list-style: none; - margin: 0; - - &-current { - list-style-type: none; - display: flex; - flex-direction: row; - color: var(--accent); - cursor: pointer; - margin: 0; - } - - &__more { - @mixin menu; - top: 35px; - right: 0; - } - } - - &-trigger { - color: var(--accent); - border: 2px solid; - margin-left: 10px; - height: 100%; - padding: 3px 8px; - position: relative; - } - } } diff --git a/themes/terminal/assets/css/logo.css b/themes/terminal/assets/css/logo.css deleted file mode 100644 index d455cc7..0000000 --- a/themes/terminal/assets/css/logo.css +++ /dev/null @@ -1,8 +0,0 @@ -.logo { - display: flex; - align-items: center; - text-decoration: none; - background: var(--accent); - color: black; - padding: 5px 10px; -} diff --git a/themes/terminal/assets/css/main.css b/themes/terminal/assets/css/main.css index 8929ea1..3117a9f 100644 --- a/themes/terminal/assets/css/main.css +++ b/themes/terminal/assets/css/main.css @@ -1,297 +1,110 @@ +/* _main.scss */ html { box-sizing: border-box; } *, -*:before, -*:after { +*::before, +*::after { box-sizing: inherit; } body { margin: 0; padding: 0; - font-family: 'Fira Code', Monaco, Consolas, Ubuntu Mono, monospace; + font-family: "Fira Code", Monaco, Consolas, "Ubuntu Mono", monospace; font-size: 1rem; line-height: 1.54; letter-spacing: -0.02em; - background-color: color-mod(var(--accent) blend(#1D1E28 98%)); - color: var(--color); - text-rendering: optimizeLegibility; + background-color: var(--background); + color: var(--foreground); + text-rendering: optimizelegibility; -webkit-font-smoothing: antialiased; font-feature-settings: "liga", "tnum", "zero", "ss01", "locl"; font-variant-ligatures: contextual; -webkit-overflow-scrolling: touch; - -webkit-text-size-adjust: 100%; - - @media (--phone) { - font-size: 1rem; - } + text-size-adjust: 100%; } -.headings--one-size { - h1, - h2, - h3, - h4, - h5, - h6 { - line-height: 1.3; - - &:not(first-child) { - margin-top: 40px; - } - } - - h1, - h2, - h3 { - font-size: 1.4rem; - } - - h4, - h5, - h6 { - font-size: 1.2rem; - } +.headings--one-size h1, +.headings--one-size h2, +.headings--one-size h3, +.headings--one-size h4, +.headings--one-size h5, +.headings--one-size h6 { + font-size: 1.4rem; + line-height: 1.3; + margin: 20px 0; } -a { +.headings--one-size ~ h1:first-child, +.headings--one-size ~ h2:first-child, +.headings--one-size ~ h3:first-child, +.headings--one-size ~ h4:first-child, +.headings--one-size ~ h5:first-child, +.headings--one-size ~ h6:first-child { + margin-top: 20px; +} + +img.left { + margin-right: auto; +} + +img.center { + margin-left: auto; + margin-right: auto; +} + +img.right { + margin-left: auto; +} + +figure.left { + margin-right: auto; +} + +figure.center { + margin-left: auto; + margin-right: auto; +} + +figure.right { + margin-left: auto; +} + +figure figcaption.left { + text-align: left; +} + +figure figcaption.center { + text-align: center; +} + +figure figcaption.right { + text-align: right; +} + +blockquote.twitter-tweet { + position: relative; + background: var(--background); + font: inherit; color: inherit; - - /* Waiting for a better times... */ - /* &:has(code) { - text-decoration-color: var(--accent); - } */ + border: 1px solid var(--accent); + padding-top: 60px; } -img { - display: block; - max-width: 100%; - - &.left { - margin-right: auto; - } - - &.center { - margin-left: auto; - margin-right: auto; - } - - &.right { - margin-left: auto; - } -} - -p { - margin-bottom: 20px; -} - -figure { - display: table; - max-width: 100%; - margin: 25px 0; - - &.left { - margin-right: auto; - } - - &.center { - margin-left: auto; - margin-right: auto; - } - - &.right { - margin-left: auto; - } - - figcaption { - font-size: 14px; - padding: 5px 10px; - margin-top: 5px; - background: var(--accent); - color: var(--background); - /* opacity: .8; */ - - &.left { - text-align: left; - } - - &.center { - text-align: center; - } - - &.right { - text-align: right; - } - } -} - -code, kbd { - font-family: 'Fira Code', Monaco, Consolas, Ubuntu Mono, monospace !important; - font-feature-settings: normal; - background: color-mod(var(--accent) a(20%)); +blockquote.twitter-tweet a { color: var(--accent); - padding: 1px 6px; - margin: 0 2px; - font-size: .95rem; - - code, kbd { - background: transparent; - padding: 0; - margin: 0; - } + text-decoration: underline; } -pre { - background: transparent !important; - padding: 20px 10px; - margin: 40px 0; - font-size: .95rem !important; - overflow: auto; - border-top: 1px solid rgba(255, 255, 255, .1); - border-bottom: 1px solid rgba(255, 255, 255, .1); - - + pre { - border-top: 0; - margin-top: -40px; - } - - @media (--phone) { - white-space: pre-wrap; - word-wrap: break-word; - } - - code { - background: none !important; - margin: 0; - padding: 0; - font-size: inherit; - border: none; - } -} - -blockquote { - border-top: 1px solid var(--accent); - border-bottom: 1px solid var(--accent); - margin: 40px 0; - padding: 25px; - - @media (--phone) { - padding-right: 0; - } - - p:first-of-type { - margin-top: 0; - } - - p:last-of-type { - margin-bottom: 0; - } - - p { - position: relative; - } - - p:first-of-type:before { - content: '>'; - display: block; - position: absolute; - left: -25px; - color: var(--accent); - } - - &.twitter-tweet { - position: relative; - background: color-mod(var(--accent) a(10%)); - font: inherit; - color: inherit; - border: 1px solid var(--accent); - padding-top: 60px; - - p:before { - content: ''; - } - - &:before { - content: '> From Twitter:'; - position: absolute; - top: 20px; - color: var(--accent); - font-weight: bold; - } - - a { - color: var(--accent); - } - } -} - -table { - table-layout: auto; - border-collapse: collapse; - width: 100%; - margin: 40px 0; -} - -table, -th, -td { - border: 1px dashed var(--accent); - padding: 10px; -} - -th { +blockquote.twitter-tweet::before { + content: "> From X:"; + position: absolute; + top: 20px; + left: 20px; color: var(--accent); -} - -ul, -ol { - margin-left: 22px; - padding: 0; - - li { - position: relative; - } - - @media (--phone) { - margin-left: 20px; - } -} - -ol { - list-style: none; - counter-reset: li; - - li { - counter-increment: li; - } - - li:before { - content: counter(li); - position: absolute; - right: calc(100% + 10px); - color: var(--accent); - display: inline-block; - text-align: right; - } - - ol { - margin-left: 38px; - - li { - counter-increment: li; - } - - li:before { - content: counters(li, ".") " "; - } - } -} - -mark { - background: var(--accent); - color: var(--background); + font-weight: bold; } .container { @@ -300,47 +113,58 @@ mark { padding: 40px; max-width: 864px; min-height: 100vh; - border-right: 1px solid rgba(255, 255, 255, 0.1); + border-right: 1px solid color-mix(in srgb, var(--accent) 10%, transparent); +} - &.full, - &.center { - border: none; - margin: 0 auto; - } +.container.full, .container.center { + border: none; + margin: 0 auto; +} - &.full { - max-width: 100%; - } - - @media (--phone) { - padding: 20px; - } - - @media print { - display: initial; - } +.container.full { + max-width: 100%; } .content { display: flex; flex-direction: column; - - @media print { - display: initial; - } -} - -hr { - width: 100%; - border: none; - background: var(--border-color); - height: 1px; } .hidden { display: none; } -sup { - line-height: 0; +.__h_video { + padding-bottom: 58.23% !important; + overflow: visible !important; +} + +iframe[src*="youtube.com"] { + border: 8px solid var(--accent) !important; + padding: 8px !important; +} + +@media (max-width: 684px) { + body { + font-size: 1rem; + } + + .container { + padding: 20px; + } + + ul, + ol { + margin-left: 20px; + } +} + +@media print { + .container { + display: initial; + } + + .content { + display: initial; + } } diff --git a/themes/terminal/assets/css/menu.css b/themes/terminal/assets/css/menu.css new file mode 100644 index 0000000..87c4b04 --- /dev/null +++ b/themes/terminal/assets/css/menu.css @@ -0,0 +1,149 @@ +/* _menu.scss */ +.navigation-menu { + display: flex; + align-items: flex-start; + justify-content: space-between; + margin: 20px 1px; +} + +.navigation-menu__inner { + display: flex; + flex: 1; + flex-wrap: wrap; + list-style: none; + margin: 0; + padding: 0; +} + +.navigation-menu__inner > li { + flex: 0 0 auto; + margin-bottom: 10px; + white-space: nowrap; +} + +.navigation-menu__inner > li:not(:last-of-type) { + margin-right: 20px; +} + +.navigation-menu .spacer { + flex-grow: 1 !important; +} + +.menu { + display: flex; + flex-direction: column; + position: relative; + list-style: none; + padding: 0; + margin: 0; +} + +.menu__trigger { + margin-right: 0 !important; + color: var(--accent); + user-select: none; + cursor: pointer; +} + +.menu__dropdown { + display: none; + flex-direction: column; + position: absolute; + background: var(--background); + box-shadow: 0 10px var(--background), -10px 10px var(--background), 10px 10px var(--background); + color: var(--accent); + border: 2px solid var(--accent); + margin: 0; + padding: 10px; + top: 10px; + left: 0; + list-style: none; + z-index: 99; +} + +.open .menu__dropdown { + display: flex; +} + +.menu__dropdown > li { + flex: 0 0 auto; +} + +.menu__dropdown > li:not(:last-of-type) { + margin-bottom: 10px; +} + +.menu__dropdown > li a { + display: flex; + padding: 5px; +} + +.menu--mobile .menu__trigger { + color: var(--accent); + border: 2px solid; + margin-left: 10px; + height: 100%; + padding: 3px 8px; + margin-bottom: 0 !important; + position: relative; + cursor: pointer; + display: none; +} + +.menu--mobile li { + flex: 0 0 auto; +} + +.menu--mobile li:not(:last-of-type) { + margin-bottom: 10px; +} + +.menu--language-selector .menu__trigger { + color: var(--accent); + border: 2px solid; + margin-left: 10px; + height: 100%; + padding: 3px 8px; + margin-bottom: 0 !important; + position: relative; + cursor: pointer; +} + +.menu--language-selector .menu__dropdown { + left: auto; + right: 0; +} + +@media (max-width: 684px) { + .navigation-menu { + margin: 0; + } + + .navigation-menu__inner { + flex-direction: column; + align-items: flex-start; + padding: 0; + } + + .navigation-menu__inner li { + margin: 0; + padding: 5px; + } + + .menu--desktop { + display: none; + } + + .menu--mobile .menu__trigger { + display: block; + } + + .menu--mobile .menu__dropdown { + left: auto; + right: 0; + } + + .menu--language-selector .menu__trigger { + display: none; + } +} diff --git a/themes/terminal/assets/css/pagination.css b/themes/terminal/assets/css/pagination.css index 30dbadc..5cf162b 100644 --- a/themes/terminal/assets/css/pagination.css +++ b/themes/terminal/assets/css/pagination.css @@ -1,86 +1,97 @@ +/* _pagination.scss */ .pagination { margin-top: 50px; +} - @media print { - display: none; - } +.pagination__title { + display: flex; + text-align: center; + position: relative; + margin: 100px 0 20px; +} - &__title { - display: flex; - text-align: center; - position: relative; - margin: 100px 0 20px; +.pagination__title-h { + text-align: center; + margin: 0 auto; + padding: 5px 10px; + background: var(--background); + color: color-mix(in srgb var(--foreground) 30%, transparent); + font-size: 0.8rem; + text-transform: uppercase; + text-decoration: none; + letter-spacing: 0.1em; + z-index: 1; +} - &-h { - text-align: center; - margin: 0 auto; - padding: 5px 10px; - background: color-mod(var(--accent) blend(#1D1E28 98%)); - font-size: .8rem; - text-transform: uppercase; - text-decoration: none; - letter-spacing: .1em; - z-index: 1; - } +.pagination__title hr { + position: absolute; + left: 0; + right: 0; + width: 100%; + margin-top: 15px; + z-index: 0; +} - hr { - position: absolute; - left: 0; - right: 0; - width: 100%; - margin-top: 15px; - z-index: 0; - } - } +.pagination__buttons { + display: flex; + align-items: center; + justify-content: center; + flex-flow: row wrap; + gap: 10px; +} - &__buttons { - display: flex; - align-items: center; - justify-content: center; - - a { - text-decoration: none; - } - } +.pagination__buttons a { + display: inline-flex; + max-width: 100%; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + text-decoration: none; } .button { position: relative; display: inline-flex; - flex: 1; align-items: center; justify-content: center; font-size: 1rem; - border-radius: 8px; padding: 0; - cursor: pointer; appearance: none; +} + +.button a { + display: flex; + justify-content: center; + flex: 1; + padding: 8px 16px; + text-decoration: none; + text-overflow: ellipsis; + white-space: nowrap; overflow: hidden; +} - + .button { - margin-left: 10px; - } +.button__text { + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; +} - a { - display: flex; - padding: 8px 16px; - text-decoration: none; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - } +.next .button__icon { + margin-left: 8px; +} - &__text { - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - } +.prev .button__icon { + margin-right: 8px; +} - &.next .button__icon { - margin-left: 8px; - } - - &.previous .button__icon { - margin-right: 8px; +@media (max-width: 684px) { + .button { + flex: 1; + } +} + +@media print { + .pagination { + display: none; } } diff --git a/themes/terminal/assets/css/post.css b/themes/terminal/assets/css/post.css index 37155bc..f1fe27f 100644 --- a/themes/terminal/assets/css/post.css +++ b/themes/terminal/assets/css/post.css @@ -1,3 +1,4 @@ +/* _post.scss */ .index-content { margin-top: 20px; } @@ -5,14 +6,14 @@ .framed { border: 1px solid var(--accent); padding: 20px; +} - *:first-child { - margin-top: 0; - } +.framed *:first-child { + margin-top: 0; +} - *:last-child { - margin-bottom: 0; - } +.framed *:last-child { + margin-bottom: 0; } .posts { @@ -22,111 +23,120 @@ .post { width: 100%; text-align: left; - margin: 20px auto; - padding: 20px 0; - - @media (--tablet) { - max-width: 660px; - } - - &:not(:last-of-type) { - border-bottom: 1px solid var(--border-color); - } - - &-meta { - font-size: 1rem; - margin-bottom: 10px; - color: color-mod(var(--accent) a(70%)); - } - - &-title { - --border: 3px dotted var(--accent); - position: relative; - color: var(--accent); - margin: 0 0 15px; - padding-bottom: 15px; - border-bottom: var(--border); - - &:after { - content: ''; - position: absolute; - bottom: 2px; - display: block; - width: 100%; - border-bottom: var(--border); - } - - a { - text-decoration: none; - } - } - - &-tags { - display: block; - margin-bottom: 20px; - font-size: 1rem; - opacity: .5; - - a { - text-decoration: none; - } - } - - &-content { - margin-top: 30px; - } - - &-cover { - border: 20px solid var(--accent); - background: transparent; - margin: 40px 0; - padding: 20px; - - @media (--phone) { - padding: 10px; - border-width: 10px; - } - } - - ul { - list-style: none; - - li:not(:empty):before { - content: '-'; - position: absolute; - left: -20px; - color: var(--accent); - } - } + padding: 40px 0; } -.post--regulation { - h1 { - justify-content: center; - } +.post:not(:last-of-type) { + border-bottom: 1px solid color-mix(in srgb, var(--foreground) 10%, transparent); +} - h2 { - justify-content: center; - margin-bottom: 10px; +.post-meta { + font-size: 1rem; + margin-bottom: 10px; + color: color-mix(in srgb, var(--foreground) 50%, transparent); +} - & + h2 { - margin-top: -10px; - margin-bottom: 20px; - } - } +.post-meta > *:not(:first-child)::before { + content: "::"; + display: inline-block; + margin: 0 8px; +} + +.post-title { + position: relative; + color: var(--accent); + margin-top: 0 !important; + margin-bottom: 15px !important; + padding-bottom: 15px; + border-bottom: 3px dotted var(--accent); + text-decoration: none !important; +} + +.post-title::after { + content: ""; + position: absolute; + bottom: 2px; + display: block; + width: 100%; + border-bottom: 3px dotted var(--accent); +} + +.post-title a { + text-decoration: none; +} + +.post-tags { + display: block; + margin-bottom: 20px; + font-size: 1rem; + color: var(--accent); +} + +.table-of-contents { + margin: 40px 0; +} + +.post-content { + margin-top: 30px; +} + +.post-cover { + margin: 40px 0; +} + +.post ul { + list-style: none; +} + +.post ul li:not(:empty)::before { + content: "-"; + position: absolute; + left: -20px; + color: var(--accent); +} + +.post--regulation h1 { + justify-content: center; +} + +.post--regulation h2 { + justify-content: center; + margin-bottom: 10px; +} + +.post--regulation h2 + h2 { + margin-top: -10px; + margin-bottom: 20px; } .hanchor { - color: color-mod(var(--accent) alpha(90%)); + position: absolute; + color: var(--accent); text-decoration: none; margin-left: 10px; visibility: hidden; } -h1:hover a, h2:hover a, h3:hover a, h4:hover a { +h1:hover .hanchor, +h2:hover .hanchor, +h3:hover .hanchor, +h4:hover .hanchor, +h5:hover .hanchor, +h6:hover .hanchor { visibility: visible; } .footnotes { - color: color-mod(var(--color) alpha(50%)); + color: color-mix(in srgb, var(--foreground) 50%, transparent); +} + +.footnotes hr { + background: color-mix(in srgb, var(--foreground) 50%, transparent); +} + +@media (max-width: 684px) { + .post-cover { + padding: 10px; + border-width: 10px; + } } diff --git a/themes/terminal/assets/css/prism.css b/themes/terminal/assets/css/prism.css index e4268ae..653e502 100644 --- a/themes/terminal/assets/css/prism.css +++ b/themes/terminal/assets/css/prism.css @@ -1,52 +1,46 @@ +/* _prism.scss */ + /* PrismJS 1.24.1 https://prismjs.com/download.html#themes=prism-tomorrow&languages=markup+css+clike+javascript+actionscript+apacheconf+applescript+bash+c+csharp+cpp+cmake+coffeescript+csp+css-extras+diff+django+docker+elixir+elm+erlang+fsharp+flow+git+go+graphql+haml+handlebars+haskell+http+java+json+kotlin+latex+less+llvm+makefile+markdown+markup-templating+nasm+objectivec+ocaml+perl+php+php-extras+powershell+processing+pug+python+r+jsx+tsx+reason+ruby+rust+sass+scss+scala+scheme+sql+stylus+swift+textile+toml+twig+typescript+vim+visual-basic+wasm+yaml&plugins=line-highlight+line-numbers+jsonp-highlight+highlight-keywords+command-line+toolbar+copy-to-clipboard */ + /** * prism.js tomorrow night eighties for JavaScript, CoffeeScript, CSS and HTML * Based on https://github.com/chriskempson/tomorrow-theme * @author Rose Pritchard */ - -code[class*="language-"], -pre[class*="language-"] { - color: #ccc; - background: none; - font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; - font-size: 1em; - text-align: left; - white-space: pre; - word-spacing: normal; - word-break: normal; - word-wrap: normal; - line-height: 1.5; - - -moz-tab-size: 4; - -o-tab-size: 4; - tab-size: 4; - - -webkit-hyphens: none; - -moz-hyphens: none; - -ms-hyphens: none; - hyphens: none; - +code[class*=language-], +pre[class*=language-] { + color: #ccc; + background: none; + font-family: Consolas, Monaco, "Andale Mono", "Ubuntu Mono", monospace; + font-size: 1em; + text-align: left; + white-space: pre; + word-spacing: normal; + word-break: normal; + word-wrap: normal; + line-height: 1.5; + tab-size: 4; + hyphens: none; } /* Code blocks */ -pre[class*="language-"] { - padding: 1em; - margin: .5em 0; - overflow: auto; +pre[class*=language-] { + padding: 1em; + margin: 0.5em 0; + overflow: auto; } -:not(pre) > code[class*="language-"], -pre[class*="language-"] { - background: #2d2d2d; +:not(pre) > code[class*=language-], +pre[class*=language-] { + background: #2d2d2d; } /* Inline code */ -:not(pre) > code[class*="language-"] { - padding: .1em; - border-radius: .3em; - white-space: normal; +:not(pre) > code[class*=language-] { + padding: 0.1em; + border-radius: 0.3em; + white-space: normal; } .token.comment, @@ -54,35 +48,35 @@ pre[class*="language-"] { .token.prolog, .token.doctype, .token.cdata { - color: #999; + color: #999; } .token.punctuation { - color: #ccc; + color: #ccc; } .token.tag, .token.attr-name, .token.namespace, .token.deleted { - color: #e2777a; + color: #e2777a; } .token.function-name { - color: #6196cc; + color: #6196cc; } .token.boolean, .token.number, .token.function { - color: #f08d49; + color: #f08d49; } .token.property, .token.class-name, .token.constant, .token.symbol { - color: #f8c555; + color: #f8c555; } .token.selector, @@ -90,7 +84,7 @@ pre[class*="language-"] { .token.atrule, .token.keyword, .token.builtin { - color: #cc99cd; + color: #cc99cd; } .token.string, @@ -98,230 +92,225 @@ pre[class*="language-"] { .token.attr-value, .token.regex, .token.variable { - color: #7ec699; + color: #7ec699; } .token.operator, .token.entity, .token.url { - color: #67cdcc; + color: #67cdcc; } .token.important, .token.bold { - font-weight: bold; + font-weight: bold; } + .token.italic { - font-style: italic; + font-style: italic; } .token.entity { - cursor: help; + cursor: help; } .token.inserted { - color: green; + color: green; } pre[data-line] { - position: relative; - padding: 1em 0 1em 3em; + position: relative; + padding: 1em 0 1em 3em; } .line-highlight { - position: absolute; - left: 0; - right: 0; - padding: inherit 0; - margin-top: 1em; /* Same as .prism’s padding-top */ + position: absolute; + left: 0; + right: 0; + padding: inherit 0; + margin-top: 1em; - background: hsla(24, 20%, 50%,.08); - background: linear-gradient(to right, hsla(24, 20%, 50%,.1) 70%, hsla(24, 20%, 50%,0)); - - pointer-events: none; - - line-height: inherit; - white-space: pre; + /* Same as .prism’s padding-top */ + background: hsla(24deg, 20%, 50%, 8%); + background: linear-gradient(to right, hsla(24deg, 20%, 50%, 10%) 70%, hsla(24deg, 20%, 50%, 0%)); + pointer-events: none; + line-height: inherit; + white-space: pre; } @media print { - .line-highlight { - /* - * This will prevent browsers from replacing the background color with white. - * It's necessary because the element is layered on top of the displayed code. - */ - -webkit-print-color-adjust: exact; - color-adjust: exact; - } + .line-highlight { + /* + * This will prevent browsers from replacing the background color with white. + * It's necessary because the element is layered on top of the displayed code. + */ + -webkit-print-color-adjust: exact; + color-adjust: exact; + } } - .line-highlight:before, - .line-highlight[data-end]:after { - content: attr(data-start); - position: absolute; - top: .4em; - left: .6em; - min-width: 1em; - padding: 0 .5em; - background-color: hsla(24, 20%, 50%,.4); - color: hsl(24, 20%, 95%); - font: bold 65%/1.5 sans-serif; - text-align: center; - vertical-align: .3em; - border-radius: 999px; - text-shadow: none; - box-shadow: 0 1px white; - } +.line-highlight::before, +.line-highlight[data-end]::after { + content: attr(data-start); + position: absolute; + top: 0.4em; + left: 0.6em; + min-width: 1em; + padding: 0 0.5em; + background-color: hsla(24deg, 20%, 50%, 40%); + color: hsl(24deg, 20%, 95%); + font: bold 65%/1.5 sans-serif; + text-align: center; + vertical-align: 0.3em; + border-radius: 999px; + text-shadow: none; + box-shadow: 0 1px white; +} - .line-highlight[data-end]:after { - content: attr(data-end); - top: auto; - bottom: .4em; - } +.line-highlight[data-end]::after { + content: attr(data-end); + top: auto; + bottom: 0.4em; +} -.line-numbers .line-highlight:before, -.line-numbers .line-highlight:after { - content: none; +.line-numbers .line-highlight::before, +.line-numbers .line-highlight::after { + content: none; } pre[id].linkable-line-numbers span.line-numbers-rows { - pointer-events: all; -} -pre[id].linkable-line-numbers span.line-numbers-rows > span:before { - cursor: pointer; -} -pre[id].linkable-line-numbers span.line-numbers-rows > span:hover:before { - background-color: rgba(128, 128, 128, .2); + pointer-events: all; } -pre[class*="language-"].line-numbers { - position: relative; - padding-left: 3.8em; - counter-reset: linenumber; +pre[id].linkable-line-numbers span.line-numbers-rows > span::before { + cursor: pointer; } -pre[class*="language-"].line-numbers > code { - position: relative; - white-space: inherit; +pre[id].linkable-line-numbers span.line-numbers-rows > span:hover::before { + background-color: rgba(128, 128, 128, 20%); +} + +pre[class*=language-].line-numbers { + position: relative; + padding-left: 3.8em; + counter-reset: linenumber; +} + +pre[class*=language-].line-numbers > code { + position: relative; + white-space: inherit; } .line-numbers .line-numbers-rows { - position: absolute; - pointer-events: none; - top: 0; - font-size: 100%; - left: -3.8em; - width: 3em; /* works for line-numbers below 1000 lines */ - letter-spacing: -1px; - border-right: 1px solid #999; - - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; + position: absolute; + pointer-events: none; + top: 0; + font-size: 100%; + left: -3.8em; + width: 3em; + /* works for line-numbers below 1000 lines */ + letter-spacing: -1px; + border-right: 1px solid #999; + user-select: none; } - .line-numbers-rows > span { - display: block; - counter-increment: linenumber; - } +.line-numbers-rows > span { + display: block; + counter-increment: linenumber; +} - .line-numbers-rows > span:before { - content: counter(linenumber); - color: #999; - display: block; - padding-right: 0.8em; - text-align: right; - } +.line-numbers-rows > span::before { + content: counter(linenumber); + color: #999; + display: block; + padding-right: 0.8em; + text-align: right; +} .command-line-prompt { - border-right: 1px solid #999; - display: block; - float: left; - font-size: 100%; - letter-spacing: -1px; - margin-right: 1em; - pointer-events: none; - - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; + border-right: 1px solid #999; + display: block; + float: left; + font-size: 100%; + letter-spacing: -1px; + margin-right: 1em; + pointer-events: none; + user-select: none; } -.command-line-prompt > span:before { - color: #999; - content: ' '; - display: block; - padding-right: 0.8em; +.command-line-prompt > span::before { + color: #999; + content: " "; + display: block; + padding-right: 0.8em; } -.command-line-prompt > span[data-user]:before { - content: "[" attr(data-user) "@" attr(data-host) "] $"; +.command-line-prompt > span[data-user]::before { + content: "["attr(data-user) "@"attr(data-host) "] $"; } -.command-line-prompt > span[data-user="root"]:before { - content: "[" attr(data-user) "@" attr(data-host) "] #"; +.command-line-prompt > span[data-user=root]::before { + content: "["attr(data-user) "@"attr(data-host) "] #"; } -.command-line-prompt > span[data-prompt]:before { - content: attr(data-prompt); +.command-line-prompt > span[data-prompt]::before { + content: attr(data-prompt); } div.code-toolbar { - position: relative; + position: relative; } div.code-toolbar > .toolbar { - position: absolute; - top: .3em; - right: .2em; - transition: opacity 0.3s ease-in-out; - opacity: 0; + position: absolute; + top: 0.3em; + right: 0.2em; + transition: opacity 0.3s ease-in-out; + opacity: 0; } div.code-toolbar:hover > .toolbar { - opacity: 1; + opacity: 1; } /* Separate line b/c rules are thrown out if selector is invalid. IE11 and old Edge versions don't support :focus-within. */ div.code-toolbar:focus-within > .toolbar { - opacity: 1; + opacity: 1; } div.code-toolbar > .toolbar > .toolbar-item { - display: inline-block; + display: inline-block; } div.code-toolbar > .toolbar > .toolbar-item > a { - cursor: pointer; + cursor: pointer; } div.code-toolbar > .toolbar > .toolbar-item > button { - background: none; - border: 0; - color: inherit; - font: inherit; - line-height: normal; - overflow: visible; - padding: 0; - -webkit-user-select: none; /* for button */ - -moz-user-select: none; - -ms-user-select: none; + background: none; + border: 0; + color: inherit; + font: inherit; + line-height: normal; + overflow: visible; + padding: 0; + + /* for button */ + user-select: none; } div.code-toolbar > .toolbar > .toolbar-item > a, div.code-toolbar > .toolbar > .toolbar-item > button, div.code-toolbar > .toolbar > .toolbar-item > span { - color: #bbb; - font-size: .8em; - padding: 0 .5em; - background: #f5f2f0; - background: rgba(224, 224, 224, 0.2); - box-shadow: 0 2px 0 0 rgba(0,0,0,0.2); - border-radius: .5em; + color: #bbb; + font-size: 0.8em; + padding: 0 0.5em; + background: #f5f2f0; + background: rgba(224, 224, 224, 20%); + box-shadow: 0 2px 0 0 rgba(0, 0, 0, 20%); + border-radius: 0.5em; } div.code-toolbar > .toolbar > .toolbar-item > a:hover, @@ -330,7 +319,6 @@ div.code-toolbar > .toolbar > .toolbar-item > button:hover, div.code-toolbar > .toolbar > .toolbar-item > button:focus, div.code-toolbar > .toolbar > .toolbar-item > span:hover, div.code-toolbar > .toolbar > .toolbar-item > span:focus { - color: inherit; - text-decoration: none; + color: inherit; + text-decoration: none; } - diff --git a/themes/terminal/assets/css/style.css b/themes/terminal/assets/css/style.css deleted file mode 100644 index 020d71e..0000000 --- a/themes/terminal/assets/css/style.css +++ /dev/null @@ -1,18 +0,0 @@ -@import 'variables.css'; - -@import 'font.css'; -@import 'buttons.css'; -@import 'form.css'; - -@import 'header.css'; -@import 'logo.css'; -@import 'main.css'; -@import 'post.css'; -@import 'pagination.css'; -@import 'footer.css'; - -@import 'prism.css'; -@import 'syntax.css'; -@import 'code.css'; -@import 'terms.css'; -@import 'gist.css'; diff --git a/themes/terminal/assets/css/syntax.css b/themes/terminal/assets/css/syntax.css index 215aa82..c205855 100644 --- a/themes/terminal/assets/css/syntax.css +++ b/themes/terminal/assets/css/syntax.css @@ -1,3 +1,4 @@ +/* _syntax.scss */ code.language-css, code.language-scss, .token.boolean, @@ -26,7 +27,6 @@ code.language-scss, .token.unit, .token.placeholder, .token.variable, -.token.tag, .token.attr-name, .token.namespace, .token.deleted, @@ -34,7 +34,7 @@ code.language-scss, .token.class-name, .token.constant, .token.symbol { - color: color-mod(var(--accent) a(70%)) !important; + color: color-mix(in srgb, var(--accent) 70%, transparent) !important; } .token.property, @@ -43,34 +43,33 @@ code.language-scss, .token.deleted, code.language-javascript, code.language-html, -.command-line-prompt > span:before { - color: color-mod(var(--accent) blend(#999 90%)) !important; +.command-line-prompt > span::before { + color: var(--accent) !important; } .token.selector, .token.tag, .token.punctuation { - color: white; + color: color-mix(in srgb, var(--accent) 50%, var(--foreground)) !important; } .token.comment, .token.prolog, .token.doctype, .token.cdata { - color: rgba(255, 255, 255, .3) !important; + color: color-mix(in srgb, var(--foreground) 30%, transparent) !important; } .token.namespace { - opacity: .7 !important; + opacity: 0.7 !important; } pre[data-line] { position: relative; } -pre[class*="language-"] { +pre[class*=language-] { margin: 0; - padding: 0; overflow: auto; } @@ -80,77 +79,38 @@ pre[class*="language-"] { right: 0; padding: 0; margin: 0; - background: color-mod(var(--accent) blend(#999 90%) a(8%)); + background: color-mix(in srgb, var(--foreground) 7%, transparent); pointer-events: none; line-height: inherit; white-space: pre; } -.line-highlight:before, -.line-highlight[data-end]:after { +.line-highlight::before, +.line-highlight[data-end]::after { content: attr(data-start); position: absolute; + /* top: .4em; */ - left: .6em; + left: 0.6em; min-width: 1em; - padding: 0 .5em; - background-color: hsla(24, 20%, 50%, .4); - color: hsl(24, 20%, 95%); + padding: 0 0.5em; + background-color: color-mix(in srgb, var(--foreground) 40%, transparent); + color: var(--foreground); font: bold 65%/1.5 sans-serif; text-align: center; - vertical-align: .3em; + vertical-align: 0.3em; border-radius: 999px; text-shadow: none; - box-shadow: 0 1px white; + box-shadow: 0 1px var(--foreground); } -.line-highlight[data-end]:after { +.line-highlight[data-end]::after { content: attr(data-end); top: auto; - bottom: .4em; + bottom: 0.4em; } -.line-numbers .line-highlight:before, -.line-numbers .line-highlight:after { +.line-numbers .line-highlight::before, +.line-numbers .line-highlight::after { content: none; } - -:root { - --code-margin: 40px; -} - -.code-toolbar { - position: relative; - margin: var(--code-margin) 0; - padding: 20px; - border: 1px solid rgba(255, 255, 255, .1); - - + .code-toolbar, - + .highlight, - + .highlight .code-toolbar { - border-top: 0; - margin-top: calc(-1 * var(--code-margin)); - } - - pre, code { - border: none; - } - - code { - display: block; - color: inherit; - } - - > .toolbar { - button { - font-size: .8em !important; - background: hsla(0,0%,87.8%,.2) !important; - color: #bbb !important; - box-shadow: 0 2px 0 0 rgba(0,0,0,.2) !important; - border-radius: 0 !important; - margin: 6px !important; - padding: 10px !important; - user-select:none - } - } -} diff --git a/themes/terminal/assets/css/terminal.css b/themes/terminal/assets/css/terminal.css new file mode 100644 index 0000000..0acc318 --- /dev/null +++ b/themes/terminal/assets/css/terminal.css @@ -0,0 +1,377 @@ +@import url("https://fonts.googleapis.com/css2?family=Fira+Code&family=Fira+Code:wght@400;700&display=swap"); + +:root { + --background: #1a170f; + --foreground: #eceae5; + --accent: #eec35e; + --font-size: 1rem; + --line-height: 1.54rem; + --radius: 0px; +} + +html { + box-sizing: border-box; +} + +*, +*:before, +*:after { + box-sizing: inherit; + margin: 0; + padding: 0; +} + +body { + margin: 0; + padding: 0; + font-family: + "Fira Code", + Monaco, + Consolas, + "Ubuntu Mono", + monospace; + font-size: 1rem; + font-weight: 400; + line-height: var(--line-height); + letter-spacing: -0.02em; + background-color: var(--background); + color: var(--foreground); + text-rendering: optimizeLegibility; + -webkit-font-smoothing: antialiased; + font-feature-settings: "liga", "tnum", "zero", "ss01", "locl"; + font-variant-ligatures: contextual; + -webkit-overflow-scrolling: touch; + -webkit-text-size-adjust: 100%; +} + +::placeholder { + color: color-mix(in srgb var(--foreground) 50%, black); +} + +h1, +h2 { + font-size: calc(var(--font-size) * 1.1); + text-transform: uppercase; + letter-spacing: 0.04em; +} + +h1 { + text-decoration: underline; + text-decoration-thickness: 2px; + text-underline-offset: calc(var(--font-size) * 0.2); +} + +h3, +h4, +h5, +h6 { + font-size: calc(var(--font-size) * 1.1); + letter-spacing: 0.04em; +} + +h1, +h2, +h3, +h4, +h5, +h6, +p, +ul, +ol, +img, +figure, +video, +table { + margin: calc(var(--line-height) * 1.2) 0; +} + +a { + color: var(--accent); +} + +button { + position: relative; + font: inherit; + font-weight: bold; + text-decoration: none; + text-align: center; + background: transparent; + color: var(--accent); + padding: 5px 18px; + border: 4px solid var(--accent); + border-radius: var(--radius); + transition: background 0.15s linear; + appearance: none; + cursor: pointer; + outline: none; +} + +button:hover { + background: color-mix(in srgb, var(--accent) 15%, transparent); +} + +button:focus-visible, +a:focus-visible { + outline: 1px solid var(--accent); + outline-offset: 2px; +} + +fieldset { + display: inline-block; + border: 2px solid var(--foreground); + border-radius: calc(var(--radius) * 1.6); + padding: 10px; +} + +fieldset *:first-child { + margin-top: 0; +} + +fieldset input, +fieldset select, +fieldset textarea, +fieldset label, +fieldset button { + margin-top: calc(var(--line-height) * 0.5); + width: 100%; +} + +label { + display: inline-block; +} + +label input { + margin-top: 0; +} + +input, +textarea, +select { + background: transparent; + color: var(--foreground); + border: 1px solid var(--foreground); + border-radius: var(--radius); + padding: 10px; + font: inherit; + appearance: none; +} + +input[type="checkbox"] { + width: auto; +} + +input:focus-visible, +input:active, +textarea:focus-visible, +textarea:active, +select:focus-visible, +select:active { + border-color: var(--accent); + outline: 1px solid var(--accent); + outline-offset: 2px; +} + +input:active, +textarea:active, +select:active { + box-shadow: none; +} + +select { + background-image: linear-gradient( + 45deg, + transparent 50%, + var(--foreground) 50% + ), + linear-gradient(135deg, var(--foreground) 50%, transparent 50%); + background-position: calc(100% - 20px), calc(100% - 1em); + background-size: + 5px 5px, + 5px 5px; + background-repeat: no-repeat; + padding-right: 40px; +} + +select option { + background: var(--background); +} + +input[type="checkbox"] { + vertical-align: middle; + padding: 10px; + box-shadow: inset 0 0 0 3px var(--background); +} + +input[type="checkbox"]:checked { + background: var(--accent); +} + +img { + display: block; + max-width: 100%; + border: 8px solid var(--accent); + border-radius: var(--radius); + padding: 8px; + overflow: hidden; +} + +figure img, +figure video { + margin-bottom: 0; +} + +figure figcaption { + background: var(--accent); + color: var(--background); + text-align: center; + font-size: 1rem; + font-weight: normal; + margin-top: -8px; + border-radius: 0 0 var(--radius) var(--radius); +} + +ul, +ol { + margin-left: 4ch; + padding: 0; +} + +ul ul, +ul ol, +ol ul, +ol ol { + margin-top: 0; +} + +li::marker { + color: var(--accent); +} + +ul li, +ol li { + position: relative; +} + +code, +kbd { + font-family: + "Fira Code", + Monaco, + Consolas, + Ubuntu Mono, + monospace !important; + font-feature-settings: normal; + background: color-mix(in srgb, var(--foreground) 5%, transparent); + color: var(--accent); + padding: 1px 6px; + margin: 0 2px; + font-size: 0.95rem; +} + +kbd { + border-top: 1px solid color-mix(in srgb, var(--accent) 25%, transparent); + border-left: 1px solid var(--accent); + border-right: 1px solid var(--accent); + border-bottom: 4px solid var(--accent); + border-radius: 4px; +} + +code code { + background: transparent; + padding: 0; + margin: 0; +} + +pre { + tab-size: 4; + background: color-mix(in srgb, var(--foreground) 5%, transparent) !important; + color: var(--foreground); + padding: 20px 10px; + font-size: 0.95rem !important; + overflow: auto; + border-radius: var(--radius); + border: 1px solid color-mix(in srgb, var(--foreground) 10%, transparent); +} + +pre code { + background: none !important; + margin: 0; + padding: 0; + font-size: inherit; + border: none; +} + +sup { + line-height: 0; +} + +abbr { + position: relative; + text-decoration-style: wavy; + text-decoration-color: var(--accent); + cursor: help; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.25em; +} + +mark { + background: color-mix(in srgb, var(--accent) 45%, transparent); + color: var(--foreground); +} + +blockquote { + position: relative; + border-top: 1px solid var(--accent); + border-bottom: 1px solid var(--accent); + margin: 0; + padding: 25px; +} + +blockquote:before { + content: ">"; + display: block; + position: absolute; + left: 0; + color: var(--accent); +} + +blockquote p:first-child { + margin-top: 0; +} + +blockquote p:last-child { + margin-bottom: 0; +} + +table { + table-layout: auto; + border-collapse: collapse; +} + +table, +th, +td { + border: 2px solid var(--foreground); + padding: 10px; +} + +th { + border-style: solid; + color: var(--foreground); + text-align: left; + text-transform: uppercase; + letter-spacing: 0.04em; +} + +hr { + width: 100%; + border: none; + background: var(--accent); + height: 2px; +} diff --git a/themes/terminal/assets/css/terms.css b/themes/terminal/assets/css/terms.css index 794e2fa..d6534e3 100644 --- a/themes/terminal/assets/css/terms.css +++ b/themes/terminal/assets/css/terms.css @@ -1,9 +1,19 @@ -.terms { - h1 { - color: var(--accent); - } - - h3 { - font-size: initial; - } +/* _terms.scss */ +.terms h3 { + font-size: initial; +} + +.terms ul { + list-style: none; +} + +.terms ul li a { + color: var(--accent); +} + +.terms ul li:not(:empty)::before { + content: "-"; + position: absolute; + left: -20px; + color: var(--accent); } diff --git a/themes/terminal/assets/css/variables.css b/themes/terminal/assets/css/variables.css deleted file mode 100644 index 33fd8d8..0000000 --- a/themes/terminal/assets/css/variables.css +++ /dev/null @@ -1,13 +0,0 @@ -:root { - --accent: #FFA86A; - --background: color-mod(var(--accent) blend(#1D1E28 98%)); - --color: white; - --border-color: rgba(255, 255, 255, .1); - - /* variables for js, must be the same as these in @custom-media queries */ - --phoneWidth: (max-width: 684px); - --tabletWidth: (max-width: 900px); -} - -@custom-media --phone (max-width: 684px); -@custom-media --tablet (max-width: 900px); diff --git a/themes/terminal/assets/js/languageSelector.js b/themes/terminal/assets/js/languageSelector.js deleted file mode 100644 index 23c9acb..0000000 --- a/themes/terminal/assets/js/languageSelector.js +++ /dev/null @@ -1,23 +0,0 @@ -const mobileQuery = getComputedStyle(document.body).getPropertyValue("--phoneWidth"); -const isMobile = () => window.matchMedia(mobileQuery).matches; - -const languageSelector = document.querySelector(".language-selector-current"); -const moreLanguagesContainer = document.querySelector(".language-selector__more"); - -document.body.addEventListener("click", () => { - if ( - !isMobile() && - moreLanguagesContainer && - !moreLanguagesContainer.classList.contains("hidden") - ) { - moreLanguagesContainer.classList.add("hidden"); - } -}); - -languageSelector && - languageSelector.addEventListener("click", (e) => { - if (!isMobile()) { - e.stopPropagation(); - moreLanguagesContainer.classList.toggle("hidden"); - } - }); diff --git a/themes/terminal/assets/js/menu.js b/themes/terminal/assets/js/menu.js index 0a4899b..3b662e7 100644 --- a/themes/terminal/assets/js/menu.js +++ b/themes/terminal/assets/js/menu.js @@ -1,51 +1,44 @@ const container = document.querySelector(".container"); -const menu = document.querySelector(".menu"); -const mobileMenuTrigger = document.querySelector(".menu-trigger"); -const desktopMenu = document.querySelector(".menu__inner--desktop"); -const desktopMenuTrigger = document.querySelector(".menu__sub-inner-more-trigger"); -const menuMore = document.querySelector(".menu__sub-inner-more"); -const mobileQuery = getComputedStyle(document.body).getPropertyValue("--phoneWidth"); -const isMobile = () => window.matchMedia(mobileQuery).matches; -const handleMenuClasses = () => { - mobileMenuTrigger && mobileMenuTrigger.classList.toggle("hidden", !isMobile()); - menu && menu.classList.toggle("hidden", isMobile()); - menuMore && menuMore.classList.toggle("hidden", !isMobile()); -}; - -// Common - -menu && menu.addEventListener("click", e => e.stopPropagation()); -menuMore && menuMore.addEventListener("click", e => e.stopPropagation()); - -handleMenuClasses(); +const allMenus = document.querySelectorAll(".menu"); +// Hide menus on body click document.body.addEventListener("click", () => { - if (!isMobile() && menuMore && !menuMore.classList.contains("hidden")) { - menuMore.classList.add("hidden"); - } else if (isMobile() && !menu.classList.contains("hidden")) { - menu.classList.add("hidden"); - } -}); - -window.addEventListener("resize", handleMenuClasses); - -// Mobile menu - -mobileMenuTrigger && - mobileMenuTrigger.addEventListener("click", e => { - e.stopPropagation(); - menu && menu.classList.toggle("hidden"); - }); - -// Desktop menu - -desktopMenuTrigger && - desktopMenuTrigger.addEventListener("click", e => { - e.stopPropagation(); - menuMore && menuMore.classList.toggle("hidden"); - - if (menuMore.getBoundingClientRect().right > container.getBoundingClientRect().right) { - menuMore.style.left = "auto"; - menuMore.style.right = 0; + allMenus.forEach(menu => { + if (menu.classList.contains("open")) { + menu.classList.remove("open"); } }); +}); + +// Reset menus on resize +window.addEventListener("resize", () => { + allMenus.forEach(menu => { + menu.classList.remove("open"); + }); +}); + +// Handle desktop menu +allMenus.forEach(menu => { + const trigger = menu.querySelector(".menu__trigger"); + const dropdown = menu.querySelector(".menu__dropdown"); + + trigger.addEventListener("click", e => { + e.stopPropagation(); + + if (menu.classList.contains("open")) { + menu.classList.remove("open"); + } else { + // Close all menus... + allMenus.forEach(m => m.classList.remove("open")); + // ...before opening the current one + menu.classList.add("open"); + } + + if (dropdown.getBoundingClientRect().right > container.getBoundingClientRect().right) { + dropdown.style.left = "auto"; + dropdown.style.right = 0; + } + }); + + dropdown.addEventListener("click", e => e.stopPropagation()); +}); diff --git a/themes/terminal/config.toml b/themes/terminal/config.toml new file mode 100644 index 0000000..47b7807 --- /dev/null +++ b/themes/terminal/config.toml @@ -0,0 +1,4 @@ +[module] + [module.hugoVersion] + extended = true + min = '0.90.0' diff --git a/themes/terminal/exampleSite/config.toml b/themes/terminal/exampleSite/config.toml index a06270a..cb78253 100644 --- a/themes/terminal/exampleSite/config.toml +++ b/themes/terminal/exampleSite/config.toml @@ -3,9 +3,11 @@ languageCode = "en-us" theme = "hugo-theme-terminal" paginate = 5 +[markup.goldmark.renderer] + unsafe = true + [params] contentTypeName = "posts" - themeColor = "orange" showMenuItems = 2 fullWidthTheme = false centerTheme = false diff --git a/themes/terminal/exampleSite/content/about.md b/themes/terminal/exampleSite/content/about.md index 8944da1..e957768 100644 --- a/themes/terminal/exampleSite/content/about.md +++ b/themes/terminal/exampleSite/content/about.md @@ -14,9 +14,8 @@ This theme is pretty basic and covers all of the essentials. All you have to do The theme includes: -- **5 duotone themes**, depending on your preferences (orange, red, blue, green, pink) -- [**Fira Code**](https://github.com/tonsky/FiraCode) as default monospaced font. It's gorgeous! -- **really nice, custom duotone** syntax highlighting based on [**PrismJS**](https://prismjs.com) -- mobile friendly layout +- fully customizable color schemes generated by [**terminal.css**](https://panr.github.io/terminal-css/). +- great reading experience thanks to [**Fira Code**](https://github.com/tonsky/FiraCode). +- nice code highlighting thanks to [**PrismJS**](https://prismjs.com) that matches the theme's color scheme. So, there you have it... enjoy! diff --git a/themes/terminal/exampleSite/content/showcase.md b/themes/terminal/exampleSite/content/showcase.md index 1ffc150..bf6a26e 100644 --- a/themes/terminal/exampleSite/content/showcase.md +++ b/themes/terminal/exampleSite/content/showcase.md @@ -1,22 +1,139 @@ ---- -title: "Showcase" -date: "2018-07-18" -author: "Hello Robot" ---- ++++ +author = "Hugo Authors & Radek" +title = "Showcase" +date = "2019-03-11" +description = "Sample article showcasing basic styling and formatting for HTML elements." ++++ -## Header 2 +This article offers a sample of basic Markdown syntax that can be used in Hugo content files, also it shows whether basic HTML elements are decorated with CSS in a Hugo theme. + -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam nec interdum metus. Aenean rutrum ligula sodales ex auctor, sed tempus dui mollis. Curabitur ipsum dui, aliquet nec commodo at, tristique eget ante. **Donec quis dolor nec nunc mollis interdum vel in purus**. Sed vitae leo scelerisque, sollicitudin elit sed, congue ante. In augue nisl, vestibulum commodo est a, tristique porttitor est. Proin laoreet iaculis ornare. Nullam ut neque quam. +## Headings -> Fusce pharetra suscipit orci nec tempor. Quisque vitae sem sit amet sem mollis consequat. Sed at imperdiet lorem. Vestibulum pharetra faucibus odio, ac feugiat tellus sollicitudin at. Pellentesque varius tristique mi imperdiet dapibus. Duis orci odio, sodales lacinia venenatis sit amet, feugiat et diam. +The following HTML `

`—`

` elements represent six levels of section headings. `

` is the highest section level while `

` is the lowest. -### Header 3 +# H1 +## H2 +### H3 +### H4 +#### H5 +##### H6 -Nulla libero turpis, lacinia vitae cursus ut, auctor dictum nisl. Fusce varius felis nec sem ullamcorper, at convallis nisi vestibulum. Duis risus odio, porta sit amet placerat mollis, tincidunt non mauris. Suspendisse fringilla, `odio a dignissim pharetra`, est urna sollicitudin urna, eu scelerisque magna ex vitae tellus. +## Paragraph -```css -/* PostCSS code */ +Xerum, quo qui aut unt expliquam qui dolut labo. Aque venitatiusda cum, voluptionse latur sitiae dolessi aut parist aut dollo enim qui voluptate ma dolestendit peritin re plis aut quas inctum laceat est volestemque commosa as cus endigna tectur, offic to cor sequas etum rerum idem sintibus eiur? Quianimin porecus evelectur, cum que nis nust voloribus ratem aut omnimi, sitatur? Quiatem. Nam, omnis sum am facea corem alique molestrunt et eos evelece arcillit ut aut eos eos nus, sin conecerem erum fuga. Ri oditatquam, ad quibus unda veliamenimin cusam et facea ipsamus es exerum sitate dolores editium rerore eost, temped molorro ratiae volorro te reribus dolorer sperchicium faceata tiustia prat. +Itatur? Quiatae cullecum rem ent aut odis in re eossequodi nonsequ idebis ne sapicia is sinveli squiatum, core et que aut hariosam ex eat. + +## Images + +![Terminal Theme Preview](/img/terminal-theme.png) + +### Figure with a caption + +{{< figure src="/img/terminal-theme.png" alt="Terminal Theme Preview" position="center" caption="Terminal Theme Preview" captionPosition="center" >}} + +## Blockquotes + +The blockquote element represents content that is quoted from another source, optionally with a citation which must be within a `footer` or `cite` element, and optionally with in-line changes such as annotations and abbreviations. + +### Blockquote without attribution + +> Tiam, ad mint andaepu dandae nostion secatur sequo quae. +> **Note** that you can use *Markdown syntax* within a blockquote. + +### Blockquote with attribution + +> Don't communicate by sharing memory, share memory by communicating.
+> — Rob Pike[^1] + +[^1]: The above quote is excerpted from Rob Pike's [talk](https://www.youtube.com/watch?v=PAAkCSZUG1c) during Gopherfest, November 18, 2015. + +## Buttons and links + + +Link +Link + +## Tables + +Tables aren't part of the core Markdown spec, but Hugo supports supports them out-of-the-box. + + Name | Age +--------|------ + Bob | 27 + Alice | 23 + +### Inline Markdown within tables + +| Italics | Bold | Code | +| -------- | -------- | ------ | +| *italics* | **bold** | `code` | + +## Forms + +
+
+
+
+
+
+ I understand
+ +
+ +## Code Blocks + +### Code block with backticks + +```html + + + + + Example HTML5 Document + + +

Test

+ + +``` + +### Code block indented with four spaces + + + + + + Example HTML5 Document + + +

Test

+ + + +### Code block with Hugo's internal highlight shortcode + +{{< highlight html >}} + + + + + Example HTML5 Document + + +

Test

+ + +{{< /highlight >}} + +### Code block with custom built-in `{{ < code > }}` shortcode + +{{< code title="Hey, this is a code block title" language="css" >}} pre { background: #1a1a1d; padding: 20px; @@ -36,49 +153,40 @@ pre { font-size: inherit; } } -``` +{{< /code >}} -```js -// JS code +## List Types -const menuTrigger = document.querySelector('.menu-trigger') -const menu = document.querySelector('.menu') -const mobileQuery = getComputedStyle(document.body).getPropertyValue('--phoneWidth') -const isMobile = () => window.matchMedia(mobileQuery).matches -const isMobileMenu = () => { - menuTrigger.classList.toggle('hidden', !isMobile()) - menu.classList.toggle('hidden', isMobile()) -} +### Ordered List -isMobileMenu() +1. First item +2. Second item +3. Third item -menuTrigger.addEventListener('click', () => menu.classList.toggle('hidden')) +### Unordered List -window.addEventListener('resize', isMobileMenu) -``` +* List item +* Another item +* And another item -```html - +### Nested list -
-
-

{{ .Title }}

- {{ range .Pages }} - {{ .Render "summary"}} - {{ end }} -
-
-``` +* Fruit + * Apple + * Orange + * Banana +* Dairy + * Milk + * Cheese -#### Header 4 +## Other Elements — abbr, sub, sup, kbd, mark -Curabitur scelerisque felis viverra varius scelerisque. Ut enim libero, molestie gravida blandit at, mollis ornare tellus. Cras arcu mi, ultrices vel pulvinar vel, volutpat eu tortor. Nullam nec eros quis massa ultrices iaculis sed in metus. Praesent sollicitudin sem sit amet orci tempor gravida. +GIF is a bitmap image format. -- Maecenas elementum vitae nibh vitae porttitor. -- Aenean consequat, risus ut cursus placerat, arcu nulla sodales risus, ut molestie tellus tellus et dui. -- Integer imperdiet turpis vitae lacus imperdiet, ut ornare ligula auctor. Integer in mi eu velit vehicula suscipit eget vulputate nulla. -- Etiam vitae enim quis velit lobortis placerat a ut sem. - - Curabitur lobortis ante sit amet orci pulvinar, sollicitudin viverra nunc accumsan. - - Praesent fermentum orci quis leo facilisis posuere. +H2O -Aliquam erat volutpat. In hac habitasse platea dictumst. Nunc ut tincidunt mauris. Sed at gravida risus, id semper magna. Nullam vitae enim mattis, sodales neque non, pharetra elit. Cras sit amet sagittis augue, et finibus turpis. Ut tempus tincidunt diam vel pharetra. Nulla porttitor odio sit amet nulla scelerisque, quis aliquam mi imperdiet. Sed tincidunt dui vel tellus vestibulum rhoncus. Donec tempus ultrices velit. +Xn + Yn = Zn + +Press CTRL+ALT+Delete to end the session. + +Most salamanders are nocturnal, and hunt for insects, worms, and other small creatures. diff --git a/themes/terminal/go.mod b/themes/terminal/go.mod new file mode 100644 index 0000000..9c958ae --- /dev/null +++ b/themes/terminal/go.mod @@ -0,0 +1,3 @@ +module github.com/panr/hugo-theme-terminal/v4 + +go 1.19 diff --git a/themes/terminal/images/screenshot.png b/themes/terminal/images/screenshot.png index c5ae803..4229b13 100644 Binary files a/themes/terminal/images/screenshot.png and b/themes/terminal/images/screenshot.png differ diff --git a/themes/terminal/images/terminal-css.png b/themes/terminal/images/terminal-css.png new file mode 100644 index 0000000..78f7d1d Binary files /dev/null and b/themes/terminal/images/terminal-css.png differ diff --git a/themes/terminal/images/terminal-theme-old.png b/themes/terminal/images/terminal-theme-old.png new file mode 100644 index 0000000..c5ae803 Binary files /dev/null and b/themes/terminal/images/terminal-theme-old.png differ diff --git a/themes/terminal/images/terminal-theme.png b/themes/terminal/images/terminal-theme.png new file mode 100644 index 0000000..8bd688d Binary files /dev/null and b/themes/terminal/images/terminal-theme.png differ diff --git a/themes/terminal/images/tn.png b/themes/terminal/images/tn.png index e6f363d..1658e05 100644 Binary files a/themes/terminal/images/tn.png and b/themes/terminal/images/tn.png differ diff --git a/themes/terminal/layouts/_default/baseof.html b/themes/terminal/layouts/_default/baseof.html index ae3b9cc..a467db2 100644 --- a/themes/terminal/layouts/_default/baseof.html +++ b/themes/terminal/layouts/_default/baseof.html @@ -6,10 +6,10 @@ {{ end }} {{ partial "head.html" . }} - + {{ $container := cond ($.Site.Params.FullWidthTheme | default false) "container full" (cond ($.Site.Params.CenterTheme | default false) "container center" "container") }} -
+
{{ partial "header.html" . }} diff --git a/themes/terminal/layouts/_default/index.html b/themes/terminal/layouts/_default/index.html index 1cab615..b971adf 100644 --- a/themes/terminal/layouts/_default/index.html +++ b/themes/terminal/layouts/_default/index.html @@ -15,17 +15,20 @@ {{ $paginator := .Paginate (where $PageContext.RegularPages "Type" $contentTypeName) }} {{ range $paginator.Pages }} -
-

+

+
- - {{ .Date.Format "2006-01-02" }} - - {{ with .Params.Author }} - :: {{ . }} - {{ end }} + {{- if .Date -}} + + {{- end -}} + {{- with .Params.Author -}} + {{ . }} + {{- end -}}
{{ if .Params.tags }} @@ -38,28 +41,26 @@ {{ end }} - {{ partial "cover.html" . }} -
{{ if .Params.showFullContent }} {{ .Content }} {{ else if .Description }} - {{ .Description | markdownify }} +

{{ .Description | markdownify }}

{{ else }} - {{ .Summary | markdownify }} + {{ .Summary }} {{ end }}
{{ if not .Params.showFullContent }} -
- {{ $.Site.Params.ReadMore }} → -
+
+ {{ $.Site.Params.ReadMore }} +
{{ end }} -
+ {{ end }} + {{ partial "pagination.html" . }}
{{ end }} diff --git a/themes/terminal/layouts/_default/list.html b/themes/terminal/layouts/_default/list.html index 02f69b4..791efce 100644 --- a/themes/terminal/layouts/_default/list.html +++ b/themes/terminal/layouts/_default/list.html @@ -6,17 +6,19 @@ {{ end }}
{{ range .Paginator.Pages }} -
-

+

- - {{ .Date.Format "2006-01-02" }} - - {{ with .Params.Author }} - :: {{ . }} - {{ end }} + {{- if .Date -}} + + {{- end -}} + {{- with .Params.Author -}} + {{- . -}} + {{- end -}}
{{ if .Params.tags }} @@ -31,25 +33,24 @@ {{ partial "cover.html" . }} -
{{ if .Params.showFullContent }} {{ .Content }} {{ else if .Description }} - {{ .Description | markdownify }} +

{{ .Description | markdownify }}

{{ else }} - {{ .Summary | markdownify }} + {{ .Summary }} {{ end }}
{{ if not .Params.showFullContent }} -
- {{ $.Site.Params.ReadMore }} → -
+
+ {{ $.Site.Params.ReadMore }} +
{{ end }} -
+ {{ end }} + {{ partial "pagination.html" . }}
{{ end }} diff --git a/themes/terminal/layouts/_default/single.html b/themes/terminal/layouts/_default/single.html index 22146f4..43a4102 100644 --- a/themes/terminal/layouts/_default/single.html +++ b/themes/terminal/layouts/_default/single.html @@ -1,30 +1,31 @@ {{ define "main" }} -
+
- {{ if .Params.Date }} - - {{ .Date.Format "2006-01-02" }} - {{ if $.Site.Params.showLastUpdated }} - [{{or $.Site.Params.updatedDatePrefix "Updated"}}: {{ .Lastmod.Format "2006-01-02" }}] - {{ end }} - - {{ end }} - {{ with .Params.Author }} - :: {{ . }} - {{ end }} - {{ if and (.Param "readingTime") (eq (.Param "readingTime") true) }} - :: {{ .ReadingTime }} min read ({{ .WordCount }} words) - {{ end }} + {{- if .Date -}} + + {{- end -}} + {{- with .Params.Author -}} + {{ . }} + {{- end -}} + {{- if and (.Param "readingTime") (eq (.Param "readingTime") true) -}} + {{ .ReadingTime }} {{ $.Site.Params.minuteReadingTime | default "min read" }} ({{ .WordCount }} {{ $.Site.Params.words | default "words" }}) + {{- end -}}
{{ if .Params.tags }} - - {{ range .Params.tags }} - #{{ . }}  - {{ end }} - + + {{ range .Params.tags }} + #{{ . }}  + {{ end }} + {{ end }} {{ partial "cover.html" . }} @@ -40,17 +41,17 @@
{{- with .Content -}}
- {{ . | replaceRE "()" `${1}⌗ ${3}` | safeHTML }} + {{ . | replaceRE "()" `${1}# ${3}` | safeHTML }}
{{- end -}}
{{ if eq .Type $.Site.Params.contentTypeName }} - {{ partial "posts_pagination.html" . }} + {{ partial "posts_pagination.html" . }} {{ end }} {{ if not (.Params.hideComments | default false) }} - {{ partial "comments.html" . }} + {{ partial "comments.html" . }} {{ end }} - + {{ end }} diff --git a/themes/terminal/layouts/_default/term.html b/themes/terminal/layouts/_default/term.html new file mode 100644 index 0000000..2ed7a75 --- /dev/null +++ b/themes/terminal/layouts/_default/term.html @@ -0,0 +1,57 @@ +{{ define "main" }} +

Posts for: #{{ .Title }}

+ {{ with .Content }} +
+ {{ . }} +
+ {{ end }} +
+ {{ range .Paginator.Pages }} +
+

+ {{ .Title | markdownify }} +

+
+ {{- if .Date -}} + + {{- end -}} + {{- with .Params.Author -}} + {{- . -}} + {{- end -}} +
+ + {{ if .Params.tags }} + + {{ range .Params.tags }} + # + {{- . -}} +   + {{ end }} + + {{ end }} + + {{ partial "cover.html" . }} + +
+ {{ if .Params.showFullContent }} + {{ .Content }} + {{ else if .Description }} +

{{ .Description | markdownify }}

+ {{ else }} + {{ .Summary }} + {{ end }} +
+ + {{ if not .Params.showFullContent }} +
+ {{ $.Site.Params.ReadMore }} +
+ {{ end }} +
+ {{ end }} + + {{ partial "pagination.html" . }} +
+{{ end }} diff --git a/themes/terminal/layouts/_default/terms.html b/themes/terminal/layouts/_default/terms.html index 399d665..9ac27fe 100644 --- a/themes/terminal/layouts/_default/terms.html +++ b/themes/terminal/layouts/_default/terms.html @@ -1,16 +1,21 @@ {{ define "main" }}

{{ .Title }}

+ {{ with .Content }} +
+ {{ . }} +
+ {{ end }}
diff --git a/themes/terminal/layouts/partials/footer.html b/themes/terminal/layouts/partials/footer.html index a077b3d..02ecd25 100644 --- a/themes/terminal/layouts/partials/footer.html +++ b/themes/terminal/layouts/partials/footer.html @@ -5,19 +5,19 @@ {{ $.Site.Copyright | safeHTML }} {{ else }}
- © {{ now.Year }} Powered by Hugo + © {{ now.Year }} Powered by Hugo {{ end }} - :: Theme made by panr + :: Theme made by panr
- - +{{ $menu := resources.Get "js/menu.js" | js.Build }} +{{ $prism := resources.Get "js/prism.js" | js.Build }} -{{ if $.Site.Params.showLanguageSelector }} - -{{ end }} +{{ $bundle := slice $menu $prism | resources.Concat "bundle.js" | resources.Minify }} + + {{ partial "extended_footer.html" . }} diff --git a/themes/terminal/layouts/partials/head.html b/themes/terminal/layouts/partials/head.html index 48f2d28..c77ac7a 100644 --- a/themes/terminal/layouts/partials/head.html +++ b/themes/terminal/layouts/partials/head.html @@ -2,31 +2,34 @@ - +{{ if .Params.noindex }} + {{ if or (eq (.Param "noindex") true) (eq (.Param "noindex") "true") }} + + {{ end }} +{{ else }} + +{{ end }} {{ template "_internal/google_analytics.html" . }} - - -{{ if (isset .Params "color") }} - -{{ else if and (ne $.Site.Params.ThemeColor "orange") (ne $.Site.Params.ThemeColor "color" "") }} - +{{ $css := resources.Match "css/*.css" }} +{{ range $css }} + {{ $styles := . | minify | fingerprint }} + {{ end }} - + +{{ if (fileExists "static/terminal.css") -}} + +{{- end }} {{ if (fileExists "static/style.css") -}} {{- end }} - -{{ if isset $.Site.Params "favicon" }} - -{{ else }} - -{{ end }} + + @@ -44,17 +47,17 @@ -{{ if and (not .IsHome) (isset .Params "cover") }} - -{{ else }} - {{ if isset $.Site.Params "favicon" }} - - {{ else }} - +{{ if (isset .Params "cover") }} + {{ $pageCover := .Param "cover" }} + {{ with (.Resources.GetMatch (.Param "cover")) }} + {{ $pageCover = .RelPermalink }} {{ end }} + +{{ else }} + {{ end }} - - + + {{ range .Params.categories }} {{ end }} diff --git a/themes/terminal/layouts/partials/header.html b/themes/terminal/layouts/partials/header.html index 23214f8..b43e320 100644 --- a/themes/terminal/layouts/partials/header.html +++ b/themes/terminal/layouts/partials/header.html @@ -4,7 +4,10 @@ {{ partial "logo.html" . }} {{ if len $.Site.Menus }} -
menu
+ {{ partial "mobile-menu.html" . }} + {{ end }} + {{ if and $.Site.Params.showLanguageSelector (len $.Site.Home.AllTranslations) }} + {{ partial "language-menu.html" . }} {{ end }} {{ if len $.Site.Menus }} diff --git a/themes/terminal/layouts/partials/language-menu.html b/themes/terminal/layouts/partials/language-menu.html new file mode 100644 index 0000000..c9f7c66 --- /dev/null +++ b/themes/terminal/layouts/partials/language-menu.html @@ -0,0 +1,10 @@ + diff --git a/themes/terminal/layouts/partials/menu.html b/themes/terminal/layouts/partials/menu.html index 17d39c8..dd069cc 100644 --- a/themes/terminal/layouts/partials/menu.html +++ b/themes/terminal/layouts/partials/menu.html @@ -1,60 +1,33 @@ -