diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-05-09 14:43:14 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-05-09 20:27:16 +0000 |
| commit | cd20de5e686f24e36cfd66ef18b001cb845ad9c6 (patch) | |
| tree | 1273fa4749d7da5ac41b2ffd4cda0c93694e45ca /WebContent/VAADIN/themes/base | |
| parent | aab62befe8384c96bf24ed0a556011fd47aad933 (diff) | |
| download | vaadin-framework-cd20de5e686f24e36cfd66ef18b001cb845ad9c6.tar.gz vaadin-framework-cd20de5e686f24e36cfd66ef18b001cb845ad9c6.zip | |
Make touch actions disabled on some CSS classes (#13368)
This makes Slider, SplitPanels and DragAndDrop anywhere except Table
work on IE and touch screen.
Change-Id: I1c710a14fc3957c81ade07fd2a3de1e4b6feec1a
Diffstat (limited to 'WebContent/VAADIN/themes/base')
| -rw-r--r-- | WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss | 2 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/slider/slider.scss | 3 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/splitpanel/splitpanel.scss | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss b/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss index e66f02e207..86000abd7c 100644 --- a/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss +++ b/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss @@ -6,6 +6,8 @@ -webkit-border-radius: 4px; border-radius: 4px; position: relative; + -ms-touch-action: none; + touch-action: none; } [draggable=true] { -khtml-user-drag: element; diff --git a/WebContent/VAADIN/themes/base/slider/slider.scss b/WebContent/VAADIN/themes/base/slider/slider.scss index 9ef94d9d9e..60047bc6db 100644 --- a/WebContent/VAADIN/themes/base/slider/slider.scss +++ b/WebContent/VAADIN/themes/base/slider/slider.scss @@ -10,7 +10,6 @@ background: #eee; border-left: 1px solid #ddd; border-right: 1px solid #eee; - } .#{$primaryStyleName}-handle { background: #aaa; @@ -18,6 +17,8 @@ height: 12px; margin-top: -5px; font-size: 0; + -ms-touch-action: none; + touch-action: none; } .#{$primaryStyleName}-vertical { diff --git a/WebContent/VAADIN/themes/base/splitpanel/splitpanel.scss b/WebContent/VAADIN/themes/base/splitpanel/splitpanel.scss index bae740257f..968894d92d 100644 --- a/WebContent/VAADIN/themes/base/splitpanel/splitpanel.scss +++ b/WebContent/VAADIN/themes/base/splitpanel/splitpanel.scss @@ -15,6 +15,8 @@ background: #ddd; cursor: e-resize; cursor: col-resize; + -ms-touch-action: none; + touch-action: none } .v-disabled .#{$primaryStyleName}-hsplitter div { cursor: default; @@ -27,6 +29,8 @@ background: #ddd; cursor: s-resize; cursor: row-resize; + -ms-touch-action: none; + touch-action: none; } .v-disabled .#{$primaryStyleName}-vsplitter div { cursor: default; |