Merge remote-tracking branch 'origin/master' into philip/kale

This commit is contained in:
Philip Monk 2019-08-08 14:57:26 -07:00
commit 35e63f2051
No known key found for this signature in database
GPG Key ID: B66E1F02604E44EC
4 changed files with 10 additions and 7 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:8f0e4a88d79980bbbe49776f76e8212ed15c87c9cf068903f7cfbb7bf1e4244d oid sha256:e74db52174c893fe6982ac4c20d12078dbab7fc9360d7248ca205ea1556555ad
size 10059881 size 10131981

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:d77f1b019165a2efee9109206b608961a9eede56cf99cf791ac928d795c506aa oid sha256:d65910e769131b62d6df9e24de97ff4cf806e4782b59254a55bcec815a7601df
size 5026254 size 5100616

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:166c9cb6e57c1a063d1f0df5a26940b64976bb31789ceeb1b26d029f466b630e oid sha256:ebb95d1d0e8dd96c51fb6c25b2901fccb1186deb09a96b3bf520158f499ed6c1
size 12567624 size 12644051

View File

@ -374,6 +374,9 @@
#topborder { #topborder {
border-top: 3px #fff solid; border-top: 3px #fff solid;
} }
#ship-name {
font-family: 'Source Code Pro', monospace, sans-serif;
}
h1 { h1 {
line-height: 77px; line-height: 77px;
font-size: 64px; font-size: 64px;
@ -425,7 +428,7 @@
;div#main ;div#main
;div#inner ;div#inner
;h1#topborder:"Welcome" ;h1#topborder:"Welcome"
;h1:"{(scow %p our)}" ;h1#ship-name:"{(scow %p our)}"
;form(action "/~/login", method "post", enctype "application/x-www-form-urlencoded") ;form(action "/~/login", method "post", enctype "application/x-www-form-urlencoded")
;input(type "password", name "password", placeholder "passcode", autofocus "true"); ;input(type "password", name "password", placeholder "passcode", autofocus "true");
;input(type "hidden", name "redirect", value redirect-str); ;input(type "hidden", name "redirect", value redirect-str);