clean up plugins, style

5 files changed, 15 insertions, 23 deletions

diff --git a/$mmm/plugins/code/scripts: text$lua -> fn -> text$html+frag.lua b/$mmm/plugins/code/scripts: text$lua -> fn -> text$html+frag.lua
index 87a182f..96c4b0d 100644
--- a/$mmm/plugins/code/scripts: text$lua -> fn -> text$html+frag.lua
+++ b/$mmm/plugins/code/scripts: text$lua -> fn -> text$html+frag.lua
@@ -1,5 +1,3 @@
-local tourl
-tourl = (require('mmm.mmmfs.util'))({ }).tourl
 return function(self)
   return "\n  <link rel=\"stylesheet\" type=\"text/css\" href=\"" .. tostring(self:gett('style: URL -> text/css')) .. "\" />" .. [[<!--
   <link rel="stylesheet" type="text/css" href="//unpkg.com/codemirror@5.49.2/lib/codemirror.css" />
diff --git a/$mmm/plugins/code/scripts: text$moonscript -> fn -> text$html+frag.moon b/$mmm/plugins/code/scripts: text$moonscript -> fn -> text$html+frag.moon
index 9799ac6..e158e2b 100644
--- a/$mmm/plugins/code/scripts: text$moonscript -> fn -> text$html+frag.moon
+++ b/$mmm/plugins/code/scripts: text$moonscript -> fn -> text$html+frag.moon
@@ -1,5 +1,3 @@
-import tourl from (require 'mmm.mmmfs.util') {}
-
 =>
   "
   <link rel=\"stylesheet\" type=\"text/css\" href=\"#{@gett 'style: URL -> text/css'}\" />" ..
diff --git a/$mmm/plugins/markdown/scripts: text$lua -> fn -> text$html+frag.lua b/$mmm/plugins/markdown/scripts: text$lua -> fn -> text$html+frag.lua
index fb849db..f1b07f1 100644
--- a/$mmm/plugins/markdown/scripts: text$lua -> fn -> text$html+frag.lua
+++ b/$mmm/plugins/markdown/scripts: text$lua -> fn -> text$html+frag.lua
@@ -1,5 +1,3 @@
-local tourl
-tourl = (require('mmm.mmmfs.util'))({ }).tourl
 return function(self)
   return "\n  <script type=\"text/javascript\" src=\"" .. tostring(self:gett('marked: URL -> text/javascript')) .. "\"></script>"
 end
diff --git a/$mmm/plugins/markdown/scripts: text$moonscript -> fn -> text$html+frag.moon b/$mmm/plugins/markdown/scripts: text$moonscript -> fn -> text$html+frag.moon
index c4637b2..3203e82 100644
--- a/$mmm/plugins/markdown/scripts: text$moonscript -> fn -> text$html+frag.moon
+++ b/$mmm/plugins/markdown/scripts: text$moonscript -> fn -> text$html+frag.moon
@@ -1,5 +1,3 @@
-import tourl from (require 'mmm.mmmfs.util') {}
-
 =>
   "
   <script type=\"text/javascript\" src=\"#{@gett 'marked: URL -> text/javascript'}\"></script>"
diff --git a/static/style/content/text$x-scss.scss b/static/style/content/text$x-scss.scss
index eb99d44..cdffaa3 100644
--- a/static/style/content/text$x-scss.scss
+++ b/static/style/content/text$x-scss.scss
@@ -10,8 +10,8 @@
     padding: 1em 2em;
     overflow: hidden;
 
-    color: $gray-darker;
-    background: $gray-fail;
+    color: var(--gray-darker);
+    background: var(--gray-fail);
 
     &.empty {
       display: none;
@@ -38,7 +38,7 @@
   margin: 0 1em;
   align-self: flex-start;
   min-width: 30vw;
-  background: $white;
+  background: var(--white);
 
   position: relative;
 
@@ -68,8 +68,8 @@
       line-height: normal;
       margin: 1rem var(--margin-wide);
       padding: 1rem;
-      background: $gray-bright;
-      border-color: $gray-neutral;
+      background: var(--gray-bright);
+      border-color: var(--gray-neutral);
     }
   }
 
@@ -132,7 +132,7 @@
       display: inline-block;
       padding: 0.5em;
       margin: 0.2em;
-      background: $gray-bright;
+      background: var(--gray-bright);
     }
 
     > *:not(.description) {
@@ -152,7 +152,7 @@
 
   pre > code {
     @include left-border;
-    border-color: $gray-dark;
+    border-color: var(--gray-dark);
 
     display: block;
     margin: 0 var(--margin-wide);
@@ -172,13 +172,13 @@
     margin: 1rem var(--margin-wide);
     padding: 1rem;
     line-height: normal;
-    background: $gray-bright;
-    border-color: $gray-neutral;
+    background: var(--gray-bright);
+    border-color: var(--gray-neutral);
     break-inside: avoid-page;
   }
 
   .well-warning {
-    border-color: $gray-fail;
+    border-color: var(--gray-fail);
   }
 }
 
@@ -195,17 +195,17 @@
   padding: 0.25em 0.5em;
   border-radius: 0.2em;
 
-  color: $gray-bright;
-  background: $gray-dark;
-  border: 1px solid $gray-dark;
+  color: var(--gray-bright);
+  background: var(--gray-dark);
+  border: 1px solid var(--gray-dark);
 
   transition: background 500ms;
 
   &.secondary {
     background: transparent;
 
-    border: 1px solid $gray-dark;
-    color: $gray-dark;
+    border: 1px solid var(--gray-dark);
+    color: var(--gray-dark);
   }
 
   &:hover {