aboutsummaryrefslogtreecommitdiff
path: root/js/stage
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-05 23:13:03 -0700
committerArmen Kesablyan2012-06-05 23:13:03 -0700
commit7d3bdf39e6d1534de1848ca2744aed66dfeb5d2a (patch)
tree12cf81e70f38e4bbe8739654d6c4aa4e5f8f498c /js/stage
parent73a62c95b5635fee903457279f0f5b57f164e0b5 (diff)
downloadninja-7d3bdf39e6d1534de1848ca2744aed66dfeb5d2a.tar.gz
Initial Text Tool Changes
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/stage')
-rwxr-xr-xjs/stage/stage.reel/stage.css10
-rwxr-xr-xjs/stage/stage.reel/stage.html2
2 files changed, 10 insertions, 2 deletions
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 @@
12 overflow: hidden; 12 overflow: hidden;
13} 13}
14 14
15.montage-editor-container {
16 z-index: 8;
17}
18
19.stageAndScenesContainer .montage-editor {
20 -webkit-user-select:text;
21}
22
15.codeViewContainer { 23.codeViewContainer {
16 position: absolute; 24 position: absolute;
17 top: 0px; 25 top: 0px;
@@ -55,4 +63,4 @@ div.CodeMirror span.CodeMirror-matchingbracket {color: #000 !important;backgroun
55.cm-s-monokai .activeline {background: #8da6ce; !important} 63.cm-s-monokai .activeline {background: #8da6ce; !important}
56.cm-s-rubyblue .activeline {background: #3E7087; !important} 64.cm-s-rubyblue .activeline {background: #3E7087; !important}
57.cm-s-lesser-dark .activeline {background: #8da6ce; !important} 65.cm-s-lesser-dark .activeline {background: #8da6ce; !important}
58.cm-s-xq-dark .activeline {background: #8da6ce; !important} \ No newline at end of file 66.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 @@
31 }, 31 },
32 32
33 "textTool": { 33 "textTool": {
34 "prototype": "node_modules/labs/rich-text-editor.reel", 34 "prototype": "montage/ui/rich-text-editor/rich-text-editor.reel",
35 "properties": { 35 "properties": {
36 "element" : {"#": "textToolObject"} 36 "element" : {"#": "textToolObject"}
37 } 37 }