website: Rearrange intro text.

* website/haunt.scm (read-markdown-page): Move intro text from here...
(base-layout): ...to here.
* website/static/css/main.css: Adjust header styles.
* website/static/images/noise-bg.png: New file.
* website/index.md: Remove tag line.

4 files changed, 26 insertions, 42 deletions

diff --git a/website/haunt.scm b/website/haunt.scm
index bb02010..289d0b5 100644
--- a/website/haunt.scm
+++ b/website/haunt.scm
@@ -68,9 +68,19 @@
                                 (src ,(image-url (if front-page?
                                                      "/logo.svg"
                                                      "/logo-small.svg"))))))
-                     ,@(if front-page?
-                           '((div (@ (class "baseline"))
-                                  "Software for human empowerment."))
+
+                     ;; Add the large-font welcoming message on the
+                     ;; front page.
+                     ,@(if (assoc-ref meta 'frontpage)
+                           `((p (@ (id "heading")
+                                   (class "front-page-heading"))
+                                "Welcome to the GNU Assembly!  We write "
+                                (a (@ (href "/en/documents/free-software"))
+                                   (emph "free software"))
+                                " — software that empowers users, "
+                                "giving them individual and collective control "
+                                "over their computing, from the operating "
+                                "system to applications."))
                            '())))
            (div (@ (id "menubar")
                    (class "width-control"))
@@ -103,19 +113,7 @@ representation."
     (base-layout `(div (@ (class "post"))
                        (div (@ (class "post-body"))
 
-                            ;; Add the large-font welcoming message on the
-                            ;; front page.
-                            ,@(if (assoc-ref meta 'frontpage)
-                                  `((p (@ (id "heading")
-                                          (class "front-page-heading"))
-                                       "Welcome to the GNU Assembly!  We write "
-                                       (a (@ (href "/en/documents/free-software"))
-                                          (emph "free software"))
-                                       " — software that empowers users, "
-                                       "giving them individual and collective control "
-                                       "over their computing, from the operating "
-                                       "system to applications."))
-                                  '())
+                            
                             ,body))
                  #:title (string-append "The GNU Assembly — "
                                         (assoc-ref meta 'title))
diff --git a/website/index.md b/website/index.md
index 30056aa..f012840 100644
--- a/website/index.md
+++ b/website/index.md
@@ -1,4 +1,4 @@
-title: The GNU Assembly — Software for human empowerment
+title: The GNU Assembly
 frontpage: yes
 ---
 
diff --git a/website/static/css/main.css b/website/static/css/main.css
index 89ff430..2acd5ef 100644
--- a/website/static/css/main.css
+++ b/website/static/css/main.css
@@ -38,15 +38,11 @@
 @media all and (max-width:800px){html {font-size: 16px;}}
 @media all and (max-width:760px){html {font-size: 16px;}}
 
-.front-page-heading {
-    font-size: 175%;
-    line-height: 150%;
-}
 
 /*#ffbf2d*/
 
 body,html {
-    background-color: #fff;
+    background-color: #fafafa;
     color: #073b4c;
     width: 100%;
     height: 100%;
@@ -95,7 +91,7 @@ p + p {
 }
 
 #header {
-    background: #fff;
+    background: url('../images/noise-bg.png');
     height: 90px;
     width: 100%;
     box-shadow: 0 3px 8px #ccc;
@@ -104,7 +100,8 @@ p + p {
 #header .logo {
     padding: 10px;
     display: block;
-    height: 15rem;
+    height: 25rem;
+    margin-bottom: 2em;
 }
 
 #header .logo:focus {
@@ -115,24 +112,11 @@ p + p {
     height: 4.5rem;
 }
 
-#header .baseline {
-    color: #073b4c;
-    font-size: 16px;
-    font-family: 'Roboto', sans-serif;
-    font-weight: bold;
-    display: none;  /* overridden below */
-    padding: 10px;
-    padding-top: 2px;
-}
-
 #header .members {
     float: right;
 }
 
 @media screen and (min-width: 640px) {
-    #header .baseline {
-        display: block;
-    }
     #header {
         height: 110px;
     }
@@ -146,16 +130,19 @@ p + p {
     padding-bottom: 1rem;
 }
 
+#header.frontpage .front-page-heading {
+    font-size: 175%;
+    line-height: 150%;
+    text-align: left;
+    padding-top: 0.5em;
+}
+
 #header.frontpage .logo {
     padding: 0;
     margin: 0 auto;
     max-width: 100%;
 }
 
-#header.frontpage .baseline {
-    padding-top: 1rem;
-}
-
 #menubar {
     margin: auto;
     padding: 0px;
@@ -197,7 +184,6 @@ p + p {
 }
 
 .post {
-    background: #ffffff;
     padding: 10px;
     margin-bottom: 25px;
 }
diff --git a/website/static/images/noise-bg.png b/website/static/images/noise-bg.png
new file mode 100644
index 0000000..df511d7
--- /dev/null
+++ b/website/static/images/noise-bg.png