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
8 changes: 5 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- RevealContentContainer
- Member
- Container
- Updated ContactUsForm's checkbox wrapper from div to label to enhance its accessibility
- Updated SearchInput width to 100% for better styling
- Reverted the prop name to styles in Container component as the change of the name introduced a styling bug
- Updated ContactUsForm's checkbox wrapper from div to label to enhance its accessibility
- Updated SearchInput width to 100% for better styling
- Reverted the prop name to styles in Container component as the change of the name introduced a styling bug
- Extracted :root from themes.scss to globals.scss

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@use '@/styles/mixins' as *;
@use '@/styles/variables' as *;
@use '@/styles/index' as *;

.blogContainer {
display: flex;
Expand Down
3 changes: 1 addition & 2 deletions components/containers/Member/Member.module.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@use '@/styles/mixins' as *;
@use '@/styles/variables' as *;
@use '@/styles/index' as *;

.card {
margin: 1rem 1rem 0 0.5rem;
Expand Down
5 changes: 2 additions & 3 deletions pages/_app.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
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';
import { lightTheme, GlobalStyles } from '@/styles/themeConfig';
import '@/styles/globals.scss';

function MyApp({ Component, pageProps }) {
// Only uncomment when the darkTheme is set
Expand Down
15 changes: 15 additions & 0 deletions styles/globals.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
:root {
--bg-contact-card: #ffffff;
--bg-color: #eaeaea;
--color-black: #000000;
--color-blue: #0000ee;
--color-dark-grey: #9ba39d;
--color-grey: #d9d9d9;
--color-white: #ffffff;
--color-light-bg: #8cd5e8;
--color-primary-content: #292929;
--color-transparent: transparent;
--color-box-shadow: rgba(0, 0, 0, 0.08);
--dark-bg: #023047;
--error: #be1313;
}
5 changes: 2 additions & 3 deletions styles/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
@use './themes';
@use './mixins';
@use './variables';
@forward 'mixins';
@forward 'variables';
16 changes: 0 additions & 16 deletions styles/themes.scss
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
:root {
--bg-contact-card: #ffffff;
--bg-color: #eaeaea;
--color-black: #000000;
--color-blue: #0000ee;
--color-dark-grey: #9ba39d;
--color-grey: #d9d9d9;
--color-white: #ffffff;
--color-light-bg: #8cd5e8;
--color-primary-content: #292929;
--color-transparent: transparent;
--color-box-shadow: rgba(0, 0, 0, 0.08);
--dark-bg: #023047;
--error: #be1313;
}

// placeholder colors
[data-theme='dark'] {
--bg-contact-card: #232431;
Expand Down