From fdd7a56e3ba4ac9b4e9d1c38cd715a132d1eab4e Mon Sep 17 00:00:00 2001 From: Minghua Sun Date: Wed, 26 Sep 2018 15:32:22 -0400 Subject: [PATCH] React/componentize error page styles (#271) * componentize error page styles * move error page styles into organism * move narrow template styles into pages componentize with error page components * center align site logo on error pages * revert justify center site logo * add changelog --- changelogs/componentize-error-page-styles.txt | 4 ++++ react/src/components/organisms/ErrorPage/index.js | 1 + react/src/components/organisms/ErrorPage/styles.scss | 2 ++ react/src/components/pages/Error403/index.js | 1 + react/src/components/pages/Error404/index.js | 1 + react/src/components/pages/Error500/index.js | 1 + react/src/components/pages/styles.scss | 2 ++ react/src/index.scss | 2 -- 8 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 changelogs/componentize-error-page-styles.txt create mode 100644 react/src/components/organisms/ErrorPage/styles.scss create mode 100644 react/src/components/pages/styles.scss diff --git a/changelogs/componentize-error-page-styles.txt b/changelogs/componentize-error-page-styles.txt new file mode 100644 index 0000000000..03a439d54d --- /dev/null +++ b/changelogs/componentize-error-page-styles.txt @@ -0,0 +1,4 @@ +___DESCRIPTION___ +Added (see below) +Change_impact (see below) +- (React) Componentize scss into error page organism and pages #271 diff --git a/react/src/components/organisms/ErrorPage/index.js b/react/src/components/organisms/ErrorPage/index.js index 83505ee220..79c496bcc3 100644 --- a/react/src/components/organisms/ErrorPage/index.js +++ b/react/src/components/organisms/ErrorPage/index.js @@ -1,5 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; +import './styles.css'; const ErrorPage = (errorPage) => (
diff --git a/react/src/components/organisms/ErrorPage/styles.scss b/react/src/components/organisms/ErrorPage/styles.scss new file mode 100644 index 0000000000..9b3b8810c5 --- /dev/null +++ b/react/src/components/organisms/ErrorPage/styles.scss @@ -0,0 +1,2 @@ +@import 'global'; +@import "03-organisms/error-page"; diff --git a/react/src/components/pages/Error403/index.js b/react/src/components/pages/Error403/index.js index 6b269a8cbf..6f437589d1 100644 --- a/react/src/components/pages/Error403/index.js +++ b/react/src/components/pages/Error403/index.js @@ -1,6 +1,7 @@ import React from 'react'; import NarrowTemplate from '../../templates/NarrowTemplate'; import ErrorPage from '../../organisms/ErrorPage'; +import '../styles.css'; const Error403 = () => ( diff --git a/react/src/components/pages/Error404/index.js b/react/src/components/pages/Error404/index.js index e00776386a..194313c12d 100644 --- a/react/src/components/pages/Error404/index.js +++ b/react/src/components/pages/Error404/index.js @@ -1,6 +1,7 @@ import React from 'react'; import NarrowTemplate from '../../templates/NarrowTemplate'; import ErrorPage from '../../organisms/ErrorPage'; +import '../styles.css'; const Error404 = () => ( diff --git a/react/src/components/pages/Error500/index.js b/react/src/components/pages/Error500/index.js index b26445be4d..aa255f2a84 100644 --- a/react/src/components/pages/Error500/index.js +++ b/react/src/components/pages/Error500/index.js @@ -1,6 +1,7 @@ import React from 'react'; import NarrowTemplate from '../../templates/NarrowTemplate'; import ErrorPage from '../../organisms/ErrorPage'; +import '../styles.css'; const Error500 = () => ( diff --git a/react/src/components/pages/styles.scss b/react/src/components/pages/styles.scss new file mode 100644 index 0000000000..66ce0b3b0b --- /dev/null +++ b/react/src/components/pages/styles.scss @@ -0,0 +1,2 @@ +@import 'global'; +@import "04-templates/narrow-template"; diff --git a/react/src/index.scss b/react/src/index.scss index 7015838d38..67d66e6a5d 100644 --- a/react/src/index.scss +++ b/react/src/index.scss @@ -143,7 +143,6 @@ $assets-path: './assets'; @import "03-organisms/content-eyebrow"; @import "03-organisms/curated-person"; @import "03-organisms/emergency-alerts"; -@import "03-organisms/error-page"; @import "03-organisms/event-listing"; @import "03-organisms/event-listing-interactive"; @import "03-organisms/featured-item-mosaic"; @@ -210,7 +209,6 @@ $assets-path: './assets'; @import "04-templates/form-page"; @import "04-templates/general"; @import "04-templates/information-details"; -@import "04-templates/narrow-template"; @import "04-templates/organization-details"; @import "04-templates/policy-advisory"; @import "04-templates/press";