Merge branch 'dev' into next

This commit is contained in:
chenjiahan
2020-09-18 22:01:02 +08:00
12 changed files with 75 additions and 63 deletions
+2 -2
View File
@@ -243,8 +243,8 @@ export default createComponent({
state.rect = rect;
state.swiping = true;
state.active = active;
state.width = Math.round(+props.width || rect.width);
state.height = Math.round(+props.height || rect.height);
state.width = Math.floor(+props.width || rect.width);
state.height = Math.floor(+props.height || rect.height);
state.offset = getTargetOffset(active);
children.forEach((swipe) => {
swipe.setOffset(0);
+2 -1
View File
@@ -41,7 +41,8 @@
background-color: @swipe-indicator-inactive-background-color;
border-radius: 100%;
opacity: @swipe-indicator-inactive-opacity;
transition: opacity 0.2s;
transition: opacity @animation-duration-fast,
background-color @animation-duration-fast;
&:not(:last-child) {
margin-right: @swipe-indicator-size;