From 9cce1ac1908feda48f3ee9144157378d029dea45 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Tue, 14 Jul 2015 17:31:00 -0700 Subject: [PATCH 1/2] more general css url fix --- pub/talk/src/css/fonts.styl | 28 ++++++++++++++-------------- pub/talk/src/css/main.css | 28 ++++++++++++++-------------- pub/tree/src/css/fonts.styl | 24 ++++++++++++------------ pub/tree/src/css/main.css | 24 ++++++++++++------------ 4 files changed, 52 insertions(+), 52 deletions(-) diff --git a/pub/talk/src/css/fonts.styl b/pub/talk/src/css/fonts.styl index 8a1d89755..abfedf60e 100644 --- a/pub/talk/src/css/fonts.styl +++ b/pub/talk/src/css/fonts.styl @@ -1,84 +1,84 @@ @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau.woff"); font-weight: 400; font-style: normal; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-italic.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-italic.woff"); font-weight: 400; font-style: italic; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-medium.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-medium.woff"); font-weight: 500; font-style: normal; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-mediumitalic.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-mediumitalic.woff"); font-weight: 500; font-style: italic; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-bold.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-bold.woff"); font-weight: 600; font-style: normal; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-bolditalic.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-bolditalic.woff"); font-weight: 600; font-style: italic; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-super.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-super.woff"); font-weight: 600; font-style: normal; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-superitalic.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-superitalic.woff"); font-weight: 600; font-style: italic; } @font-face { font-family: "scp"; - src: url("https://storage.googleapis.com/urbit-extra/scp-extralight.woff"); + src: url("//storage.googleapis.com/urbit-extra/scp-extralight.woff"); font-weight: 200; font-style: normal; } @font-face { font-family: "scp"; - src: url("https://storage.googleapis.com/urbit-extra/scp-light.woff"); + src: url("//storage.googleapis.com/urbit-extra/scp-light.woff"); font-weight: 300; font-style: normal; } @font-face { font-family: "scp"; - src: url("https://storage.googleapis.com/urbit-extra/scp-regular.woff"); + src: url("//storage.googleapis.com/urbit-extra/scp-regular.woff"); font-weight: 400; font-style: normal; } @font-face { font-family: "scp"; - src: url("https://storage.googleapis.com/urbit-extra/scp-medium.woff"); + src: url("//storage.googleapis.com/urbit-extra/scp-medium.woff"); font-weight: 500; font-style: normal; } @font-face { font-family: "scp"; - src: url("https://storage.googleapis.com/urbit-extra/scp-bold.woff"); + src: url("//storage.googleapis.com/urbit-extra/scp-bold.woff"); font-weight: 600; font-style: normal; } @font-face { font-family: "scp"; - src: url("https://storage.googleapis.com/urbit-extra/scp-black.woff"); + src: url("//storage.googleapis.com/urbit-extra/scp-black.woff"); font-weight: 700; font-style: normal; } \ No newline at end of file diff --git a/pub/talk/src/css/main.css b/pub/talk/src/css/main.css index 487c2a648..77af2c8e7 100644 --- a/pub/talk/src/css/main.css +++ b/pub/talk/src/css/main.css @@ -1,84 +1,84 @@ @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau.woff"); font-weight: 400; font-style: normal; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-italic.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-italic.woff"); font-weight: 400; font-style: italic; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-medium.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-medium.woff"); font-weight: 500; font-style: normal; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-mediumitalic.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-mediumitalic.woff"); font-weight: 500; font-style: italic; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-bold.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-bold.woff"); font-weight: 600; font-style: normal; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-bolditalic.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-bolditalic.woff"); font-weight: 600; font-style: italic; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-super.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-super.woff"); font-weight: 600; font-style: normal; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-superitalic.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-superitalic.woff"); font-weight: 600; font-style: italic; } @font-face { font-family: "scp"; - src: url("https://storage.googleapis.com/urbit-extra/scp-extralight.woff"); + src: url("//storage.googleapis.com/urbit-extra/scp-extralight.woff"); font-weight: 200; font-style: normal; } @font-face { font-family: "scp"; - src: url("https://storage.googleapis.com/urbit-extra/scp-light.woff"); + src: url("//storage.googleapis.com/urbit-extra/scp-light.woff"); font-weight: 300; font-style: normal; } @font-face { font-family: "scp"; - src: url("https://storage.googleapis.com/urbit-extra/scp-regular.woff"); + src: url("//storage.googleapis.com/urbit-extra/scp-regular.woff"); font-weight: 400; font-style: normal; } @font-face { font-family: "scp"; - src: url("https://storage.googleapis.com/urbit-extra/scp-medium.woff"); + src: url("//storage.googleapis.com/urbit-extra/scp-medium.woff"); font-weight: 500; font-style: normal; } @font-face { font-family: "scp"; - src: url("https://storage.googleapis.com/urbit-extra/scp-bold.woff"); + src: url("//storage.googleapis.com/urbit-extra/scp-bold.woff"); font-weight: 600; font-style: normal; } @font-face { font-family: "scp"; - src: url("https://storage.googleapis.com/urbit-extra/scp-black.woff"); + src: url("//storage.googleapis.com/urbit-extra/scp-black.woff"); font-weight: 700; font-style: normal; } diff --git a/pub/tree/src/css/fonts.styl b/pub/tree/src/css/fonts.styl index 0a3e76a4a..505e2c388 100644 --- a/pub/tree/src/css/fonts.styl +++ b/pub/tree/src/css/fonts.styl @@ -4,42 +4,42 @@ @font-face font-family "bau" - src url("https://storage.googleapis.com/urbit-extra/bau.woff") + src url("//storage.googleapis.com/urbit-extra/bau.woff") font-weight 400 font-style normal @font-face font-family "bau" - src url("https://storage.googleapis.com/urbit-extra/bau-italic.woff") + src url("//storage.googleapis.com/urbit-extra/bau-italic.woff") font-weight 400 font-style italic @font-face font-family "bau" - src url("https://storage.googleapis.com/urbit-extra/bau-medium.woff") + src url("//storage.googleapis.com/urbit-extra/bau-medium.woff") font-weight 500 font-style normal @font-face font-family "bau" - src url("https://storage.googleapis.com/urbit-extra/bau-mediumitalic.woff") + src url("//storage.googleapis.com/urbit-extra/bau-mediumitalic.woff") font-weight 500 font-style italic @font-face font-family "bau" - src url("https://storage.googleapis.com/urbit-extra/bau-bold.woff") + src url("//storage.googleapis.com/urbit-extra/bau-bold.woff") font-weight 600 font-style normal @font-face font-family "bau" - src url("https://storage.googleapis.com/urbit-extra/bau-bolditalic.woff") + src url("//storage.googleapis.com/urbit-extra/bau-bolditalic.woff") font-weight 600 font-style italic @font-face font-family "bau" - src url("https://storage.googleapis.com/urbit-extra/bau-super.woff") + src url("//storage.googleapis.com/urbit-extra/bau-super.woff") font-weight 600 font-style normal @font-face font-family "bau" - src url("https://storage.googleapis.com/urbit-extra/bau-superitalic.woff") + src url("//storage.googleapis.com/urbit-extra/bau-superitalic.woff") font-weight 600 font-style italic @@ -49,21 +49,21 @@ @font-face font-family "scp" - src url("https://storage.googleapis.com/urbit-extra/scp-extralight.woff") + src url("//storage.googleapis.com/urbit-extra/scp-extralight.woff") font-weight 200 font-style normal @font-face font-family "scp" - src url("https://storage.googleapis.com/urbit-extra/scp-light.woff") + src url("//storage.googleapis.com/urbit-extra/scp-light.woff") font-weight 300 font-style normal @font-face font-family "scp" - src url("https://storage.googleapis.com/urbit-extra/scp-regular.woff") + src url("//storage.googleapis.com/urbit-extra/scp-regular.woff") font-weight 400 font-style normal @font-face font-family "scp" - src url("https://storage.googleapis.com/urbit-extra/scp-medium.woff") + src url("//storage.googleapis.com/urbit-extra/scp-medium.woff") font-weight 500 font-style normal \ No newline at end of file diff --git a/pub/tree/src/css/main.css b/pub/tree/src/css/main.css index 76f13d7c7..9c8f64198 100644 --- a/pub/tree/src/css/main.css +++ b/pub/tree/src/css/main.css @@ -1,72 +1,72 @@ @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau.woff"); font-weight: 400; font-style: normal; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-italic.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-italic.woff"); font-weight: 400; font-style: italic; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-medium.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-medium.woff"); font-weight: 500; font-style: normal; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-mediumitalic.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-mediumitalic.woff"); font-weight: 500; font-style: italic; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-bold.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-bold.woff"); font-weight: 600; font-style: normal; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-bolditalic.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-bolditalic.woff"); font-weight: 600; font-style: italic; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-super.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-super.woff"); font-weight: 600; font-style: normal; } @font-face { font-family: "bau"; - src: url("https://storage.googleapis.com/urbit-extra/bau-superitalic.woff"); + src: url("//storage.googleapis.com/urbit-extra/bau-superitalic.woff"); font-weight: 600; font-style: italic; } @font-face { font-family: "scp"; - src: url("https://storage.googleapis.com/urbit-extra/scp-extralight.woff"); + src: url("//storage.googleapis.com/urbit-extra/scp-extralight.woff"); font-weight: 200; font-style: normal; } @font-face { font-family: "scp"; - src: url("https://storage.googleapis.com/urbit-extra/scp-light.woff"); + src: url("//storage.googleapis.com/urbit-extra/scp-light.woff"); font-weight: 300; font-style: normal; } @font-face { font-family: "scp"; - src: url("https://storage.googleapis.com/urbit-extra/scp-regular.woff"); + src: url("//storage.googleapis.com/urbit-extra/scp-regular.woff"); font-weight: 400; font-style: normal; } @font-face { font-family: "scp"; - src: url("https://storage.googleapis.com/urbit-extra/scp-medium.woff"); + src: url("//storage.googleapis.com/urbit-extra/scp-medium.woff"); font-weight: 500; font-style: normal; } From d48a6d1869f94339f21cdb1001a7970521673100 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Wed, 15 Jul 2015 15:11:45 -0700 Subject: [PATCH 2/2] fixed ~ escaped . being unhandled in urx:ab --- arvo/hoon.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index 1e3cba2c8..7c00fbcec 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -3409,7 +3409,7 @@ cab (cold ' ' dot) (cook tuft (ifix [sig dot] hex)) - (cold '~' ;~(plug sig sig)) + ;~(pfix sig ;~(pose sig dot)) == ++ voy ;~(pfix bas ;~(pose bas soq bix)) --