Skip to content

Commit

Permalink
Merge pull request #297 from tagion/a_branch
Browse files Browse the repository at this point in the history
A branch
  • Loading branch information
Kristian-Tagion authored Oct 25, 2024
2 parents 933605a + 25502ce commit 22144aa
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 14 deletions.
1 change: 0 additions & 1 deletion src/blocks/buy-earn-tagions/buy-earn-tagions.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
display: flex;
flex-direction: column;
justify-content: center;

padding: 48px;
min-height: 296px;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import React from "react";

import {
InclusiveElasticDecentralisedSwiper,
InclusiveElasticDecentralisedSwiperCard,
//InclusiveElasticDecentralisedSwiperCard,
} from "../../components";
import { inclusiveElasticDecentralisedData } from "../../content";

export const InclusiveElasticDecentralisedBlock: React.FC = () => {
const inclusiveCardGenerator = () =>
inclusiveElasticDecentralisedData &&
const inclusiveCardGenerator = () => [];
/* inclusiveElasticDecentralisedData &&
inclusiveElasticDecentralisedData.map((card, i) => (
<InclusiveElasticDecentralisedSwiperCard
Logo={card.Logo}
Expand All @@ -18,7 +18,7 @@ export const InclusiveElasticDecentralisedBlock: React.FC = () => {
key={i}
/>
));

*/
return (
<InclusiveElasticDecentralisedSwiper
cardGenerator={inclusiveCardGenerator}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
}

@media (min-width: $value_partner_card-tablet-breakpoint) {
min-height: 309px;
min-height: 550px;
padding: 32px;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,4 @@
padding-right: 120px;
}
}

1 change: 1 addition & 0 deletions src/components/questions-block/questions-block.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
flex-direction: row;
justify-content: space-between;
margin-top: 40px;
margin-bottom: 80px;

.question_container_title {
margin-top: 40px;
Expand Down
6 changes: 3 additions & 3 deletions src/content/start-contributing.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Go to Discord &gt; Contributing &gt; #translate and fill out the application for
},
},
{
taskName: "Co-Design our Governance",
taskName: "Co-design our governance",
description: {
title: "Research contributor",
body: (
Expand All @@ -94,9 +94,9 @@ Go to Discord &gt; Contributing &gt; #translate and fill out the application for
},
},
{
taskName: "Test our Tech and run a node",
taskName: "Test our tech and run a node",
description: {
title: "Test our Tech",
title: "Test our tech",
body: (
<>
All our code it publicly accessible on Github.
Expand Down
4 changes: 2 additions & 2 deletions src/content/you-can-participate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,6 @@ export const joinTheConversation = {
};

export const youCanParticipateBlockData = {
aboutPage: [visitTheBlog, joinTheCommunity, getTagions],
mainPage: [getTagions, visitTheBlog, joinTheCommunity],
learnandfollowPage: [visitOurBlog, codeAndDocumentation, joinTheConversation],};
learnandfollowPage: [visitOurBlog, codeAndDocumentation, joinTheConversation],
gettagionsPage: [visitTheBlog, getTagions],};
9 changes: 8 additions & 1 deletion src/pages/community.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ import classNames from "classnames/bind";
import { Layout } from "../templates/layout";
import { GradientSpotsWrapper, IntroductoryBlock } from "../components";
import {
BuyEarnTagionsBlock,
LetsTalkBlock,
StartContributingBlock,
SubscribeToOurNewsletterBlock,
//TweetsAboutTagionBlock,
ValueForContributorsBlock,
WhatIsTagionBlock,
} from "../blocks";
import {
bottomPageAnimatedGradientData,
Expand Down Expand Up @@ -39,7 +41,11 @@ const CommunityPage = () => {
>
<AnimatedGradientWrapper gradientData={topPageAnimatedGradientData}>
<IntroductoryBlock
title="Co-develop, co-own"
title={
<>
Co&#8209;develop<br />and co&#8209;own
</>
}
description={
<>
Are you a developer, designer, academic, writer or just want to give your idle hardware a new purpose?
Expand All @@ -63,6 +69,7 @@ const CommunityPage = () => {
<StartContributingBlock />
</AnimatedGradientWrapper>
<ValueForContributorsBlock />
<WhatIsTagionBlock/>
<GradientSpotsWrapper
gradients={communityPageGradients.tweetsAboutTagionBlock}
disableMainSidePaddings
Expand Down
2 changes: 1 addition & 1 deletion src/pages/get-tagions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const GetTagionsPage = () => {
gradientData={bottomPageAnimatedGradientData}
withLateralPaddings
>
<YouCanParticipateBlock data={youCanParticipateBlockData.aboutPage} />
<YouCanParticipateBlock data={youCanParticipateBlockData.gettagionsPage} />
<SubscribeToOurNewsletterBlock />
</AnimatedGradientWrapper>
</Layout>
Expand Down
6 changes: 5 additions & 1 deletion src/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ const IndexPage = () => {
}}
/>
<ScrollingBlock
title="The technology that enables and aligns"
title={
<>
The technology <br /> that enables and aligns
</>
}
data={nextGennFinancialInfrastrucureData}
classNames={{
title: cx("scrollingBlock_title"),
Expand Down

1 comment on commit 22144aa

@Kristian-Tagion
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New changes - approved

Please sign in to comment.