Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

2 files changed, 17 insertions, 6 deletions

diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index 0b0649dc..97344b1e 100755
--- a/scss/imports/scss/_MainWindow.scss
+++ b/scss/imports/scss/_MainWindow.scss
@@ -200,18 +200,16 @@
 }
 
 #mainContainer #rulerTop {
-    // TODO: temporary background please replace when component is implemented  
-    background: url("../images/temp/ruler-top.png");
+    // TODO: temporary background please replace when component is implemented
+    background:$color-stage;
     height:15px;
     margin-bottom: 0px;
-    display:none;
 }
 
 #rulerLeft {
-    // TODO: temporary background please replace when component is implemented  
-    background: url("../images/temp/ruler-left.png");
+    // TODO: temporary background please replace when component is implemented
+    background:$color-stage;
     width:16px;
-    display:none;
 }
 
 #stateBar {
diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss
index 7b7db576..587903d2 100644
--- a/scss/imports/scss/_Stage.scss
+++ b/scss/imports/scss/_Stage.scss
@@ -192,3 +192,16 @@
     overflow-x: auto;
     overflow-y: auto;
 }
+
+.montage-editor-frame {
+    position:absolute;
+    z-index:7;
+    top: 0;
+    left:0;
+    display:none;
+    -webkit-user-select: initial;
+}
+.montage-editor {
+    padding:0px;
+    word-wrap: normal;
+}
\ No newline at end of file