aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnanya Sen2012-04-30 13:22:23 -0700
committerAnanya Sen2012-04-30 13:22:23 -0700
commit0e67024be5993049ea6acd9add96b76be6017a4d (patch)
tree5a5667a65ac5c14a42f8f7395cd306915a66a565
parentaa35d31fa94f844586581c770913858bd15af505 (diff)
downloadninja-0e67024be5993049ea6acd9add96b76be6017a4d.tar.gz
IKNINJA-1562 : override font-size for some themes to allow xooming
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
-rwxr-xr-xindex.html6
-rw-r--r--js/code-editor/codemirror-ninja/lib/ninja-simple-hint.js (renamed from js/code-editor/codemirror-ninja-lib/ninja-simple-hint.js)0
-rw-r--r--js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css45
-rw-r--r--js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css22
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css14
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html6
6 files changed, 87 insertions, 6 deletions
diff --git a/index.html b/index.html
index 2c50d294..1821e370 100755
--- a/index.html
+++ b/index.html
@@ -28,8 +28,8 @@
28 <link rel="stylesheet" href="imports/codemirror/theme/monokai.css"> 28 <link rel="stylesheet" href="imports/codemirror/theme/monokai.css">
29 <link rel="stylesheet" href="imports/codemirror/theme/cobalt.css"> 29 <link rel="stylesheet" href="imports/codemirror/theme/cobalt.css">
30 <link rel="stylesheet" href="imports/codemirror/theme/eclipse.css"> 30 <link rel="stylesheet" href="imports/codemirror/theme/eclipse.css">
31 <link rel="stylesheet" href="imports/codemirror/theme/rubyblue.css"> 31 <link rel="stylesheet" href="js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css">
32 <link rel="stylesheet" href="imports/codemirror/theme/lesser-dark.css"> 32 <link rel="stylesheet" href="js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css">
33 <link rel="stylesheet" href="imports/codemirror/theme/xq-dark.css"> 33 <link rel="stylesheet" href="imports/codemirror/theme/xq-dark.css">
34 34
35 35
@@ -238,7 +238,7 @@
238 <!-- functionality libraries --> 238 <!-- functionality libraries -->
239 <script type="text/javascript" src="imports/codemirror/lib/util/searchcursor.js"></script> 239 <script type="text/javascript" src="imports/codemirror/lib/util/searchcursor.js"></script>
240 <script type="text/javascript" src="imports/codemirror/lib/util/match-highlighter.js"></script> 240 <script type="text/javascript" src="imports/codemirror/lib/util/match-highlighter.js"></script>
241 <script type="text/javascript" src="js/code-editor/codemirror-ninja-lib/ninja-simple-hint.js"></script> 241 <script type="text/javascript" src="js/code-editor/codemirror-ninja/lib/ninja-simple-hint.js"></script>
242 <script type="text/javascript" src="imports/codemirror/lib/util/javascript-hint.js"></script> 242 <script type="text/javascript" src="imports/codemirror/lib/util/javascript-hint.js"></script>
243 <script type="text/javascript" src="imports/codemirror/lib/util/formatting.js"></script> 243 <script type="text/javascript" src="imports/codemirror/lib/util/formatting.js"></script>
244 <!-- --> 244 <!-- -->
diff --git a/js/code-editor/codemirror-ninja-lib/ninja-simple-hint.js b/js/code-editor/codemirror-ninja/lib/ninja-simple-hint.js
index 866e1a8b..866e1a8b 100644
--- a/js/code-editor/codemirror-ninja-lib/ninja-simple-hint.js
+++ b/js/code-editor/codemirror-ninja/lib/ninja-simple-hint.js
diff --git a/js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css b/js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
new file mode 100644
index 00000000..fa7e8e07
--- /dev/null
+++ b/js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.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/js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css b/js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css
new file mode 100644
index 00000000..b09e4e3e
--- /dev/null
+++ b/js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css
@@ -0,0 +1,22 @@
1.cm-s-rubyblue {
2 font:Trebuchet, Verdana, sans-serif; } /* - customized editor font - */
3
4.cm-s-rubyblue { background: #112435; color: white; }
5.cm-s-rubyblue div.CodeMirror-selected { background: #38566F !important; }
6.cm-s-rubyblue .CodeMirror-gutter { background: #1F4661; border-right: 7px solid #3E7087; min-width:2.5em; }
7.cm-s-rubyblue .CodeMirror-gutter-text { color: white; }
8.cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white !important; }
9
10.cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; line-height: 1em; }
11.cm-s-rubyblue span.cm-atom { color: #F4C20B; }
12.cm-s-rubyblue span.cm-number, .cm-s-rubyblue span.cm-attribute { color: #82C6E0; }
13.cm-s-rubyblue span.cm-keyword { color: #F0F; }
14.cm-s-rubyblue span.cm-string { color: #F08047; }
15.cm-s-rubyblue span.cm-meta { color: #F0F; }
16.cm-s-rubyblue span.cm-variable-2, .cm-s-rubyblue span.cm-tag { color: #7BD827; }
17.cm-s-rubyblue span.cm-variable-3, .cm-s-rubyblue span.cm-def { color: white; }
18.cm-s-rubyblue span.cm-error { color: #AF2018; }
19.cm-s-rubyblue span.cm-bracket { color: #F0F; }
20.cm-s-rubyblue span.cm-link { color: #F4C20B; }
21.cm-s-rubyblue span.CodeMirror-matchingbracket { color:#F0F !important; }
22.cm-s-rubyblue span.cm-builtin, .cm-s-rubyblue span.cm-special { color: #FF9D00; }
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css
index ed314fc9..1e3b4ce7 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css
@@ -76,6 +76,7 @@
76 white-space: nowrap; 76 white-space: nowrap;
77 padding:5px; 77 padding:5px;
78 background-color: #313131; 78 background-color: #313131;
79 width:200px;
79} 80}
80 81
81.viewOptions .shortKeys .list div{ 82.viewOptions .shortKeys .list div{
@@ -88,4 +89,17 @@
88 89
89.viewOptions .shortKeys .show{ 90.viewOptions .shortKeys .show{
90 visibility: visible; 91 visibility: visible;
92}
93
94.viewOptions .shortKeys div{
95 padding:2px;
96}
97
98.viewOptions .shortKey{
99 font-style: italic;
100 color: #d1d1d1;
101}
102
103.viewOptions .shortKeyDesc{
104 float:right;
91} \ No newline at end of file 105} \ No newline at end of file
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 8a46a0b1..d207ea23 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
@@ -75,9 +75,9 @@
75 </div> 75 </div>
76 <div id="shortKeys" class="shortKeys"> 76 <div id="shortKeys" class="shortKeys">
77 <div class="list hide"> 77 <div class="list hide">
78 <div><span>ctrl+space : code hints</span></div> 78 <div><span class="shortKey">ctrl+space :</span> <span class="shortKeyDesc">code hints</span></div>
79 <div><span>ctrl+/ : comment selection</span></div> 79 <div><span class="shortKey">ctrl+/ :</span> <span class="shortKeyDesc">comment selection</span></div>
80 <div><span>ctrl+shift+/ : uncomment selection</span></div> 80 <div><span class="shortKey">ctrl+shift+/ :</span> <span class="shortKeyDesc">uncomment selection</span></div>
81 </div> 81 </div>
82 <span>ShortKeys</span> 82 <span>ShortKeys</span>
83 <span class="dropdownArrow">&#9660</span> 83 <span class="dropdownArrow">&#9660</span>