Skip to content

Commit

Permalink
Merge pull request #26 from near/develop
Browse files Browse the repository at this point in the history
develop -> main
  • Loading branch information
charleslavon authored May 21, 2024
2 parents 5a2ca21 + 11b47de commit 2f80bcb
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 35 deletions.
6 changes: 5 additions & 1 deletion src/components/CookiePrompt.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ export const CookiePrompt = () => {
<Wrapper>
<Text $size="text-s" $mobileSize="text-xs">
We use our own and third-party cookies on our website to enhance your experience, analyze traffic, and for
marketing. For more information see our <Link href="/cookies">Cookie Policy</Link>.
marketing. For more information see our&nbsp;
<Link target="_blank" href="/cookies">
Cookie Policy
</Link>
.
</Text>

<Actions>
Expand Down
32 changes: 0 additions & 32 deletions src/components/layouts/DefaultLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import { type ReactNode } from 'react';
import styled from 'styled-components';

import { Banner } from '../Banner';
import { Footer } from '../Footer';
import { Button } from '../lib/Button';
import { Navigation } from '../navigation/Navigation';

interface Props {
Expand Down Expand Up @@ -31,36 +29,6 @@ const Content = styled.div`
export function DefaultLayout({ children }: Props) {
return (
<Wrapper>
<Banner
bannerId="early-stage-founder" // See note about "bannerId" in <Banner /> source
message="Are you an early-stage founder? Apply to our equity-free accelerator program. Applications are now live!"
actions={
<>
<Button
href="https://airtable.com/appFoIqAoY0ikoVIb/shrst8Tt4PUtYTSvD"
target="_blank"
label="Apply Now"
iconRight="ph-bold ph-arrow-up-right"
variant="primary"
fill="outline"
size="small"
className="desktop-button"
/>

<Button
href="https://airtable.com/appFoIqAoY0ikoVIb/shrst8Tt4PUtYTSvD"
target="_blank"
label="Apply"
iconRight="ph-bold ph-arrow-up-right"
variant="primary"
fill="outline"
size="small"
className="mobile-button"
/>
</>
}
/>

<Navigation />

<Content>
Expand Down
2 changes: 1 addition & 1 deletion src/components/pages/EcosystemOverview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export const EcosystemOverview = () => {
</Text>
<div>
<Button
href="/devhub.near/widget/app"
href="/devhub.near/widget/app?page=communities"
target="_blank"
label="Explore DevHub"
variant="secondary"
Expand Down
3 changes: 2 additions & 1 deletion src/components/pages/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,8 @@ const communityItems = [
description:
'DevHub is a decentralized community where NEAR developers can share ideas, match solutions, and access support and funding.',
image: images.community.devHub,
url: '/devgovgigs.near/widget/Ideas',
url: 'https://dev.near.org/devhub.near/widget/app?page=communities',
target: '_blank',
},
{
name: 'Horizon',
Expand Down

0 comments on commit 2f80bcb

Please sign in to comment.