style: optimize pagination simple disabled

ant-design · Aug 4, 2020 · 81e21c1 · 81e21c1
1 parent 87555eb
commit 81e21c1
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/components/pagination/demo/mini.md b/components/pagination/demo/mini.md
@@ -25,6 +25,14 @@ ReactDOM.render(
     <Pagination size="small" total={50} />
     <Pagination size="small" total={50} showSizeChanger showQuickJumper />
     <Pagination size="small" total={50} showTotal={showTotal} />
+    <Pagination
+      size="small"
+      total={50}
+      disabled
+      showTotal={showTotal}
+      showSizeChanger
+      showQuickJumper
+    />
   </>,
   mountNode,
 );

diff --git a/components/pagination/demo/simple.md b/components/pagination/demo/simple.md
@@ -16,5 +16,12 @@ Simple mode.
 ```jsx
 import { Pagination } from 'antd';
 
-ReactDOM.render(<Pagination simple defaultCurrent={2} total={50} />, mountNode);
+ReactDOM.render(
+  <>
+    <Pagination simple defaultCurrent={2} total={50} />
+    <br />
+    <Pagination disabled simple defaultCurrent={2} total={50} />
+  </>,
+  mountNode,
+);
 ```
diff --git a/components/pagination/style/index.less b/components/pagination/style/index.less
@@ -282,6 +282,13 @@
       &:hover {
         border-color: @primary-color;
       }
+
+      &[disabled] {
+        color: @disabled-color;
+        background: @disabled-bg;
+        border-color: @border-color-base;
+        cursor: not-allowed;
+      }
     }
   }
 
@@ -377,6 +384,9 @@
       background: @disabled-bg;
       border-color: @border-color-base;
       cursor: not-allowed;
+      .@{pagination-prefix-cls}-simple& {
+        background: transparent;
+      }
     }
 
     .@{pagination-prefix-cls}-item-link-icon {
@@ -386,6 +396,10 @@
     .@{pagination-prefix-cls}-item-ellipsis {
       opacity: 1;
     }
+
+    .@{pagination-prefix-cls}-simple-pager {
+      color: @disabled-color;
+    }
   }
 }
 

diff --git a/package.json b/package.json
@@ -128,7 +128,7 @@
     "rc-mentions": "~1.4.0",
     "rc-menu": "~8.5.0",
     "rc-notification": "~4.4.0",
-    "rc-pagination": "~2.4.1",
+    "rc-pagination": "~2.4.5",
     "rc-picker": "~1.15.1",
     "rc-progress": "~3.0.0",
     "rc-rate": "~2.8.2",