Merge branch 'refs/heads/master' into binding

Conflicts:
	js/document/models/html.js
	js/document/views/design.js
	js/ninja.reel/ninja.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

2 files changed, 12 insertions, 26 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  
 
diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss
index d6da708b..39a98d82 100644
--- a/scss/imports/scss/_Stage.scss
+++ b/scss/imports/scss/_Stage.scss
@@ -151,7 +151,7 @@
     padding: 0px;
     top: 0px;
     left: 0px;
-    z-index: 5;
+    z-index: 6;
 }
 
 .layoutCanvas {
@@ -161,6 +161,16 @@
     padding: 0px;
     top: 0px;
     left: 0px;
+    z-index: 5;
+}
+
+.gridCanvas {
+    position: absolute;
+    margin: 0px;
+    border: none;
+    padding: 0px;
+    top: 0px;
+    left: 0px;
     z-index: 4;
 }