diff --git a/.public/index.html b/.public/index.html index cb0f153cdca..f00ccd76f4f 100644 --- a/.public/index.html +++ b/.public/index.html @@ -1,7 +1,7 @@ - + diff --git a/packages/patternfly-4/react-charts/README.md b/packages/patternfly-4/react-charts/README.md index 3c1056283d2..fb3a387d97a 100644 --- a/packages/patternfly-4/react-charts/README.md +++ b/packages/patternfly-4/react-charts/README.md @@ -45,10 +45,9 @@ import '@patternfly/react-core/dist/styles/base.css'; import React from 'react'; import { Area } from '@patternfly/react-charts'; -export default ; - - +export default ; +; ``` All css related to each component is provided alongside it. There is no component level CSS to import. @@ -106,5 +105,5 @@ Testing is done at the root of this repo. To only run the patternfly-react tests yarn test packages/patternfly-4/react-charts ``` -[patternfly-4]: https://github.com/patternfly/patternfly-next +[patternfly-4]: https://github.com/patternfly/patternfly [docs]: https://patternfly-react.surge.sh/patternfly-4 diff --git a/packages/patternfly-4/react-charts/package.json b/packages/patternfly-4/react-charts/package.json index 5a1cd6d0270..5c1c556477d 100644 --- a/packages/patternfly-4/react-charts/package.json +++ b/packages/patternfly-4/react-charts/package.json @@ -46,7 +46,7 @@ "victory": "^30.1.0" }, "devDependencies": { - "@patternfly/patternfly-next": "1.0.175", + "@patternfly/patternfly": "1.0.178", "css": "^2.2.3", "fs-extra": "^6.0.1", "glob": "^7.1.2", diff --git a/packages/patternfly-4/react-core/README.md b/packages/patternfly-4/react-core/README.md index 29d7cfd5700..0a94a290842 100644 --- a/packages/patternfly-4/react-core/README.md +++ b/packages/patternfly-4/react-core/README.md @@ -103,5 +103,5 @@ Testing is done at the root of this repo. To only run the patternfly-react tests yarn test packages/patternfly-4/react-core ``` -[patternfly-4]: https://github.com/patternfly/patternfly-next +[patternfly-4]: https://github.com/patternfly/-next [docs]: https://patternfly-react.surge.sh/patternfly-4 diff --git a/packages/patternfly-4/react-core/build/copyStyles.js b/packages/patternfly-4/react-core/build/copyStyles.js index 0541003fba7..f882085b21b 100644 --- a/packages/patternfly-4/react-core/build/copyStyles.js +++ b/packages/patternfly-4/react-core/build/copyStyles.js @@ -5,7 +5,7 @@ const { parse: parseCSS, stringify: stringifyCSS } = require('css'); const baseCSSFilename = 'patternfly-base.css'; const stylesDir = resolve(__dirname, '../dist/styles'); -const pfDir = dirname(require.resolve(`@patternfly/patternfly-next/${baseCSSFilename}`)); +const pfDir = dirname(require.resolve(`@patternfly/patternfly/${baseCSSFilename}`)); const css = readFileSync(join(pfDir, baseCSSFilename), 'utf8'); const ast = parseCSS(css); diff --git a/packages/patternfly-4/react-core/build/snapshot-serializer.js b/packages/patternfly-4/react-core/build/snapshot-serializer.js index aad145a54a9..0edb3cb5b4c 100644 --- a/packages/patternfly-4/react-core/build/snapshot-serializer.js +++ b/packages/patternfly-4/react-core/build/snapshot-serializer.js @@ -1,7 +1,7 @@ const fs = require('fs'); const { createSerializer } = require('@patternfly/react-styles/snapshot-serializer'); -const pf4CSS = fs.readFileSync(require.resolve('@patternfly/patternfly-next/patternfly-base.css'), 'utf8'); +const pf4CSS = fs.readFileSync(require.resolve('@patternfly/patternfly/patternfly-base.css'), 'utf8'); module.exports = createSerializer({ globalCSS: pf4CSS.match(/:root\W?\{(.|\n)*?\}/)[0] diff --git a/packages/patternfly-4/react-core/package.json b/packages/patternfly-4/react-core/package.json index d89d78f34af..9f3e88cc774 100644 --- a/packages/patternfly-4/react-core/package.json +++ b/packages/patternfly-4/react-core/package.json @@ -64,7 +64,7 @@ "@babel/preset-env": "^7.0.0", "@babel/preset-react": "^7.0.0", "@babel/preset-typescript": "^7.0.0", - "@patternfly/patternfly-next": "1.0.175", + "@patternfly/patternfly": "1.0.178", "@types/enzyme": "^3.1.15", "@types/jest": "^23.3.10", "@types/prop-types": "^15.5.6", diff --git a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.js b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.js index 9cc15fe050f..7f6dd631d32 100644 --- a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.js +++ b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.js @@ -5,7 +5,7 @@ import AboutModalContainer from './AboutModalContainer'; import { canUseDOM } from 'exenv'; import { KEY_CODES } from '../../internal/constants'; import { css } from '@patternfly/react-styles'; -import styles from '@patternfly/patternfly-next/components/Backdrop/backdrop.css'; +import styles from '@patternfly/patternfly/components/Backdrop/backdrop.css'; const propTypes = { /** content rendered inside the About Modal. */ diff --git a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBox.js b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBox.js index 752c6be93c0..2125c23d299 100644 --- a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBox.js +++ b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBox.js @@ -1,7 +1,7 @@ import React from 'react'; import { css } from '@patternfly/react-styles'; import PropTypes from 'prop-types'; -import styles from '@patternfly/patternfly-next/components/AboutModalBox/about-modal-box.css'; +import styles from '@patternfly/patternfly/components/AboutModalBox/about-modal-box.css'; const propTypes = { /** content rendered inside the AboutModelBox. */ diff --git a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxBrand.js b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxBrand.js index 910632981f6..200ca565dae 100644 --- a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxBrand.js +++ b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxBrand.js @@ -1,7 +1,7 @@ import React from 'react'; import { css } from '@patternfly/react-styles'; import PropTypes from 'prop-types'; -import styles from '@patternfly/patternfly-next/components/AboutModalBox/about-modal-box.css'; +import styles from '@patternfly/patternfly/components/AboutModalBox/about-modal-box.css'; const propTypes = { /** additional classes added to the About Modal Brand */ diff --git a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxCloseButton.js b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxCloseButton.js index 3069f9ce132..d708c218c9b 100644 --- a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxCloseButton.js +++ b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxCloseButton.js @@ -1,7 +1,7 @@ import React from 'react'; import { css } from '@patternfly/react-styles'; import PropTypes from 'prop-types'; -import styles from '@patternfly/patternfly-next/components/AboutModalBox/about-modal-box.css'; +import styles from '@patternfly/patternfly/components/AboutModalBox/about-modal-box.css'; import { Button, ButtonVariant } from '../Button'; import { TimesIcon } from '@patternfly/react-icons'; diff --git a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxContent.js b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxContent.js index 79ab43fbc07..5e74675cdf7 100644 --- a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxContent.js +++ b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxContent.js @@ -1,9 +1,9 @@ import React from 'react'; import { css } from '@patternfly/react-styles'; import PropTypes from 'prop-types'; -import styles from '@patternfly/patternfly-next/components/AboutModalBox/about-modal-box.css'; -import titleStyles from '@patternfly/patternfly-next/components/Title/title.css'; -import contentStyles from '@patternfly/patternfly-next/components/Content/content.css'; +import styles from '@patternfly/patternfly/components/AboutModalBox/about-modal-box.css'; +import titleStyles from '@patternfly/patternfly/components/Title/title.css'; +import contentStyles from '@patternfly/patternfly/components/Content/content.css'; const propTypes = { /** content rendered inside the AboutModalBoxContent */ diff --git a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxHeader.js b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxHeader.js index 4afba6fb2dc..241f70b72ce 100644 --- a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxHeader.js +++ b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxHeader.js @@ -1,7 +1,7 @@ import React from 'react'; import { css } from '@patternfly/react-styles'; import PropTypes from 'prop-types'; -import styles from '@patternfly/patternfly-next/components/AboutModalBox/about-modal-box.css'; +import styles from '@patternfly/patternfly/components/AboutModalBox/about-modal-box.css'; import Title from '../Title/Title'; const propTypes = { diff --git a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxHero.js b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxHero.js index a73a45e4d7e..a5e90f106f6 100644 --- a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxHero.js +++ b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxHero.js @@ -1,7 +1,7 @@ import React from 'react'; import { css } from '@patternfly/react-styles'; import PropTypes from 'prop-types'; -import styles from '@patternfly/patternfly-next/components/AboutModalBox/about-modal-box.css'; +import styles from '@patternfly/patternfly/components/AboutModalBox/about-modal-box.css'; const propTypes = { /** additional classes added to the About Modal Hero */ diff --git a/packages/patternfly-4/react-core/src/components/AboutModal/__snapshots__/AboutModalBox.test.js.snap b/packages/patternfly-4/react-core/src/components/AboutModal/__snapshots__/AboutModalBox.test.js.snap index eb045744a67..54156879399 100644 --- a/packages/patternfly-4/react-core/src/components/AboutModal/__snapshots__/AboutModalBox.test.js.snap +++ b/packages/patternfly-4/react-core/src/components/AboutModal/__snapshots__/AboutModalBox.test.js.snap @@ -3,6 +3,7 @@ exports[`AboutModalBox Test 1`] = ` .pf-c-about-modal-box { display: grid; + color: #ffffff; position: relative; z-index: 600; grid-template-rows: max-content max-content auto; diff --git a/packages/patternfly-4/react-core/src/components/Alert/Alert.js b/packages/patternfly-4/react-core/src/components/Alert/Alert.js index 92481e3cf09..e9754640111 100644 --- a/packages/patternfly-4/react-core/src/components/Alert/Alert.js +++ b/packages/patternfly-4/react-core/src/components/Alert/Alert.js @@ -1,8 +1,8 @@ import React from 'react'; import { css, getModifier } from '@patternfly/react-styles'; import PropTypes from 'prop-types'; -import styles from '@patternfly/patternfly-next/components/Alert/alert.css'; -import accessibleStyles from '@patternfly/patternfly-next/utilities/Accessibility/accessibility.css'; +import styles from '@patternfly/patternfly/components/Alert/alert.css'; +import accessibleStyles from '@patternfly/patternfly/utilities/Accessibility/accessibility.css'; import AlertIcon from './AlertIcon'; import { capitalize } from '../../internal/util'; import AlertActionCloseButton from './AlertActionCloseButton'; diff --git a/packages/patternfly-4/react-core/src/components/Alert/AlertActionCloseButton.js b/packages/patternfly-4/react-core/src/components/Alert/AlertActionCloseButton.js index 1e57c5c7b01..8aba21122b7 100644 --- a/packages/patternfly-4/react-core/src/components/Alert/AlertActionCloseButton.js +++ b/packages/patternfly-4/react-core/src/components/Alert/AlertActionCloseButton.js @@ -1,7 +1,7 @@ import React from 'react'; import { css } from '@patternfly/react-styles'; import PropTypes from 'prop-types'; -import styles from '@patternfly/patternfly-next/components/Alert/alert.css'; +import styles from '@patternfly/patternfly/components/Alert/alert.css'; import { Button, ButtonVariant } from '../Button'; import { TimesIcon } from '@patternfly/react-icons'; diff --git a/packages/patternfly-4/react-core/src/components/Alert/AlertActionLink.js b/packages/patternfly-4/react-core/src/components/Alert/AlertActionLink.js index 34cbf2e68fe..57555ee5238 100644 --- a/packages/patternfly-4/react-core/src/components/Alert/AlertActionLink.js +++ b/packages/patternfly-4/react-core/src/components/Alert/AlertActionLink.js @@ -1,7 +1,7 @@ import React from 'react'; import { css } from '@patternfly/react-styles'; import PropTypes from 'prop-types'; -import styles from '@patternfly/patternfly-next/components/Alert/alert.css'; +import styles from '@patternfly/patternfly/components/Alert/alert.css'; import { Button, ButtonVariant } from '../Button'; const propTypes = { diff --git a/packages/patternfly-4/react-core/src/components/Alert/AlertBody.js b/packages/patternfly-4/react-core/src/components/Alert/AlertBody.js index 0e5d835a7f2..d32690603de 100644 --- a/packages/patternfly-4/react-core/src/components/Alert/AlertBody.js +++ b/packages/patternfly-4/react-core/src/components/Alert/AlertBody.js @@ -1,7 +1,7 @@ import React from 'react'; import { css } from '@patternfly/react-styles'; import PropTypes from 'prop-types'; -import styles from '@patternfly/patternfly-next/components/Alert/alert.css'; +import styles from '@patternfly/patternfly/components/Alert/alert.css'; import { TimesIcon } from '@patternfly/react-icons'; import { Button, ButtonVariant } from '../Button'; diff --git a/packages/patternfly-4/react-core/src/components/Alert/AlertIcon.js b/packages/patternfly-4/react-core/src/components/Alert/AlertIcon.js index de125b074d1..7321c9c72ac 100644 --- a/packages/patternfly-4/react-core/src/components/Alert/AlertIcon.js +++ b/packages/patternfly-4/react-core/src/components/Alert/AlertIcon.js @@ -1,7 +1,7 @@ import React from 'react'; import { css } from '@patternfly/react-styles'; import PropTypes from 'prop-types'; -import styles from '@patternfly/patternfly-next/components/Alert/alert.css'; +import styles from '@patternfly/patternfly/components/Alert/alert.css'; import { CheckCircleIcon, diff --git a/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.js.snap b/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.js.snap index 9c0a6950f64..66575d3c41c 100644 --- a/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.js.snap +++ b/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.js.snap @@ -38,6 +38,7 @@ exports[`Alert - danger Action Close Button 1`] = ` } .pf-c-alert.pf-m-danger { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -204,6 +205,7 @@ exports[`Alert - danger Action Link 1`] = ` } .pf-c-alert.pf-m-danger { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -357,6 +359,7 @@ exports[`Alert - danger Action and Title 1`] = ` } .pf-c-alert.pf-m-danger { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -521,6 +524,7 @@ exports[`Alert - danger Custom aria label 1`] = ` } .pf-c-alert.pf-m-danger { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -651,6 +655,7 @@ exports[`Alert - danger Description 1`] = ` } .pf-c-alert.pf-m-danger { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -747,6 +752,7 @@ exports[`Alert - danger Title 1`] = ` } .pf-c-alert.pf-m-danger { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -859,6 +865,7 @@ exports[`Alert - info Action Close Button 1`] = ` } .pf-c-alert.pf-m-info { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -1025,6 +1032,7 @@ exports[`Alert - info Action Link 1`] = ` } .pf-c-alert.pf-m-info { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -1178,6 +1186,7 @@ exports[`Alert - info Action and Title 1`] = ` } .pf-c-alert.pf-m-info { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -1342,6 +1351,7 @@ exports[`Alert - info Custom aria label 1`] = ` } .pf-c-alert.pf-m-info { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -1472,6 +1482,7 @@ exports[`Alert - info Description 1`] = ` } .pf-c-alert.pf-m-info { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -1568,6 +1579,7 @@ exports[`Alert - info Title 1`] = ` } .pf-c-alert.pf-m-info { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -1680,6 +1692,7 @@ exports[`Alert - success Action Close Button 1`] = ` } .pf-c-alert.pf-m-success { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -1846,6 +1859,7 @@ exports[`Alert - success Action Link 1`] = ` } .pf-c-alert.pf-m-success { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -1999,6 +2013,7 @@ exports[`Alert - success Action and Title 1`] = ` } .pf-c-alert.pf-m-success { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -2163,6 +2178,7 @@ exports[`Alert - success Custom aria label 1`] = ` } .pf-c-alert.pf-m-success { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -2293,6 +2309,7 @@ exports[`Alert - success Description 1`] = ` } .pf-c-alert.pf-m-success { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -2389,6 +2406,7 @@ exports[`Alert - success Title 1`] = ` } .pf-c-alert.pf-m-success { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -2501,6 +2519,7 @@ exports[`Alert - warning Action Close Button 1`] = ` } .pf-c-alert.pf-m-warning { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -2667,6 +2686,7 @@ exports[`Alert - warning Action Link 1`] = ` } .pf-c-alert.pf-m-warning { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -2820,6 +2840,7 @@ exports[`Alert - warning Action and Title 1`] = ` } .pf-c-alert.pf-m-warning { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -2984,6 +3005,7 @@ exports[`Alert - warning Custom aria label 1`] = ` } .pf-c-alert.pf-m-warning { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -3114,6 +3136,7 @@ exports[`Alert - warning Description 1`] = ` } .pf-c-alert.pf-m-warning { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; @@ -3210,6 +3233,7 @@ exports[`Alert - warning Title 1`] = ` } .pf-c-alert.pf-m-warning { display: grid; + color: #282d33; grid-template-columns: max-content 1fr max-content; grid-template-rows: 1fr auto; grid-template-areas: "icon title action" "icon content content"; diff --git a/packages/patternfly-4/react-core/src/components/Avatar/Avatar.tsx b/packages/patternfly-4/react-core/src/components/Avatar/Avatar.tsx index d2182d43541..a590d7a9fba 100644 --- a/packages/patternfly-4/react-core/src/components/Avatar/Avatar.tsx +++ b/packages/patternfly-4/react-core/src/components/Avatar/Avatar.tsx @@ -1,5 +1,5 @@ -import styles from '@patternfly/patternfly-next/components/Avatar/avatar.css'; +import styles from '@patternfly/patternfly/components/Avatar/avatar.css'; import { css } from '@patternfly/react-styles'; import React, { DetailedHTMLProps, ImgHTMLAttributes } from 'react'; diff --git a/packages/patternfly-4/react-core/src/components/Backdrop/Backdrop.js b/packages/patternfly-4/react-core/src/components/Backdrop/Backdrop.js index f9f276c50f1..02ce3c1ad59 100644 --- a/packages/patternfly-4/react-core/src/components/Backdrop/Backdrop.js +++ b/packages/patternfly-4/react-core/src/components/Backdrop/Backdrop.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { css } from '@patternfly/react-styles'; -import styles from '@patternfly/patternfly-next/components/Backdrop/backdrop.css'; +import styles from '@patternfly/patternfly/components/Backdrop/backdrop.css'; const propTypes = { /** content rendered inside the backdrop */ diff --git a/packages/patternfly-4/react-core/src/components/BackgroundImage/BackgroundImage.js b/packages/patternfly-4/react-core/src/components/BackgroundImage/BackgroundImage.js index 7d7ab89ad35..f7ed8aed3aa 100644 --- a/packages/patternfly-4/react-core/src/components/BackgroundImage/BackgroundImage.js +++ b/packages/patternfly-4/react-core/src/components/BackgroundImage/BackgroundImage.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { css, StyleSheet } from '@patternfly/react-styles'; -import styles from '@patternfly/patternfly-next/components/BackgroundImage/background-image.css'; +import styles from '@patternfly/patternfly/components/BackgroundImage/background-image.css'; /* eslint-disable camelcase */ import { diff --git a/packages/patternfly-4/react-core/src/components/Badge/Badge.js b/packages/patternfly-4/react-core/src/components/Badge/Badge.js index 4092094149a..e3f2a479167 100644 --- a/packages/patternfly-4/react-core/src/components/Badge/Badge.js +++ b/packages/patternfly-4/react-core/src/components/Badge/Badge.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { css } from '@patternfly/react-styles'; -import styles from '@patternfly/patternfly-next/components/Badge/badge.css'; +import styles from '@patternfly/patternfly/components/Badge/badge.css'; export const propTypes = { /** Adds styling to the badge to indicate it has been read */ diff --git a/packages/patternfly-4/react-core/src/components/Breadcrumb/Breadcrumb.js b/packages/patternfly-4/react-core/src/components/Breadcrumb/Breadcrumb.js index e8e6504523c..ed5cc7da612 100644 --- a/packages/patternfly-4/react-core/src/components/Breadcrumb/Breadcrumb.js +++ b/packages/patternfly-4/react-core/src/components/Breadcrumb/Breadcrumb.js @@ -1,5 +1,5 @@ import React from 'react'; -import styles from '@patternfly/patternfly-next/components/Breadcrumb/breadcrumb.css'; +import styles from '@patternfly/patternfly/components/Breadcrumb/breadcrumb.css'; import PropTypes from 'prop-types'; import { css } from '@patternfly/react-styles'; diff --git a/packages/patternfly-4/react-core/src/components/Breadcrumb/BreadcrumbHeading.js b/packages/patternfly-4/react-core/src/components/Breadcrumb/BreadcrumbHeading.js index 3d9c8d7df83..510864bce1d 100644 --- a/packages/patternfly-4/react-core/src/components/Breadcrumb/BreadcrumbHeading.js +++ b/packages/patternfly-4/react-core/src/components/Breadcrumb/BreadcrumbHeading.js @@ -1,5 +1,5 @@ import React from 'react'; -import styles from '@patternfly/patternfly-next/components/Breadcrumb/breadcrumb.css'; +import styles from '@patternfly/patternfly/components/Breadcrumb/breadcrumb.css'; import PropTypes from 'prop-types'; import { css } from '@patternfly/react-styles'; import { componentShape } from '../../internal/componentShape'; diff --git a/packages/patternfly-4/react-core/src/components/Breadcrumb/BreadcrumbItem.js b/packages/patternfly-4/react-core/src/components/Breadcrumb/BreadcrumbItem.js index e9b80bfcb68..63a52078c40 100644 --- a/packages/patternfly-4/react-core/src/components/Breadcrumb/BreadcrumbItem.js +++ b/packages/patternfly-4/react-core/src/components/Breadcrumb/BreadcrumbItem.js @@ -1,5 +1,5 @@ import React from 'react'; -import styles from '@patternfly/patternfly-next/components/Breadcrumb/breadcrumb.css'; +import styles from '@patternfly/patternfly/components/Breadcrumb/breadcrumb.css'; import PropTypes from 'prop-types'; import { AngleRightIcon } from '@patternfly/react-icons'; import { css, getModifier } from '@patternfly/react-styles'; diff --git a/packages/patternfly-4/react-core/src/components/Button/Button.js b/packages/patternfly-4/react-core/src/components/Button/Button.js index 69bd4dbde00..1d08b840568 100644 --- a/packages/patternfly-4/react-core/src/components/Button/Button.js +++ b/packages/patternfly-4/react-core/src/components/Button/Button.js @@ -2,7 +2,7 @@ import React from 'react'; import { css, getModifier } from '@patternfly/react-styles'; import PropTypes from 'prop-types'; import { componentShape } from '../../internal/componentShape'; -import styles from '@patternfly/patternfly-next/components/Button/button.css'; +import styles from '@patternfly/patternfly/components/Button/button.css'; export const ButtonVariant = { primary: 'primary', diff --git a/packages/patternfly-4/react-core/src/components/Card/Card.js b/packages/patternfly-4/react-core/src/components/Card/Card.js index dc5d56ddc93..3b22d535644 100644 --- a/packages/patternfly-4/react-core/src/components/Card/Card.js +++ b/packages/patternfly-4/react-core/src/components/Card/Card.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { css } from '@patternfly/react-styles'; -import styles from '@patternfly/patternfly-next/components/Card/card.css'; +import styles from '@patternfly/patternfly/components/Card/card.css'; import { componentShape } from '../../internal/componentShape'; const propTypes = { diff --git a/packages/patternfly-4/react-core/src/components/Card/CardBody.js b/packages/patternfly-4/react-core/src/components/Card/CardBody.js index 480a5536df7..779b1edf183 100644 --- a/packages/patternfly-4/react-core/src/components/Card/CardBody.js +++ b/packages/patternfly-4/react-core/src/components/Card/CardBody.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { css } from '@patternfly/react-styles'; -import styles from '@patternfly/patternfly-next/components/Card/card.css'; +import styles from '@patternfly/patternfly/components/Card/card.css'; import { componentShape } from '../../internal/componentShape'; const propTypes = { diff --git a/packages/patternfly-4/react-core/src/components/Card/CardFooter.js b/packages/patternfly-4/react-core/src/components/Card/CardFooter.js index 6afefe6f17d..525c2f5c2f8 100644 --- a/packages/patternfly-4/react-core/src/components/Card/CardFooter.js +++ b/packages/patternfly-4/react-core/src/components/Card/CardFooter.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { css } from '@patternfly/react-styles'; -import styles from '@patternfly/patternfly-next/components/Card/card.css'; +import styles from '@patternfly/patternfly/components/Card/card.css'; import { componentShape } from '../../internal/componentShape'; const propTypes = { diff --git a/packages/patternfly-4/react-core/src/components/Card/CardHeader.js b/packages/patternfly-4/react-core/src/components/Card/CardHeader.js index 481e3484109..205da0006cf 100644 --- a/packages/patternfly-4/react-core/src/components/Card/CardHeader.js +++ b/packages/patternfly-4/react-core/src/components/Card/CardHeader.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { css } from '@patternfly/react-styles'; -import styles from '@patternfly/patternfly-next/components/Card/card.css'; +import styles from '@patternfly/patternfly/components/Card/card.css'; import { componentShape } from '../../internal/componentShape'; const propTypes = { diff --git a/packages/patternfly-4/react-core/src/components/Checkbox/Checkbox.js b/packages/patternfly-4/react-core/src/components/Checkbox/Checkbox.js index 562c7bcd9b0..66ce0249c67 100644 --- a/packages/patternfly-4/react-core/src/components/Checkbox/Checkbox.js +++ b/packages/patternfly-4/react-core/src/components/Checkbox/Checkbox.js @@ -1,5 +1,5 @@ import React from 'react'; -import styles from '@patternfly/patternfly-next/components/Check/check.css'; +import styles from '@patternfly/patternfly/components/Check/check.css'; import PropTypes from 'prop-types'; import { css, getModifier } from '@patternfly/react-styles'; diff --git a/packages/patternfly-4/react-core/src/components/Chip/Chip.js b/packages/patternfly-4/react-core/src/components/Chip/Chip.js index 8f037f26e66..7f119f7bb36 100644 --- a/packages/patternfly-4/react-core/src/components/Chip/Chip.js +++ b/packages/patternfly-4/react-core/src/components/Chip/Chip.js @@ -4,7 +4,7 @@ import PropTypes from 'prop-types'; import ChipButton from './ChipButton'; import { Tooltip, TooltipPosition } from '../Tooltip'; import { TimesCircleIcon } from '@patternfly/react-icons'; -import styles from '@patternfly/patternfly-next/components/Chip/chip.css'; +import styles from '@patternfly/patternfly/components/Chip/chip.css'; import GenerateId from '../../internal/GenerateId/GenerateId'; class Chip extends React.Component { span = React.createRef(); diff --git a/packages/patternfly-4/react-core/src/components/Chip/ChipButton.js b/packages/patternfly-4/react-core/src/components/Chip/ChipButton.js index 53371e362c3..13fe829f484 100644 --- a/packages/patternfly-4/react-core/src/components/Chip/ChipButton.js +++ b/packages/patternfly-4/react-core/src/components/Chip/ChipButton.js @@ -1,7 +1,7 @@ import React from 'react'; import { css } from '@patternfly/react-styles'; import PropTypes from 'prop-types'; -import styles from '@patternfly/patternfly-next/components/Chip/chip.css'; +import styles from '@patternfly/patternfly/components/Chip/chip.css'; import { Button } from '../Button'; const ChipButton = ({ ariaLabel, children, className, onClick, ...props }) => { diff --git a/packages/patternfly-4/react-core/src/components/DataList/DataList.js b/packages/patternfly-4/react-core/src/components/DataList/DataList.js index 7d530641d49..cff030fc43d 100644 --- a/packages/patternfly-4/react-core/src/components/DataList/DataList.js +++ b/packages/patternfly-4/react-core/src/components/DataList/DataList.js @@ -1,8 +1,8 @@ import React from 'react'; import { css } from '@patternfly/react-styles'; import PropTypes from 'prop-types'; -import styles from '@patternfly/patternfly-next/components/DataList/data-list.css'; -import boxShStyles from '@patternfly/patternfly-next//utilities/BoxShadow/box-shadow.css'; +import styles from '@patternfly/patternfly/components/DataList/data-list.css'; +import boxShStyles from '@patternfly/patternfly//utilities/BoxShadow/box-shadow.css'; const DataList = ({ children, className, 'aria-label': ariaLabel, ...props }) => (