summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--assets/css/_basics.scss2
-rw-r--r--assets/css/components/_page.scss17
-rw-r--r--assets/css/scopes/_code.scss14
-rw-r--r--content/3jF85da/index.md (renamed from content/_personal/index.md)1
-rw-r--r--content/blog/test2/index.md6
-rw-r--r--filters/common_actions.lua2
-rw-r--r--metadata/metadata.yaml4
7 files changed, 40 insertions, 6 deletions
diff --git a/assets/css/_basics.scss b/assets/css/_basics.scss
index b18ca57..cbdfb9a 100644
--- a/assets/css/_basics.scss
+++ b/assets/css/_basics.scss
@@ -175,7 +175,7 @@ p {
175 175
176hr { 176hr {
177 height: 1px; 177 height: 1px;
178 margin: ($line-height * 2em) 0; 178 margin: ($line-height * 1em) 0;
179 border: 0; 179 border: 0;
180 background-color: var(--obj); 180 background-color: var(--obj);
181} 181}
diff --git a/assets/css/components/_page.scss b/assets/css/components/_page.scss
index ce67f7e..87d5413 100644
--- a/assets/css/components/_page.scss
+++ b/assets/css/components/_page.scss
@@ -2,6 +2,14 @@
2 &__header { 2 &__header {
3 margin-bottom: $line-height * 1em; 3 margin-bottom: $line-height * 1em;
4 4
5 &::after {
6 content: '--';
7 display: block;
8 margin-bottom: $line-height * -1em;
9 color: var(--fg-hi);
10 line-height: 2 * $line-height;
11 }
12
5 &__title { 13 &__title {
6 margin-top: 0; 14 margin-top: 0;
7 } 15 }
@@ -44,14 +52,21 @@
44 text-align: right; 52 text-align: right;
45 } 53 }
46 54
55 $h1-unscale-factor: px-to-em($font-size, $content--h1--font-size);
56
47 &--h1 { 57 &--h1 {
58 margin-top: $line-height * $h1-unscale-factor;
48 font-size: px-to-em($content--h1--font-size); 59 font-size: px-to-em($content--h1--font-size);
49 60
50 &::before { 61 &::before {
51 content: '#'; 62 content: '#';
52 font-size: px-to-em($font-size, $content--h1--font-size); 63 font-size: $h1-unscale-factor;
53 } 64 }
54 } 65 }
66
67 &--h1 + &--h1 {
68 margin-top: $line-height * $h1-unscale-factor;
69 }
55 70
56 &--h2::before { 71 &--h2::before {
57 content: '##'; 72 content: '##';
diff --git a/assets/css/scopes/_code.scss b/assets/css/scopes/_code.scss
index f6697aa..f024dbd 100644
--- a/assets/css/scopes/_code.scss
+++ b/assets/css/scopes/_code.scss
@@ -1,18 +1,28 @@
1.s-code { 1.s-code {
2 pre,
3 code {
4 color: var(--fg-lo);
5 }
6
2 pre { 7 pre {
3 overflow-x: auto; 8 overflow-x: auto;
4 color: var(--fg-lo);
5 font-size: 1em; 9 font-size: 1em;
6 line-height: $line-height; 10 line-height: $line-height;
7 } 11 }
8 12
13 &--plain {
14 pre,
15 code {
16 color: var(--fg);
17 }
18 }
19
9 /* stylelint-disable selector-class-pattern */ 20 /* stylelint-disable selector-class-pattern */
10 21
11 .c { 22 .c {
12 color: var(--fg-hi); 23 color: var(--fg-hi);
13 } 24 }
14 25
15 .nt,
16 .kt, 26 .kt,
17 .k, 27 .k,
18 .kr, 28 .kr,
diff --git a/content/_personal/index.md b/content/3jF85da/index.md
index 5e89459..8f4484b 100644
--- a/content/_personal/index.md
+++ b/content/3jF85da/index.md
@@ -1,4 +1,5 @@
1--- 1---
2title: Personal Blog 2title: Personal Blog
3layout: dated_list 3layout: dated_list
4create_feed: true
4--- 5---
diff --git a/content/blog/test2/index.md b/content/blog/test2/index.md
index aee4641..aa23764 100644
--- a/content/blog/test2/index.md
+++ b/content/blog/test2/index.md
@@ -4,8 +4,14 @@ title: Test Page 2
4category: per 4category: per
5--- 5---
6 6
7Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
8
7``` 9```
8 - /----\ 10 - /----\
9- | | 11- | |
10 - \----/ 12 - \----/
11``` 13```
14
15## Subtitle
16
17Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
diff --git a/filters/common_actions.lua b/filters/common_actions.lua
index a358b99..abb15a1 100644
--- a/filters/common_actions.lua
+++ b/filters/common_actions.lua
@@ -1,6 +1,8 @@
1function CodeBlock(el) 1function CodeBlock(el)
2 if next(el.classes) == nil then 2 if next(el.classes) == nil then
3 el.classes = el.classes .. {'c-page__prefixed', 'c-page__prefixed--pre'} 3 el.classes = el.classes .. {'c-page__prefixed', 'c-page__prefixed--pre'}
4 elseif el.classes[1] == "plain" then
5 el = pandoc.Div({el}, {class = 'c-page__code s-code s-code--plain'})
4 else 6 else
5 local formatted = pandoc.pipe('pygmentize', { 7 local formatted = pandoc.pipe('pygmentize', {
6 '-l', el.classes[1], '-f', 'html', '-O', 8 '-l', el.classes[1], '-f', 'html', '-O',
diff --git a/metadata/metadata.yaml b/metadata/metadata.yaml
index ac8474d..150c172 100644
--- a/metadata/metadata.yaml
+++ b/metadata/metadata.yaml
@@ -14,9 +14,9 @@ menus:
14 - id: blog 14 - id: blog
15 label: Blog 15 label: Blog
16 url: /blog/ 16 url: /blog/
17 - id: _personal 17 - id: 3jF85da
18 label: Personal 18 label: Personal
19 url: /_personal/ 19 url: /3jF85da/
20 hidden: true 20 hidden: true
21 21
22feeds: 22feeds: