From f7389b92d6b4f06ef19f27afe16cee4822024354 Mon Sep 17 00:00:00 2001 From: lexicon-admin <150657043+lexicon-admin@users.noreply.github.com> Date: Fri, 9 Feb 2024 12:24:33 +0000 Subject: [PATCH 1/2] Update Landing.tsx Small changes to landing page text. Feedback and adaptation links removed until #145 is resolved --- packages/berlin/src/pages/Landing.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/berlin/src/pages/Landing.tsx b/packages/berlin/src/pages/Landing.tsx index 57e3986d..8b39fc77 100644 --- a/packages/berlin/src/pages/Landing.tsx +++ b/packages/berlin/src/pages/Landing.tsx @@ -15,7 +15,7 @@ function Landing() { problems in decentralization, including the challenge of maintaining research and academic independence in the wake of technological vertical integration and hyper-financialization. Using plural mechanism design, we experiment with novel ways to surface ideas in the public - interest that transcend our biases—protocol, politics, purse— while encouraging + interest that transcend our biases—protocol, politics, purse — while encouraging collaboration and insights across unlikely intersections where breakthroughs tend to emerge. @@ -30,17 +30,17 @@ function Landing() { Zupass here. {' '} - Early submissions before March 31 will be prioritized. + Submissions received before March 31 will get more attention. - The experiment will be novel, fun, and weird — like the best of research….and + The experiment will be novel, fun, and weird — like the best of research… and Berlin. Through a series of structured interactions, the community will decide how to prioritize research and allocate funds, relying on structured, high-bandwidth deliberations that surface research public goods, while elevating truth and expertise with peer prediction. The community is interdisciplinary, drawing on insights from science of science, social science, economics, complexity science, cryptography, and philosophy, among other intersections. The community will test and evolve these mechanisms through multiple cycles - of feedback and adaptation. + of feedback and adaptation. ); From 9e991a1b60430368cf0c4eeeee4ec59d99034735 Mon Sep 17 00:00:00 2001 From: Martin Benedikt Busch Date: Fri, 9 Feb 2024 14:22:28 +0100 Subject: [PATCH 2/2] fix linting --- packages/berlin/src/pages/Landing.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/berlin/src/pages/Landing.tsx b/packages/berlin/src/pages/Landing.tsx index 8b39fc77..518116d9 100644 --- a/packages/berlin/src/pages/Landing.tsx +++ b/packages/berlin/src/pages/Landing.tsx @@ -1,5 +1,5 @@ // Components -import Link from '../components/link'; +// import Link from '../components/link'; // Styled components import { FlexColumn } from '../components/containers/FlexColum.styled';