diff --git a/base/lib/base.css b/base/lib/base.css index 889ccb047..a9e53fe12 100644 --- a/base/lib/base.css +++ b/base/lib/base.css @@ -144,7 +144,7 @@ button { vertical-align: middle; } -#ship { +span#ship { font-family: 'bau'; font-weight: 400; font-size: 1.2rem; @@ -159,7 +159,7 @@ input { display: inline; } -#ship, +span#ship, input { border: none; padding: .3rem; diff --git a/base/pub/octo/fab/hymn.hook b/base/pub/octo/fab/hymn.hook index 89d4b9cf4..3c109c15e 100644 --- a/base/pub/octo/fab/hymn.hook +++ b/base/pub/octo/fab/hymn.hook @@ -8,10 +8,24 @@ ;meta(charset "utf-8"); ;script(type "text/javascript", src "//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.js"); ;script(type "text/javascript", src "/~/at/base/lib/urb.js"); + ;link(type "text/css", rel "stylesheet", href "/home/lib/base.css"); ;link(type "text/css", rel "stylesheet", href "/home/pub/octo/src/main.css"); - ;title: urbit cit cat eot + ;title: octo :urbit == ;body + ;div#what + ;div#ship + ;div.sig: ~ + ;div.ship; + ;div.as; + == + ;div#vs: vs + ;div#user + ;div.sig: ~ + ;div.ship; + ;div.as; + == + == ;div#bord; ;div#whom; ;script(type "text/javascript", src "/home/pub/octo/src/main.js"); diff --git a/base/pub/octo/src/main.css b/base/pub/octo/src/main.css index fd6b6c3c2..b38891741 100644 --- a/base/pub/octo/src/main.css +++ b/base/pub/octo/src/main.css @@ -1,3 +1,4 @@ +#what, #bord, #whom { width: 600px; @@ -7,11 +8,14 @@ margin-left: -300px; } +#what { + height: 36px; +} + #bord { - width: 600px; height: 600px; position: absolute; - top: 18px; + top: 72px; } #whom { @@ -19,6 +23,27 @@ top: 636px; } +#what { + font-family: "bau"; +} + +#what div { + display: inline-block; +} + +#what .ship { + font-weight: 400; + letter-spacing: 1px; + text-transform: uppercase; +} + +#vs { + margin: 0 1rem; + padding: .3rem; + color: #fff; + background-color: #ccc; +} + #whom, .spac { font-size: 100px; diff --git a/base/pub/octo/src/main.js b/base/pub/octo/src/main.js index c165bd53a..f34519f66 100644 --- a/base/pub/octo/src/main.js +++ b/base/pub/octo/src/main.js @@ -42,4 +42,7 @@ $(function() { function(i) { return Number(i); }) urb.send({mark:'octo-move',data:data}) }) + + $('#ship .ship').text(window.urb.ship) + $('#user .ship').text(window.urb.user) }) diff --git a/base/pub/talk/fab/hymn.hook b/base/pub/talk/fab/hymn.hook index d654d3f58..1e22a8d86 100644 --- a/base/pub/talk/fab/hymn.hook +++ b/base/pub/talk/fab/hymn.hook @@ -26,7 +26,7 @@ ;meta(name "viewport", content "width=device-width, height=device-height, ". "initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0"); ;link(type "text/css", rel "stylesheet", href "/home/pub/talk/src/css/main.css"); - ;title: urbit talk + ;title: Talk :urbit == ;body ;div#c;