aboutsummaryrefslogtreecommitdiff
path: root/js/code-editor/codemirror-ninja/theme
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/code-editor/codemirror-ninja/theme
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/code-editor/codemirror-ninja/theme')
-rw-r--r--js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css2
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; }