From c2d38fa6c2d67457065fd3dce7e0d939ae0a1278 Mon Sep 17 00:00:00 2001
From: Henrik Paul <henrik@vaadin.com>
Date: Thu, 21 Nov 2013 16:52:32 +0200
Subject: Support OSX's hiding scrollbars (#12645)

Change-Id: If5df6a7651482a33558088398330fd73a4d43645
---
 WebContent/VAADIN/themes/base/escalator/escalator.scss | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'WebContent')

diff --git a/WebContent/VAADIN/themes/base/escalator/escalator.scss b/WebContent/VAADIN/themes/base/escalator/escalator.scss
index 436f849456..8136f23df6 100644
--- a/WebContent/VAADIN/themes/base/escalator/escalator.scss
+++ b/WebContent/VAADIN/themes/base/escalator/escalator.scss
@@ -11,9 +11,23 @@ $border-color: #aaa;
 .#{$primaryStyleName}-scroller {
 	position: absolute;
 	overflow: auto;
-	height: inherit;
+	z-index: 20;
+}
+
+.#{$primaryStyleName}-scroller-horizontal {
 	left: 0; /* Left position adjusted to align with frozen columns */
 	right: 0;
+	bottom: 0;
+	overflow-y: hidden;
+	-ms-overflow-y: hidden;
+}
+
+.#{$primaryStyleName}-scroller-vertical {
+	right: 0;
+	top: 0;    /* this will be overridden by code, but it's a good default behavior */
+	bottom: 0; /* this will be overridden by code, but it's a good default behavior */
+	overflow-x: hidden;
+	-ms-overflow-x: hidden;
 }
 
 .#{$primaryStyleName}-tablewrapper {
-- 
cgit v1.2.3