Skip to content

Commit adaa2c5

Browse files
authored
Merge pull request #279 from Web-Dev-Path/refactor/to-scss-cardcolumns
Refactor/to scss cardcolumns
2 parents 405b807 + 84f9ffd commit adaa2c5

File tree

13 files changed

+77
-110
lines changed

13 files changed

+77
-110
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
184184
- Layout
185185
- RelatedPosts
186186
- Footer
187+
- CardsColumns
187188
- Nav
188189
- Extracted :root from themes.scss to globals.scss
189190
- Updated ContactUsForm's checkbox wrapper from div to label to enhance its accessibility

components/ContactUs/ContactUsCards/index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { ContactCardsColumns } from '../../containers/CardColumns/ContactCardsColumns';
1+
import { CardsColumns } from '@/components/containers/CardsColumns';
2+
import { ContactUsCard } from '@/components/containers/Card/ContactUsCard';
23
import RevealContentContainer from '../../containers/RevealContentContainer';
34
import styles from './ContactUsCards.module.scss';
45

@@ -34,7 +35,7 @@ export default function ContactUsCards() {
3435
return (
3536
<article className={styles.contactCards}>
3637
<RevealContentContainer>
37-
<ContactCardsColumns cards={cards} />
38+
<CardsColumns cards={cards} cardComponent={ContactUsCard} />
3839
</RevealContentContainer>
3940
</article>
4041
);

components/blog/BlogPostsContainer/index.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Link from 'next/link';
2-
import { BlogCardsColumns } from '@/components/containers/CardColumns/BlogCardsColumns';
32
import { BlogCard } from '@/components/containers/Card/BlogCard';
3+
import { CardsColumns } from '@/components/containers/CardsColumns';
44
import RevealContentContainer from '@/components/containers/RevealContentContainer';
55
import { tagToHeading } from '@/utils/blogCategories';
66
import Container from '@/components/containers/Container';
@@ -37,7 +37,12 @@ const BlogPostsContainer = ({
3737
{swipe ? (
3838
<>
3939
{[posts.slice(0, 6)].map((p, index) => (
40-
<BlogCardsColumns key={index} cards={p} />
40+
<CardsColumns
41+
key={index}
42+
cards={p}
43+
cardComponent={BlogCard}
44+
customClass='blog'
45+
/>
4146
))}
4247
</>
4348
) : (

components/containers/CardColumns/BlogCardsColumns.js

Lines changed: 0 additions & 12 deletions
This file was deleted.

components/containers/CardColumns/CardColumnsInterface.js

Lines changed: 0 additions & 49 deletions
This file was deleted.

components/containers/CardColumns/ContactCardsColumns.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

components/containers/CardColumns/OurGoalsCardsColumns.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

components/containers/CardColumns/index.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

components/containers/CardColumns/styles.js

Lines changed: 0 additions & 24 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
.innerContent {
2+
padding-bottom: 4rem;
3+
}
4+
5+
.cardColumnSwiper {
6+
margin-bottom: 5rem;
7+
8+
:global(.swiper-pagination-bullet-active) {
9+
background-color: var(--dark-bg);
10+
}
11+
}

0 commit comments

Comments
 (0)