From dd1b1c78ed13f586a953cf73bffdf9fee57435c7 Mon Sep 17 00:00:00 2001 From: Aleksandra Rubaj Date: Wed, 4 May 2022 17:26:21 +0200 Subject: [PATCH 1/5] fix: removed negative margin from hero image --- site/components/Home/Hero.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/components/Home/Hero.js b/site/components/Home/Hero.js index ca6f36f..5926e0d 100644 --- a/site/components/Home/Hero.js +++ b/site/components/Home/Hero.js @@ -57,7 +57,7 @@ export function Hero() {

-
+
Date: Wed, 4 May 2022 17:37:23 +0200 Subject: [PATCH 2/5] fix: removed duplicate code with img --- site/components/Home/Why.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/site/components/Home/Why.js b/site/components/Home/Why.js index 8d02bc8..c88a74e 100644 --- a/site/components/Home/Why.js +++ b/site/components/Home/Why.js @@ -127,15 +127,6 @@ export default function Why() {
-
-
- Read More -
-
); From 45c65b272fa5708180e348773fd489690b9bd0c5 Mon Sep 17 00:00:00 2001 From: Aleksandra Rubaj Date: Wed, 4 May 2022 22:24:26 +0200 Subject: [PATCH 3/5] fix: adjusted image size responsiveness on home page --- site/components/Home/Features.js | 32 +++---- site/components/Home/Get-Involved.js | 138 +++++++++++++-------------- site/components/Home/Hero.js | 2 +- site/components/Home/Why.js | 18 ++-- 4 files changed, 95 insertions(+), 95 deletions(-) diff --git a/site/components/Home/Features.js b/site/components/Home/Features.js index f842cc4..091a8f1 100644 --- a/site/components/Home/Features.js +++ b/site/components/Home/Features.js @@ -12,7 +12,7 @@ export default function Features() { A Guide to Crypto and Web3

- Blockchain, tokens, NFTs, DAOs - what does it all mean? Our guide provides an accessible overview of the key concepts in Crypto and Web3. + Blockchain, tokens, NFTs, DAOs - what does it all mean? Our guide provides an accessible overview of the key concepts in Crypto and Web3.

@@ -26,10 +26,10 @@ export default function Features() {
-
-
+
+
Discover @@ -46,12 +46,12 @@ export default function Features() { Library

- Want to learn more? We are maintaining a comprehensive library of articles, papers, books and other materials related to the space and the surrounding discourse. It provides deeper background on specific topics along with everything you need to fully engage with, and evaluate, Web3 and the claims being made about it. + Want to learn more? We are maintaining a comprehensive library of articles, papers, books and other materials related to the space and the surrounding discourse. It provides deeper background on specific topics along with everything you need to fully engage with, and evaluate, Web3 and the claims being made about it.

-
-
+
+
Library
@@ -78,10 +78,10 @@ export default function Features() {

- Claims for Crypto and Web3 + Claims for Crypto and Web3

- Crypto and Web3 are associated with many bold claims. From classic technology boosterism of better and faster, to the radical transformation of our societies. But huge controversy surrounds these claims, and there’s a lack of agreement on even basic points and definitions. + Crypto and Web3 are associated with many bold claims. From classic technology boosterism of better and faster, to the radical transformation of our societies. But huge controversy surrounds these claims, and there’s a lack of agreement on even basic points and definitions.

@@ -95,12 +95,12 @@ export default function Features() {
-
-
+
+
Learn More
diff --git a/site/components/Home/Get-Involved.js b/site/components/Home/Get-Involved.js index ec1ef6a..582dec0 100644 --- a/site/components/Home/Get-Involved.js +++ b/site/components/Home/Get-Involved.js @@ -2,86 +2,86 @@ import Link from 'next/link' export default function GetInvolved() { return ( -
-
-

Get Involved

-

- This is a collective effort and we’re keen to involve collaborators and contributors. -

-
-
-
-
-
-
-

- Here's how you can get involved: -

-
    -
  • Contribute to the library,
    • -
  • Write up key concepts,
    • -
  • Proof edit articles and transcribe dialogs,
    • -
  • Share the work with others.
    • -
+
+
+

Get Involved

+

+ This is a collective effort and we’re keen to involve collaborators and contributors. +

+
+ +
+
+
+
+
+

+ We’d also love to have feedback through our forum: +

+
    +
  • Are there particular topics or areas we should cover?
    • +
  • Do you disagree with any of our assessments?
    • +
  • Have we missed or misunderstood something?
    • +
  • Do you have feedback on how we structure or present the thinking?
    • +
+
-
-
-
- Get Involved +
+
+ Our Forum +
-
-
-
-
-
-

- We’d also love to have feedback through our forum: -

-
    -
  • Are there particular topics or areas we should cover?
    • -
  • Do you disagree with any of our assessments?
    • -
  • Have we missed or misunderstood something?
    • -
  • Do you have feedback on how we structure or present the thinking?
    • -
- -
-
-
-
-
- Our Forum -
-
-
-
-
) } diff --git a/site/components/Home/Hero.js b/site/components/Home/Hero.js index 5926e0d..bef2ebb 100644 --- a/site/components/Home/Hero.js +++ b/site/components/Home/Hero.js @@ -60,7 +60,7 @@ export function Hero() {
diff --git a/site/components/Home/Why.js b/site/components/Home/Why.js index c88a74e..b62950a 100644 --- a/site/components/Home/Why.js +++ b/site/components/Home/Why.js @@ -2,7 +2,7 @@ import Link from 'next/link' export default function Why() { return ( -
+

Why this Project @@ -38,10 +38,10 @@ export default function Why() {

-
-
+
+
Read More @@ -80,9 +80,9 @@ export default function Why() {
-
+
Read More @@ -117,10 +117,10 @@ export default function Why() {
-
-
+
+
Read More From a5c67fcc7ed2637c28f5965b944f6ffa629a7f23 Mon Sep 17 00:00:00 2001 From: olarubaj Date: Wed, 4 May 2022 22:50:40 +0200 Subject: [PATCH 4/5] fix: reverting word changes --- site/components/Home/Features.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/components/Home/Features.js b/site/components/Home/Features.js index 091a8f1..eab70aa 100644 --- a/site/components/Home/Features.js +++ b/site/components/Home/Features.js @@ -66,7 +66,7 @@ export default function Features() { Discover
@@ -100,7 +100,7 @@ export default function Features() { Discover
From c93f4397943640743f64b50cc3c5aa7254d0621f Mon Sep 17 00:00:00 2001 From: olayway Date: Wed, 11 May 2022 11:40:09 +0200 Subject: [PATCH 5/5] [site/content][m]: clickable coggle tree images --- claims/index.md | 5 ++--- site/content/about.md | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/claims/index.md b/claims/index.md index fea6170..3259ef3 100644 --- a/claims/index.md +++ b/claims/index.md @@ -59,6 +59,5 @@ Explore crypto and "web3" in terms of the claims made about it. These subclaims ## Taxonomy of Aspirations and Claims -https://coggle.it/diagram/YhTzF8ZnKihmLdpm/t/web3-taxonomy-of-aspirations-and-claims - -![](/img/Web3_Taxonomy_of_Aspirations_and_Claims_m4bmpq.png) +[![](/img/Web3_Taxonomy_of_Aspirations_and_Claims_m4bmpq.png)](https://coggle.it/diagram/YhTzF8ZnKihmLdpm/t/web3-taxonomy-of-aspirations-and-claims +) diff --git a/site/content/about.md b/site/content/about.md index 4e696b5..9a19b86 100644 --- a/site/content/about.md +++ b/site/content/about.md @@ -45,7 +45,7 @@ We think good sensemaking begins by clarifying and agreeing the questions we wan And here is our full structured tree of questions: -![](/img/Web3_What_is_the_evaluation_of_the_various_claims_ve_or_-ve_for_web3crypto_and_the_supporting_reasoningsensemaking_so_that__we_collectively_as_individuals_societies_etc_make_good_choices_te_the_technology_wh_awh0yl.png) +[![](/img/Web3_What_is_the_evaluation_of_the_various_claims_ve_or_-ve_for_web3crypto_and_the_supporting_reasoningsensemaking_so_that__we_collectively_as_individuals_societies_etc_make_good_choices_te_the_technology_wh_awh0yl.png)](https://coggle.it/diagram/Yh-L7j5DfRykGi7e/t/web3-what-is-the-evaluation-polarizing-way-as-possible) ## Our Approach @@ -57,7 +57,7 @@ We intend to take a distinctive approach. It has three key, layered components: First, we distinguish the key claims being made and the underlying aspiration behind them. For example, “blockchain allows for easier collaborative decision making” connects to an aspiration of more democratic governance. This brings clarity to the discussion: claims are atomic, well-defined and separate but connected to aspirations. -![](/img/Web3_Taxonomy_of_Aspirations_and_Claims_m4bmpq.png) +[![](/img/Web3_Taxonomy_of_Aspirations_and_Claims_m4bmpq.png)](https://coggle.it/diagram/YnpnzQ8o3JWk-DSu/t/web3-taxonomy-of-aspirations-and-claims) Second, we transparently structure and steel-man the claims. In particular, using hypothesis trees we can break down a larger claim into sub-claims. For example, “blockchain allows for easier collaborative decision making” could break down into the claims: “a major problem for collaborative decision making is creating and tracking votes, especially at scale” and “blockchain makes it easier to create and track votes”. We combine this structured approach with the principle of generosity or steel-manning: creating the best version of any claim or thesis.