aboutsummaryrefslogtreecommitdiff
path: root/js/code-editor/ui
diff options
context:
space:
mode:
authorAnanya Sen2012-04-30 13:22:23 -0700
committerAnanya Sen2012-04-30 13:22:23 -0700
commit0e67024be5993049ea6acd9add96b76be6017a4d (patch)
tree5a5667a65ac5c14a42f8f7395cd306915a66a565 /js/code-editor/ui
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>
Diffstat (limited to 'js/code-editor/ui')
-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
2 files changed, 17 insertions, 3 deletions
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>