much better

gabydd · gabydd · commit e0b4afda23d3 · 2023-06-13T00:40:19.000-04:00
diff --git a/index.lisp b/index.lisp
@@ -1 +1 @@
-(p () "Welcome home!")
+(p () "Welcome to my WIP " (a (:href "https://github.com/gabydd/site") "site") "!")
diff --git a/page.lisp b/page.lisp
@@ -3,19 +3,21 @@
 (defparameter pages '("index" "about" "projects" "helix"))
 
 (defun page-header (current-page)
-  (nav (:class "header")
-       "Gaby"
+  (div (:class "header")
+       (div (:class "title")
+            (div () "Gaby")
+            (a (:href "https://github.com/gabydd") (img (:src "octocat-lisp.png" :style "width:min(16vw, 16vh);"))))
        (div (:class "nav")
             (dohtml (page pages)
-                    (div (:class "nav-item")
-                          (a (:class (if (equal page current-page) "link-current" "link")
-                              :href (conc-str page ".html"))
-                             page))))))
+                    (a (:class (conc-str "link" (when (equal page current-page) " link-current"))
+                        :href (conc-str page ".html"))
+                       page)))))
 
 (defparameter footer
-  (div ()
+  (div (:class "footer")
        "Made with a little bit of lisp and a whole lot of love"
-       (a (:href "https://github.com/gabydd") "Github")))
+       (img (:src "lisp-warning.png" :style "width:max(6vw, 6vh);margin-left:auto;"))))
+
 (defmacro template (page &rest body)
   `(conc-str "<!DOCTYPE HTML>"
              (html (:lang "en")
@@ -27,7 +29,7 @@
                          (link (:rel "stylesheet" :href "style.css")))
                    (body ()
                          (page-header ,page)
-                         ,@body
+                         (div (:class "body") ,@body)
                          footer))))
 
 (dolist (page pages)
diff --git a/projects.lisp b/projects.lisp
@@ -1,5 +1,5 @@
 (div ()
-     (h1 () "working on:")
+     (h2 () "working on:")
      (p  () "This site")
      (p  () "proxy state with firebase")
      (p  () "HELIX!"))
diff --git a/serve.lisp b/serve.lisp
@@ -9,4 +9,6 @@
 (cl-inotify:with-inotify (inotify t ("." '(:modify :dont-follow)))
   (cl-inotify:do-events (event inotify :blocking-p t)
     (print "A file changed: regenerating")
-    (load "page.lisp")))
+    (handler-case (load "page.lisp")
+        (error (c)
+          (print c)))))
diff --git a/serve/lisp-warning.png b/serve/lisp-warning.png
diff --git a/serve/octocat-lisp.png b/serve/octocat-lisp.png
diff --git a/serve/style.css b/serve/style.css
@@ -1,30 +1,61 @@
+* {
+  box-sizing: border-box;
+  margin: 0;
+}
 .header {
+  font-size: min(10vw, 10vh);
   display: flex;
-  justify-content: space-between;
+  flex-direction: column;
+  align-items: center;
+  margin-bottom: 5vh;
 }
 
-.nav {
+.title {
+  align-items: center;
   display: flex;
 }
 
-.nav-item {
-  margin-left: 2em;
+.nav {
+  display: flex;
+  gap: min(6vw, 6vh);
 }
 
 .link {
+  font-size: min(6vw, 6vh);
+  color: #524747;
   text-decoration: none;
-  color: gray;
 }
 
 .link:hover {
-  color: green;
+  color: #ba53c6;
 }
 
 .link-current {
-  text-decoration: none;
-  color: purple;
+  color: #773edb;
+}
+
+body {
+  display: flex;
+  flex-direction: column;
+  min-height: 100vh;
+}
+.body {
+  font-size: min(5vh, 5vw);
+  margin-left: 8vw;
+  margin-right: 8vw;
+  flex: 1;
+}
+
+.footer {
+  display: flex;
+  font-size: max(1.5vh, 1.5vw);
+  margin-top: 5vh;
+  margin-bottom: 1vh;
+  margin-left: 5vw;
+  margin-right: 5vw;
+  align-items: flex-end;
 }
 
-.link-current:hover {
-  color: blue;
+.h2 {
+  font-size: min(6vh, 6vw);
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-(p () "Welcome home!")`
	`1`	`+(p () "Welcome to my WIP " (a (:href "https://github.com/gabydd/site") "site") "!")`