From 948120e224b56bfbd8e618ff780c567354f62267 Mon Sep 17 00:00:00 2001
From: Yuwei Ba <i@xiaoba.me>
Date: Fri, 4 Dec 2015 14:19:06 +0800
Subject: [PATCH 1/3] update simple pagination style

---
 components/pagination/index.jsx | 34 ++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/components/pagination/index.jsx b/components/pagination/index.jsx
index 015de3bb89..122425a1f2 100644
--- a/components/pagination/index.jsx
+++ b/components/pagination/index.jsx
@@ -1,16 +1,47 @@
 import React from 'react';
 import Pagination from 'rc-pagination';
-import Select from 'rc-select';
+import Select from '../select';
 import zhCN from './locale/zh_CN';
 
 const prefixCls = 'ant-pagination';
 
+const MiniSelect = React.createClass({
+  render() {
+    return <Select size="small" {...this.props} />;
+  }
+});
+
+MiniSelect.Option = Select.Option;
+
 class AntPagination extends React.Component {
   render() {
     let className = this.props.className;
+
+    if (this.props.simple) {
+      // hijiking simple pagination
+      let newProps = {};
+      for (let key in this.props) {
+        if (this.props.hasOwnProperty(key)) {
+          newProps[key] = this.props[key];
+        }
+      }
+
+      delete newProps.simple;
+
+      className += ' mini';
+
+      return <Pagination selectComponentClass={MiniSelect}
+        selectPrefixCls="ant-select"
+        prefixCls={prefixCls}
+        showSizeChanger
+        showQuickJumper
+        {...newProps} className={className}/>;
+    }
+
     if (this.props.size === 'small') {
       className += ' mini';
     }
+
     return <Pagination selectComponentClass={Select}
                        selectPrefixCls="ant-select"
                        prefixCls={prefixCls}
@@ -20,6 +51,7 @@ class AntPagination extends React.Component {
 
 AntPagination.defaultProps = {
   locale: zhCN,
+  className: '',
 };
 
 export default AntPagination;

From 958285525513af911a94a00d2dc20e39e739e9fb Mon Sep 17 00:00:00 2001
From: Yuwei Ba <i@xiaoba.me>
Date: Fri, 4 Dec 2015 14:37:30 +0800
Subject: [PATCH 2/3] use object-assign

---
 components/pagination/index.jsx | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/components/pagination/index.jsx b/components/pagination/index.jsx
index 122425a1f2..1f9681fd24 100644
--- a/components/pagination/index.jsx
+++ b/components/pagination/index.jsx
@@ -1,3 +1,5 @@
+import assign from 'object-assign';
+
 import React from 'react';
 import Pagination from 'rc-pagination';
 import Select from '../select';
@@ -5,11 +7,11 @@ import zhCN from './locale/zh_CN';
 
 const prefixCls = 'ant-pagination';
 
-const MiniSelect = React.createClass({
+class MiniSelect extends React.Component {
   render() {
     return <Select size="small" {...this.props} />;
   }
-});
+}
 
 MiniSelect.Option = Select.Option;
 
@@ -19,13 +21,7 @@ class AntPagination extends React.Component {
 
     if (this.props.simple) {
       // hijiking simple pagination
-      let newProps = {};
-      for (let key in this.props) {
-        if (this.props.hasOwnProperty(key)) {
-          newProps[key] = this.props[key];
-        }
-      }
-
+      let newProps = assign({}, this.props);
       delete newProps.simple;
 
       className += ' mini';

From 36e234de97a2ce97c9187cb4c9e2f8734212f751 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sat, 5 Dec 2015 13:34:55 +0800
Subject: [PATCH 3/3] update small examples

---
 components/pagination/demo/mini.md |  8 +++++---
 components/pagination/index.jsx    | 28 ++++++----------------------
 style/components/select.less       |  2 +-
 3 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/components/pagination/demo/mini.md b/components/pagination/demo/mini.md
index 8b1b693a06..a0a9d1befb 100644
--- a/components/pagination/demo/mini.md
+++ b/components/pagination/demo/mini.md
@@ -9,7 +9,9 @@
 ````jsx
 import { Pagination } from 'antd';
 
-ReactDOM.render(
-  <Pagination size="small" defaultCurrent={2} total={50} />,
- document.getElementById('components-pagination-demo-mini'));
+ReactDOM.render(<div>
+  <Pagination size="small" total={50} />
+  <br />
+  <Pagination size="small" total={50} showSizeChanger showQuickJumper />
+</div>, document.getElementById('components-pagination-demo-mini'));
 ````
diff --git a/components/pagination/index.jsx b/components/pagination/index.jsx
index 1f9681fd24..048184ed63 100644
--- a/components/pagination/index.jsx
+++ b/components/pagination/index.jsx
@@ -1,12 +1,8 @@
-import assign from 'object-assign';
-
 import React from 'react';
 import Pagination from 'rc-pagination';
 import Select from '../select';
 import zhCN from './locale/zh_CN';
 
-const prefixCls = 'ant-pagination';
-
 class MiniSelect extends React.Component {
   render() {
     return <Select size="small" {...this.props} />;
@@ -18,36 +14,24 @@ MiniSelect.Option = Select.Option;
 class AntPagination extends React.Component {
   render() {
     let className = this.props.className;
-
-    if (this.props.simple) {
-      // hijiking simple pagination
-      let newProps = assign({}, this.props);
-      delete newProps.simple;
-
-      className += ' mini';
-
-      return <Pagination selectComponentClass={MiniSelect}
-        selectPrefixCls="ant-select"
-        prefixCls={prefixCls}
-        showSizeChanger
-        showQuickJumper
-        {...newProps} className={className}/>;
-    }
+    let selectComponentClass = Select;
 
     if (this.props.size === 'small') {
       className += ' mini';
+      selectComponentClass = MiniSelect;
     }
 
-    return <Pagination selectComponentClass={Select}
+    return <Pagination selectComponentClass={selectComponentClass}
                        selectPrefixCls="ant-select"
-                       prefixCls={prefixCls}
-      {...this.props} className={className}/>;
+                       {...this.props}
+                       className={className} />;
   }
 }
 
 AntPagination.defaultProps = {
   locale: zhCN,
   className: '',
+  prefixCls: 'ant-pagination',
 };
 
 export default AntPagination;
diff --git a/style/components/select.less b/style/components/select.less
index a239e9cb4c..48d49243db 100644
--- a/style/components/select.less
+++ b/style/components/select.less
@@ -105,7 +105,7 @@
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
-      padding-left: 10px;
+      padding-left: 8px;
       padding-right: 24px;
       line-height: 26px;
     }