Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .public/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>

<head>
<link rel="stylesheet" href="https://unpkg.com/@patternfly/patternfly-next@1.0.126/patternfly.min.css" type="text/css" />
<link rel="stylesheet" href="https://unpkg.com/@patternfly/patternfly@1.0.126/patternfly.min.css" type="text/css" />
</head>

<body>
Expand Down
7 changes: 3 additions & 4 deletions packages/patternfly-4/react-charts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,9 @@ import '@patternfly/react-core/dist/styles/base.css';
import React from 'react';
import { Area } from '@patternfly/react-charts';

export default <Area/>;

<Area data={[{ x: 1, y: 1 }, { x: 2, y: 2 }]}/>
export default <Area />;

<Area data={[{ x: 1, y: 1 }, { x: 2, y: 2 }]} />;
```

All css related to each component is provided alongside it. There is no component level CSS to import.
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion packages/patternfly-4/react-charts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/patternfly-4/react-core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion packages/patternfly-4/react-core/build/copyStyles.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
2 changes: 1 addition & 1 deletion packages/patternfly-4/react-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
Original file line number Diff line number Diff line change
@@ -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. */
Expand Down
Original file line number Diff line number Diff line change
@@ -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 */
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -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 */
Expand Down
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Loading