Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wanjj_1210
ant-design
提交
d220314b
A
ant-design
项目概览
wanjj_1210
/
ant-design
与 Fork 源项目一致
从无法访问的项目Fork
通知
10
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
ant-design
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d220314b
编写于
7月 14, 2015
作者:
S
simaQ
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/ant-design/ant-design
上级
4d9bbf81
fa6e9736
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
90 addition
and
107 deletion
+90
-107
components/pagination/demo/mini-more.md
components/pagination/demo/mini-more.md
+0
-19
components/pagination/index.jsx
components/pagination/index.jsx
+2
-2
components/pagination/index.md
components/pagination/index.md
+1
-1
components/steps/demo/simple.md
components/steps/demo/simple.md
+1
-1
package.json
package.json
+1
-1
style/components/pagination.less
style/components/pagination.less
+75
-78
style/components/steps.less
style/components/steps.less
+10
-5
未找到文件。
components/pagination/demo/mini-more.md
已删除
100644 → 0
浏览文件 @
4d9bbf81
# 迷你的改变
-
order: 5
改变每页显示条目数
---
````
jsx
var
Pagination
=
antd
.
Pagination
;
function
onChange
(
page
)
{
console
.
log
(
page
);
}
React
.
render
(
<
Pagination
className
=
"mini"
showQuickJumper
=
{
true
}
showSizeChanger
=
{
true
}
onChange
=
{
onChange
}
total
=
{
500
}
/>,
document
.
getElementById
(
'
components-pagination-demo-mini-more
'
));
````
components/pagination/index.jsx
浏览文件 @
d220314b
...
...
@@ -3,11 +3,11 @@
let
Pagination
=
require
(
'
rc-pagination
'
);
let
React
=
require
(
'
react
'
);
let
prefixCls
=
'
ant-pa
t
ination
'
;
let
prefixCls
=
'
ant-pa
g
ination
'
;
class
AntPagination
extends
React
.
Component
{
render
()
{
return
<
Pagination
className
=
{
prefixCls
+
this
.
props
.
className
}
{
...
this
.
props
}
/>;
return
<
Pagination
selectPrefixCls
=
"ant-select"
prefixCls
=
{
prefixCls
}
{
...
this
.
props
}
/>;
}
}
...
...
components/pagination/index.md
浏览文件 @
d220314b
...
...
@@ -25,4 +25,4 @@
| showSizeChanger | 是否可以改变 pageSize | Bool | false |
| showQuickJump | 是否可以快速跳转至某页 | Bool | false |
| className | 当为「mini」时,是小尺寸分页 | String | ant-pagination |
| simple | 当添加该属性时,显示
未
简单分页 | Object | 无 |
| simple | 当添加该属性时,显示
为
简单分页 | Object | 无 |
components/steps/demo/simple.md
浏览文件 @
d220314b
...
...
@@ -18,7 +18,7 @@ var steps = [{
},
{
status
:
'
process
'
,
title
:
'
进行中
'
,
description
:
'
这里是多信息的耶哦耶哦哦耶哦耶
哦耶哦耶哦耶
'
description
:
'
这里是多信息的耶哦耶哦哦耶哦耶
'
},
{
status
:
'
wait
'
,
title
:
'
又一个待运行
'
,
...
...
package.json
浏览文件 @
d220314b
...
...
@@ -27,7 +27,7 @@
"
rc-progress
"
:
"
~1.0.0
"
,
"
rc-select
"
:
"
~4.2.1
"
,
"
rc-slider
"
:
"
^1.2.5
"
,
"
rc-steps
"
:
"
~1.1.
3
"
,
"
rc-steps
"
:
"
~1.1.
4
"
,
"
rc-switch
"
:
"
~1.2.0
"
,
"
rc-tabs
"
:
"
~5.2.0
"
,
"
rc-tooltip
"
:
"
~2.4.0
"
...
...
style/components/pagination.less
浏览文件 @
d220314b
@prefixClass: rc-pagination;
@prefixClass: ant-pagination;
.@{prefixClass} {
user-select: none;
...
...
@@ -15,7 +14,7 @@
visibility: hidden;
}
.@{prefixClass}
-item {
&
-item {
cursor: pointer;
border-radius: 6px;
min-width: 28px;
...
...
@@ -27,31 +26,32 @@
border: 1px solid #d9d9d9;
background-color: #fff;
margin-right: 8px;
transition: all 0.3s ease;
a {
text-decoration: none;
color: #666;
}
&:hover {
border-color:
#2db7f5
;
border-color:
@primary-color
;
a {
color:
#2db7f5
;
color:
@primary-color
;
}
}
&
.
active {
background-color:
#2db7f5
;
border
: none
;
&
-
active {
background-color:
@primary-color
;
border
-color: @primary-color
;
a {
a,
&:hover a {
color: #fff;
}
}
}
.jump-prev, .
jump-next {
&-jump-prev, &-
jump-next {
&:after {
content: "•••";
display: block;
...
...
@@ -63,13 +63,13 @@
&:hover {
&:after {
color:
#2db7f5
;
color:
@primary-color
;
}
}
}
.
jump-prev {
&-
jump-prev {
&:hover {
&:after {
content: "‹‹";
...
...
@@ -77,7 +77,7 @@
}
}
.
jump-next {
&-
jump-next {
&:hover {
&:after {
content: "››";
...
...
@@ -85,10 +85,10 @@
}
}
.prev, .jump-prev, .
jump-next {
&-prev, &-jump-prev, &-
jump-next {
margin-right: 8px;
}
.prev, .next, .jump-prev, .
jump-next {
&-prev, &-next, &-jump-prev, &-
jump-next {
cursor: pointer;
color: #666;
font-size: 10px;
...
...
@@ -101,7 +101,7 @@
text-align: center;
}
.prev, .
next {
&-prev, &-
next {
border: 1px solid #d9d9d9;
a {
...
...
@@ -111,92 +111,53 @@
}
&:hover {
border-color:
#2db7f5
;
border-color:
@primary-color
;
a {
color:
#2db7f5
;
color:
@primary-color
;
}
}
&.disabled {
cursor: not-allowed;
}
&-disabled {
&:hover {
border-color: #d9d9d9;
a {
color: #ccc;
cursor: not-allowed;
}
}
cursor: not-allowed;
a {
color: #ccc;
}
}
.
options {
&-
options {
float: left;
margin-left: 15px;
.
size-changer {
&-
size-changer {
float: left;
width: 90px;
margin-right: 10px;
}
.
quick-jumper {
&-
quick-jumper {
float: left;
margin-left: 16px;
height: 28px;
line-height: 28px;
input {
.input;
margin: 0 8px;
box-sizing: border-box;
background-color: #fff;
border-radius: 6px;
border: 1px solid #d9d9d9;
outline: none;
padding: 3px 12px;
width: 50px;
height: 28px;
&:hover {
border-color: #2db7f5;
}
}
}
}
}
.@{prefixClass}.mini {
.@{prefixClass}-item {
border: none;
margin: 0;
min-width: 20px;
height: 20px;
line-height: 20px;
}
.prev, .next {
margin: 0;
min-width: 20px;
height: 20px;
line-height: 20px;
border: none;
}
.jump-prev, .jump-next {
height: 20px;
line-height: 20px;
}
.quick-jumper {
height: 20px;
line-height: 20px;
input {
padding: 3px 7px;
width: 40px;
height: 20px;
line-height: 20px;
}
}
}
.@{prefixClass}.simple {
.prev, .next {
&-simple &-prev, &-simple &-next {
border: none;
height: 24px;
line-height: 24px;
...
...
@@ -204,11 +165,11 @@
font-size: 18px;
}
.
simple-pager {
&-simple &-
simple-pager {
float: left;
margin-right: 8px;
.
slash {
&-
slash {
margin: 0 10px;
}
...
...
@@ -222,13 +183,49 @@
padding: 5px 8px;
width: 30px;
min-height: 20px;
text-align: center;
&:hover {
border-color:
#2db7f5
;
border-color:
@primary-color
;
}
}
}
}
.@{prefixClass} {
&.mini &-item {
border: none;
margin: 0;
min-width: 20px;
height: 20px;
line-height: 20px;
}
&.mini &-prev,
&.mini &-next {
margin: 0;
min-width: 20px;
height: 20px;
line-height: 20px;
border: none;
}
&.mini &-jump-prev, &.mini &-jump-next {
height: 20px;
line-height: 20px;
}
&.mini &-options {
&-quick-jumper {
height: 20px;
line-height: 20px;
input {
.input-sm;
}
}
}
}
style/components/steps.less
浏览文件 @
d220314b
...
...
@@ -4,11 +4,11 @@
@process-icon-color: @primary-color;
@process-title-color: #666;
@process-description-color: @process-title-color;
@process-tail-color: #
bcbcbc
;
@wait-icon-color: #
bcbcb
c;
@process-tail-color: #
e9e9e9
;
@wait-icon-color: #
cc
c;
@wait-title-color: #999;
@wait-description-color: @wait-title-color;
@wait-tail-color: @
wait-icon
-color;
@wait-tail-color: @
process-tail
-color;
@finish-icon-color: @process-icon-color;
@finish-title-color: @wait-title-color;
@finish-description-color: @finish-title-color;
...
...
@@ -93,7 +93,9 @@
height: auto;
> .@{stepsPrefixClass}-icon {
font-size: 20px;
top: 0;
top: 2px;
width: 20px;
height: 20px;
}
}
&.@{stepsPrefixClass}-status-process {
...
...
@@ -134,6 +136,8 @@
&.anticon {
font-size: 12px;
position: relative;
top: -2px;
}
}
}
...
...
@@ -167,7 +171,7 @@
> i {
display: inline-block;
background: @wait-tail-color;
height:
2
px;
height:
1
px;
border-radius: 1px;
width: 100%;
.transition(background 0.3s ease);
...
...
@@ -188,6 +192,7 @@
font-size: 12px;
font-size: ~"9px \9"; // ie8-9
.scale(0.75);
top: -1px;
}
}
.@{stepsPrefixClass}-main {
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录