From 3a4e7bdb1a828f16110bef21f829e7b4cea1bd03 Mon Sep 17 00:00:00 2001 From: Cheryl M Date: Wed, 23 Jul 2025 23:53:18 +1000 Subject: [PATCH 1/4] fix barrel imports and extract :root to globals.scss --- styles/globals.scss | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 styles/globals.scss diff --git a/styles/globals.scss b/styles/globals.scss new file mode 100644 index 00000000..e69de29b From 6022d6f2b8749f0712b31954609ef2d8e18c43bd Mon Sep 17 00:00:00 2001 From: Cheryl M Date: Wed, 23 Jul 2025 23:54:21 +1000 Subject: [PATCH 2/4] fix barrel imports and extract :root to globals.scss --- components/containers/Member/Member.module.scss | 3 +-- pages/_app.js | 5 ++--- styles/globals.scss | 15 +++++++++++++++ styles/index.scss | 5 ++--- styles/themes.scss | 16 ---------------- 5 files changed, 20 insertions(+), 24 deletions(-) diff --git a/components/containers/Member/Member.module.scss b/components/containers/Member/Member.module.scss index 6518d493..4fd8f0fb 100644 --- a/components/containers/Member/Member.module.scss +++ b/components/containers/Member/Member.module.scss @@ -1,5 +1,4 @@ -@use '@/styles/mixins' as *; -@use '@/styles/variables' as *; +@use '@/styles/index' as *; .card { margin: 1rem 1rem 0 0.5rem; diff --git a/pages/_app.js b/pages/_app.js index ef275342..13191b4c 100644 --- a/pages/_app.js +++ b/pages/_app.js @@ -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 diff --git a/styles/globals.scss b/styles/globals.scss index e69de29b..893e160f 100644 --- a/styles/globals.scss +++ b/styles/globals.scss @@ -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; +} diff --git a/styles/index.scss b/styles/index.scss index 07bf9359..66504132 100644 --- a/styles/index.scss +++ b/styles/index.scss @@ -1,3 +1,2 @@ -@use './themes'; -@use './mixins'; -@use './variables'; +@forward 'mixins'; +@forward 'variables'; diff --git a/styles/themes.scss b/styles/themes.scss index 882df289..0f810c45 100644 --- a/styles/themes.scss +++ b/styles/themes.scss @@ -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; From 86360615476e7199224d1619f40f861f658450c5 Mon Sep 17 00:00:00 2001 From: Cheryl M Date: Thu, 24 Jul 2025 00:03:51 +1000 Subject: [PATCH 3/4] update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b54486c..af0c3ef1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -171,4 +171,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Member - Container - Updated ContactUsForm's checkbox wrapper from div to label to enhance its accessibility -- Updated SearchInput width to 100% for better styling \ No newline at end of file +- Updated SearchInput width to 100% for better styling +- Extracted :root from themes.scss to globals.scss \ No newline at end of file From 0f00b3cf7c2eb179a368f82d02f7e98d58cddc2a Mon Sep 17 00:00:00 2001 From: Cheryl M Date: Fri, 25 Jul 2025 15:36:53 +1000 Subject: [PATCH 4/4] update BlogPostsContainer.module.scss imports --- .../blog/BlogPostsContainer/BlogPostsContainer.module.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/blog/BlogPostsContainer/BlogPostsContainer.module.scss b/components/blog/BlogPostsContainer/BlogPostsContainer.module.scss index b314dc1d..5218a0f7 100644 --- a/components/blog/BlogPostsContainer/BlogPostsContainer.module.scss +++ b/components/blog/BlogPostsContainer/BlogPostsContainer.module.scss @@ -1,5 +1,4 @@ -@use '@/styles/mixins' as *; -@use '@/styles/variables' as *; +@use '@/styles/index' as *; .blogContainer { display: flex;