diff options
author | Volpeon <git@volpeon.ink> | 2021-04-29 20:31:16 +0200 |
---|---|---|
committer | Volpeon <git@volpeon.ink> | 2021-04-29 20:31:16 +0200 |
commit | f561409f1cf476e2cc1112538eb7b724748a2378 (patch) | |
tree | 814e7e97fdbcc51c3368957078c5a4be022e08a1 | |
parent | Fix text contrast on cards (diff) | |
download | volpeon.ink-f561409f1cf476e2cc1112538eb7b724748a2378.tar.gz volpeon.ink-f561409f1cf476e2cc1112538eb7b724748a2378.tar.bz2 volpeon.ink-f561409f1cf476e2cc1112538eb7b724748a2378.zip |
Update
-rw-r--r-- | assets/css/objects/_button.scss | 23 | ||||
-rw-r--r-- | assets/css/scopes/_body.scss | 29 | ||||
-rw-r--r-- | assets/css/style.scss | 1 | ||||
-rw-r--r-- | filters/common_actions.lua | 16 | ||||
-rw-r--r-- | metadata/metadata.yaml | 21 | ||||
-rw-r--r-- | templates/layouts/categorized_list.html | 15 | ||||
-rw-r--r-- | templates/layouts/page.html | 8 |
7 files changed, 63 insertions, 50 deletions
diff --git a/assets/css/objects/_button.scss b/assets/css/objects/_button.scss deleted file mode 100644 index d97ca2d..0000000 --- a/assets/css/objects/_button.scss +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | @include namespace('button') { | ||
2 | @include store(( | ||
3 | --dims: ( | ||
4 | --pad-x: 1.4em, | ||
5 | --pad-y: .5em | ||
6 | ), | ||
7 | --colors: ( | ||
8 | --bg: prop(--colors --fg-lo, $global: true), | ||
9 | --fg: prop(--colors --bg, $global: true), | ||
10 | ) | ||
11 | )); | ||
12 | |||
13 | @include object(namespace()) { | ||
14 | display: inline-block; | ||
15 | padding: prop(--dims --pad-y) prop(--dims --pad-x); | ||
16 | border-radius: 10em; | ||
17 | background-color: prop(--colors --bg); | ||
18 | color: prop(--colors --fg); | ||
19 | font-size: 1 / 16 * 14em; | ||
20 | font-weight: 500; | ||
21 | text-decoration: none; | ||
22 | } | ||
23 | } | ||
diff --git a/assets/css/scopes/_body.scss b/assets/css/scopes/_body.scss index faf1ef0..9598290 100644 --- a/assets/css/scopes/_body.scss +++ b/assets/css/scopes/_body.scss | |||
@@ -1,8 +1,14 @@ | |||
1 | @include namespace('body') { | 1 | @include namespace('body') { |
2 | @include store(( | 2 | @include store(( |
3 | --colors: ( | 3 | --colors: ( |
4 | --emph-fg: prop(--colors --accent --color, $global: true), | 4 | --emph: ( |
5 | --emph-bg: prop(--colors --bg-hi, $global: true) | 5 | --fg: prop(--colors --accent --color, $global: true), |
6 | --bg: prop(--colors --bg-hi, $global: true), | ||
7 | ), | ||
8 | --meta: ( | ||
9 | --fg: prop(--colors --fg-hi, $global: true), | ||
10 | --bg: prop(--colors --bg-hi, $global: true), | ||
11 | ) | ||
6 | ) | 12 | ) |
7 | )); | 13 | )); |
8 | 14 | ||
@@ -62,12 +68,27 @@ | |||
62 | background-image: linear-gradient( | 68 | background-image: linear-gradient( |
63 | to top, | 69 | to top, |
64 | transparent .15em, | 70 | transparent .15em, |
65 | #{prop(--colors --emph-bg)} .15em, | 71 | #{prop(--colors --emph --bg)} .15em, |
66 | #{prop(--colors --emph-bg)} .6em, | 72 | #{prop(--colors --emph --bg)} .6em, |
67 | transparent .6em | 73 | transparent .6em |
68 | ); | 74 | ); |
69 | } | 75 | } |
70 | 76 | ||
77 | @include element('meta') { | ||
78 | display: flex; | ||
79 | font-size: 1 / 16 * 14rem; | ||
80 | |||
81 | + h1 { | ||
82 | margin-top: $line-height * 1rem; | ||
83 | } | ||
84 | } | ||
85 | |||
86 | @include element('meta-item') { | ||
87 | padding: .3em .7em; | ||
88 | background-color: prop(--colors --meta --bg); | ||
89 | color: prop(--colors --meta --fg); | ||
90 | } | ||
91 | |||
71 | img { | 92 | img { |
72 | max-width: 100%; | 93 | max-width: 100%; |
73 | } | 94 | } |
diff --git a/assets/css/style.scss b/assets/css/style.scss index 958710c..aa83f85 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss | |||
@@ -16,7 +16,6 @@ | |||
16 | @import 'layouts/project-grid'; | 16 | @import 'layouts/project-grid'; |
17 | 17 | ||
18 | @import 'objects/icon'; | 18 | @import 'objects/icon'; |
19 | @import 'objects/button'; | ||
20 | 19 | ||
21 | @import 'components/outer-button'; | 20 | @import 'components/outer-button'; |
22 | @import 'components/header'; | 21 | @import 'components/header'; |
diff --git a/filters/common_actions.lua b/filters/common_actions.lua index 6070c7e..535a225 100644 --- a/filters/common_actions.lua +++ b/filters/common_actions.lua | |||
@@ -1,7 +1,5 @@ | |||
1 | function CodeBlock(el) | 1 | function CodeBlock(el) |
2 | if next(el.classes) == nil then | 2 | if el.classes[1] == "plain" then |
3 | el.classes = el.classes .. {'c-page__pre'} | ||
4 | elseif el.classes[1] == "plain" then | ||
5 | el = pandoc.Div({el}, {class = 's-code'}) | 3 | el = pandoc.Div({el}, {class = 's-code'}) |
6 | else | 4 | else |
7 | local formatted = pandoc.pipe('pygmentize', { | 5 | local formatted = pandoc.pipe('pygmentize', { |
@@ -15,12 +13,12 @@ function CodeBlock(el) | |||
15 | end | 13 | end |
16 | 14 | ||
17 | function Header(el) | 15 | function Header(el) |
18 | if el.level == 1 then | 16 | if el.level == 1 or el.level == 2 then |
19 | el.classes = el.classes .. {'c-page__h1'} | 17 | local newchildren = pandoc.List() |
20 | elseif el.level == 2 then | 18 | |
21 | el.classes = el.classes .. {'c-page__h2'} | 19 | newchildren:insert(pandoc.Span(el.content, {class = 's-body__title-inner'})) |
22 | elseif el.level == 3 then | 20 | |
23 | el.classes = el.classes .. {'c-page__h3'} | 21 | el.content = newchildren |
24 | end | 22 | end |
25 | return el | 23 | return el |
26 | end | 24 | end |
diff --git a/metadata/metadata.yaml b/metadata/metadata.yaml index 226401d..c8a841d 100644 --- a/metadata/metadata.yaml +++ b/metadata/metadata.yaml | |||
@@ -7,14 +7,15 @@ author: | |||
7 | 7 | ||
8 | menus: | 8 | menus: |
9 | main: | 9 | main: |
10 | - id: projects | 10 | - id: projects |
11 | label: Projects | 11 | label: Projects |
12 | url: /#projects | 12 | url: /#projects |
13 | - id: personal | 13 | |
14 | label: Personal | 14 | - id: personal |
15 | label: Personal | ||
15 | label_long: Personal Notebook | 16 | label_long: Personal Notebook |
16 | url: /personal/ | 17 | url: /personal/ |
17 | hidden: true | 18 | hidden: true |
18 | 19 | ||
19 | feeds: | 20 | feeds: |
20 | - title: Notebook | 21 | - title: Notebook |
@@ -23,7 +24,9 @@ feeds: | |||
23 | categories: | 24 | categories: |
24 | personal: | 25 | personal: |
25 | dre: | 26 | dre: |
26 | name: Dreams | 27 | name: Dream Journal |
28 | show_date: true | ||
29 | |||
27 | projects: | 30 | projects: |
28 | emj: | 31 | emj: |
29 | name: Emojis | 32 | name: Emojis |
@@ -32,7 +35,7 @@ categories: | |||
32 | rewrites: | 35 | rewrites: |
33 | path: | 36 | path: |
34 | - from: ^/personal | 37 | - from: ^/personal |
35 | to: /9thPK7O3xn | 38 | to: /9thPK7O3xn |
36 | 39 | ||
37 | profiles: | 40 | profiles: |
38 | - platform: Bandcamp | 41 | - platform: Bandcamp |
diff --git a/templates/layouts/categorized_list.html b/templates/layouts/categorized_list.html index f2eda8b..75c636a 100644 --- a/templates/layouts/categorized_list.html +++ b/templates/layouts/categorized_list.html | |||
@@ -6,14 +6,21 @@ $body$ | |||
6 | 6 | ||
7 | $for(pages.by_category)$ | 7 | $for(pages.by_category)$ |
8 | <h2> | 8 | <h2> |
9 | $for(it.value/first)$ | 9 | <span class="s-body__title-inner"> |
10 | $it.category.name$ | 10 | $for(it.value/first/first)$ |
11 | $endfor$ | 11 | $it.category.name$ |
12 | $endfor$ | ||
13 | </span> | ||
12 | </h2> | 14 | </h2> |
13 | <ul> | 15 | <ul> |
14 | $for(it.value)$ | 16 | $for(it.value)$ |
15 | <li> | 17 | <li> |
16 | <a href="$it.url.rel$">$it.title$</a> | 18 | <a href="$it.url.rel$"> |
19 | $if(it.category.show_date)$ | ||
20 | $it.date.yyyy_mm_dd$: | ||
21 | $endif$ | ||
22 | $it.title$ | ||
23 | </a> | ||
17 | </li> | 24 | </li> |
18 | $endfor$ | 25 | $endfor$ |
19 | </ul> | 26 | </ul> |
diff --git a/templates/layouts/page.html b/templates/layouts/page.html index bccdeae..e985484 100644 --- a/templates/layouts/page.html +++ b/templates/layouts/page.html | |||
@@ -1,5 +1,13 @@ | |||
1 | <section class="l-section l-section--fullscreen l-section--no-head"> | 1 | <section class="l-section l-section--fullscreen l-section--no-head"> |
2 | <div class="l-container l-container--pad-x l-container--pad-y l-container--content s-body"> | 2 | <div class="l-container l-container--pad-x l-container--pad-y l-container--content s-body"> |
3 | $if(category.show_date)$ | ||
4 | <div class="s-body__meta"> | ||
5 | <div class="s-body__meta-item"> | ||
6 | $date.yyyy_mm_dd$ | ||
7 | </div> | ||
8 | </div> | ||
9 | $endif$ | ||
10 | |||
3 | <h1><span class="s-body__title-inner">$title$</span></h1> | 11 | <h1><span class="s-body__title-inner">$title$</span></h1> |
4 | 12 | ||
5 | $body$ | 13 | $body$ |