diff options
author | Valerio Virgillito | 2012-07-09 17:06:15 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 17:06:15 -0700 |
commit | 9bf7f21b5e4c70aeca2ad14d53e1a4051f5440dc (patch) | |
tree | 855e19e66f20e3f49f70e7fbf82ba18a73a6527d | |
parent | bc4e72b2e61fd8560dfd3124e2bc77651845242d (diff) | |
download | ninja-9bf7f21b5e4c70aeca2ad14d53e1a4051f5440dc.tar.gz |
Removed the customized xq-dark and lesser-dark themes temporarily until copyright legalities determined
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Conflicts:
js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
4 files changed, 0 insertions, 162 deletions
@@ -54,8 +54,6 @@ POSSIBILITY OF SUCH DAMAGE. | |||
54 | <link rel="stylesheet" href="imports/codemirror/theme/cobalt.css"> | 54 | <link rel="stylesheet" href="imports/codemirror/theme/cobalt.css"> |
55 | <link rel="stylesheet" href="imports/codemirror/theme/eclipse.css"> | 55 | <link rel="stylesheet" href="imports/codemirror/theme/eclipse.css"> |
56 | <link rel="stylesheet" href="js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css"> | 56 | <link rel="stylesheet" href="js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css"> |
57 | <link rel="stylesheet" href="js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css"> | ||
58 | <link rel="stylesheet" href="js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css"> | ||
59 | 57 | ||
60 | 58 | ||
61 | <style type="text/css"> | 59 | <style type="text/css"> |
diff --git a/js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css b/js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css deleted file mode 100644 index 0bac581e..00000000 --- a/js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css +++ /dev/null | |||
@@ -1,79 +0,0 @@ | |||
1 | /* <copyright> | ||
2 | Copyright (c) 2012, Motorola Mobility LLC. | ||
3 | All Rights Reserved. | ||
4 | |||
5 | Redistribution and use in source and binary forms, with or without | ||
6 | modification, are permitted provided that the following conditions are met: | ||
7 | |||
8 | * Redistributions of source code must retain the above copyright notice, | ||
9 | this list of conditions and the following disclaimer. | ||
10 | |||
11 | * Redistributions in binary form must reproduce the above copyright notice, | ||
12 | this list of conditions and the following disclaimer in the documentation | ||
13 | and/or other materials provided with the distribution. | ||
14 | |||
15 | * Neither the name of Motorola Mobility LLC nor the names of its | ||
16 | contributors may be used to endorse or promote products derived from this | ||
17 | software without specific prior written permission. | ||
18 | |||
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | ||
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
26 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
27 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
28 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
29 | POSSIBILITY OF SUCH DAMAGE. | ||
30 | </copyright> */ | ||
31 | |||
32 | /* adopted from CodeMirror 2.23 (http://codemirror.net/) */ | ||
33 | |||
34 | /* | ||
35 | http://lesscss.org/ dark theme | ||
36 | Ported to CodeMirror by Peter Kroon | ||
37 | */ | ||
38 | |||
39 | .CodeMirror{ | ||
40 | line-height: 15px; | ||
41 | } | ||
42 | .cm-s-lesser-dark { | ||
43 | font-family: 'Bitstream Vera Sans Mono', 'DejaVu Sans Mono', 'Monaco', Courier, monospace !important; | ||
44 | /*font-size:12px;*/ | ||
45 | } | ||
46 | |||
47 | .cm-s-lesser-dark { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; } | ||
48 | .cm-s-lesser-dark div.CodeMirror-selected {background: #45443B !important;} /* 33322B*/ | ||
49 | .cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white !important; } | ||
50 | .cm-s-lesser-dark .CodeMirror-lines { margin-left:3px; margin-right:3px; }/*editable code holder*/ | ||
51 | |||
52 | div.CodeMirror span.CodeMirror-matchingbracket { color: #7EFC7E; }/*65FC65*/ | ||
53 | |||
54 | .cm-s-lesser-dark .CodeMirror-gutter { background: #262626; border-right:1px solid #aaa; padding-right:3px; min-width:2.5em; } | ||
55 | .cm-s-lesser-dark .CodeMirror-gutter-text { color: #777; } | ||
56 | |||
57 | .cm-s-lesser-dark span.cm-keyword { color: #599eff; } | ||
58 | .cm-s-lesser-dark span.cm-atom { color: #C2B470; } | ||
59 | .cm-s-lesser-dark span.cm-number { color: #B35E4D; } | ||
60 | .cm-s-lesser-dark span.cm-def {color: color: white;} | ||
61 | .cm-s-lesser-dark span.cm-variable { color:#D9BF8C; } | ||
62 | .cm-s-lesser-dark span.cm-variable-2 { color: #669199; } | ||
63 | .cm-s-lesser-dark span.cm-variable-3 { color: white; } | ||
64 | .cm-s-lesser-dark span.cm-property {color: #92A75C;} | ||
65 | .cm-s-lesser-dark span.cm-operator {color: #92A75C;} | ||
66 | .cm-s-lesser-dark span.cm-comment { color: #666; } | ||
67 | .cm-s-lesser-dark span.cm-string { color: #BCD279; } | ||
68 | .cm-s-lesser-dark span.cm-string-2 {color: #f50;} | ||
69 | .cm-s-lesser-dark span.cm-meta { color: #738C73; } | ||
70 | .cm-s-lesser-dark span.cm-error { color: #9d1e15; } | ||
71 | .cm-s-lesser-dark span.cm-qualifier {color: #555;} | ||
72 | .cm-s-lesser-dark span.cm-builtin { color: #ff9e59; } | ||
73 | .cm-s-lesser-dark span.cm-bracket { color: #EBEFE7; } | ||
74 | .cm-s-lesser-dark span.cm-tag { color: #669199; } | ||
75 | .cm-s-lesser-dark span.cm-attribute {color: #00c;} | ||
76 | .cm-s-lesser-dark span.cm-header {color: #a0a;} | ||
77 | .cm-s-lesser-dark span.cm-quote {color: #090;} | ||
78 | .cm-s-lesser-dark span.cm-hr {color: #999;} | ||
79 | .cm-s-lesser-dark span.cm-link {color: #00c;} | ||
diff --git a/js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css b/js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css deleted file mode 100644 index 60043953..00000000 --- a/js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css +++ /dev/null | |||
@@ -1,79 +0,0 @@ | |||
1 | /* <copyright> | ||
2 | Copyright (c) 2012, Motorola Mobility LLC. | ||
3 | All Rights Reserved. | ||
4 | |||
5 | Redistribution and use in source and binary forms, with or without | ||
6 | modification, are permitted provided that the following conditions are met: | ||
7 | |||
8 | * Redistributions of source code must retain the above copyright notice, | ||
9 | this list of conditions and the following disclaimer. | ||
10 | |||
11 | * Redistributions in binary form must reproduce the above copyright notice, | ||
12 | this list of conditions and the following disclaimer in the documentation | ||
13 | and/or other materials provided with the distribution. | ||
14 | |||
15 | * Neither the name of Motorola Mobility LLC nor the names of its | ||
16 | contributors may be used to endorse or promote products derived from this | ||
17 | software without specific prior written permission. | ||
18 | |||
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | ||
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
26 | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
27 | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
28 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
29 | POSSIBILITY OF SUCH DAMAGE. | ||
30 | </copyright> */ | ||
31 | |||
32 | /* adopted from CodeMirror 2.23 (http://codemirror.net/) */ | ||
33 | |||
34 | /* | ||
35 | Copyright (C) 2011 by MarkLogic Corporation | ||
36 | Author: Mike Brevoort <mike@brevoort.com> | ||
37 | |||
38 | Permission is hereby granted, free of charge, to any person obtaining a copy | ||
39 | of this software and associated documentation files (the "Software"), to deal | ||
40 | in the Software without restriction, including without limitation the rights | ||
41 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
42 | copies of the Software, and to permit persons to whom the Software is | ||
43 | furnished to do so, subject to the following conditions: | ||
44 | |||
45 | The above copyright notice and this permission notice shall be included in | ||
46 | all copies or substantial portions of the Software. | ||
47 | |||
48 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
49 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
50 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
51 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
52 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
53 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
54 | THE SOFTWARE. | ||
55 | */ | ||
56 | .cm-s-xq-dark { background: #0a001f; color: #f8f8f8; } | ||
57 | .cm-s-xq-dark span.CodeMirror-selected { background: #044259 !important; } | ||
58 | .cm-s-xq-dark .CodeMirror-gutter { background: #0a001f; border-right: 1px solid #aaa; } | ||
59 | .cm-s-xq-dark .CodeMirror-gutter-text { color: #f8f8f8; } | ||
60 | .cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white !important; } | ||
61 | |||
62 | .cm-s-xq-dark span.cm-keyword {color: #FFBD40;} | ||
63 | .cm-s-xq-dark span.cm-atom {color: #6C8CD5;} | ||
64 | .cm-s-xq-dark span.cm-number {color: #164;} | ||
65 | .cm-s-xq-dark span.cm-def {color: #FFF; text-decoration:underline;} | ||
66 | .cm-s-xq-dark span.cm-variable {color: #FFF;} | ||
67 | .cm-s-xq-dark span.cm-variable-2 {color: #EEE;} | ||
68 | .cm-s-xq-dark span.cm-variable-3 {color: #DDD;} | ||
69 | .cm-s-xq-dark span.cm-property {} | ||
70 | .cm-s-xq-dark span.cm-operator {} | ||
71 | .cm-s-xq-dark span.cm-comment {color: gray;} | ||
72 | .cm-s-xq-dark span.cm-string {color: #9FEE00;} | ||
73 | .cm-s-xq-dark span.cm-meta {color: yellow;} | ||
74 | .cm-s-xq-dark span.cm-error {color: #f00;} | ||
75 | .cm-s-xq-dark span.cm-qualifier {color: #FFF700;} | ||
76 | .cm-s-xq-dark span.cm-builtin {color: #30a;} | ||
77 | .cm-s-xq-dark span.cm-bracket {color: #cc7;} | ||
78 | .cm-s-xq-dark span.cm-tag {color: #FFBD40;} | ||
79 | .cm-s-xq-dark span.cm-attribute {color: #FFF700;} | ||
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 ddda8499..1a1af9fc 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 | |||
@@ -101,8 +101,6 @@ POSSIBILITY OF SUCH DAMAGE. | |||
101 | <option value="cobalt" >COBALT</option> | 101 | <option value="cobalt" >COBALT</option> |
102 | <option value="eclipse" >ECLIPSE</option> | 102 | <option value="eclipse" >ECLIPSE</option> |
103 | <option value="rubyblue" >RUBYBLUE</option> | 103 | <option value="rubyblue" >RUBYBLUE</option> |
104 | <option value="lesser-dark" >LESSER-DARK</option> | ||
105 | <option value="xq-dark" >XQ-DARK</option> | ||
106 | </select> | 104 | </select> |
107 | </div> | 105 | </div> |
108 | <div data-montage-id="shortKeys" class="shortKeys"> | 106 | <div data-montage-id="shortKeys" class="shortKeys"> |