From 3c2cf64e41ab45359fbf1d5fb62588c23890ac07 Mon Sep 17 00:00:00 2001 From: Galen Wolfe-Pauly Date: Wed, 20 Jan 2016 18:15:33 -0800 Subject: [PATCH] restructured lib, working tree --- lib/{syntax => css}/codemirror.css | 0 lib/fonts.styl | 84 ------------------------------ lib/{syntax => js}/hoon.js | 0 lib/{ => js}/urb.js | 0 pub/docs.md | 4 +- tree/hymn.hook | 21 +++++--- 6 files changed, 17 insertions(+), 92 deletions(-) rename lib/{syntax => css}/codemirror.css (100%) delete mode 100644 lib/fonts.styl rename lib/{syntax => js}/hoon.js (100%) rename lib/{ => js}/urb.js (100%) diff --git a/lib/syntax/codemirror.css b/lib/css/codemirror.css similarity index 100% rename from lib/syntax/codemirror.css rename to lib/css/codemirror.css diff --git a/lib/fonts.styl b/lib/fonts.styl deleted file mode 100644 index 1e64aa386..000000000 --- a/lib/fonts.styl +++ /dev/null @@ -1,84 +0,0 @@ -@font-face { - font-family: "bau"; - src: url("http://storage.googleapis.com/urbit-extra/bau.woff"); - font-weight: 400; - font-style: normal; -} -@font-face { - font-family: "bau"; - src: url("http://storage.googleapis.com/urbit-extra/bau-italic.woff"); - font-weight: 400; - font-style: italic; -} -@font-face { - font-family: "bau"; - src: url("http://storage.googleapis.com/urbit-extra/bau-medium.woff"); - font-weight: 500; - font-style: normal; -} -@font-face { - font-family: "bau"; - src: url("http://storage.googleapis.com/urbit-extra/bau-mediumitalic.woff"); - font-weight: 500; - font-style: italic; -} -@font-face { - font-family: "bau"; - src: url("http://storage.googleapis.com/urbit-extra/bau-bold.woff"); - font-weight: 600; - font-style: normal; -} -@font-face { - font-family: "bau"; - src: url("http://storage.googleapis.com/urbit-extra/bau-bolditalic.woff"); - font-weight: 600; - font-style: italic; -} -@font-face { - font-family: "bau"; - src: url("http://storage.googleapis.com/urbit-extra/bau-super.woff"); - font-weight: 600; - font-style: normal; -} -@font-face { - font-family: "bau"; - src: url("http://storage.googleapis.com/urbit-extra/bau-superitalic.woff"); - font-weight: 600; - font-style: italic; -} -@font-face { - font-family: "scp"; - src: url("http://storage.googleapis.com/urbit-extra/scp-extralight.woff"); - font-weight: 200; - font-style: normal; -} -@font-face { - font-family: "scp"; - src: url("http://storage.googleapis.com/urbit-extra/scp-light.woff"); - font-weight: 300; - font-style: normal; -} -@font-face { - font-family: "scp"; - src: url("http://storage.googleapis.com/urbit-extra/scp-regular.woff"); - font-weight: 400; - font-style: normal; -} -@font-face { - font-family: "scp"; - src: url("http://storage.googleapis.com/urbit-extra/scp-medium.woff"); - font-weight: 500; - font-style: normal; -} -@font-face { - font-family: "scp"; - src: url("http://storage.googleapis.com/urbit-extra/scp-bold.woff"); - font-weight: 600; - font-style: normal; -} -@font-face { - font-family: "scp"; - src: url("http://storage.googleapis.com/urbit-extra/scp-black.woff"); - font-weight: 700; - font-style: normal; -} \ No newline at end of file diff --git a/lib/syntax/hoon.js b/lib/js/hoon.js similarity index 100% rename from lib/syntax/hoon.js rename to lib/js/hoon.js diff --git a/lib/urb.js b/lib/js/urb.js similarity index 100% rename from lib/urb.js rename to lib/js/urb.js diff --git a/pub/docs.md b/pub/docs.md index 42492474d..9ec3be952 100644 --- a/pub/docs.md +++ b/pub/docs.md @@ -4,7 +4,7 @@ layout: no-anchor logo: black --- -
+
# Urbit documentation @@ -19,6 +19,6 @@ user doc; it doesn't assume any prior knowledge. The most fun thing to do with Urbit is code, but the developer doc remains under construction. Sorry. We'll have more soon. - +
diff --git a/tree/hymn.hook b/tree/hymn.hook index 9a735ff31..ef0ecce67 100644 --- a/tree/hymn.hook +++ b/tree/hymn.hook @@ -20,23 +20,32 @@ ;title: Tree ;meta(name "viewport", content "width=device-width, initial-scale=1"); ;link(type "text/css", rel "stylesheet", href "//cdnjs.cloudflare.com/ajax/libs/codemirror/4.3.0/codemirror.min.css"); - ;link(type "text/css", rel "stylesheet", href "/{dez}/lib/bootstrap.css"); + ;link(type "text/css", rel "stylesheet", href "/{dez}/lib/css/fonts.css"); + ;link(type "text/css", rel "stylesheet", href "/{dez}/lib/css/bootstrap.css"); + ;link(type "text/css", rel "stylesheet", href "/{dez}/lib/css/codemirror.css"); ;link(type "text/css", rel "stylesheet", href "/{dez}/pub/tree/main.css"); - ;link(type "text/css", rel "stylesheet", href "/{dez}/lib/syntax/codemirror.css"); ::;link(type "text/css", rel "stylesheet", href "http://localhost:8000/docs/pub/tree/src/css/main.css"); ;script(type "text/javascript", src "//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"); ;script(type "text/javascript", src "//cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js"); ;script(type "text/javascript", src "//cdnjs.cloudflare.com/ajax/libs/react/0.12.2/react.js"); ;script(type "text/javascript", src "//cdnjs.cloudflare.com/ajax/libs/codemirror/4.3.0/codemirror.js"); - ;script(type "text/javascript", src "/{dez}/lib/urb.js"); - ;script(type "text/javascript", src "/{dez}/lib/syntax/hoon.js"); + ;script(type "text/javascript", src "/{dez}/lib/js/urb.js"); + ;script(type "text/javascript", src "/{dez}/lib/js/hoon.js"); ;script(type "text/javascript", src "/{dez}/pub/tree/main.js"); ::;script(type "text/javascript", src "http://localhost:8000/docs/pub/tree/src/js/main.js"); == ;body ;+ =+ inject=(jobe kids/kids-json body/body.dat ~) ;script(type "text/javascript"): window.tree = {(pojo inject)} - ;div#nav; - ;div#cont; + ;div.container.nav + ;div.row + ;div.col-md-2.ctrl#nav; + == + == + ;div.container + ;div.row + ;div.col-md-10.col-md-offset-2.body#cont; + == + == == ==