diff --git a/app/app.js b/app/app.js index 6cddf4e..788b08c 100644 --- a/app/app.js +++ b/app/app.js @@ -29,6 +29,17 @@ import LanguageProvider from 'containers/LanguageProvider'; /* eslint-disable import/no-unresolved, import/extensions */ import '!file-loader?name=[name].[ext]!./images/favicon.ico'; import 'file-loader?name=.htaccess!./.htaccess'; +/* + * app fonts + * jest requires 'index.css' for import to be mocked. + * see @ https://github.com/facebook/jest/issues/8988 + */ +import 'typeface-montserrat/index.css'; +import 'typeface-poppins/index.css'; +import 'typeface-roboto/index.css'; +// styles +import 'style/custom.scss'; +import 'style/global.scss'; /* eslint-enable import/no-unresolved, import/extensions */ import configureStore from './configureStore'; diff --git a/app/components/atoms/Anicon/index.js b/app/components/atoms/Anicon/index.js index 2ebb444..74e3e9a 100644 --- a/app/components/atoms/Anicon/index.js +++ b/app/components/atoms/Anicon/index.js @@ -17,6 +17,7 @@ const HoverContainer = styled.div` justify-content: center; align-items: center; text-align: center; + background-color: transparent; `; const Anicon = ({ name, loop, rotate, hoverable, moveTo, ...props }) => { diff --git a/app/components/atoms/Anicon/tests/__snapshots__/index.test.js.snap b/app/components/atoms/Anicon/tests/__snapshots__/index.test.js.snap index 95a36af..3f4ae1a 100644 --- a/app/components/atoms/Anicon/tests/__snapshots__/index.test.js.snap +++ b/app/components/atoms/Anicon/tests/__snapshots__/index.test.js.snap @@ -2,7 +2,7 @@ exports[` Should render and match the snapshot 1`] = `
( diff --git a/app/components/molecules/IconGroup/tests/__snapshots__/index.test.js.snap b/app/components/molecules/IconGroup/tests/__snapshots__/index.test.js.snap index 88aed65..d32614e 100644 --- a/app/components/molecules/IconGroup/tests/__snapshots__/index.test.js.snap +++ b/app/components/molecules/IconGroup/tests/__snapshots__/index.test.js.snap @@ -5,7 +5,7 @@ exports[` Should render and match the snapshot 1`] = ` class="border-0 list-group list-group-horizontal" >
@@ -17,7 +17,7 @@ exports[` Should render and match the snapshot 1`] = `
diff --git a/app/components/organisms/Header/tests/__snapshots__/index.test.js.snap b/app/components/organisms/Header/tests/__snapshots__/index.test.js.snap index f63fc93..e77549d 100644 --- a/app/components/organisms/Header/tests/__snapshots__/index.test.js.snap +++ b/app/components/organisms/Header/tests/__snapshots__/index.test.js.snap @@ -14,7 +14,7 @@ exports[`
Should render and match the snapshot 1`] = ` class="border-0 list-group list-group-horizontal" >
Should render and match the snapshot 1`] = `
Should render and match the snapshot 1`] = `
Should render and match the snapshot 1`] = ` class="border-0 list-group list-group-horizontal" >
Should render and match the snapshot 1`] = `
Should render and match the snapshot 1`] = ` class="border-0 list-group list-group-horizontal" >
Should render and match the snapshot 1`] = `
Should render and match the snapshot 1`] = `
Should render and match the snapshot 1`] = ` class="border-0 list-group list-group-horizontal" >
Should render and match the snapshot 1`] = `
- - - - - - - + + + + + ); } diff --git a/app/containers/App/tests/__snapshots__/index.test.js.snap b/app/containers/App/tests/__snapshots__/index.test.js.snap index a14ee3f..aef4754 100644 --- a/app/containers/App/tests/__snapshots__/index.test.js.snap +++ b/app/containers/App/tests/__snapshots__/index.test.js.snap @@ -2,20 +2,16 @@ exports[` should render and match the snapshot 1`] = ` - - - - - - - + + + + + `; diff --git a/app/style/global.scss b/app/style/global.scss new file mode 100644 index 0000000..5614b99 --- /dev/null +++ b/app/style/global.scss @@ -0,0 +1,62 @@ +// Global Styles + +html, +body { + height: 100%; + width: 100%; +} + +body { + font-family: 'Poppins', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, + 'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', + 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; +} + +#app { + background-color: #fafafa; + min-height: 100%; + min-width: 100%; +} + +p, +label { + font-family: 'Poppins', Georgia, Times, 'Times New Roman', serif; + line-height: 1.5em; +} + +@media (max-width: 1200px) { + legend { + font-size: calc(1.275rem + 0.3vw); + } + h1, + .h1 { + font-size: calc(1.375rem + 1.5vw); + } + h2, + .h2 { + font-size: calc(1.325rem + 0.9vw); + } + h3, + .h3 { + font-size: calc(1.3rem + 0.6vw); + } + h4, + .h4 { + font-size: calc(1.275rem + 0.3vw); + } + .display-1 { + font-size: calc(1.725rem + 5.7vw); + } + .display-2 { + font-size: calc(1.675rem + 5.1vw); + } + .display-3 { + font-size: calc(1.575rem + 3.9vw); + } + .display-4 { + font-size: calc(1.475rem + 2.7vw); + } + .close { + font-size: calc(1.275rem + 0.3vw); + } +} diff --git a/app/tests/__snapshots__/storybook.test.js.snap b/app/tests/__snapshots__/storybook.test.js.snap index 9f256ff..54a46e9 100644 --- a/app/tests/__snapshots__/storybook.test.js.snap +++ b/app/tests/__snapshots__/storybook.test.js.snap @@ -100,7 +100,7 @@ exports[`Storyshots Design|Atoms/Anicon Search Anicon 1`] = ` } >
@@ -177,7 +177,7 @@ exports[`Storyshots Design|Atoms/Anicon With Dynamic Variables 1`] = ` } >
@@ -1729,7 +1729,7 @@ exports[`Storyshots Design|Molecules/FeaturedProduct Default Story 1`] = ` } >
@@ -1811,7 +1811,7 @@ exports[`Storyshots Design|Molecules/FeaturedProduct With Product 1`] = ` } >
@@ -2183,7 +2183,7 @@ exports[`Storyshots Design|Molecules/IconGroup Social Icon Button Group 1`] = ` onKeyDown={[Function]} >
@@ -3181,7 +3181,7 @@ exports[`Storyshots Design|Organisms/Header Default Header 1`] = `
@@ -3491,7 +3491,7 @@ exports[`Storyshots Design|Organisms/SocialBar With Dynamic Variables 1`] = ` onKeyDown={[Function]} >
@@ -3845,7 +3845,7 @@ exports[`Storyshots Design|Pages/HomePage Default Story 1`] = `
@@ -4107,7 +4107,7 @@ exports[`Storyshots Design|Pages/HomePage Default Story 1`] = ` className="d-flex align-items-end justify-content-center col" >
@@ -4132,7 +4132,7 @@ exports[`Storyshots Design|Pages/HomePage Default Story 1`] = ` className="d-flex align-items-end justify-content-center col" >
@@ -4157,7 +4157,7 @@ exports[`Storyshots Design|Pages/HomePage Default Story 1`] = ` className="d-flex align-items-end justify-content-center col" >
@@ -4396,7 +4396,7 @@ exports[`Storyshots Design|Templates/HomeLayout With Dynamic Variables 1`] = ` onKeyDown={[Function]} >
@@ -4474,7 +4474,7 @@ exports[`Storyshots Design|Templates/HomeLayout With Dynamic Variables 1`] = `
@@ -4859,7 +4859,7 @@ exports[`Storyshots Design|Templates/HomeLayout With Placeholders 1`] = ` onKeyDown={[Function]} >
@@ -4937,7 +4937,7 @@ exports[`Storyshots Design|Templates/HomeLayout With Placeholders 1`] = `