aboutsummaryrefslogtreecommitdiff
path: root/js/code-editor
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/code-editor
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/code-editor')
-rw-r--r--js/code-editor/code-editor-wrapper.js4
-rw-r--r--js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css2
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html2
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js4
4 files changed, 6 insertions, 6 deletions
diff --git a/js/code-editor/code-editor-wrapper.js b/js/code-editor/code-editor-wrapper.js
index fcf7460a..f9e4edda 100644
--- a/js/code-editor/code-editor-wrapper.js
+++ b/js/code-editor/code-editor-wrapper.js
@@ -30,8 +30,8 @@ POSSIBILITY OF SUCH DAMAGE.
30 30
31//////////////////////////////////////////////////////////////////////// 31////////////////////////////////////////////////////////////////////////
32// 32//
33var Montage = require("montage/core/core").Montage, 33var Montage = require("montage/core/core").Montage,
34 Component = require("montage/ui/component").Component; 34 Component = require("montage/ui/component").Component;
35 35
36exports.CodeEditorWrapper = Montage.create(Component, { 36exports.CodeEditorWrapper = Montage.create(Component, {
37 hasTemplate: { 37 hasTemplate: {
diff --git a/js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css b/js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css
index c66311f0..94fb02f2 100644
--- a/js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css
+++ b/js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
31/* adopted from CodeMirror 2.23 (http://codemirror.net/) */ 31/* adopted from CodeMirror 2.23 (http://codemirror.net/) */
32 32
33.cm-s-rubyblue { 33.cm-s-rubyblue {
34 font:Trebuchet, Verdana, sans-serif; } /* - customized editor font - */ 34 font:Trebuchet, Verdana, sans-serif; } /* - customized editor font - */
35 35
36.cm-s-rubyblue { background: #112435; color: white; } 36.cm-s-rubyblue { background: #112435; color: white; }
37.cm-s-rubyblue div.CodeMirror-selected { background: #38566F !important; } 37.cm-s-rubyblue div.CodeMirror-selected { background: #38566F !important; }
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
index de4d81ce..e4fb4cec 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
index 7ad547d0..a61c6508 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
@@ -30,8 +30,8 @@ POSSIBILITY OF SUCH DAMAGE.
30 30
31//////////////////////////////////////////////////////////////////////// 31////////////////////////////////////////////////////////////////////////
32// 32//
33var Montage = require("montage/core/core").Montage, 33var Montage = require("montage/core/core").Montage,
34 Component = require("montage/ui/component").Component; 34 Component = require("montage/ui/component").Component;
35 35
36exports.CodeEditorViewOptions = Montage.create(Component, { 36exports.CodeEditorViewOptions = Montage.create(Component, {
37 37