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, 13 deletions

diff --git a/css/ninja.css b/css/ninja.css
index ce27977b..e3d560ab 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -909,7 +909,7 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 
 ::-webkit-scrollbar-track:disabled { display: none; }
 
-:-webkit-scrollbar-track:vertical:disabled { display: none; }
+::-webkit-scrollbar-track:vertical:disabled { display: none; }
 
 ::-webkit-scrollbar-track:horizontal:disabled { display: none; }
 
@@ -919,18 +919,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 
 ::-webkit-scrollbar-corner:disabled { 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; }
-
 .tree { -webkit-user-select: none; cursor: default; float: left; padding-left: 0; color: white; }
 
 .tree li { -webkit-margin-before: 0px; -webkit-margin-after: 0px; list-style-type: none; }