Merge pull request #401 from TheBoef/master

Touchpad/Trackpad scrolling IE10+ and Edge
2016-01-23 15:52:37 +09:00 · 2016-01-23 15:52:37 +09:00 · 2413028ad4
commit 2413028ad4
parent cc0fded8cb e4dda6f408
1 changed files with 12 additions and 1 deletions
--- a/src/css/main.scss
+++ b/src/css/main.scss
@ -63,8 +63,19 @@ $ps-bar-hover: #999;

 .ps-container {
  -ms-touch-action: none;
+  touch-action: none;
  overflow: hidden !important;
-
+  -ms-overflow-style: none;
+  
+  // Edge
+  @supports (-ms-overflow-style: none) { 
+    overflow: auto !important;
+  }
+  // IE10+
+  @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { 
+    overflow: auto !important;
+  }
+  
  &.ps-active-x > .ps-scrollbar-x-rail,
  &.ps-active-y > .ps-scrollbar-y-rail {
    display: block;