aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/theme
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /imports/codemirror/theme
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'imports/codemirror/theme')
-rw-r--r--imports/codemirror/theme/eclipse.css2
-rw-r--r--imports/codemirror/theme/elegant.css4
-rw-r--r--imports/codemirror/theme/lesser-dark.css45
-rw-r--r--imports/codemirror/theme/neat.css6
-rw-r--r--imports/codemirror/theme/rubyblue.css2
-rw-r--r--imports/codemirror/theme/xq-dark.css46
6 files changed, 98 insertions, 7 deletions
diff --git a/imports/codemirror/theme/eclipse.css b/imports/codemirror/theme/eclipse.css
index 41f6fcbd..47d66a01 100644
--- a/imports/codemirror/theme/eclipse.css
+++ b/imports/codemirror/theme/eclipse.css
@@ -1,5 +1,5 @@
1.cm-s-eclipse span.cm-meta {color: #FF1717;} 1.cm-s-eclipse span.cm-meta {color: #FF1717;}
2.cm-s-eclipse span.cm-keyword { font-weight: bold; color: #7F0055; } 2.cm-s-eclipse span.cm-keyword { line-height: 1em; font-weight: bold; color: #7F0055; }
3.cm-s-eclipse span.cm-atom {color: #219;} 3.cm-s-eclipse span.cm-atom {color: #219;}
4.cm-s-eclipse span.cm-number {color: #164;} 4.cm-s-eclipse span.cm-number {color: #164;}
5.cm-s-eclipse span.cm-def {color: #00f;} 5.cm-s-eclipse span.cm-def {color: #00f;}
diff --git a/imports/codemirror/theme/elegant.css b/imports/codemirror/theme/elegant.css
index 29afa982..d0ce0cb5 100644
--- a/imports/codemirror/theme/elegant.css
+++ b/imports/codemirror/theme/elegant.css
@@ -1,6 +1,6 @@
1.cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom {color: #762;} 1.cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom {color: #762;}
2.cm-s-elegant span.cm-comment {color: #262;font-style: italic;} 2.cm-s-elegant span.cm-comment {color: #262; font-style: italic; line-height: 1em;}
3.cm-s-elegant span.cm-meta {color: #555;font-style: italic;} 3.cm-s-elegant span.cm-meta {color: #555; font-style: italic; line-height: 1em;}
4.cm-s-elegant span.cm-variable {color: black;} 4.cm-s-elegant span.cm-variable {color: black;}
5.cm-s-elegant span.cm-variable-2 {color: #b11;} 5.cm-s-elegant span.cm-variable-2 {color: #b11;}
6.cm-s-elegant span.cm-qualifier {color: #555;} 6.cm-s-elegant span.cm-qualifier {color: #555;}
diff --git a/imports/codemirror/theme/lesser-dark.css b/imports/codemirror/theme/lesser-dark.css
new file mode 100644
index 00000000..fb5160b4
--- /dev/null
+++ b/imports/codemirror/theme/lesser-dark.css
@@ -0,0 +1,45 @@
1/*
2http://lesscss.org/ dark theme
3Ported to CodeMirror by Peter Kroon
4*/
5.CodeMirror{
6 line-height: 15px;
7}
8.cm-s-lesser-dark {
9 font-family: 'Bitstream Vera Sans Mono', 'DejaVu Sans Mono', 'Monaco', Courier, monospace !important;
10 font-size:12px;
11}
12
13.cm-s-lesser-dark { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; }
14.cm-s-lesser-dark div.CodeMirror-selected {background: #45443B !important;} /* 33322B*/
15.cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
16.cm-s-lesser-dark .CodeMirror-lines { margin-left:3px; margin-right:3px; }/*editable code holder*/
17
18div.CodeMirror span.CodeMirror-matchingbracket { color: #7EFC7E; }/*65FC65*/
19
20.cm-s-lesser-dark .CodeMirror-gutter { background: #262626; border-right:1px solid #aaa; padding-right:3px; min-width:2.5em; }
21.cm-s-lesser-dark .CodeMirror-gutter-text { color: #777; }
22
23.cm-s-lesser-dark span.cm-keyword { color: #599eff; }
24.cm-s-lesser-dark span.cm-atom { color: #C2B470; }
25.cm-s-lesser-dark span.cm-number { color: #B35E4D; }
26.cm-s-lesser-dark span.cm-def {color: color: white;}
27.cm-s-lesser-dark span.cm-variable { color:#D9BF8C; }
28.cm-s-lesser-dark span.cm-variable-2 { color: #669199; }
29.cm-s-lesser-dark span.cm-variable-3 { color: white; }
30.cm-s-lesser-dark span.cm-property {color: #92A75C;}
31.cm-s-lesser-dark span.cm-operator {color: #92A75C;}
32.cm-s-lesser-dark span.cm-comment { color: #666; }
33.cm-s-lesser-dark span.cm-string { color: #BCD279; }
34.cm-s-lesser-dark span.cm-string-2 {color: #f50;}
35.cm-s-lesser-dark span.cm-meta { color: #738C73; }
36.cm-s-lesser-dark span.cm-error { color: #9d1e15; }
37.cm-s-lesser-dark span.cm-qualifier {color: #555;}
38.cm-s-lesser-dark span.cm-builtin { color: #ff9e59; }
39.cm-s-lesser-dark span.cm-bracket { color: #EBEFE7; }
40.cm-s-lesser-dark span.cm-tag { color: #669199; }
41.cm-s-lesser-dark span.cm-attribute {color: #00c;}
42.cm-s-lesser-dark span.cm-header {color: #a0a;}
43.cm-s-lesser-dark span.cm-quote {color: #090;}
44.cm-s-lesser-dark span.cm-hr {color: #999;}
45.cm-s-lesser-dark span.cm-link {color: #00c;}
diff --git a/imports/codemirror/theme/neat.css b/imports/codemirror/theme/neat.css
index 6d2dbf5f..8a307f80 100644
--- a/imports/codemirror/theme/neat.css
+++ b/imports/codemirror/theme/neat.css
@@ -1,8 +1,8 @@
1.cm-s-neat span.cm-comment { color: #a86; } 1.cm-s-neat span.cm-comment { color: #a86; }
2.cm-s-neat span.cm-keyword { font-weight: bold; color: blue; } 2.cm-s-neat span.cm-keyword { line-height: 1em; font-weight: bold; color: blue; }
3.cm-s-neat span.cm-string { color: #a22; } 3.cm-s-neat span.cm-string { color: #a22; }
4.cm-s-neat span.cm-builtin { font-weight: bold; color: #077; } 4.cm-s-neat span.cm-builtin { line-height: 1em; font-weight: bold; color: #077; }
5.cm-s-neat span.cm-special { font-weight: bold; color: #0aa; } 5.cm-s-neat span.cm-special { line-height: 1em; font-weight: bold; color: #0aa; }
6.cm-s-neat span.cm-variable { color: black; } 6.cm-s-neat span.cm-variable { color: black; }
7.cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; } 7.cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; }
8.cm-s-neat span.cm-meta {color: #555;} 8.cm-s-neat span.cm-meta {color: #555;}
diff --git a/imports/codemirror/theme/rubyblue.css b/imports/codemirror/theme/rubyblue.css
index 3c67762b..502817ae 100644
--- a/imports/codemirror/theme/rubyblue.css
+++ b/imports/codemirror/theme/rubyblue.css
@@ -6,7 +6,7 @@
6.cm-s-rubyblue .CodeMirror-gutter-text { color: white; } 6.cm-s-rubyblue .CodeMirror-gutter-text { color: white; }
7.cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white !important; } 7.cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white !important; }
8 8
9.cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; } 9.cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; line-height: 1em; }
10.cm-s-rubyblue span.cm-atom { color: #F4C20B; } 10.cm-s-rubyblue span.cm-atom { color: #F4C20B; }
11.cm-s-rubyblue span.cm-number, .cm-s-rubyblue span.cm-attribute { color: #82C6E0; } 11.cm-s-rubyblue span.cm-number, .cm-s-rubyblue span.cm-attribute { color: #82C6E0; }
12.cm-s-rubyblue span.cm-keyword { color: #F0F; } 12.cm-s-rubyblue span.cm-keyword { color: #F0F; }
diff --git a/imports/codemirror/theme/xq-dark.css b/imports/codemirror/theme/xq-dark.css
new file mode 100644
index 00000000..493e3a63
--- /dev/null
+++ b/imports/codemirror/theme/xq-dark.css
@@ -0,0 +1,46 @@
1/*
2Copyright (C) 2011 by MarkLogic Corporation
3Author: Mike Brevoort <mike@brevoort.com>
4
5Permission is hereby granted, free of charge, to any person obtaining a copy
6of this software and associated documentation files (the "Software"), to deal
7in the Software without restriction, including without limitation the rights
8to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9copies of the Software, and to permit persons to whom the Software is
10furnished to do so, subject to the following conditions:
11
12The above copyright notice and this permission notice shall be included in
13all copies or substantial portions of the Software.
14
15THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21THE SOFTWARE.
22*/
23.cm-s-xq-dark { background: #0a001f; color: #f8f8f8; }
24.cm-s-xq-dark span.CodeMirror-selected { background: #a8f !important; }
25.cm-s-xq-dark .CodeMirror-gutter { background: #0a001f; border-right: 1px solid #aaa; }
26.cm-s-xq-dark .CodeMirror-gutter-text { color: #f8f8f8; }
27.cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
28
29.cm-s-xq-dark span.cm-keyword {color: #FFBD40;}
30.cm-s-xq-dark span.cm-atom {color: #6C8CD5;}
31.cm-s-xq-dark span.cm-number {color: #164;}
32.cm-s-xq-dark span.cm-def {color: #FFF; text-decoration:underline;}
33.cm-s-xq-dark span.cm-variable {color: #FFF;}
34.cm-s-xq-dark span.cm-variable-2 {color: #EEE;}
35.cm-s-xq-dark span.cm-variable-3 {color: #DDD;}
36.cm-s-xq-dark span.cm-property {}
37.cm-s-xq-dark span.cm-operator {}
38.cm-s-xq-dark span.cm-comment {color: gray;}
39.cm-s-xq-dark span.cm-string {color: #9FEE00;}
40.cm-s-xq-dark span.cm-meta {color: yellow;}
41.cm-s-xq-dark span.cm-error {color: #f00;}
42.cm-s-xq-dark span.cm-qualifier {color: #FFF700;}
43.cm-s-xq-dark span.cm-builtin {color: #30a;}
44.cm-s-xq-dark span.cm-bracket {color: #cc7;}
45.cm-s-xq-dark span.cm-tag {color: #FFBD40;}
46.cm-s-xq-dark span.cm-attribute {color: #FFF700;}