Merge branch 'master' of https://github.com/iview/iview into 2.0

Update carousel component: add loop and radiusDot property
# Conflicts:
#	package.json
#	src/components/date-picker/picker.vue
#	src/components/select/select.vue
This commit is contained in:
houyl 2017-10-24 16:47:12 +08:00
parent 9b24f1ab7b
commit ccf544dcc2
4 changed files with 115 additions and 19 deletions

View file

@ -31,6 +31,9 @@
overflow: hidden;
z-index: 1;
&.higher {
z-index: 2;
}
}
&-item {
@ -159,6 +162,11 @@
color: transparent;
transition: all .5s;
&.radius {
width: 6px;
height: 6px;
border-radius: 50%;
}
}
&:hover > button {
@ -168,6 +176,9 @@
&.@{carousel-prefix-cls}-active > button {
opacity: 1;
width: 24px;
&.radius{
width: 6px;
}
}
}
}