From 643dc0b56117a4549962dca95d0b3a4476f04012 Mon Sep 17 00:00:00 2001
From: s-ol <s-ol@users.noreply.github.com>
Date: Sat, 25 Jan 2020 15:41:09 +0100
Subject: merge fixes

---
 mmm/mmmfs/layout.moon                              |  1 +
 mmm/mmmfs/plugins/markdown.moon                    |  6 +++++
 root/projects/VJmidiKit/text$markdown+fullwidth.md | 31 ----------------------
 root/projects/VJmidiKit/text$markdown+wide.md      | 31 ++++++++++++++++++++++
 root/projects/demoloops/squaregrid/text$html       |  5 ----
 root/projects/demoloops/squaregrid/text$html+frag  |  5 ++++
 6 files changed, 43 insertions(+), 36 deletions(-)
 delete mode 100644 root/projects/VJmidiKit/text$markdown+fullwidth.md
 create mode 100644 root/projects/VJmidiKit/text$markdown+wide.md
 delete mode 100644 root/projects/demoloops/squaregrid/text$html
 create mode 100644 root/projects/demoloops/squaregrid/text$html+frag

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
@@ -49,6 +49,12 @@ assert markdown, "no markdown implementation found"
       cost: 1
       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'
diff --git a/root/projects/VJmidiKit/text$markdown+fullwidth.md b/root/projects/VJmidiKit/text$markdown+fullwidth.md
deleted file mode 100644
index 7767e93..0000000
--- a/root/projects/VJmidiKit/text$markdown+fullwidth.md
+++ /dev/null
@@ -1,31 +0,0 @@
-VJmidiKit
-=========
-
-VJmidiKit is a tool for VJing using livecoded (raymarching) shaders and connecting shaders to MIDI signals
-from live music and controllers for music reactivity.
-The interactions between MIDI signals and shader variables can be programmed in many different ways using a visual block language.
-
-VJmidiKit is a C++ application built on top of [openFrameworks][of], [Dear Imgui][imgui], [RtMidi][rtmidi] and [yaml-cpp][yaml].  
-The Shaders in the following media are all written in GLSL by me, using the excellent [hg\_sdf][hgsdf] library.
-
-If you are interested in trying VJmidiKit for yourself, feel free to message me.
-You can find my email address at the top, and social media at the bottom of this website.
-
-<div style="align-items: flex-start; display: flex; flex-wrap: wrap; margin: -0.5em;">
-  <mmm-embed nolink inline path="boxy_dnb"></mmm-embed>
-  <mmm-embed nolink inline path="boxy_visualist"></mmm-embed>
-  <mmm-embed nolink inline path="stills"></mmm-embed>
-  <mmm-embed nolink inline path="pineapple"></mmm-embed>
-  <mmm-embed nolink inline path="kaleidoscope"></mmm-embed>
-  <mmm-embed nolink inline path="pillars"></mmm-embed>
-  <mmm-embed nolink inline path="tomcat_tunnel"></mmm-embed>
-  <mmm-embed nolink inline path="dancing_pineapple"></mmm-embed>
-  <mmm-embed nolink inline path="tomcat"></mmm-embed>
-  <mmm-embed nolink inline path="jam"></mmm-embed>
-</div>
-
-[of]: https://openframeworks.cc/
-[imgui]: https://github.com/ocornut/imgui
-[rtmidi]: https://github.com/thestk/rtmidi
-[yaml]: https://github.com/jbeder/yaml-cpp
-[hgsdf]: http://mercury.sexy/hg_sdf/
diff --git a/root/projects/VJmidiKit/text$markdown+wide.md b/root/projects/VJmidiKit/text$markdown+wide.md
new file mode 100644
index 0000000..7767e93
--- /dev/null
+++ b/root/projects/VJmidiKit/text$markdown+wide.md
@@ -0,0 +1,31 @@
+VJmidiKit
+=========
+
+VJmidiKit is a tool for VJing using livecoded (raymarching) shaders and connecting shaders to MIDI signals
+from live music and controllers for music reactivity.
+The interactions between MIDI signals and shader variables can be programmed in many different ways using a visual block language.
+
+VJmidiKit is a C++ application built on top of [openFrameworks][of], [Dear Imgui][imgui], [RtMidi][rtmidi] and [yaml-cpp][yaml].  
+The Shaders in the following media are all written in GLSL by me, using the excellent [hg\_sdf][hgsdf] library.
+
+If you are interested in trying VJmidiKit for yourself, feel free to message me.
+You can find my email address at the top, and social media at the bottom of this website.
+
+<div style="align-items: flex-start; display: flex; flex-wrap: wrap; margin: -0.5em;">
+  <mmm-embed nolink inline path="boxy_dnb"></mmm-embed>
+  <mmm-embed nolink inline path="boxy_visualist"></mmm-embed>
+  <mmm-embed nolink inline path="stills"></mmm-embed>
+  <mmm-embed nolink inline path="pineapple"></mmm-embed>
+  <mmm-embed nolink inline path="kaleidoscope"></mmm-embed>
+  <mmm-embed nolink inline path="pillars"></mmm-embed>
+  <mmm-embed nolink inline path="tomcat_tunnel"></mmm-embed>
+  <mmm-embed nolink inline path="dancing_pineapple"></mmm-embed>
+  <mmm-embed nolink inline path="tomcat"></mmm-embed>
+  <mmm-embed nolink inline path="jam"></mmm-embed>
+</div>
+
+[of]: https://openframeworks.cc/
+[imgui]: https://github.com/ocornut/imgui
+[rtmidi]: https://github.com/thestk/rtmidi
+[yaml]: https://github.com/jbeder/yaml-cpp
+[hgsdf]: http://mercury.sexy/hg_sdf/
diff --git a/root/projects/demoloops/squaregrid/text$html b/root/projects/demoloops/squaregrid/text$html
deleted file mode 100644
index aa33399..0000000
--- a/root/projects/demoloops/squaregrid/text$html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-  <mmm-embed path="rotated"></mmm-embed>
-  <mmm-embed path="rounded"></mmm-embed>
-  <mmm-embed path="overlaid"></mmm-embed>
-</div>
diff --git a/root/projects/demoloops/squaregrid/text$html+frag b/root/projects/demoloops/squaregrid/text$html+frag
new file mode 100644
index 0000000..aa33399
--- /dev/null
+++ b/root/projects/demoloops/squaregrid/text$html+frag
@@ -0,0 +1,5 @@
+<div>
+  <mmm-embed path="rotated"></mmm-embed>
+  <mmm-embed path="rounded"></mmm-embed>
+  <mmm-embed path="overlaid"></mmm-embed>
+</div>
-- 
cgit v1.2.3