Skip to content

Commit

Permalink
Merge pull request #92 from gthomas-appfolio/updatePaginator
Browse files Browse the repository at this point in the history
gt - Update Paginator
  • Loading branch information
gthomas-appfolio authored Dec 23, 2016
2 parents b359ab4 + 634cbca commit d275dac
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 8 deletions.
5 changes: 1 addition & 4 deletions src/components/Paginator.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import State from './Paginator/State';
import Summary from './Paginator/Summary';
import { Col, Icon, Pagination, Row } from '../';

import styles from './Paginator.scss';

const DEFAULT_PER_PAGE = 20;

/**
Expand Down Expand Up @@ -68,9 +66,8 @@ export default class Paginator extends Component {
}
}

// TODO Summary isn't same Pagination font, apm-bs does not style it but shouldn't set here either
return (
<Row className={styles.paginator}>
<Row>
<hr />
<Col sm={{ size: 7, push: 5 }} className="text-xs-center text-sm-right">
<Pagination size={size} className="my-0">
Expand Down
1 change: 0 additions & 1 deletion src/components/Paginator.scss

This file was deleted.

1 change: 0 additions & 1 deletion src/components/Paginator/ShortcutLink.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, { Component } from 'react';
import { PaginationItem, PaginationLink } from '../../';
import styles from '../Paginator.scss';

/**
* A clickable link to the first/previous/next/last page in the pagination bar
Expand Down
2 changes: 0 additions & 2 deletions src/components/Paginator/Summary.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import React, { Component } from 'react';

import styles from '../Paginator.scss';

/**
* A text summary of the current pagination state
*/
Expand Down
2 changes: 2 additions & 0 deletions stories/Paginator.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import { Paginator } from '../src';

// TODO this wrapper hides the usage example in react-storybook:
class Wrapper extends Component {
displayName = 'Paginator';

constructor() {
super();
this.state = { currentPage: 1 };
Expand Down

0 comments on commit d275dac

Please sign in to comment.