Skip to content

Commit

Permalink
Merge 5cdacc0 into b5039ad
Browse files Browse the repository at this point in the history
  • Loading branch information
@ibolton336
ibolton336 committed Dec 20, 2018
2 parents b5039ad + 5cdacc0 commit f66c8c3
Show file tree
Hide file tree
Showing 27 changed files with 34 additions and 154 deletions.
4 changes: 2 additions & 2 deletions packages/patternfly-4/react-charts/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
"victory": "^30.1.0"
},
"devDependencies": {
"@patternfly/patternfly-next": "1.0.105",
"@patternfly/patternfly-next": "1.0.109",
"css": "^2.2.3",
"fs-extra": "^6.0.1",
"glob": "^7.1.2",
"npmlog": "^4.1.2"
}
}
}
4 changes: 2 additions & 2 deletions packages/patternfly-4/react-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@babel/preset-typescript": "^7.0.0",
"@patternfly/patternfly-next": "1.0.105",
"@patternfly/patternfly-next": "1.0.109",
"@patternfly/react-styles": "^2.3.0",
"@types/enzyme": "^3.1.15",
"@types/jest": "^23.3.10",
Expand All @@ -83,4 +83,4 @@
"ts-jest": "^23.10.5",
"typescript": "^3.1.5"
}
}
}
8 changes: 0 additions & 8 deletions packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxLogo.d.ts
View file

This file was deleted.

28 changes: 0 additions & 28 deletions packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxLogo.js
View file

This file was deleted.

8 changes: 0 additions & 8 deletions packages/patternfly-4/react-core/src/components/AboutModal/AboutModalBoxLogo.test.js
View file

This file was deleted.

2 changes: 0 additions & 2 deletions packages/patternfly-4/react-core/src/components/AboutModal/AboutModalContainer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
import AboutModalBoxContent from './AboutModalBoxContent';
import AboutModalBoxHeader from './AboutModalBoxHeader';
import AboutModalBoxHero from './AboutModalBoxHero';
import AboutModalBoxLogo from './AboutModalBoxLogo';
import AboutModalBoxBrand from './AboutModalBoxBrand';
import AboutModalBoxCloseButton from './AboutModalBoxCloseButton';
import AboutModalBox from './AboutModalBox';
Expand Down Expand Up @@ -79,7 +78,6 @@ const ModalContent = ({
{children}
</AboutModalBoxContent>
<AboutModalBoxHero src={heroImageSrc} alt={heroImageAlt} />
<AboutModalBoxLogo src={logoImageSrc} alt={logoImageAlt} />
</AboutModalBox>
</Bullseye>
</Backdrop>
Expand Down
4 changes: 2 additions & 2 deletions ...atternfly-4/react-core/src/components/AboutModal/__snapshots__/AboutModalBox.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ exports[`AboutModalBox Test 1`] = `
display: grid;
z-index: 600;
grid-template-rows: max-content max-content auto max-content;
grid-template-areas: "brand close" "header header" "content content" "logo logo";
grid-template-areas: "brand close" "header header" "content content";
overflow-x: hidden;
overflow-y: auto;
background-color: #030303;
box-shadow: 0 0 100px 0 rgba(255,255,255,0.4);
box-shadow: 0 0 100px 0 rgba(255,255,255,0.05);
}
<div
Expand Down
30 changes: 0 additions & 30 deletions ...rnfly-4/react-core/src/components/AboutModal/__snapshots__/AboutModalBoxLogo.test.js.snap
View file

This file was deleted.

5 changes: 0 additions & 5 deletions ...fly-4/react-core/src/components/AboutModal/__snapshots__/AboutModalContainer.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ exports[`About Modal Container Test isOpen 1`] = `
className=""
src="heroImg..."
/>
<AboutModalBoxHero
alt="AboutModal Logo"
className=""
src="logoImg..."
/>
</AboutModalBox>
</Bullseye>
</Backdrop>
Expand Down
2 changes: 1 addition & 1 deletion packages/patternfly-4/react-core/src/components/Backdrop/__snapshots__/Backdrop.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ exports[`Backdrop Test 1`] = `
z-index: 600;
width: 100%;
height: 100%;
background-color: rgba(3, 3, 3, 0.32);
background-color: rgba(3, 3, 3, 0.62);
}
<div
Expand Down
3 changes: 0 additions & 3 deletions packages/patternfly-4/react-core/src/components/BackgroundImage/BackgroundImage.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ import { Omit, OneOf } from '../../typeUtils';

export const BackgroundImageSrc: {
lg: 'lg';
md: 'md';
md2x: 'md2x';
sm: 'sm';
sm2x: 'sm2x';
xl: 'xl';
xs: 'xs';
xs2x: 'xs2x';
filter: 'filter';
Expand Down
15 changes: 3 additions & 12 deletions packages/patternfly-4/react-core/src/components/BackgroundImage/BackgroundImage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,17 @@ import {

export const BackgroundImageSrc = {
lg: 'lg',
md: 'md',
md2x: 'md2x',
sm: 'sm',
sm2x: 'sm2x',
xl: 'xl',
xs: 'xs',
xs2x: 'xs2x',
filter: 'filter'
};

const variableMap = {
[BackgroundImageSrc.lg]: c_background_image_BackgroundImage_lg && c_background_image_BackgroundImage_lg.name,
[BackgroundImageSrc.md]: c_background_image_BackgroundImage_md && c_background_image_BackgroundImage_md.name,
[BackgroundImageSrc.md2x]: c_background_image_BackgroundImage_md_2x && c_background_image_BackgroundImage_md_2x.name,
[BackgroundImageSrc.sm]: c_background_image_BackgroundImage_sm && c_background_image_BackgroundImage_sm.name,
[BackgroundImageSrc.sm2x]: c_background_image_BackgroundImage_sm_2x && c_background_image_BackgroundImage_sm_2x.name,
[BackgroundImageSrc.xl]: c_background_image_BackgroundImage_xl && c_background_image_BackgroundImage_xl.name,
[BackgroundImageSrc.xs]: c_background_image_BackgroundImage_xs && c_background_image_BackgroundImage_xs.name,
[BackgroundImageSrc.xs2x]: c_background_image_BackgroundImage_xs_2x && c_background_image_BackgroundImage_xs_2x.name,
[BackgroundImageSrc.filter]: c_background_image_Filter && c_background_image_Filter.name
Expand All @@ -49,11 +43,8 @@ export const propTypes = {
PropTypes.string,
PropTypes.shape({
lg: PropTypes.string,
md: PropTypes.string,
md2x: PropTypes.string,
sm: PropTypes.string,
sm2x: PropTypes.string,
xl: PropTypes.string,
xs: PropTypes.string,
xs2x: PropTypes.string,
filter: PropTypes.string
Expand Down Expand Up @@ -81,9 +72,9 @@ const BackgroundImage = ({ className, src, ...props }) => {
const bgStyles = StyleSheet.create({
bgOverrides: `&.pf-c-background-image {
${Object.keys(variableOverrides).reduce(
(prev, size) => `${prev.length ? prev : ''}${variableMap[size]}: url('${variableOverrides[size]}');`,
{}
)}
(prev, size) => `${prev.length ? prev : ''}${variableMap[size]}: url('${variableOverrides[size]}');`,
{}
)}
}`
});

Expand Down
5 changes: 1 addition & 4 deletions packages/patternfly-4/react-core/src/components/BackgroundImage/BackgroundImage.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ import { shallow } from 'enzyme';

const images = {
[BackgroundImageSrc.lg]: '/assets/images/pfbg_1200.jpg',
[BackgroundImageSrc.md]: '/assets/images/pfbg_992.jpg',
[BackgroundImageSrc.md2x]: '/assets/images/pfbg_992@2x.jpg',
[BackgroundImageSrc.sm]: '/assets/images/pfbg_768.jpg',
[BackgroundImageSrc.sm2x]: '/assets/images/pfbg_768@2x.jpg',
[BackgroundImageSrc.xl]: '/assets/images/pfbg_2000.jpg',
[BackgroundImageSrc.xs]: '/assets/images/pfbg_576.jpg',
[BackgroundImageSrc.xs2x]: '/assets/images/pfbg_576@2x.jpg',
[BackgroundImageSrc.filter]: '/assets/images/background-filter.svg'
Expand All @@ -22,6 +19,6 @@ Object.values([true, false]).forEach(isRead => {
});

test('allows passing in a single string as the image src', () => {
const view = shallow(<BackgroundImage src={images.xl} />);
const view = shallow(<BackgroundImage src={images.lg} />);
expect(view).toMatchSnapshot();
});
12 changes: 6 additions & 6 deletions ...ly-4/react-core/src/components/BackgroundImage/__snapshots__/BackgroundImage.test.js.snap
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`BackgroundImage 1`] = `
.pf-c-background-image.css-wv98h3 {
.pf-c-background-image.css-1mxwfbc {
display: block;
}
<div
className="pf-c-background-image css-wv98h3"
className="pf-c-background-image css-1mxwfbc"
/>
`;

exports[`BackgroundImage 2`] = `
.pf-c-background-image.css-wv98h3 {
.pf-c-background-image.css-1mxwfbc {
display: block;
}
<div
className="pf-c-background-image css-wv98h3"
className="pf-c-background-image css-1mxwfbc"
/>
`;

exports[`allows passing in a single string as the image src 1`] = `
.pf-c-background-image.css-f7zm90 {
.pf-c-background-image.css-i3a8u7 {
display: block;
}
<div
className="pf-c-background-image css-f7zm90"
className="pf-c-background-image css-i3a8u7"
/>
`;
3 changes: 0 additions & 3 deletions .../patternfly-4/react-core/src/components/BackgroundImage/examples/SimpleBackgroundImage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@ import { BackgroundImage, BackgroundImageSrc } from '@patternfly/react-core';
*/
const images = {
[BackgroundImageSrc.lg]: '/assets/images/pfbg_1200.jpg',
[BackgroundImageSrc.md]: '/assets/images/pfbg_992.jpg',
[BackgroundImageSrc.md2x]: '/assets/images/pfbg_992@2x.jpg',
[BackgroundImageSrc.sm]: '/assets/images/pfbg_768.jpg',
[BackgroundImageSrc.sm2x]: '/assets/images/pfbg_768@2x.jpg',
[BackgroundImageSrc.xl]: '/assets/images/pfbg_2000.jpg',
[BackgroundImageSrc.xs]: '/assets/images/pfbg_576.jpg',
[BackgroundImageSrc.xs2x]: '/assets/images/pfbg_576@2x.jpg',
[BackgroundImageSrc.filter]: '/assets/images/background-filter.svg#image_overlay'
Expand Down
2 changes: 1 addition & 1 deletion ...s/patternfly-4/react-core/src/components/EmptyState/__snapshots__/EmptyState.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`EmptyState Main 1`] = `
.pf-c-empty-state {
display: block;
max-width: 25rem;
max-width: 37.5rem;
padding: 2rem;
text-align: center;
}
Expand Down
3 changes: 0 additions & 3 deletions packages/patternfly-4/react-core/src/components/LoginPage/examples/SimpleLoginPage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,8 @@ import {

const images = {
[BackgroundImageSrc.lg]: '/assets/images/pfbg_1200.jpg',
[BackgroundImageSrc.md]: '/assets/images/pfbg_992.jpg',
[BackgroundImageSrc.md2x]: '/assets/images/pfbg_992@2x.jpg',
[BackgroundImageSrc.sm]: '/assets/images/pfbg_768.jpg',
[BackgroundImageSrc.sm2x]: '/assets/images/pfbg_768@2x.jpg',
[BackgroundImageSrc.xl]: '/assets/images/pfbg_2000.jpg',
[BackgroundImageSrc.xs]: '/assets/images/pfbg_576.jpg',
[BackgroundImageSrc.xs2x]: '/assets/images/pfbg_576@2x.jpg',
[BackgroundImageSrc.filter]: '/assets/images/background-filter.svg#image_overlay'
Expand Down
3 changes: 0 additions & 3 deletions packages/patternfly-4/react-core/src/demos/PageLayout/examples/PageLayoutDefaultNav.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,8 @@ class PageLayoutDefaultNav extends React.Component {
);
const bgImages = {
[BackgroundImageSrc.lg]: '/assets/images/pfbg_1200.jpg',
[BackgroundImageSrc.md]: '/assets/images/pfbg_992.jpg',
[BackgroundImageSrc.md2x]: '/assets/images/pfbg_992@2x.jpg',
[BackgroundImageSrc.sm]: '/assets/images/pfbg_768.jpg',
[BackgroundImageSrc.sm2x]: '/assets/images/pfbg_768@2x.jpg',
[BackgroundImageSrc.xl]: '/assets/images/pfbg_2000.jpg',
[BackgroundImageSrc.xs]: '/assets/images/pfbg_576.jpg',
[BackgroundImageSrc.xs2x]: '/assets/images/pfbg_576@2x.jpg',
[BackgroundImageSrc.filter]: '/assets/images/background-filter.svg#image_overlay'
Expand Down
3 changes: 0 additions & 3 deletions packages/patternfly-4/react-core/src/demos/PageLayout/examples/PageLayoutExpandableNav.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,8 @@ class PageLayoutExpandableNav extends React.Component {
);
const bgImages = {
[BackgroundImageSrc.lg]: '/assets/images/pfbg_1200.jpg',
[BackgroundImageSrc.md]: '/assets/images/pfbg_992.jpg',
[BackgroundImageSrc.md2x]: '/assets/images/pfbg_992@2x.jpg',
[BackgroundImageSrc.sm]: '/assets/images/pfbg_768.jpg',
[BackgroundImageSrc.sm2x]: '/assets/images/pfbg_768@2x.jpg',
[BackgroundImageSrc.xl]: '/assets/images/pfbg_2000.jpg',
[BackgroundImageSrc.xs]: '/assets/images/pfbg_576.jpg',
[BackgroundImageSrc.xs2x]: '/assets/images/pfbg_576@2x.jpg',
[BackgroundImageSrc.filter]: '/assets/images/background-filter.svg#image_overlay'
Expand Down
3 changes: 0 additions & 3 deletions packages/patternfly-4/react-core/src/demos/PageLayout/examples/PageLayoutGroupsNav.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,8 @@ class PageLayoutGroupsNav extends React.Component {
);
const bgImages = {
[BackgroundImageSrc.lg]: '/assets/images/pfbg_1200.jpg',
[BackgroundImageSrc.md]: '/assets/images/pfbg_992.jpg',
[BackgroundImageSrc.md2x]: '/assets/images/pfbg_992@2x.jpg',
[BackgroundImageSrc.sm]: '/assets/images/pfbg_768.jpg',
[BackgroundImageSrc.sm2x]: '/assets/images/pfbg_768@2x.jpg',
[BackgroundImageSrc.xl]: '/assets/images/pfbg_2000.jpg',
[BackgroundImageSrc.xs]: '/assets/images/pfbg_576.jpg',
[BackgroundImageSrc.xs2x]: '/assets/images/pfbg_576@2x.jpg',
[BackgroundImageSrc.filter]: '/assets/images/background-filter.svg#image_overlay'
Expand Down
3 changes: 0 additions & 3 deletions packages/patternfly-4/react-core/src/demos/PageLayout/examples/PageLayoutHorizontalNav.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,8 @@ class PageLayoutHorizontalNav extends React.Component {
);
const bgImages = {
[BackgroundImageSrc.lg]: '/assets/images/pfbg_1200.jpg',
[BackgroundImageSrc.md]: '/assets/images/pfbg_992.jpg',
[BackgroundImageSrc.md2x]: '/assets/images/pfbg_992@2x.jpg',
[BackgroundImageSrc.sm]: '/assets/images/pfbg_768.jpg',
[BackgroundImageSrc.sm2x]: '/assets/images/pfbg_768@2x.jpg',
[BackgroundImageSrc.xl]: '/assets/images/pfbg_2000.jpg',
[BackgroundImageSrc.xs]: '/assets/images/pfbg_576.jpg',
[BackgroundImageSrc.xs2x]: '/assets/images/pfbg_576@2x.jpg',
[BackgroundImageSrc.filter]: '/assets/images/background-filter.svg#image_overlay'
Expand Down
3 changes: 0 additions & 3 deletions packages/patternfly-4/react-core/src/demos/PageLayout/examples/PageLayoutSimpleNav.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,8 @@ class PageLayoutSimpleNav extends React.Component {
);
const bgImages = {
[BackgroundImageSrc.lg]: '/assets/images/pfbg_1200.jpg',
[BackgroundImageSrc.md]: '/assets/images/pfbg_992.jpg',
[BackgroundImageSrc.md2x]: '/assets/images/pfbg_992@2x.jpg',
[BackgroundImageSrc.sm]: '/assets/images/pfbg_768.jpg',
[BackgroundImageSrc.sm2x]: '/assets/images/pfbg_768@2x.jpg',
[BackgroundImageSrc.xl]: '/assets/images/pfbg_2000.jpg',
[BackgroundImageSrc.xs]: '/assets/images/pfbg_576.jpg',
[BackgroundImageSrc.xs2x]: '/assets/images/pfbg_576@2x.jpg',
[BackgroundImageSrc.filter]: '/assets/images/background-filter.svg#image_overlay'
Expand Down
4 changes: 2 additions & 2 deletions packages/patternfly-4/react-styled-system/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"react": "^16.4.0"
},
"devDependencies": {
"@patternfly/patternfly-next": "1.0.105",
"@patternfly/patternfly-next": "1.0.109",
"css": "^2.2.3",
"fs-extra": "^6.0.1",
"glob": "^7.1.2",
Expand All @@ -52,4 +52,4 @@
"optionalDependencies": {
"@types/styled-system": "^3.0.7"
}
}
}
Loading

0 comments on commit f66c8c3

Please sign in to comment.