From 76e99752b14c6b573bba56dde2be0cc4fc0b959e Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Mon, 11 Jun 2018 19:48:38 +0200 Subject: [PATCH] move to CSS modules --- src/components/atoms/Content.jsx | 4 +- .../{Content.scss => Content.module.scss} | 0 src/components/atoms/FullWidth.jsx | 6 ++- .../{FullWidth.scss => FullWidth.module.scss} | 2 +- .../atoms/{Icons.scss => Icons.module.scss} | 0 src/components/atoms/LogoUnit.jsx | 12 ++--- .../{LogoUnit.scss => LogoUnit.module.scss} | 6 ++- src/components/molecules/Availability.jsx | 6 ++- ...lability.scss => Availability.module.scss} | 0 src/components/molecules/Networks.jsx | 16 +++---- .../{Networks.scss => Networks.module.scss} | 27 ++++++----- src/components/molecules/ProjectLinks.jsx | 10 ++--- ...ectLinks.scss => ProjectLinks.module.scss} | 19 ++++++-- src/components/molecules/ProjectNav.jsx | 45 ++++++++++--------- ...ProjectNav.scss => ProjectNav.module.scss} | 30 ++++++------- src/components/molecules/ProjectTechstack.jsx | 6 +-- ...tack.scss => ProjectTechstack.module.scss} | 15 ++++++- src/components/molecules/ThemeSwitch.jsx | 16 +++---- ...emeSwitch.scss => ThemeSwitch.module.scss} | 14 +++--- src/components/organisms/Footer.jsx | 8 ++-- .../{Footer.scss => Footer.module.scss} | 2 +- src/components/organisms/Header.jsx | 8 ++-- .../{Header.scss => Header.module.scss} | 6 +-- src/pages/index.jsx | 6 +-- src/pages/{index.scss => index.module.scss} | 4 +- 25 files changed, 155 insertions(+), 113 deletions(-) rename src/components/atoms/{Content.scss => Content.module.scss} (100%) rename src/components/atoms/{FullWidth.scss => FullWidth.module.scss} (91%) rename src/components/atoms/{Icons.scss => Icons.module.scss} (100%) rename src/components/atoms/{LogoUnit.scss => LogoUnit.module.scss} (95%) rename src/components/molecules/{Availability.scss => Availability.module.scss} (100%) rename src/components/molecules/{Networks.scss => Networks.module.scss} (78%) rename src/components/molecules/{ProjectLinks.scss => ProjectLinks.module.scss} (78%) rename src/components/molecules/{ProjectNav.scss => ProjectNav.module.scss} (92%) rename src/components/molecules/{ProjectTechstack.scss => ProjectTechstack.module.scss} (66%) rename src/components/molecules/{ThemeSwitch.scss => ThemeSwitch.module.scss} (91%) rename src/components/organisms/{Footer.scss => Footer.module.scss} (97%) rename src/components/organisms/{Header.scss => Header.module.scss} (86%) rename src/pages/{index.scss => index.module.scss} (94%) diff --git a/src/components/atoms/Content.jsx b/src/components/atoms/Content.jsx index 16f3047..a0282d8 100644 --- a/src/components/atoms/Content.jsx +++ b/src/components/atoms/Content.jsx @@ -1,9 +1,9 @@ import React from 'react' import PropTypes from 'prop-types' -import './Content.scss' +import styles from './Content.module.scss' const Content = props => ( -
+
{props.children}
) diff --git a/src/components/atoms/Content.scss b/src/components/atoms/Content.module.scss similarity index 100% rename from src/components/atoms/Content.scss rename to src/components/atoms/Content.module.scss diff --git a/src/components/atoms/FullWidth.jsx b/src/components/atoms/FullWidth.jsx index c0d7afe..a6ffe4c 100644 --- a/src/components/atoms/FullWidth.jsx +++ b/src/components/atoms/FullWidth.jsx @@ -1,8 +1,10 @@ import React from 'react' import PropTypes from 'prop-types' -import './FullWidth.scss' +import styles from './FullWidth.module.scss' -const FullWidth = ({ children }) =>
{children}
+const FullWidth = ({ children }) => ( +
{children}
+) FullWidth.propTypes = { children: PropTypes.node diff --git a/src/components/atoms/FullWidth.scss b/src/components/atoms/FullWidth.module.scss similarity index 91% rename from src/components/atoms/FullWidth.scss rename to src/components/atoms/FullWidth.module.scss index 3f13c53..c368b9f 100644 --- a/src/components/atoms/FullWidth.scss +++ b/src/components/atoms/FullWidth.module.scss @@ -1,4 +1,4 @@ -.full-width { +.fullWidth { width: 100vw; position: relative; left: 50%; diff --git a/src/components/atoms/Icons.scss b/src/components/atoms/Icons.module.scss similarity index 100% rename from src/components/atoms/Icons.scss rename to src/components/atoms/Icons.module.scss diff --git a/src/components/atoms/LogoUnit.jsx b/src/components/atoms/LogoUnit.jsx index 2046421..48b18ca 100644 --- a/src/components/atoms/LogoUnit.jsx +++ b/src/components/atoms/LogoUnit.jsx @@ -1,16 +1,18 @@ import React from 'react' import PropTypes from 'prop-types' import { ReactComponent as Logo } from '../../images/logo.svg' -import './LogoUnit.scss' +import styles from './LogoUnit.module.scss' const LogoUnit = ({ meta, minimal }) => { - const classes = minimal ? 'logounit logounit--minimal' : 'logounit' + const classes = minimal + ? `${styles.logounit} ${styles.minimal}` + : styles.logounit return (
- -

{meta.title.toLowerCase()}

-

+ +

{meta.title.toLowerCase()}

+

{'{ '} {meta.tagline.toLowerCase()} {' }'}

diff --git a/src/components/atoms/LogoUnit.scss b/src/components/atoms/LogoUnit.module.scss similarity index 95% rename from src/components/atoms/LogoUnit.scss rename to src/components/atoms/LogoUnit.module.scss index 1c9e908..6afe6b5 100644 --- a/src/components/atoms/LogoUnit.scss +++ b/src/components/atoms/LogoUnit.module.scss @@ -1,5 +1,9 @@ @import 'variables'; +.logounit { + display: block; +} + .logounit__logo { display: block; width: 1.5rem; @@ -36,7 +40,7 @@ } } -.logounit--minimal { +.minimal { transform: scale(.7); transform-origin: top center; transform-box: border-box; diff --git a/src/components/molecules/Availability.jsx b/src/components/molecules/Availability.jsx index 6091095..e5094d4 100644 --- a/src/components/molecules/Availability.jsx +++ b/src/components/molecules/Availability.jsx @@ -1,7 +1,7 @@ import React, { Fragment, PureComponent } from 'react' import PropTypes from 'prop-types' import { MoveIn } from '../atoms/Animations' -import './Availability.scss' +import styles from './Availability.module.scss' class Availability extends PureComponent { constructor(props) { @@ -64,7 +64,9 @@ class Availability extends PureComponent {