From 7d3bdf39e6d1534de1848ca2744aed66dfeb5d2a Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Tue, 5 Jun 2012 23:13:03 -0700
Subject: Initial Text Tool Changes

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 js/stage/stage.reel/stage.css  | 10 +++++++++-
 js/stage/stage.reel/stage.html |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'js/stage/stage.reel')

diff --git a/js/stage/stage.reel/stage.css b/js/stage/stage.reel/stage.css
index 13537ba1..2271cd8a 100755
--- a/js/stage/stage.reel/stage.css
+++ b/js/stage/stage.reel/stage.css
@@ -12,6 +12,14 @@
     overflow: hidden;
 }
 
+.montage-editor-container {
+    z-index: 8;
+}
+
+.stageAndScenesContainer .montage-editor {
+    -webkit-user-select:text;
+}
+
 .codeViewContainer {
   position: absolute;
   top: 0px;
@@ -55,4 +63,4 @@ div.CodeMirror span.CodeMirror-matchingbracket {color: #000 !important;backgroun
 .cm-s-monokai .activeline {background: #8da6ce; !important}
 .cm-s-rubyblue .activeline {background: #3E7087; !important}
 .cm-s-lesser-dark .activeline {background: #8da6ce; !important}
-.cm-s-xq-dark .activeline {background: #8da6ce; !important}
\ No newline at end of file
+.cm-s-xq-dark .activeline {background: #8da6ce; !important}
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 7a9619cd..2ed596f3 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -31,7 +31,7 @@
             },
 
             "textTool": {
-                "prototype": "node_modules/labs/rich-text-editor.reel",
+                "prototype": "montage/ui/rich-text-editor/rich-text-editor.reel",
                 "properties": {
                     "element" : {"#": "textToolObject"}
                 }
-- 
cgit v1.2.3