From 41f83010fa023848550ab68e853461ec5eee7c02 Mon Sep 17 00:00:00 2001 From: Rijn Date: Mon, 16 Jan 2017 02:59:46 -0600 Subject: [PATCH] update props and events --- src/components/carousel/carousel.vue | 50 +++++++++++++++++++++++++++++++++++++++++++++++--- src/styles/components/carousel.less | 7 ++++++- src/styles/components/index.less | 3 ++- test/routers/carousel.vue | 6 ++++++ 4 files changed, 61 insertions(+), 5 deletions(-) diff --git a/src/components/carousel/carousel.vue b/src/components/carousel/carousel.vue index fb63eb0..680cd56 100644 --- a/src/components/carousel/carousel.vue +++ b/src/components/carousel/carousel.vue @@ -1,11 +1,55 @@ diff --git a/src/styles/components/carousel.less b/src/styles/components/carousel.less index 21a6eb0..b440717 100644 --- a/src/styles/components/carousel.less +++ b/src/styles/components/carousel.less @@ -2,5 +2,10 @@ @carousel-item-prefix-cls: ~"@{css-prefix}carousel-item"; .@{carousel-prefix-cls} { - + position: relative; + display: block; + box-sizing: border-box; + user-select: none; + touch-action: pan-y; + -webkit-tap-highlight-color: transparent; } diff --git a/src/styles/components/index.less b/src/styles/components/index.less index 07baccd..d0ba5df 100644 --- a/src/styles/components/index.less +++ b/src/styles/components/index.less @@ -34,4 +34,5 @@ @import "menu"; @import "date-picker"; @import "time-picker"; -@import "form"; \ No newline at end of file +@import "form"; +@import "carousel"; \ No newline at end of file diff --git a/test/routers/carousel.vue b/test/routers/carousel.vue index 6db7e5f..4dff775 100644 --- a/test/routers/carousel.vue +++ b/test/routers/carousel.vue @@ -1,5 +1,11 @@ -- libgit2 0.21.4