Merge remote-tracking branch 'ninja-internal/master' into test-merge

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js

1 files changed, 1 insertions, 25 deletions

diff --git a/scss/imports/scss/_ScrollBars.scss b/scss/imports/scss/_ScrollBars.scss
index 2e79d9c8..9fa2fcb8 100755
--- a/scss/imports/scss/_ScrollBars.scss
+++ b/scss/imports/scss/_ScrollBars.scss
@@ -131,7 +131,7 @@
 }
 
 //  These don't seem to be necessary or in some cases, they just seem to be ignored
-:-webkit-scrollbar-track:vertical:disabled {
+::-webkit-scrollbar-track:vertical:disabled {
     display: none;
 }
 
@@ -151,29 +151,5 @@
     display: none;
 }
 
-#iframeContainer::-webkit-resizer:disabled {
-    display: block;
-}
-
-#iframeContainer::-webkit-scrollbar-track:vertical:disabled {
-  display: block;
-}
-
-#iframeContainer::-webkit-scrollbar-track:horizontal:disabled {
-  display: block;
-}
-
-#iframeContainer::-webkit-scrollbar-track-piece:disabled {
-  display: block;
-}
-
-#iframeContainer::-webkit-scrollbar-corner:disabled {
-  display: block;
-}
-
-#iframeContainer::-webkit-resizer:disabled {
-  display: block;
-}
- 
 //  End: Scroll Bar Skinning