From 3fec4463564d0f833862e8a8ef712b516b8cd6fb Mon Sep 17 00:00:00 2001 From: Yuwei Ba Date: Fri, 17 Jul 2015 16:24:00 +0800 Subject: [PATCH 1/4] Add missing dep. --- package.json | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 07838ec1df..f8b411202f 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,9 @@ "framework", "frontend" ], - "contributors": ["ant"], + "contributors": [ + "ant" + ], "repository": { "type": "git", "url": "https://github.com/ant-design/ant-design" @@ -24,13 +26,16 @@ "url": "https://github.com/ant-design/ant-design/issues" }, "main": "lib/index", - "files": ["lib"], + "files": [ + "lib" + ], "license": "MIT", "dependencies": { "gregorian-calendar": "~3.0.0", "gregorian-calendar-format": "~3.0.1", "object-assign": "~3.0.0", "rc-calendar": "~3.10.0", + "rc-checkbox": "~1.0.6", "rc-collapse": "~1.2.2", "rc-dialog": "~4.4.0", "rc-dropdown": "~1.1.1", @@ -39,15 +44,14 @@ "rc-notification": "~1.0.1", "rc-pagination": "^1.0.0", "rc-progress": "~1.0.0", + "rc-radio": "~2.0.0", "rc-select": "~4.4.0", "rc-slider": "~1.2.6", "rc-steps": "~1.1.4", "rc-switch": "~1.2.0", "rc-table": "~3.1.0", "rc-tabs": "~5.2.0", - "rc-tooltip": "~2.4.0", - "rc-checkbox":"~1.0.0", - "rc-radio":"~2.0.0" + "rc-tooltip": "~2.4.0" }, "devDependencies": { "css-animation": "~1.0.3", From 46f00868d19dcb0f7b3074bf109eb57d95dd38ae Mon Sep 17 00:00:00 2001 From: Yuwei Ba Date: Fri, 17 Jul 2015 16:24:09 +0800 Subject: [PATCH 2/4] Use anticon. --- style/components/pagination.less | 41 +++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/style/components/pagination.less b/style/components/pagination.less index 19c4991c6c..f0c3f10800 100644 --- a/style/components/pagination.less +++ b/style/components/pagination.less @@ -53,6 +53,7 @@ } &-jump-prev, &-jump-next { + &:after { content: "•••"; display: block; @@ -73,7 +74,9 @@ &-jump-prev { &:hover { &:after { - content: "‹‹"; + font-family: "anticon"; + content: "\e604"; + transform: rotate(180deg); } } } @@ -81,7 +84,8 @@ &-jump-next { &:hover { &:after { - content: "››"; + font-family: "anticon"; + content: "\e604"; } } } @@ -106,14 +110,19 @@ &-prev, &-next { border: 1px solid #d9d9d9; + font-size: 18px; a { font-size: 16px; color: #666; &:after { display: block; - margin-top: -2px; + height: 28px; + line-height: 28px; + font-size: 10px; + font-family: "anticon"; } + } &:hover { @@ -136,6 +145,25 @@ } } + &-prev { + a { + &:after { + content: "\e611"; + display: block; + transform: rotate(180deg); + } + } + } + + &-next { + a { + &:after { + content: "\e611"; + display: block; + } + } + } + &-disabled { &:hover { border-color: #d9d9d9; @@ -225,6 +253,13 @@ height: 20px; line-height: 20px; border: none; + + a { + &:after { + height: 20px; + line-height: 20px; + } + } } &.mini &-jump-prev, &.mini &-jump-next { From 2a53e9f7454f62bcd2a19518c0521a0bff7a4170 Mon Sep 17 00:00:00 2001 From: Yuwei Ba Date: Mon, 20 Jul 2015 15:01:00 +0800 Subject: [PATCH 3/4] Adjust pagination jump button style. --- style/components/pagination.less | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/style/components/pagination.less b/style/components/pagination.less index f0c3f10800..3e428c5586 100644 --- a/style/components/pagination.less +++ b/style/components/pagination.less @@ -66,6 +66,9 @@ &:hover { &:after { color: @primary-color; + font-size: 8px; + letter-spacing: -1px; + font-family: "anticon"; } } @@ -74,8 +77,7 @@ &-jump-prev { &:hover { &:after { - font-family: "anticon"; - content: "\e604"; + content: "\e611\e611"; transform: rotate(180deg); } } @@ -84,8 +86,7 @@ &-jump-next { &:hover { &:after { - font-family: "anticon"; - content: "\e604"; + content: "\e611\e611"; } } } @@ -110,7 +111,6 @@ &-prev, &-next { border: 1px solid #d9d9d9; - font-size: 18px; a { font-size: 16px; @@ -119,7 +119,7 @@ display: block; height: 28px; line-height: 28px; - font-size: 10px; + font-size: 8px; font-family: "anticon"; } @@ -134,17 +134,6 @@ } } - &-prev { - a:after { - content: "‹"; - } - } - &-next { - a:after { - content: "›"; - } - } - &-prev { a { &:after { From ac3323e15b12bd5fb17ec85decbf794576188bca Mon Sep 17 00:00:00 2001 From: Yuwei Ba Date: Mon, 20 Jul 2015 15:01:38 +0800 Subject: [PATCH 4/4] Use ~ as dep prefix. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f8b411202f..c4bbba4ea7 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "rc-input-number": "~2.0.1", "rc-menu": "~3.4.2", "rc-notification": "~1.0.1", - "rc-pagination": "^1.0.0", + "rc-pagination": "~1.0.0", "rc-progress": "~1.0.0", "rc-radio": "~2.0.0", "rc-select": "~4.4.0",