Merge pull request #4121 from tylershuster/serve-woff

landscape: add woff2 support, serve Inter & Source Code Pro

pkg/arvo/app/file-server.hoon

@@ -213,6 +213,9 @@
               (lowercase (weld path.content.u.content suffix.u.content))
           ==
         ?.  .^(? %cu scry-path)  [not-found:gen %.n]
+        ?:  ?=([~ %woff2] ext.req-line)
+          :_  public.u.content
+          [[200 [['content-type' '/font/woff2'] ~]] `.^(octs %cx scry-path)]
         =/  file  (as-octs:mimes:html .^(@ %cx scry-path))
         :_  public.u.content
         ?+  ext.req-line  not-found:gen

pkg/arvo/mar/woff2.hoon

@@ -0,0 +1,12 @@
+|_  dat=octs
+++  grow 
+  |% 
+  ++  mime  [/font/woff2 dat] 
+  -- 
+++  grab 
+  |% 
+  ++  mime  |=([=mite =octs] octs) 
+  ++  noun  octs
+  -- 
+++  grad  %mime 
+--

pkg/interface/src/views/css/fonts.css

@@ -2,76 +2,76 @@
   font-family: 'Inter';
   font-style:  normal;
   font-weight: 400;
-  src: url("https://media.urbit.org/fonts/Inter-Regular.woff2") format("woff2");
+  src: url("/~landscape/fonts/inter-regular.woff2") format("woff2");
 }
 
 @font-face {
   font-family: 'Inter';
   font-style: normal;
   font-weight: 500;
-  src: url("https://media.urbit.org/fonts/Inter-Medium.woff2") format("woff2");
+  src: url("/~landscape/fonts/inter-medium.woff2") format("woff2");
 }
 
 @font-face {
   font-family: 'Inter';
   font-style: normal;
   font-weight: 600;
-  src: url("https://media.urbit.org/fonts/Inter-SemiBold.woff2") format("woff2");
+  src: url("/~landscape/fonts/inter-semibold.woff2") format("woff2");
 }
 
 @font-face {
   font-family: 'Inter';
   font-style:  italic;
   font-weight: 400;
-  src: url("https://media.urbit.org/fonts/Inter-Italic.woff2") format("woff2");
+  src: url("/~landscape/fonts/inter-italic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: 'Inter';
   font-style:  normal;
   font-weight: 700;
-  src: url("https://media.urbit.org/fonts/Inter-Bold.woff2") format("woff2");
+  src: url("/~landscape/fonts/inter-bold.woff2") format("woff2");
 }
 @font-face {
   font-family: 'Inter';
   font-style:  italic;
   font-weight: 700;
-  src: url("https://media.urbit.org/fonts/Inter-BoldItalic.woff2") format("woff2");
+  src: url("/~landscape/fonts/inter-bolditalic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Source Code Pro";
-  src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-extralight.woff");
+  src: url("/~landscape/fonts/sourcecodepro-extralight.woff2");
   font-weight: 200;
 }
 
 @font-face {
   font-family: "Source Code Pro";
-  src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-light.woff");
+  src: url("/~landscape/fonts/sourcecodepro-light.woff2");
   font-weight: 300;
 }
 
 @font-face {
   font-family: "Source Code Pro";
-  src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-regular.woff");
+  src: url("/~landscape/fonts/sourcecodepro-regular.woff2");
   font-weight: 400;
 }
 
 @font-face {
   font-family: "Source Code Pro";
-  src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-medium.woff");
+  src: url("(/~landscape/fonts/sourcecodepro-medium.woff2");
   font-weight: 500;
 }
 
 @font-face {
   font-family: "Source Code Pro";
-  src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-semibold.woff");
+  src: url("/~landscape/fonts/sourcecodepro-semibold.woff2");
   font-weight: 600;
 }
 
 @font-face {
   font-family: "Source Code Pro";
-  src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-bold.woff");
+  src: url("/~landscape/fonts/sourcecodepro-bold.woff2");
   font-weight: 700;
 }