Skip to content

Remove PF3 <Row>, <Col> components #2716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Sep 17, 2019
Merged

Remove PF3 <Row>, <Col> components #2716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions frontend/packages/metal3-plugin/src/components/host-detail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import * as React from 'react';
import * as _ from 'lodash';
import { connect } from 'react-redux';
import { Row, Col } from 'patternfly-react';
import {
referenceForModel,
K8sResourceKind,
Expand Down Expand Up @@ -94,8 +93,8 @@ const BaremetalHostDetails: React.FC<BaremetalHostDetailsProps> = ({
return (
<div className="co-m-pane__body">
<SectionHeading text="Baremetal Host Overview" />
<Row>
<Col sm={6} xs={12} id="name-description-column">
<div className="row">
<div className="col-xs-12 col-sm-6" id="name-description-column">
<dl>
<dt>Name</dt>
<dd>{getName(host)}</dd>
Expand Down Expand Up @@ -137,8 +136,8 @@ const BaremetalHostDetails: React.FC<BaremetalHostDetailsProps> = ({
<Timestamp timestamp={creationTimestamp} />
</dd>
</dl>
</Col>
<Col sm={6} xs={12}>
</div>
<div className="col-xs-12 col-sm-6">
<dl>
<dt>Status</dt>
<dd>
Expand Down Expand Up @@ -194,8 +193,8 @@ const BaremetalHostDetails: React.FC<BaremetalHostDetailsProps> = ({
</>
)}
</dl>
</Col>
</Row>
</div>
</div>
</div>
);
};
Expand Down
19 changes: 9 additions & 10 deletions frontend/public/components/dashboard/utilization-card/utilization-body.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as React from 'react';
import { Row, Col } from 'patternfly-react';
import { ChartAxis } from '@patternfly/react-charts';
import { global_breakpoint_sm as breakpointSM } from '@patternfly/react-tokens';

Expand Down Expand Up @@ -36,18 +35,18 @@ export const UtilizationBody: React.FC<UtilizationBodyProps> = ({ timestamps, ch

const axis = width < parseInt(breakpointSM.value, 10) ?
timestamps.length === 0 ? null : (
<Row className="co-utilization-card__item">
<Col className="co-utilization-card__axis">
<div className="row co-utilization-card__item">
<div className="co-utilization-card__axis">
<UtilizationAxis timestamps={timestamps} />
</Col>
</Row>
</div>
</div>
) : (
<Row className="co-utilization-card__item">
<Col lg={5} md={5} sm={5} xs={5} />
<Col lg={7} md={7} sm={7} xs={7} className="co-utilization-card__axis">
<div className="row co-utilization-card__item">
<div className="col-xs-5 col-sm-5 col-md-5 col-lg-5"></div>
<div className="col-xs-7 col-sm-7 col-md-7 col-lg-7 co-utilization-card__axis">
{timestamps.length > 0 && <UtilizationAxis timestamps={timestamps} />}
</Col>
</Row>
</div>
</div>
);
return (
<div
Expand Down
41 changes: 17 additions & 24 deletions frontend/public/components/dashboard/utilization-card/utilization-item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as React from 'react';
import { Col, Row } from 'patternfly-react';
import { global_breakpoint_sm as breakpointSM } from '@patternfly/react-tokens';

import { useRefWidth, Humanize } from '../../utils';
Expand Down Expand Up @@ -31,36 +30,30 @@ export const UtilizationItem: React.FC<UtilizationItemProps> = React.memo(

const rows = width < parseInt(breakpointSM.value, 10) ? (
<div className="co-utilization-card__item">
<Row className="co-utilization-card__item-row--narrow co-utilization-card__item-title-row--narrow">
<Col lg={6} md={6} sm={6} xs={6} className="co-utilization-card__item-title co-dashboard-text--small">
<div className="row co-utilization-card__item-row--narrow co-utilization-card__item-title-row--narrow">
<div className="col-xs-6 col-sm-6 col-md-6 col-lg-6 co-utilization-card__item-title co-dashboard-text--small">
{title}
</Col>
<Col className="co-utilization-card__item-current co-dashboard-text--small" lg={6} md={6} sm={6} xs={6}>
</div>
<div className="col-xs-6 col-sm-6 col-md-6 col-lg-6 co-utilization-card__item-current co-dashboard-text--small">
{current}
</Col>
</Row>
<Row className="co-utilization-card__item-row--narrow">
<Col className="co-utilization-card__item-chart co-utilization-card__item-chart--narrow">{chart}</Col>
</Row>
</div>
</div>
<div className="row co-utilization-card__item-row--narrow">
<div className="co-utilization-card__item-chart co-utilization-card__item-chart--narrow">{chart}</div>
</div>
</div>
) : (
<Row className="co-utilization-card__item co-utilization-card__item--wide">
<Col className="co-utilization-card__item-title" lg={3} md={3} sm={3} xs={3}>
<div className="row co-utilization-card__item co-utilization-card__item--wide">
<div className="col-xs-3 col-sm-3 col-md-3 col-lg-3 co-utilization-card__item-title">
{title}
</Col>
<Col className="co-utilization-card__item-current" lg={2} md={2} sm={2} xs={2}>
</div>
<div className="col-xs-2 col-sm-2 col-md-2 col-lg-2 co-utilization-card__item-current">
{current}
</Col>
<Col
className="co-utilization-card__item-chart co-utilization-card__item-chart--wide"
lg={7}
md={7}
sm={7}
xs={7}
>
</div>
<div className="col-xs-7 col-sm-7 col-md-7 col-lg-7 co-utilization-card__item-chart co-utilization-card__item-chart--wide">
{chart}
</Col>
</Row>
</div>
</div>
);

return <div ref={containerRef}>{rows}</div>;
Expand Down