Skip to content

Commit f1e0a51

Browse files
authored
Merge pull request #22 from capn-nepal/feature/popup-button
Popup button component
2 parents 7c17853 + 9ba1142 commit f1e0a51

17 files changed

Lines changed: 476 additions & 37 deletions

File tree

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/app/about/approach/page.tsx

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
import Banner from '#components/Banner';
2+
import Divider from '#components/Divider';
3+
import Page from '#components/Page';
4+
import AboutUsImage from '#public/aboutUsImage.jpg';
5+
6+
import Goals from './Goals';
7+
import Values from './Values';
8+
import VisionMission from './VisionMission';
9+
10+
import styles from './page.module.css';
11+
12+
export default function About() {
13+
return (
14+
<Page>
15+
<Banner
16+
// NOTE: We need to replace with the real image as mentioned in figma
17+
bannerImageSrc={AboutUsImage}
18+
eyebrowHeading="Our Approach"
19+
heading={(
20+
<>
21+
Empowering Change Through
22+
<br />
23+
<span>Gender-Equal Citizenship</span>
24+
</>
25+
)}
26+
/>
27+
<VisionMission />
28+
<Divider />
29+
<Goals />
30+
<Values />
31+
</Page>
32+
);
33+
}

src/app/about/page.tsx

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,5 @@
1-
import Banner from '#components/Banner';
2-
import Divider from '#components/Divider';
3-
import Page from '#components/Page';
4-
import AboutUsImage from '#public/aboutUsImage.jpg';
1+
import { redirect } from 'next/navigation';
52

6-
import Goals from './Goals';
7-
import Values from './Values';
8-
import VisionMission from './VisionMission';
9-
10-
import styles from './page.module.css';
11-
12-
export default function About() {
13-
return (
14-
<Page>
15-
<Banner
16-
// NOTE: We need to replace with the real image as mentioned in figma
17-
bannerImageSrc={AboutUsImage}
18-
eyebrowHeading="Our Approach"
19-
heading={(
20-
<>
21-
Empowering Change Through
22-
<br />
23-
<span>Gender-Equal Citizenship</span>
24-
</>
25-
)}
26-
/>
27-
<VisionMission />
28-
<Divider />
29-
<Goals />
30-
<Values />
31-
</Page>
32-
);
3+
export default function AboutRedirect() {
4+
redirect('/about/approach');
335
}

src/app/globals.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
--border-radius-small: 12px;
4242
--border-radius-extra-small: 8px;
4343

44+
--border-radius-popup: 3px;
45+
--blur-radius-popup: 1px;
46+
--color-shadow: rgba(0,0,0,.5);
47+
4448
/* Font size */
4549
--font-size-super-small: calc(var(--font-size-base) / (var(--multiplier) * var(--multiplier) * var(--multiplier)));
4650
--font-size-extra-small: calc(var(--font-size-base) / (var(--multiplier) * var(--multiplier)));

0 commit comments

Comments
 (0)