Skip to content
This repository was archived by the owner on Oct 23, 2024. It is now read-only.

Commit 5fe22bb

Browse files
author
Kenny Tran
committed
Merge pull request #36 from mesosphere/cleanup/DCOS-3190-consistent-default-classes
Do default classes the same way
2 parents 3a09bd7 + 36e7289 commit 5fe22bb

File tree

4 files changed

+13
-40
lines changed

4 files changed

+13
-40
lines changed

src/List/List.js

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import React, {PropTypes} from 'react/addons';
2-
import classNames from 'classnames';
32

43
import ListItem from './ListItem';
54

@@ -40,18 +39,10 @@ export default class List extends React.Component {
4039
}
4140

4241
render() {
43-
let defaultClasses = [
44-
'list'
45-
];
46-
47-
let classes = classNames(
48-
defaultClasses.concat(this.props.className.split(' '))
49-
);
50-
5142
let Tag = this.props.tag;
5243

5344
return (
54-
<Tag {...this.props} className={classes}>
45+
<Tag {...this.props} className={this.props.className}>
5546
{this.getListItems(this.props.items)}
5647
</Tag>
5748
);
@@ -63,15 +54,19 @@ List.defaultProps = {
6354
attributes: {
6455
className: ''
6556
},
66-
className: '',
67-
tag: 'ul'
57+
tag: 'ul',
58+
59+
// Default classes.
60+
className: 'list'
6861
};
6962

7063
List.propTypes = {
7164
attributes: PropTypes.object,
72-
className: PropTypes.string,
7365
items: PropTypes.array.isRequired,
7466
tag: PropTypes.string,
7567
transition: PropTypes.bool,
76-
transitionName: PropTypes.string
68+
transitionName: PropTypes.string,
69+
70+
// Classes.
71+
className: PropTypes.string
7772
};

src/Modal/DefaultModalClasses.js

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/Modal/ModalContents.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ ModalContents.defaultProps = {
247247
subHeader: null,
248248
titleText: '',
249249

250-
// Classes
250+
// Default classes.
251251
backdropClass: 'fade in modal-backdrop',
252252
bodyClass: 'modal-content',
253253
closeButtonClass: 'modal-close',
@@ -276,7 +276,7 @@ ModalContents.propTypes = {
276276
subHeader: PropTypes.node,
277277
titleText: PropTypes.string,
278278

279-
// Classes
279+
// Classes.
280280
backdropClass: PropTypes.string,
281281
bodyClass: PropTypes.string,
282282
closeButtonClass: PropTypes.string,

src/SidePanel/SidePanelContents.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ SidePanelContents.defaultProps = {
138138
onClose: () => {},
139139
open: false,
140140

141-
// Classes
141+
// Default classes.
142142
backdropClass: 'side-panel-backdrop',
143143
bodyClass: 'side-panel-content container container-scrollable container-fluid container-fluid-narrow',
144144
containerClass: 'side-panel-container',
@@ -154,7 +154,7 @@ SidePanelContents.propTypes = {
154154
onClose: PropTypes.func,
155155
open: PropTypes.bool,
156156

157-
// Classes
157+
// Classes.
158158
backdropClass: PropTypes.string,
159159
bodyClass: PropTypes.string,
160160
containerClass: PropTypes.string,

0 commit comments

Comments
 (0)