5826a81 · urbit.org · git.iko.soy

git.iko.soy/urbit.org

fix merge conflicts in css

commit5826a811b8c7d31b882c085c91fa117fbc9a945b authorMorgan Sutherland <morgan@morgansutherland.com> dateMon 1 Jul 2019, 14:47 (7 years ago) parenta651ad6 1942840

23 files changed+13622−13462

compare with master

unifiedsplit

README.md+3−1

@@ -1,11 +1,13 @@

11# urbit.org

3+[![Netlify Status](https://api.netlify.com/api/v1/badges/71f99a93-7b2e-4e10-b74d-7cbbb2e6dacd/deploy-status)](https://app.netlify.com/sites/urbit-org/deploys)

35The website for the Urbit project.

57## Build

791. git clone this repository

8−2. Install [zola](https://www.getzola.org/documentation/getting-started/installation/)

10+2. Install [zola@0.5.1](https://github.com/getzola/zola/releases/tag/v0.5.1)

9113. `git submodule init`

10124. `git submodule update`

11135. In the root directory of `urbit.org`, run `zola build` or `zola serve`

content/bounty.md+2−3

@@ -1,9 +1,8 @@

11+++

2−title = "Bug Bounty + Security"

2+title = "Bug Bounties"

33+++

4−## Upcoming Bug Bounty Program

6−We are in the process of designing our Bug Bounty Program, and it should be live in several days. In the meantime, if you believe you have discovered a bug or vulnerability in our code, please report it at security@tlon.io.

5+We are in the process of designing our Bug Bounty Program. In the meantime, if you believe you have discovered a bug or vulnerability in our code, please report it to [security@tlon.io](mailto:security@tlon.io).

87We'll review the issue, and a member of our dev team will get back to you ASAP. If your bug has merit, we'll work with you to fix it, and award a bounty based on the severity of the bug. We determine severity using the [CVSS](https://www.first.org/cvss/calculator/3.0) model.

content/fora.mdnew file+11

@@ -0,0 +1,11 @@

1++++

2+title = "Fora-4"

3++++

5+Fora – our old forum hosted on Urbit – no longer lives here; but don't despair!

7+- For technical discussion about Urbit, join [urbit-dev](https://groups.google.com/a/urbit.org/forum/#!forum/dev).

8+- To chat with the Urbit community, [install Urbit](https://urbit.org/docs/getting-started/) and `;join ~dopzod/urbit-help` from the [Talk](https://urbit.org/docs/using/messaging/) terminal.

9+- For any questions, write to [support@urbit.org](mailto:support@urbit.org).

10+

11+See you around ツ

content/posts/2019-5-31-update.mdnew file+30

@@ -0,0 +1,30 @@

1++++

2+title = "~2019.5.31 Update"

3+date = 2019-05-31

4+author = "~hidrel-fabtel"

5+description = "A short update from the Tlon team for the week of ~2019.5.31."

6+[taxonomies]

7+posts = ["Updates"]

8++++

10+![](https://media.urbit.org/site/posts/updates/~2019.5.31-update-3.jpg)

11+

12+**Logan** `~tacryt-socryp` has been working with **Isaac** `~novlud-padtyv` on a new chat interface to replace Landscape and recently finished a chat wrapper API on top of Hall that enables significant performance gains, simplifies the API, and enables fine-grained unread counts per chatroom.

13+

14+**Ted** `~rovnys-ricfer` published [an initial new Ames proposal](https://groups.google.com/a/urbit.org/forum/#!topic/dev/91oMaUwtVzE) to [urbit-dev](https://groups.google.com/a/urbit.org/forum/#!forum/dev) and abandoned the `aloe` branch for [`alef`](https://github.com/urbit/arvo/tree/alef), where the initial few thousand lines of code have now been checked in.

15+

16+**Joe** `~master-morzod` worked on the DNS magic behind `arvo.network`, jet compilers with `~pilfer-pandex`, `cc-release` argument parsing, and rewrites of cue and mug.

17+

18+**Elliot** `~littel-ponnys` finished a draft design of his multi-process Arvo "nuevo" design.

19+

20+**Mark** `~palfun-foslup` [merged](https://github.com/urbit/azimuth/pull/17) support for delegated sending from arbitrary stars in Azimuth.

21+

22+**Jared** `~nidsut-tomdun` released azimuth-js `v0.14.0`, pushed azimuth-solidity `v1.2.0` to NPM, continued work on `%gall`, and has been readying `cc-release`.

23+

24+**Morgan** `~hidrel-fabtel` has been reaching out to community members. If you're interested in talking with us about your experience with Urbit so far and what you'd like to see in the future, please let us know at [support@urbit.org](mailto:support@urbit.org).

25+

26+In other news, the [urbit-dev](https://groups.google.com/a/urbit.org/forum/#!forum/dev) mailing list has been lively, [urbit.org](https://github.com/urbit/urbit.org) now deploys automatically thanks to Netlify, and we're getting ready to breach the network for [cc-release](https://github.com/urbit/urbit/tree/cc-release) next week. Follow [@zodisok](https://twitter.com/zodisok) for updates.

27+

28+Until next time.

29+

30+**Morgan** `~hidrel-fabtel`

content/posts/2019-6-14-update.mdnew file+28

@@ -0,0 +1,28 @@

1++++

2+title = "~2019.6.14 Update"

3+date = 2019-06-14

4+author = "~hidrel-fabtel"

5+description = "Urbit 0.8.0, new %ames, async monad, 64-bit Vere, Haskell Vere, and more."

6+aliases = ["/posts/updates/2019-6-14-update"]

7+[taxonomies]

8+posts = ["Updates"]

9++++

10+

11+![](https://media.urbit.org/site/posts/updates/~2019.6.14-update-1.jpg)

12+

13+**Jared** `~nidsut-tomdun` has been putting final touches on the Urbit `0.8.0` (formerly "cc-release") and pushed new versions of [azimuth-js](https://github.com/urbit/azimuth-js/releases) and [urbit-key-generation](https://github.com/urbit/urbit-key-generation/releases).

14+

15+**Philip** `~wicdev-wisryt` improved his new async monad and its example apps. Read more about that [here](https://groups.google.com/a/urbit.org/forum/#!topic/dev/DDG6gHSG1Lc) and in the [original PR](https://github.com/urbit/arvo/pull/1183).

16+

17+**Ted** `~rovnys-ricfer`, with **Philip**, made progress on new `%ames` architecture and implementation. Follow along with some of the recent discussion in [this post](https://groups.google.com/a/urbit.org/forum/#!topic/dev/y_gaSpn9mxM).

18+

19+

20+**Elliot** `~littel-ponnys` finished an initial implementation of ring signatures in Arvo, including a basic voting app, described in a [post](https://groups.google.com/a/urbit.org/forum/#!topic/dev/IG-FdVpEGX0) to urbit-dev. He also worked on a forthcoming Haskell rewrite of Vere with `~pitmug-roptec` and his multi-process Urbit "Nuevo" design.

21+

22+**Joe** `~master-morzod` worked on some Hoon bugs, reviewed the `lighter-than-eyre` branch – which won't be released in 0.8.0 – and has been working to simplify the DNS magic that makes ship.arvo.network work.

23+

24+`~rigdyn-sondur` is on the home stretch with [64-bit Vere](https://github.com/BernardoDeLaPlaz/urbit/commits/vere_64).

25+

26+Until next time.

27+

28+**Morgan** `~hidrel-fabtel`

content/posts/the-dao-as-a-lesson-in-decentralized-governance.md+1−1

@@ -1,5 +1,5 @@

11+++

2−title = "Magic"

2+title = "The DAO as a Lesson in Decentralized Governance"

33date = 2016-06-24

44author = "Curtis Yarvin"

55description = "What's the right lesson for the decentralization community to learn from the collapse of the DAO?"

content/posts/urbit-grants-and-mid-2019-gifts.mdnew file+42

@@ -0,0 +1,42 @@

1++++

2+title = "Urbit Grants and mid-2019 Gifts"

3+date = 2019-06-10

4+author = "Galen Wolfe-Pauly & Alex Matzner"

5+description = "Announcing an upcoming Urbit grants program and star gifts for Mid-2019."

6+aliases = ["/posts/essays/urbit-grants-and-mid-2019-gifts"]

7+[taxonomies]

8+posts = ["Essays"]

9++++

10+

11+![](https://media.urbit.org/site/posts/essays/urbit-grants-and-mid-2019-gifts-1.jpg)

12+

13+We are excited to announce the first developer star gifts of 2019. It’s been far too long since we last awarded our contributors. We got so busy working on things ourselves that we let this program languish — but we’ve got plans to make it much more organized going forward. More on that after the important part.

14+

15+That is, our winners from the past nine months:

16+

17+**Gold: 8 stars**

18+

19+- Ben `~mirfet-hocbyt` [@bencalder](https://github.com/bencalder)

20+- Max `~ladres-forfex` [@max19](https://github.com/max19)

21+

22+**Ben** discovered the bug in our @p rendering algorithm, nicknamed “the @pocalypse” around the office, and led to a few nights of lost sleep. It was a fantastic find, which was then resolved by **Max** with one of the greatest GitHub comments of all time: “[curious if this works](https://github.com/urbit/arvo/issues/1105#issuecomment-472585937).”

23+

24+**Bronze: 1 star**

25+

26+- Pyry `~dinleb-rambep` [@pkova](https://github.com/pkova)

27+- John `~dirwex-dosrev` [@jfranklin9000](https://github.com/jfranklin9000)

28+- Assaf `~rophex-hashes` [@asssaf](https://github.com/asssaf)

29+

30+**Pyry** has been a [regular contributor](https://github.com/urbit/bridge/pulls?utf8=%E2%9C%93&q=author%3Apkova) to Bridge over the past few months, **John** has been consistently picking up changes [all](https://github.com/urbit/urbit/pulls?utf8=%E2%9C%93&q=author%3Ajfranklin9000) [over](https://github.com/urbit/arvo/pulls?utf8=%E2%9C%93&q=author%3Ajfranklin9000) [the place](https://github.com/urbit/docs/pulls?utf8=%E2%9C%93&q=author%3Ajfranklin9000), and **Assaf** found a [security issue](https://github.com/urbit/urbit-key-generation/issues/55) with our hierarchical wallet.

31+

32+Thanks to all of you for helping bring Urbit to life. We don’t make it nearly easy enough to contribute, but all of you clawed your way in and made the system better. Thank you!

33+

34+## Coming soon: Our new grant program

35+

36+As always, we much prefer to talk about working code as opposed to unfinished work – however:

37+

38+Making the process of rewarding contributors is something we’ve thought a lot about over the past few months. We’ve come up with a system that we like, and are hoping to put it up later this summer. It’s probably not perfect, but it’s a step in the right direction. We’ll be able to properly engage in a grant proposal process, post bounties as well as reward people directly with prizes.

39+

40+Please [subscribe to our newsletter](http://eepurl.com/b7x7hj) to make sure you receive future announcements.

41+

42+– **Galen** `~ravmel-ropdyl` & **Alex** `~mignyt-mogseb`

content/privacy.md+2−2

@@ -70,7 +70,7 @@ We make reasonable efforts to protect your information by using physical and ele

7070

7171## Children's Privacy

7272

73−We do not knowingly collect, maintain, or use personal information from children under 13 years of age, and no part of the Service is directed to children. If you learn that a child has provided us with personal information in violation of this Privacy Policy, then you may alert us at accounts@tlon.io.

73+We do not knowingly collect, maintain, or use personal information from children under 13 years of age, and no part of the Service is directed to children. If you learn that a child has provided us with personal information in violation of this Privacy Policy, then you may alert us at privacy@tlon.io.

7474

7575## International Visitors

7676

@@ -82,6 +82,6 @@ We will post any adjustments to the Privacy Policy on this page, and the revised

8282

8383## Contact Information

8484

85−Tlon is responsible for processing your information. If you have any questions, comments, or concerns about our processing activities, please email us at accounts@tlon.io.

85+Tlon is responsible for processing your information. If you have any questions, comments, or concerns about our processing activities, please email us at privacy@tlon.io.

8686

8787*Last Updated:* September 12, 2018

sass/_main.scss+102−60

@@ -4,8 +4,8 @@

55body {

66 font-family: 'Inter UI', -apple-system, BlinkMacSystemFont, Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";

7− font-size: 3.5rem;

8− line-height: 6rem;

7+ font-size: (3.5rem / 4);

8+ line-height: (6rem / 4);

99 color: #000000;

1010}

1111

@@ -14,7 +14,7 @@ a {

1414}

1515

1616p img {

17− margin: 4rem 0;

17+ margin: (4rem / 4) 0;

1818 width: 100%;

1919}

2020

@@ -27,18 +27,19 @@ iframe {

2727 */

2828

2929.main-wrapper {

30− margin-top: 24rem;

30+ margin-top: (24rem / 4);

3131}

3232

3333.wrapper {

3434 position: relative;

3535 margin: 0 auto;

36− padding: 0 2rem;

36+ padding: 0 (4rem / 4);

3737 max-width: 960px;

3838}

3939

4040.container {

4141 display: flex;

42+ padding-bottom: (32rem / 4);

4243}

4344

4445.pop-up {

@@ -50,17 +51,17 @@ iframe {

5051

5152.container--fixed {

5253 position: fixed;

53− margin-top: -24rem;

54+ margin-top: -(24rem / 4);

5455}

5556

5657.content-nav {

5758 width: 20%;

5859 min-width: 200px;

59− //padding-right: 1rem;

60− margin-top: 24rem;

60+ padding-right: (1rem / 4);

61+ margin-top: (24rem / 4);

6162 &__item {

62− line-height: 8rem;

63− margin-bottom: 1rem;

63+ line-height: (8rem / 4);

64+ margin-bottom: (1rem / 4);

6465 }

6566 li {

6667 font-size: inherit;

@@ -70,8 +71,8 @@ iframe {

7071

7172.content-nav-icon {

7273 position: fixed;

73− left: 2rem;

74− top: 24rem;

74+ left: (2rem / 4);

75+ top: (24rem / 4);

7576 width: 10px;

7677 height: 10px;

7778 cursor: pointer;

@@ -102,7 +103,7 @@ iframe {

102103 }

103104 }

104105 .list:first-child {

105− padding-bottom: 14rem;

106+ padding-bottom: (14rem / 4);

106107 }

107108 .list li:last-child .subsub-list li:last-child {

108109 padding-bottom: 0;

@@ -113,10 +114,10 @@ iframe {

113114.content-nav-spacer {

114115 width: 20%;

115116 min-width: 200px;

116− padding-right: 5rem;

117+ padding-right: (5rem / 4);

117118 &__item {

118− line-height: 8rem;

119− margin-bottom: 1rem;

119+ line-height: (8rem / 4);

120+ margin-bottom: (1rem / 4);

120121 }

121122}

122123

@@ -128,7 +129,7 @@ iframe {

128129.content {

129130 position: relative;

130131 z-index: 3;

131− margin-top: -16rem;

132+ margin-top: -(16rem / 4);

132133}

133134

134135.content-nav-icon {

@@ -147,12 +148,12 @@ iframe {

147148}

148149

149150.sub-list {

150− padding-left: 4rem;

151+ padding-left: (4rem / 4);

151152 .sub-list {

152153 padding-left: 0;

153154 }

154155 .subsub-list {

155− padding-left: 4rem;

156+ padding-left: (4rem / 4);

156157 }

157158}

158159

@@ -167,12 +168,12 @@ iframe {

167168 display: flex;

168169 justify-content: flex-start;

169170 .list__item {

170− margin-right: 4rem;

171+ margin-right: (4rem / 4);

171172 }

172173}

173174

174175.body-regular {

175− margin-bottom: 7rem;

176+ margin-bottom: (7rem / 4);

176177}

177178

178179.video-wrapper {

@@ -196,7 +197,7 @@ iframe {

196197

197198.header {

198199 position: fixed;

199− height: 24rem;

200+ height: (24rem / 4);

200201 width: 100%;

201202 z-index: 2;

202203 top: 0;

@@ -209,24 +210,24 @@ iframe {

209210 supported by Chrome and Opera */

210211 &__navigation {

211212 display: none;

212− padding-top: 9rem;

213+ padding-top: (9rem / 4);

213214 }

214215 &__nav-icon {

215216 position: absolute;

216− margin-left: 2rem;

217− width: 6rem;

218− height: 10rem;

217+ margin-left: (4rem / 4);

218+ width: (6rem / 4);

219+ height: (10rem / 4);

219220 left: 0;

220− top: 6rem;

221+ top: (6rem / 4);

221222 z-index: 3;

222223 cursor: pointer;

223224 &:before, &:after {

224225 content: '';

225226 position: absolute;

226227 width: 100%;

227− height: 1rem;

228+ height: (1rem / 4);

228229 background: #000;

229− margin-bottom: 4rem;

230+ margin-bottom: (4rem / 4);

230231 top: 50%;

231232 left: 0;

232233 transform-origin: 50%;

@@ -273,7 +274,7 @@ iframe {

273274.posts {

274275 &__content {

275276 z-index: 3;

276− margin-left: -8rem;

277+ margin-left: -(8rem / 4);

277278 }

278279}

279280

@@ -418,10 +419,10 @@ textarea, input[type="text"], input[type="email"], input[type="number"], input[t

418419button, .btn {

419420 font-family: 'Inter UI', -apple-system, BlinkMacSystemFont, Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";

420421 font-weight: 500;

421− font-size: 4rem;

422− line-height: 4rem;

422+ font-size: (4rem / 4);

423+ line-height: (4rem / 4);

423424 user-select: none;

424− padding: 3rem 6rem;

425+ padding: (3rem /4) (6rem / 4);

425426 margin: 0 0 6px;

426427 border: none;

427428 cursor: pointer;

@@ -526,7 +527,7 @@ button, .btn {

526527 font-weight: 700;

527528}

528529

529−.h-font {

530+.lowercase {

530531 text-transform: lowercase;

531532}

532533

@@ -539,59 +540,59 @@ h1, h2, h3, h4 {

539540 font-weight: 700;

540541}

541542h1 {

542− font-size: 8rem;

543− line-height: 8rem;

543+ font-size: (8rem / 4);

544+ line-height: (8rem / 4);

544545}

545546h2 {

546− font-size: 6rem;

547− line-height: 6rem;

547+ font-size: (6rem / 4);

548+ line-height: (6rem / 4);

548549}

549550h3 {

550− font-size: 5rem;

551− line-height: 5rem;

551+ font-size: (5rem / 4);

552+ line-height: (5rem / 4);

552553}

553554h4 {

554− font-size: 4.5rem;

555− line-height: 4.5rem;

555+ font-size: (4.5rem / 4);

556+ line-height: (4.5rem / 4);

556557}

557558h5 {

558− font-size: 4rem;

559− line-height: 4rem;

559+ font-size: (4rem / 4);

560+ line-height: (4rem / 4);

560561}

561562

562563.article {

563564 h1 {

564− margin-bottom: 7rem;

565+ margin-bottom: (7rem / 4);

565566 }

566567 h2 {

567− margin-top: 8rem;

568− margin-bottom: 4rem;

568+ margin-top: (8rem / 4);

569+ margin-bottom: (4rem / 4);

569570 }

570571 h3 {

571− margin-top: 7rem;

572− margin-bottom: 3rem;

572+ margin-top: (7rem / 4);

573+ margin-bottom: (3rem / 4);

573574 }

574575 h4 {

575− margin-top: 6.5rem;

576− margin-bottom: 2.5rem;

576+ margin-top: (6.5rem / 4);

577+ margin-bottom: (2.5rem / 4);

577578 }

578579 h5 {

579− margin-top: 6rem;

580− margin-bottom: 2rem;

580+ margin-top: (6rem / 4);

581+ margin-bottom: (2rem / 4);

581582 }

582583}

583584

584585li {

585− font-size: 4rem;

586− line-height: 8rem;

586+ font-size: (4rem / 4);

587+ line-height: (8rem / 4);

587588 font-weight: 400;

588589}

589590

590591p, .p {

591− font-size: 4rem;

592+ font-size: (4rem / 4);

592593 font-weight: 400;

593− line-height: 8rem;

594− margin: 0 0 4rem;

594+ line-height: (8rem / 4);

595+ margin: 0 0 (4rem / 4);

595596}

596597

597598pre, code {

@@ -603,6 +604,47 @@ pre, code {

603604 span {

604605 color: #000 !important;

605606 }

606− padding: 1rem;

607− font-size: 4rem;

607+ padding: (1rem / 4);

608+ font-size: (4rem / 4);

609+}

610+

611+textarea, input[type="text"], input[type="email"], input[type="number"] {

612+ border: 1px solid #B1B2B3;

613+ font-family: "Source Code Pro", mono;

614+ font-size: (4rem / 4);

615+ line-height: (6rem / 4);

616+ transition: all 0.1s linear;

617+ padding-right: 40px;

618+ position: relative;

619+ &:active, &:focus {

620+ border: 1px solid #000000;

621+ }

622+ &:required, &:invalid {

623+ box-shadow: none !important;

624+ border: 1px solid #EE892B;

625+ color: #EE892B;

626+ }

627+}

628+

629+.has-valid-input {

630+ position: relative;

631+ &:after {

632+ content: '✓';

633+ color: #2AA779;

634+ position: absolute;

635+ right: 10px;

636+ top: 50%;

637+ transform: translate(0,-50%);

638+ width: 15px;

639+ height: 24px;

640+ margin-top: -4px;

641+ }

642+ input[type="text"], input[type="email"], input[type="number"] {

643+ border: 1px solid #2AA779;

644+ }

645+}

646+

647+#mc_embed_signup form {

648+ padding: 0;

649+ text-align: inherit;

608650}

sass/_responsive.scss+5−2

@@ -20,7 +20,7 @@

2020 max-width: 90%;

2121 }

2222 .posts__content {

23− margin-left: 8rem;

23+ margin-left: (8rem / 4);

2424 }

2525 .no-side-nav-column {

2626 flex-basis: 66.66666667%;

@@ -45,6 +45,7 @@

4545 .header {

4646 &__navigation {

4747 overflow-y: scroll;

48+ -webkit-overflow-scrolling: touch;

4849 }

4950 }

5051 }

@@ -57,12 +58,14 @@

5758 width: 100%;

5859 top: 0;

5960 left: 0;

60− padding: 0 4rem;

61+ padding: 0 (4rem / 4);

6162 background: white;

6263 overflow-y: scroll;

64+ -webkit-overflow-scrolling: touch;

6365 }

6466 .content-nav {

6567 display: block;

68+ margin: (7rem) / 4;

6669 overflow: initial;

6770 width: 100%;

6871 margin: 0;

sass/indigo.scss+6014−6017