19 files changed, 24 insertions, 5 deletions

diff --git a/scss/imports/codemirror/_codemirror.scss b/scss/imports/codemirror/_codemirror.scss
index 281e7a9a..281e7a9a 100644..100755
--- a/scss/imports/codemirror/_codemirror.scss
+++ b/scss/imports/codemirror/_codemirror.scss
diff --git a/scss/imports/codemirror/_css.scss b/scss/imports/codemirror/_css.scss
index fb870e84..fb870e84 100644..100755
--- a/scss/imports/codemirror/_css.scss
+++ b/scss/imports/codemirror/_css.scss
diff --git a/scss/imports/codemirror/_javascript.scss b/scss/imports/codemirror/_javascript.scss
index 1124e279..1124e279 100644..100755
--- a/scss/imports/codemirror/_javascript.scss
+++ b/scss/imports/codemirror/_javascript.scss
diff --git a/scss/imports/scss/_Base.scss b/scss/imports/scss/_Base.scss
index a800610d..a800610d 100644..100755
--- a/scss/imports/scss/_Base.scss
+++ b/scss/imports/scss/_Base.scss
diff --git a/scss/imports/scss/_Components.scss b/scss/imports/scss/_Components.scss
index c4182c73..c4182c73 100644..100755
--- a/scss/imports/scss/_Components.scss
+++ b/scss/imports/scss/_Components.scss
diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index a2d5eef4..97344b1e 100644..100755
--- a/scss/imports/scss/_MainWindow.scss
+++ b/scss/imports/scss/_MainWindow.scss
@@ -67,7 +67,7 @@
     width:100%;
     top:0px;
     left:0px;
-    z-index: 9999;
+    z-index: 6995;
 }
 
 #topPanelContainer,
@@ -200,15 +200,15 @@
 }
 
 #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;
 }
 
 #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;
 }
 
@@ -331,3 +331,9 @@
         overflow: hidden;
         color: white;
 }
+
+.montage-popup-modal-mask
+{
+        opacity: 1;
+        background: -webkit-radial-gradient(center, ellipse cover, rgba(0,0,0,.65) 0%, rgba(0,0,0,0.8) 80%);
+}
\ No newline at end of file
diff --git a/scss/imports/scss/_MenuUI.scss b/scss/imports/scss/_MenuUI.scss
index e1fb149a..e1fb149a 100644..100755
--- a/scss/imports/scss/_MenuUI.scss
+++ b/scss/imports/scss/_MenuUI.scss
diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss
index bccea6fc..bccea6fc 100644..100755
--- a/scss/imports/scss/_PanelUI.scss
+++ b/scss/imports/scss/_PanelUI.scss
diff --git a/scss/imports/scss/_ScrollBars.scss b/scss/imports/scss/_ScrollBars.scss
index 1c2f30ea..1c2f30ea 100644..100755
--- a/scss/imports/scss/_ScrollBars.scss
+++ b/scss/imports/scss/_ScrollBars.scss
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
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index 19ede70a..19ede70a 100644..100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
diff --git a/scss/imports/scss/_ToolsSample.scss b/scss/imports/scss/_ToolsSample.scss
index 2e1da9a8..2e1da9a8 100644..100755
--- a/scss/imports/scss/_ToolsSample.scss
+++ b/scss/imports/scss/_ToolsSample.scss
diff --git a/scss/imports/scss/_UserContent.scss b/scss/imports/scss/_UserContent.scss
index e2e89186..e2e89186 100644..100755
--- a/scss/imports/scss/_UserContent.scss
+++ b/scss/imports/scss/_UserContent.scss
diff --git a/scss/imports/scss/_mixins.scss b/scss/imports/scss/_mixins.scss
index 061262f7..061262f7 100644..100755
--- a/scss/imports/scss/_mixins.scss
+++ b/scss/imports/scss/_mixins.scss
diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss
index 00d8b5f0..00d8b5f0 100644..100755
--- a/scss/imports/scss/_toolbar.scss
+++ b/scss/imports/scss/_toolbar.scss
diff --git a/scss/imports/themes/_test.scss b/scss/imports/themes/_test.scss
index 87735bec..87735bec 100644..100755
--- a/scss/imports/themes/_test.scss
+++ b/scss/imports/themes/_test.scss
diff --git a/scss/imports/themes/default/_colors.scss b/scss/imports/themes/default/_colors.scss
index 2a7b8191..2a7b8191 100644..100755
--- a/scss/imports/themes/default/_colors.scss
+++ b/scss/imports/themes/default/_colors.scss
diff --git a/scss/imports/themes/default/_fonts.scss b/scss/imports/themes/default/_fonts.scss
index 9174cff3..9174cff3 100644..100755
--- a/scss/imports/themes/default/_fonts.scss
+++ b/scss/imports/themes/default/_fonts.scss
diff --git a/scss/imports/themes/default/_mixins.scss b/scss/imports/themes/default/_mixins.scss
index 9f61e7ef..9f61e7ef 100644..100755
--- a/scss/imports/themes/default/_mixins.scss
+++ b/scss/imports/themes/default/_mixins.scss