Commit Graph

1468 Commits

Author SHA1 Message Date
copernicus-mogley e1fde7fda1 Make table overflow-x scroll only on small viewports and not footnote tables at all 2020-01-24 15:33:58 +00:00
copernicus-mogley 6fe1065ffd Remove extra border from tables 2020-01-24 15:33:58 +00:00
Daira Hopwood 2b62e7574b Move custom stylesheet to css/style.css
Author: copernicus-mogley <ryan@z.cash>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-24 15:33:40 +00:00
copernicus-mogley 25ada6f826 Update Makefile and makeindex.sh to run without errors on MacOS 2020-01-24 15:30:53 +00:00
copernicus-mogley d724d9e6e3 Remove side padding on span.math 2020-01-24 15:30:53 +00:00
copernicus-mogley c87ac8a92a Add margin around blockquote, except top 2020-01-24 15:30:53 +00:00
copernicus-mogley f0a898c6e3 Make math scroll when it's too wide for the viewport 2020-01-24 15:30:53 +00:00
copernicus-mogley 3a0c82234f Don't apply <pre> styles to <code> tags 2020-01-24 15:30:53 +00:00
copernicus-mogley b506217b2b Remove unnecessary stylesheet from second instance and replace with viewport meta tag 2020-01-24 15:30:53 +00:00
copernicus-mogley 0c0d2f04e2 Add viewport meta tag for responsive display 2020-01-24 15:30:53 +00:00
copernicus-mogley fb8dafb3d8 Remove commented-out CSS, unnessary css files and stylesheet tag 2020-01-24 15:30:53 +00:00
copernicus-mogley c29e582944 Style touchups per Daira's notes 2020-01-24 15:30:53 +00:00
copernicus-mogley fc0cb8af7c Fix pre styles 2020-01-24 15:30:53 +00:00
copernicus-mogley 2c84f207dc Line break <pre> and add element scroll bar on overflow-x 2020-01-24 15:30:53 +00:00
copernicus-mogley 72a8e7a802 Add content section with for xxl displays 2020-01-24 15:30:53 +00:00
copernicus-mogley 09091814b5 Add responsive widths to content section 2020-01-24 15:30:53 +00:00
copernicus-mogley 25d295ea38 Table styles 2020-01-24 15:30:53 +00:00
copernicus-mogley 694b4948e3 First pass at styles 2020-01-24 15:30:53 +00:00
Daira Hopwood feca6f4b26 ZIP 31: child ask_i and nsk_i keys are intended to be taken modulo r_J.
Technically the ZIP was already correct because I_{ask}, I_{nsk}, ask_{par}, and nsk_{par} are all F_{r_J} elements,
but that assumes a lot of familiarity with the spec notation.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-21 13:32:30 +00:00
Daira Hopwood c01c5defb1 ZIP 308: clarification about notes eligible for migration.
Co-Authored-By: Simon Liu <simon@bitcartel.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-20 16:10:22 +00:00
Daira Hopwood 20ebcf4a27 Update ZIPs 208 and 308 to show the interaction between Blossom and Sprout->Sapling migration.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-20 16:08:12 +00:00
Daira Hopwood 6674a859d1
Merge pull request #315 from daira/rm-audited
ZIP 1014: remove "audited" from "Annual audited financial report"
2020-01-12 17:57:45 +00:00
Daira Hopwood 242148b92d ZIP 1014: remove "audited" from "Annual audited financial report". fixes #313
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-12 00:42:59 +00:00
Daira Hopwood 775d718d87
Merge pull request #314 from daira/rename-funding-target-to-cap
ZIP 1014: rename Funding Target to Monthly Funding Cap
2020-01-12 00:33:45 +00:00
Daira Hopwood 136835232a ZIP 1014: Funding Cap -> Monthly Funding Cap.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-12 00:23:28 +00:00
Daira Hopwood 803aea13f3 ZIP 1014: rename Funding Target to Funding Cap, as suggested by @aristarchus.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-11 03:10:11 +00:00
George Tankersley 9dc6913989 zip-1014: clarify review of indefinite duration grants
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-08 15:51:50 +00:00
Daira Hopwood f7806f03c4 Set theme jekyll-theme-tactile 2020-01-07 19:21:45 +00:00
Daira Hopwood c3635e6406 Update index.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 19:21:02 +00:00
Daira Hopwood b9b5ffc646 Trivial change to poke GitHub Pages.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 19:14:00 +00:00
Daira Hopwood 2db3287d57
Merge pull request #312 from daira/zip-1014a
ZIP 1014: Dev Fund to ECC + ZF + Major Grants
2020-01-07 18:52:58 +00:00
Daira Hopwood aa6c2df6f5 Regenerate index and HTML.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 18:50:12 +00:00
Daira Hopwood 5e44e622a7 ZIP 1014: updates from review with Gtank.
Update Discussions-To: URL.
Delete section on differences from Matt Luongo's proposal.
Clarify wording on large or long-duration Major Grants.
Reporting requirement for how "fair market value" is computed.
RFC 2119 conformance language.
"$" -> USD.
Copyediting.

Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
Co-Authored-By: George Tankersley <george@zfnd.org>
Co-Authored-By: Josh Cincinnati <acityinohio@users.noreply.github.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 18:49:57 +00:00
Daira Hopwood 6a86d4a853 ZIP 1014: update Acknowledgements.
Contains some text from b8f9eb3c0b

Co-Authored-By: Josh Cincinnati <acityinohio@users.noreply.github.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 18:13:03 +00:00
Daira Hopwood befd65d99d ZIP 1014: delete Disclosures section.
Originally part of b8f9eb3c0b

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 18:09:55 +00:00
Daira Hopwood 8ed505a6c9 ZIP 1014: Add reference to the Open Source Definition.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 16:05:19 +00:00
Daira Hopwood fe161c5537 ZIP 1014: RFC 2119 conformance language.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 16:03:56 +00:00
Daira Hopwood a23752742b ZIP 1014: remove redundant credit line and fix potentially bad incentive structure in volatility reserve.
Originally 71de73058e

Co-Authored-By: Josh Cincinnati <acityinohio@users.noreply.github.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 15:59:39 +00:00
Daira Hopwood 642f7c6f1a ZIP 1014: clarify language around the criteria for awarding Major Grants.
No normative changes intended, other than removal of "new" in
item 4, which conflicts with the "maintain the existing teams
and capabilities" goal of this ZIP.

Originally
* 517562aae3
* f7277c6777

Co-Authored-By: Eran Tromer <eran@tromer.org>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 15:54:24 +00:00
Daira Hopwood e6a5a5380c ZIP 1014: clarify how Volatility Reserve is managed and by whom.
Originally 8ab85986be

Co-Authored-By: Eran Tromer <eran@tromer.org>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 14:07:16 +00:00
Daira Hopwood 46690175b9 ZIP 1014: rename Community Advisory Panel to Community Panel.
Originally 6ad20895a4

Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
Co-Authored-By: Josh Cincinnati <acityinohio@users.noreply.github.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 11:45:07 +00:00
Daira Hopwood 08f48b1b9b ZIP 1014: copyediting from Daira's review.
Originally
* c093569d53
* e7ddc76496
* deae965edc
* bac8679e83
* 2d6645b732

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 11:39:23 +00:00
Daira Hopwood f20542877c ZIP 1014: ECC may distribute Dev Fund proceeds in fair-market-value compensation to contractors, as well as employees.
Originally 3558d34601

Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
Co-Authored-By: Josh Cincinnati <acityinohio@users.noreply.github.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 11:31:45 +00:00
Daira Hopwood cfe18281eb ZIP 1014: wording updates; volatility reserve is per organization.
Deletes "ZF may award grants as profit-sharing contracts".
Adds "The ECC will not be eligible for Major Grants if they have any funds available in their slice's Volatility Reserve" (which is later deleted).
Transfers responsibility for Major Grants awards from the ZF Board of Directors to a separate committee.

Originally 025dc79858

Co-Authored-By: Josh Cincinnati <acityinohio.users.noreply.github.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 11:26:28 +00:00
Daira Hopwood cafed14a2e Create ZIP 1014 from ZIP 1012.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 11:04:07 +00:00
Daira Hopwood 901c1a7963
Merge pull request #311 from nathan-at-least/render-via-docker
Support rendering via Docker.
2020-01-06 04:39:55 +00:00
nathan d81c846af0 Modify root Makefile to build protocol with the 'all' target; update Docker to include protocol render toolchain. 2020-01-05 12:54:51 -08:00
nathan 3aba19102e Support rendering via Docker. 2020-01-02 11:58:44 -08:00
Daira Hopwood a8d7af462b Remove email addresses from Original-Authors fields.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-01 16:34:13 +00:00
Daira Hopwood 41ec7e7820 Remove email addresses from Credits fields.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-01 16:28:27 +00:00