8 files changed, 57 insertions, 217 deletions

diff --git a/app/Web.hs b/app/Web.hs
index 8faaf4a..8dad484 100644
--- a/app/Web.hs
+++ b/app/Web.hs
@@ -119,14 +119,11 @@ styles (HomeResult f False) =
 instance ToHtml HomeView where
   toHtml view =
     pageTemplate
-      [ a_
-          [href_ "https://cyfraeviolae.org/git/sumcheck", class_ "nonbreaking"]
-          "source code"
-      ]
+      []
       homeBody
     where
       (formclass, formtxt, inpval) = styles view
-      homeBody = div_ [class_ "narrow"] $ do
+      homeBody = div_ $ do
         p_ $ do
           span_
             "The diagonalizing sorcerer Roseacrucis has \
@@ -137,13 +134,15 @@ instance ToHtml HomeView where
             [href_ "https://en.wikipedia.org/wiki/Presburger_arithmetic"]
             "first-order theory of the natural numbers with addition"
           span_ "."
+        br_ []
         form_ [method_ "get", action_ "/sumcheck", class_ (T.pack formclass)] $ do
           p_ $ do
-            label_ [class_ "focus"] "theorem:"
+            label_ $ strong_ "theorem:"
             input_ ([type_ "text", name_ "theorem"] ++ inpval)
           p_ $ do
             button_ [type_ "submit"] "Decide"
             span_ [class_ "validity"] (toHtml formtxt)
+          br_ []
         p_ $ do
           span_
             "The Sphinx asks its riddles in rapidfire succession, but accompanied by your faithful "
@@ -217,17 +216,18 @@ pageTemplate crumbs body = doctypehtml_ $ do
     meta_ [name_ "viewport", content_ "width=device-width, initial-scale=1.0"]
     link_
       [rel_ "shortcut icon", type_ "image/x-icon", href_ "/sumcheck/static/favicon.ico"]
-    link_ [rel_ "stylesheet", type_ "text/css", href_ "/sumcheck/static/style.css"]
+    link_ [rel_ "stylesheet", type_ "text/css", href_ "/static/styles.css"]
+    link_ [rel_ "stylesheet", type_ "text/css", href_ "/sumcheck/static/styles.css"]
   body_ $
     div_ [class_ "container"] $ do
-      div_ [class_ "row navbar"] $
-        sequence_ $
-          L.intersperse
-            (span_ [class_ "sep"] (toHtmlRaw (T.pack " | ")))
-            (crumb : crumbs)
-      body
+        div_ $ do
+            div_ [class_ "home"] $ do
+              a_ [href_ (homeURI Nothing), class_ "home-title"] (strong_ "Sumcheck")
+              span_ " at "
+              a_ [href_ "/"] "cyfraeviolae.org"
+            div_ [class_ "crumbs"] $ sequence_ $ L.intersperse
+                (span_ [class_ "sep"] (toHtmlRaw (T.pack " · ")))
+                (srcCrumb : crumbs)
+        body
   where
-    crumb = span_ [class_ "ico"] $ do
-      a_ [href_ (homeURI Nothing), class_ "title"] (strong_ "Sumcheck")
-      span_ "@"
-      a_ [href_ "https://cyfraeviolae.org"] "cyfraeviolae.org"
+    srcCrumb =  a_ [href_ "/git/sumcheck"] "source code"
diff --git a/dist/sumcheck-exe b/dist/sumcheck-exe
index 54704a3..0505c0f 100755
--- a/dist/sumcheck-exe
+++ b/dist/sumcheck-exe
diff --git a/static/EBGaramond-Italic-VariableFont_wght.ttf b/static/EBGaramond-Italic-VariableFont_wght.ttf
deleted file mode 100644
index fa31b71..0000000
--- a/static/EBGaramond-Italic-VariableFont_wght.ttf
+++ /dev/null
diff --git a/static/EBGaramond-VariableFont_wght.ttf b/static/EBGaramond-VariableFont_wght.ttf
deleted file mode 100644
index 123d5dd..0000000
--- a/static/EBGaramond-VariableFont_wght.ttf
+++ /dev/null
diff --git a/static/FiraMono-Regular.ttf b/static/FiraMono-Regular.ttf
deleted file mode 100644
index 3910f17..0000000
--- a/static/FiraMono-Regular.ttf
+++ /dev/null
diff --git a/static/OFL.txt b/static/OFL.txt
deleted file mode 100644
index 1ba1596..0000000
--- a/static/OFL.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright (c) 2012-2013, The Mozilla Corporation and Telefonica S.A.

-

-This Font Software is licensed under the SIL Open Font License, Version 1.1.

-This license is copied below, and is also available with a FAQ at:

-http://scripts.sil.org/OFL

-

-

------------------------------------------------------------

-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007

------------------------------------------------------------

-

-PREAMBLE

-The goals of the Open Font License (OFL) are to stimulate worldwide

-development of collaborative font projects, to support the font creation

-efforts of academic and linguistic communities, and to provide a free and

-open framework in which fonts may be shared and improved in partnership

-with others.

-

-The OFL allows the licensed fonts to be used, studied, modified and

-redistributed freely as long as they are not sold by themselves. The

-fonts, including any derivative works, can be bundled, embedded, 

-redistributed and/or sold with any software provided that any reserved

-names are not used by derivative works. The fonts and derivatives,

-however, cannot be released under any other type of license. The

-requirement for fonts to remain under this license does not apply

-to any document created using the fonts or their derivatives.

-

-DEFINITIONS

-"Font Software" refers to the set of files released by the Copyright

-Holder(s) under this license and clearly marked as such. This may

-include source files, build scripts and documentation.

-

-"Reserved Font Name" refers to any names specified as such after the

-copyright statement(s).

-

-"Original Version" refers to the collection of Font Software components as

-distributed by the Copyright Holder(s).

-

-"Modified Version" refers to any derivative made by adding to, deleting,

-or substituting -- in part or in whole -- any of the components of the

-Original Version, by changing formats or by porting the Font Software to a

-new environment.

-

-"Author" refers to any designer, engineer, programmer, technical

-writer or other person who contributed to the Font Software.

-

-PERMISSION & CONDITIONS

-Permission is hereby granted, free of charge, to any person obtaining

-a copy of the Font Software, to use, study, copy, merge, embed, modify,

-redistribute, and sell modified and unmodified copies of the Font

-Software, subject to the following conditions:

-

-1) Neither the Font Software nor any of its individual components,

-in Original or Modified Versions, may be sold by itself.

-

-2) Original or Modified Versions of the Font Software may be bundled,

-redistributed and/or sold with any software, provided that each copy

-contains the above copyright notice and this license. These can be

-included either as stand-alone text files, human-readable headers or

-in the appropriate machine-readable metadata fields within text or

-binary files as long as those fields can be easily viewed by the user.

-

-3) No Modified Version of the Font Software may use the Reserved Font

-Name(s) unless explicit written permission is granted by the corresponding

-Copyright Holder. This restriction only applies to the primary font name as

-presented to the users.

-

-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font

-Software shall not be used to promote, endorse or advertise any

-Modified Version, except to acknowledge the contribution(s) of the

-Copyright Holder(s) and the Author(s) or with their explicit written

-permission.

-

-5) The Font Software, modified or unmodified, in part or in whole,

-must be distributed entirely under this license, and must not be

-distributed under any other license. The requirement for fonts to

-remain under this license does not apply to any document created

-using the Font Software.

-

-TERMINATION

-This license becomes null and void if any of the above conditions are

-not met.

-

-DISCLAIMER

-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF

-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE

-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL

-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM

-OTHER DEALINGS IN THE FONT SOFTWARE.

diff --git a/static/style.css b/static/style.css
deleted file mode 100644
index 86d1fed..0000000
--- a/static/style.css
+++ /dev/null
@@ -1,107 +0,0 @@
-@font-face {
-	font-family: EBGaramond;
-	src: url(/sumcheck/static/EBGaramond-VariableFont_wght.ttf) format('woff2-variations');
-	font-style: normal;
-}
-
-@font-face {
-	font-family: EBGaramond;
-	src: url(/sumcheck/static/EBGaramond-Italic-VariableFont_wght.ttf) format('woff2-variations');
-	font-style: italic;
-}
-
-@font-face {
-	font-family: FiraMono;
-	src: url(/sumcheck/static/FiraMono-Regular.ttf);
-	font-style: normal;
-}
-
-body {
-	background: #fdf3f3;
-	color: DarkSlateGrey;
-	font-family: EBGaramond, serif;
-    font-size: large;
-}
-
-a {
-	color: #1a97bf;
-}
-
-a:hover {
-	color: #075d77;
-}
-
-.container {
-    margin: 1em;
-}
-
-.row {
-	margin-bottom: 1em;
-}
-
-.title {
-	letter-spacing: -0.5px;
-}
-
-label {
-    margin-right: 4px;
-}
-
-form {
-	border: 1px DarkSlateGrey solid;
-    padding: 10px;
-    padding-left: 25px;
-}
-
-.narrow {
-    max-width: 40em;
-}
-
-.sep {
-    margin-left: 6px;
-    margin-right: 6px;
-}
-
-.nonbreaking {
-	white-space: nowrap;
-}
-
-.focus {
-	font-weight: bold;
-}
-
-input[type="text"] {
-    margin-left: .25em;
-	width: 75%;
-	max-width: 50em;
-    font-family: FiraMono, monospace;
-}
-
-ul {
-    list-style-type: lower-greek;
-}
-
-.theorem {
-    font-size: medium;
-    font-family: FiraMono, monospace;
-}
-
-button {
-    margin-right: 10px;
-}
-
-.valid {
-    background-color: #aed975;
-}
-
-.invalid {
-    background-color: #ff7c7b;
-}
-
-.error {
-    background-color: #c4c4c4;
-}
-
-.validity {
-    font-weight: bold;
-}
diff --git a/static/styles.css b/static/styles.css
new file mode 100644
index 0000000..54c1414
--- /dev/null
+++ b/static/styles.css
@@ -0,0 +1,40 @@
+label {
+    margin-right: 4px;
+}
+
+form {
+	border: 1px DarkSlateGrey dotted;
+    padding: 10px;
+    padding-left: 25px;
+}
+
+input[type="text"] {
+    margin-left: .25em;
+	width: 75%;
+	max-width: 50em;
+    font-family: FiraMono, monospace;
+}
+
+.theorem {
+    font-family: FiraMono, monospace;
+}
+
+.valid {
+    background-color: #aed975;
+}
+
+.invalid {
+    background-color: #ff7c7b;
+}
+
+.error {
+    background-color: #c4c4c4;
+}
+
+.validity {
+    font-weight: bold;
+}
+
+button {
+    margin-right: 10px;
+}