Skip to content

Commit b00b655

Browse files
committed
Update Columns class names
1 parent 1e3e999 commit b00b655

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

packages/react-layouts/src/Columns/Columns.jsx

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
33
import classNames from 'classnames';
4-
// import './Columns.scss';
4+
import './Columns.scss';
55

66
const columnsPropTypes = {
77
children: PropTypes.node,
@@ -13,7 +13,7 @@ const columnsDefaultProps = {
1313
};
1414

1515
const Columns = ({ children, className }) => (
16-
<div className={classNames('columns', className)}>{children}</div>
16+
<div className={classNames('rc-columns', className)}>{children}</div>
1717
);
1818

1919
Columns.propTypes = columnsPropTypes;
@@ -31,7 +31,9 @@ const columnDefaultProps = {
3131
};
3232

3333
const Column = ({ children, className, fixed }) => (
34-
<div className={classNames('column', className, { fixed })}>{children}</div>
34+
<div className={classNames('rc-column', className, { fixed })}>
35+
{children}
36+
</div>
3537
);
3638

3739
Column.propTypes = columnPropTypes;

packages/react-layouts/src/Columns/Columns.scss

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
.columns {
1+
.rc-columns {
22
display: flex;
33
flex-direction: row;
44
}
55

6-
.column {
6+
.rc-column {
77
flex-grow: 1;
88
flex-shrink: 1;
99
flex-basis: auto;
1010
min-width: 0;
1111

12+
&:empty {
13+
display: none;
14+
}
15+
1216
&.fixed {
1317
flex-grow: 0;
1418
flex-shrink: 0;

0 commit comments

Comments
 (0)