diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/code-editor/codemirror-ninja | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-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/codemirror-ninja')
| -rw-r--r-- | js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |