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

Conflicts:
	css/ninja.css
	js/stage/stage.reel/stage.html
	js/tools/TextTool.js
	node_modules/labs/rich-text-editor.reel/rich-text-editor.css
	node_modules/labs/rich-text-editor.reel/rich-text-editor.html
	node_modules/labs/rich-text-editor.reel/rich-text-editor.js
	node_modules/labs/rich-text-editor.reel/rich-text-resizer.js
	node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js

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

3 files changed, 102 insertions, 0 deletions

diff --git a/scss/imports/codemirror/_codemirror.scss b/scss/imports/codemirror/_codemirror.scss
new file mode 100644
index 00000000..281e7a9a
--- /dev/null
+++ b/scss/imports/codemirror/_codemirror.scss
@@ -0,0 +1,75 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
+.CodeMirror {
+  overflow: auto;
+  height: 300px;
+  line-height: 1em;
+  font-family: monospace;
+  _position: relative; /* IE6 hack */
+  background: white;
+}
+
+.CodeMirror-gutter {
+  position: absolute; left: 0; top: 0;
+  background-color: #f7f7f7;
+  border-right: 1px solid #eee;
+  min-width: 2em;
+  height: 100%;
+}
+.CodeMirror-gutter-text {
+  color: #aaa;
+  text-align: right;
+  padding: .4em .2em .4em .4em;
+}
+.CodeMirror-lines {
+  padding: .4em;
+}
+
+.CodeMirror pre {
+  border-width: 0; margin: 0; padding: 0; background: transparent;
+  font-family: inherit;
+}
+
+.CodeMirror-cursor {
+  z-index: 10;
+  position: absolute;
+  visibility: hidden;
+  border-left: 1px solid black !important;
+}
+.CodeMirror-focused .CodeMirror-cursor {
+  visibility: visible;
+}
+
+span.CodeMirror-selected {
+  background: #ccc !important;
+  color: HighlightText !important;
+}
+.CodeMirror-focused span.CodeMirror-selected {
+  background: Highlight !important;
+}
+
+
+.CodeMirror-matchingbracket {color: #0f0 !important;}
+.CodeMirror-nonmatchingbracket {color: #f22 !important;}
+
+.completions {
+    position: absolute;
+    z-index: 10;
+    overflow: hidden;
+    -webkit-box-shadow: 2px 3px 5px rgba(0, 0, 0, .2);
+    -moz-box-shadow: 2px 3px 5px rgba(0, 0, 0, .2);
+    box-shadow: 2px 3px 5px rgba(0, 0, 0, .2);
+}
+
+.completions select {
+    background: #fafafa;
+    outline: none;
+    border: none;
+    padding: 0;
+    margin: 0;
+    font-family: monospace;
+}
diff --git a/scss/imports/codemirror/_css.scss b/scss/imports/codemirror/_css.scss
new file mode 100644
index 00000000..fb870e84
--- /dev/null
+++ b/scss/imports/codemirror/_css.scss
@@ -0,0 +1,15 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
+span.css-at {color: #708;}
+span.css-unit {color: #281;}
+span.css-value {color: #708;}
+span.css-identifier {color: black;}
+span.css-selector {color: #11B;}
+span.css-important {color: #00F;}
+span.css-colorcode {color: #299;}
+span.css-comment {color: #A70;}
+span.css-string {color: #A22;}
diff --git a/scss/imports/codemirror/_javascript.scss b/scss/imports/codemirror/_javascript.scss
new file mode 100644
index 00000000..1124e279
--- /dev/null
+++ b/scss/imports/codemirror/_javascript.scss
@@ -0,0 +1,12 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
+span.js-keyword {color: #90b;}
+span.js-atom {color: #291;}
+span.js-variabledef {color: #00f;}
+span.js-localvariable {color: #049;}
+span.js-comment {color: #a70;}
+span.js-string {color: #a22;}