Merge pull request #87 from gthomas-appfolio/componentTweaks

gt - Tweak Alert and Paginator
appfolio · Dec 15, 2016 · 54d3b81 · 54d3b81
2 parents 4ac8436 + 4df62d1
commit 54d3b81
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/components/Alert.js b/src/components/Alert.js
@@ -42,10 +42,10 @@ export default class AlertComponent extends React.Component {
   }
 
   render() {
-    const { color, children, dismissible, icon } = this.props;
+    const { color, children, className, dismissible, icon } = this.props;
 
     return (
-      <Alert color={color} isOpen={this.state.visible} toggle={dismissible ? this.toggle : null}>
+      <Alert color={color} isOpen={this.state.visible} toggle={dismissible ? this.toggle : null} className={className || ''}>
         {icon ? <Icon name={ICON_MAP[color]} className="float-left mr-2" style={{ lineHeight: 'inherit' }} /> : null}
         {icon ? <div style={{ overflow: 'hidden' }}>{children}</div> : children}
       </Alert>

diff --git a/src/components/Paginator.js b/src/components/Paginator.js
@@ -23,8 +23,7 @@ export default class Paginator extends Component {
   }
 
   static defaultProps = {
-    perPage: DEFAULT_PER_PAGE,
-    size: 'lg'
+    perPage: DEFAULT_PER_PAGE
   };
 
   render() {