Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,3 +152,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Updated outdated dependencies

### Fixed

### Changed
- Started migrating styles from Styled Components to CSS Modules (ContactUsCard)
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.contactCards {
background-color: var(--bg-contact-card);
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { ContactCardsColumns } from './containers/CardColumns/ContactCardsColumns';
import RevealContentContainer from './containers/RevealContentContainer';
import styled from 'styled-components';
import { ContactCardsColumns } from '../../containers/CardColumns/ContactCardsColumns';
import RevealContentContainer from '../../containers/RevealContentContainer';
import styles from './ContactUsCards.module.scss';

const cards = [

{
title: 'FAQ',
image: '/images/svg/faq-icon.svg',
Expand Down Expand Up @@ -31,16 +30,12 @@ const cards = [
},
];

const ContactCardsContainer = styled.div`
background-color: ${({ theme }) => theme.colors.white};
`;

export default function ContactUsCards() {
return (
<ContactCardsContainer>
<article className={styles.contactCards}>
<RevealContentContainer>
<ContactCardsColumns cards={cards} />
</RevealContentContainer>
</ContactCardsContainer>
</article>
);
}
2 changes: 1 addition & 1 deletion pages/_app.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import Layout from '@/components/layout/Layout';
import { useState } from 'react';
import { ThemeProvider } from 'styled-components';
import { lightTheme, darkTheme, GlobalStyles } from '@/styles/themeConfig';
import '@/styles/index.scss';

function MyApp({ Component, pageProps }) {

// Only uncomment when the darkTheme is set
// const [theme, setTheme] = useState('light');
// const toggleTheme = () => {
Expand Down
2 changes: 1 addition & 1 deletion pages/contact.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useState } from 'react';
import ContactUsFormSubscribe from '@/components/ContactUs';
import ContactUsCards from '@/components/ContactUsCards';
import ContactUsCards from '@/components/ContactUs/ContactUsCards';
import S from '@/styles/pages/contactStyles';

export default function ContactUs() {
Expand Down
57 changes: 57 additions & 0 deletions styles/_mixins.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
@use './variables' as *;

@mixin transition($args...) {
-webkit-transition: $args;
-moz-transition: $args;
-ms-transition: $args;
-o-transition: $args;
transition: $args;
}

@mixin tablet {
@media (min-width: $tablet-breakpoint) {
@content;
}
}

@mixin desktop {
@media (min-width: $desktop-breakpoint) {
@content;
}
}

@mixin desktop-breakpoint-plus {
@media (min-width: $desktop-breakpoint-plus) {
@content;
}
}

@mixin medium-desktop {
@media (min-width: $medium-desktop-breakpoint) {
@content;
}
}

@mixin large-desktop {
@media (min-width: $large-desktop-breakpoint) {
@content;
}
}

@mixin desktop-breakpoint-minus {
@media (max-width: $desktop-breakpoint-minus) {
@content;
}
}

@mixin mobile {
@media (max-width: $lg-mobile-breakpoint) {
@content;
}
}

@mixin small-mobile {
@media (max-width: $sm-mobile-breakpoint) {
@content;
}
}
15 changes: 15 additions & 0 deletions styles/_variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Media Query Breakpoints
$sm-mobile-breakpoint: 350px;
$mobile-breakpoint: 578px;
$lg-mobile-breakpoint: 767px;
$tablet-breakpoint: 768px;
$desktop-breakpoint-minus: 1023px;
$desktop-breakpoint: 1024px;
$desktop-breakpoint-plus: 1025px;
$medium-desktop-breakpoint: 1250px;
$large-desktop-breakpoint: 1440px;
$extra-large-breakpoint: 2560px;

//Fonts
$copy-font: 'Assistant';
$heading-font: 'Open Sans';
3 changes: 3 additions & 0 deletions styles/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@use './themes';
@use './mixins';
@use './variables';
16 changes: 16 additions & 0 deletions styles/themes.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
:root {
--bg-contact-card: #ffffff;
--bg-color: #eaeaea;
}

// placeholder colors
[data-theme='dark'] {
--bg-contact-card: #232431;
--bg-color: #333;
}

// Theming notes:
/*
Set document data-theme to dark to activate dark theme, for example
document.documentElement.setAttribute('data-theme', 'dark');
*/