diff options
| author | s-ol <s-ol@users.noreply.github.com> | 2020-01-25 14:41:09 +0000 |
|---|---|---|
| committer | s-ol <s-ol@users.noreply.github.com> | 2020-01-25 14:41:09 +0000 |
| commit | 643dc0b56117a4549962dca95d0b3a4476f04012 (patch) | |
| tree | 12924b3156cb893233adfef3d5f1c4043b099563 | |
| parent | Merge branch 'ba' (diff) | |
| download | mmm-643dc0b56117a4549962dca95d0b3a4476f04012.tar.gz mmm-643dc0b56117a4549962dca95d0b3a4476f04012.zip | |
merge fixes
| -rw-r--r-- | mmm/mmmfs/layout.moon | 1 | ||||
| -rw-r--r-- | mmm/mmmfs/plugins/markdown.moon | 6 | ||||
| -rw-r--r-- | root/projects/VJmidiKit/text$markdown+wide.md (renamed from root/projects/VJmidiKit/text$markdown+fullwidth.md) | 0 | ||||
| -rw-r--r-- | root/projects/demoloops/squaregrid/text$html+frag (renamed from root/projects/demoloops/squaregrid/text$html) | 0 |
4 files changed, 7 insertions, 0 deletions
diff --git a/mmm/mmmfs/layout.moon b/mmm/mmmfs/layout.moon index 7fd3091..b69cf75 100644 --- a/mmm/mmmfs/layout.moon +++ b/mmm/mmmfs/layout.moon @@ -52,6 +52,7 @@ gen_header = -> } aside { navigate_to '/about', 'about me' + navigate_to '/portfolio', 'portfolio' navigate_to '/games', 'games' navigate_to '/projects', 'other' a { diff --git a/mmm/mmmfs/plugins/markdown.moon b/mmm/mmmfs/plugins/markdown.moon index 35d7162..74905e2 100644 --- a/mmm/mmmfs/plugins/markdown.moon +++ b/mmm/mmmfs/plugins/markdown.moon @@ -50,6 +50,12 @@ assert markdown, "no markdown implementation found" transform: (md) => "<div class=\"markdown sidenote-container\">#{markdown md}</div>" } { + inp: 'text/markdown%+wide' + out: 'text/html+frag' + cost: 1 + transform: (md) => "<div class=\"markdown wide\">#{markdown md}</div>" + } + { inp: 'text/markdown%+span' out: 'text/html+frag' cost: 1 diff --git a/root/projects/VJmidiKit/text$markdown+fullwidth.md b/root/projects/VJmidiKit/text$markdown+wide.md index 7767e93..7767e93 100644 --- a/root/projects/VJmidiKit/text$markdown+fullwidth.md +++ b/root/projects/VJmidiKit/text$markdown+wide.md diff --git a/root/projects/demoloops/squaregrid/text$html b/root/projects/demoloops/squaregrid/text$html+frag index aa33399..aa33399 100644 --- a/root/projects/demoloops/squaregrid/text$html +++ b/root/projects/demoloops/squaregrid/text$html+frag |