From 5fe4e4edc8481c3a74ae8141f6b18b1858e43c31 Mon Sep 17 00:00:00 2001 From: Subhajit Ghosh Date: Mon, 4 Dec 2023 16:20:35 +0000 Subject: [PATCH 1/8] Replaced all the css into tailwind css onColorSection component --- components/Branding/ColorSection/ColorSection.js | 5 ++--- components/Branding/ColorSection/ColorSection.module.css | 3 --- .../__tests__/__snapshots__/ColorSection.test.js.snap | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 components/Branding/ColorSection/ColorSection.module.css diff --git a/components/Branding/ColorSection/ColorSection.js b/components/Branding/ColorSection/ColorSection.js index 1376799a9..0b150782e 100644 --- a/components/Branding/ColorSection/ColorSection.js +++ b/components/Branding/ColorSection/ColorSection.js @@ -1,7 +1,6 @@ import { brandColorsObject } from 'common/styles/styleExports'; import Swatch from 'components/Branding/Swatch/Swatch'; import Content from 'components/Content/Content'; -import styles from './ColorSection.module.css'; function ColorSection() { const primaryColor = { name: 'Primary', hexCode: brandColorsObject.primary }; @@ -23,11 +22,11 @@ function ColorSection() { theme="white" columns={[
-

Primary

+

Primary

,
-

Secondary

+

Secondary

, ]} diff --git a/components/Branding/ColorSection/ColorSection.module.css b/components/Branding/ColorSection/ColorSection.module.css deleted file mode 100644 index 3194ef737..000000000 --- a/components/Branding/ColorSection/ColorSection.module.css +++ /dev/null @@ -1,3 +0,0 @@ -.centeredText { - text-align: center; -} diff --git a/components/Branding/ColorSection/__tests__/__snapshots__/ColorSection.test.js.snap b/components/Branding/ColorSection/__tests__/__snapshots__/ColorSection.test.js.snap index ca74425b6..f40f04eb0 100644 --- a/components/Branding/ColorSection/__tests__/__snapshots__/ColorSection.test.js.snap +++ b/components/Branding/ColorSection/__tests__/__snapshots__/ColorSection.test.js.snap @@ -8,7 +8,7 @@ exports[`ColorSection should render with required props 1`] = ` Array [

Primary

@@ -19,7 +19,7 @@ exports[`ColorSection should render with required props 1`] = `
,

Secondary

From 5b737f3e489b225046eb555788e0feb4d49ecf47 Mon Sep 17 00:00:00 2001 From: Subhajit Ghosh Date: Tue, 5 Dec 2023 15:17:49 +0000 Subject: [PATCH 2/8] Replaced all the css into tailwind css on Swatch component --- components/Branding/Swatch/Swatch.js | 5 ++--- components/Branding/Swatch/Swatch.module.css | 11 ----------- .../__tests__/__snapshots__/Swatch.test.js.snap | 4 ++-- 3 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 components/Branding/Swatch/Swatch.module.css diff --git a/components/Branding/Swatch/Swatch.js b/components/Branding/Swatch/Swatch.js index 8946dc772..78c7be2c3 100644 --- a/components/Branding/Swatch/Swatch.js +++ b/components/Branding/Swatch/Swatch.js @@ -1,6 +1,5 @@ import { string } from 'prop-types'; import ScreenReaderOnly from 'components/ScreenReaderOnly/ScreenReaderOnly'; -import styles from './Swatch.module.css'; Swatch.propTypes = { colorName: string.isRequired, @@ -9,10 +8,10 @@ Swatch.propTypes = { function Swatch({ colorName, hexCode }) { return ( -
+
{`A block of the color ${colorName}`} -
+
{colorName.toUpperCase()}
diff --git a/components/Branding/Swatch/Swatch.module.css b/components/Branding/Swatch/Swatch.module.css deleted file mode 100644 index ca37ab287..000000000 --- a/components/Branding/Swatch/Swatch.module.css +++ /dev/null @@ -1,11 +0,0 @@ -.Swatch { - border: 1px solid #333333; - padding: 1rem; - margin: 1.5rem; - width: 225px; -} - -.colorBlock { - height: 225px; - margin-bottom: 1rem; -} diff --git a/components/Branding/Swatch/__tests__/__snapshots__/Swatch.test.js.snap b/components/Branding/Swatch/__tests__/__snapshots__/Swatch.test.js.snap index 3ca00b309..16e82631f 100644 --- a/components/Branding/Swatch/__tests__/__snapshots__/Swatch.test.js.snap +++ b/components/Branding/Swatch/__tests__/__snapshots__/Swatch.test.js.snap @@ -2,13 +2,13 @@ exports[`Swatch should render with required props 1`] = `
A block of the color Blue
Date: Wed, 6 Dec 2023 09:26:14 +0000 Subject: [PATCH 3/8] Replaced all the css into tailwind css on FontSection component --- components/Branding/FontSection/FontSection.js | 3 +-- components/Branding/FontSection/FontSection.module.css | 9 --------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/components/Branding/FontSection/FontSection.js b/components/Branding/FontSection/FontSection.js index 46b234c6e..e2bec016d 100644 --- a/components/Branding/FontSection/FontSection.js +++ b/components/Branding/FontSection/FontSection.js @@ -1,6 +1,5 @@ import Content from 'components/Content/Content'; import { fontsObject } from 'common/styles/styleExports'; -import styles from './FontSection.module.css'; function FontSection() { // Every letter of the alphabet in one string @@ -12,7 +11,7 @@ function FontSection() { theme="gray" hasTitleUnderline columns={[ -
    +
      {Object.keys(fontsObject).map(item => { const fontStyle = { fontFamily: fontsObject[item], diff --git a/components/Branding/FontSection/FontSection.module.css b/components/Branding/FontSection/FontSection.module.css index 4151a7117..d757e335d 100644 --- a/components/Branding/FontSection/FontSection.module.css +++ b/components/Branding/FontSection/FontSection.module.css @@ -1,12 +1,3 @@ -.fontsList { - list-style: none; - width: 100%; -} - -.fontsList > li { - margin: 1rem; -} - .primaryFontFamily div > h6, .primaryFontFamily div > p { font-family: var(--primaryFontFamily), sans-serif; From b9353ac437088434fed7b7df9b21b8407c9c155d Mon Sep 17 00:00:00 2001 From: Subhajit Ghosh Date: Wed, 6 Dec 2023 09:27:37 +0000 Subject: [PATCH 4/8] Replaced all the css into tailwind css on FontSection component --- .../__tests__/__snapshots__/FontSection.test.js.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Branding/FontSection/__tests__/__snapshots__/FontSection.test.js.snap b/components/Branding/FontSection/__tests__/__snapshots__/FontSection.test.js.snap index aeebf5d8a..84100d6af 100644 --- a/components/Branding/FontSection/__tests__/__snapshots__/FontSection.test.js.snap +++ b/components/Branding/FontSection/__tests__/__snapshots__/FontSection.test.js.snap @@ -6,7 +6,7 @@ exports[`FontSection should render with required props 1`] = ` columns={ Array [
      • From 2f7a247ba842202e4a28fd2dbbe91e4a5a8f4377 Mon Sep 17 00:00:00 2001 From: Subhajit Ghosh Date: Thu, 7 Dec 2023 15:07:29 +0000 Subject: [PATCH 5/8] Replaced all the css into tailwind css on FontSection component --- components/Branding/FontSection/FontSection.js | 2 +- components/Branding/FontSection/FontSection.module.css | 9 --------- .../__tests__/__snapshots__/FontSection.test.js.snap | 8 ++++++-- 3 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 components/Branding/FontSection/FontSection.module.css diff --git a/components/Branding/FontSection/FontSection.js b/components/Branding/FontSection/FontSection.js index e2bec016d..1e7d21be2 100644 --- a/components/Branding/FontSection/FontSection.js +++ b/components/Branding/FontSection/FontSection.js @@ -18,7 +18,7 @@ function FontSection() { }; return (
      • -
        +
        {fontsObject[item]}

        {demoText}

        diff --git a/components/Branding/FontSection/FontSection.module.css b/components/Branding/FontSection/FontSection.module.css deleted file mode 100644 index d757e335d..000000000 --- a/components/Branding/FontSection/FontSection.module.css +++ /dev/null @@ -1,9 +0,0 @@ -.primaryFontFamily div > h6, -.primaryFontFamily div > p { - font-family: var(--primaryFontFamily), sans-serif; -} - -.secondaryFontFamily div > h6, -.secondaryFontFamily div > p { - font-family: var(--secondaryFontFamily), serif; -} diff --git a/components/Branding/FontSection/__tests__/__snapshots__/FontSection.test.js.snap b/components/Branding/FontSection/__tests__/__snapshots__/FontSection.test.js.snap index 84100d6af..b1abbde43 100644 --- a/components/Branding/FontSection/__tests__/__snapshots__/FontSection.test.js.snap +++ b/components/Branding/FontSection/__tests__/__snapshots__/FontSection.test.js.snap @@ -9,7 +9,9 @@ exports[`FontSection should render with required props 1`] = ` className="list-none w-full [&>li]:m-4" >
      • -
        +
      • -
        +
        Date: Fri, 8 Dec 2023 16:27:12 +0000 Subject: [PATCH 6/8] Replaced all the css into tailwind css on FontSection component --- components/Branding/FontSection/FontSection.js | 8 +++++++- .../__tests__/__snapshots__/FontSection.test.js.snap | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/components/Branding/FontSection/FontSection.js b/components/Branding/FontSection/FontSection.js index 1e7d21be2..d2cd1e992 100644 --- a/components/Branding/FontSection/FontSection.js +++ b/components/Branding/FontSection/FontSection.js @@ -18,7 +18,13 @@ function FontSection() { }; return (
      • -
        +
        p]:font-serif [&>h6]:font-serif' + : '[&>p]:font-sans [&>h6]:font-sans' + } + >
        {fontsObject[item]}

        {demoText}

        diff --git a/components/Branding/FontSection/__tests__/__snapshots__/FontSection.test.js.snap b/components/Branding/FontSection/__tests__/__snapshots__/FontSection.test.js.snap index b1abbde43..459250691 100644 --- a/components/Branding/FontSection/__tests__/__snapshots__/FontSection.test.js.snap +++ b/components/Branding/FontSection/__tests__/__snapshots__/FontSection.test.js.snap @@ -34,7 +34,7 @@ exports[`FontSection should render with required props 1`] = `
      • Date: Tue, 12 Dec 2023 15:25:53 +0000 Subject: [PATCH 7/8] Replaced all the css into tailwind css on FontSection component --- components/Branding/FontSection/FontSection.js | 4 ++-- .../__tests__/__snapshots__/FontSection.test.js.snap | 4 ++-- tailwind.config.js | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/components/Branding/FontSection/FontSection.js b/components/Branding/FontSection/FontSection.js index d2cd1e992..8fa61de5d 100644 --- a/components/Branding/FontSection/FontSection.js +++ b/components/Branding/FontSection/FontSection.js @@ -21,8 +21,8 @@ function FontSection() {
        p]:font-serif [&>h6]:font-serif' - : '[&>p]:font-sans [&>h6]:font-sans' + ? '[&>p]:font-serif [&>h6]:font-serif [&>p]:font-primaryFontFamily [&>h6]:font-primaryFontFamily' + : '[&>p]:font-sans [&>p]:font-secondaryFontFamily [&>h6]:font-sans [&>h6]:font-secondaryFontFamily' } >
        {fontsObject[item]}
        diff --git a/components/Branding/FontSection/__tests__/__snapshots__/FontSection.test.js.snap b/components/Branding/FontSection/__tests__/__snapshots__/FontSection.test.js.snap index 459250691..e6ec52d07 100644 --- a/components/Branding/FontSection/__tests__/__snapshots__/FontSection.test.js.snap +++ b/components/Branding/FontSection/__tests__/__snapshots__/FontSection.test.js.snap @@ -10,7 +10,7 @@ exports[`FontSection should render with required props 1`] = ` >
      • { From 4143dce3fe28e5d4eab23e1c49e0a3c01c4bb604 Mon Sep 17 00:00:00 2001 From: Subhajit Ghosh Date: Tue, 12 Dec 2023 15:29:57 +0000 Subject: [PATCH 8/8] Replaced all the css into tailwind css on FontSection component --- tailwind.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tailwind.config.js b/tailwind.config.js index 21c70a222..8eb155b5d 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -29,7 +29,7 @@ module.exports = { }, fontFamily: { primaryFontFamily: '"DIN Condensed Bold"', - secondaryFontFamily: 'Encode Sans', + secondaryFontFamily: '"Encode Sans"', }, }, plugins: [