aboutsummaryrefslogtreecommitdiff
path: root/index.html
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-07 16:30:19 -0700
committerJohn Mayhew2012-05-07 16:30:19 -0700
commitdb4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree8b79ad58108af2f17d15abc8cdc33d35229ab20d /index.html
parent843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
Diffstat (limited to 'index.html')
-rwxr-xr-xindex.html26
1 files changed, 25 insertions, 1 deletions
diff --git a/index.html b/index.html
index 0f1c6d51..209045cf 100755
--- a/index.html
+++ b/index.html
@@ -21,6 +21,17 @@
21 21
22 <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700|Droid+Sans+Mono' rel='stylesheet' type='text/css'> 22 <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700|Droid+Sans+Mono' rel='stylesheet' type='text/css'>
23 <link href="imports/codemirror/lib/codemirror.css" rel="stylesheet" type="text/css"/> 23 <link href="imports/codemirror/lib/codemirror.css" rel="stylesheet" type="text/css"/>
24 <link rel="stylesheet" href="imports/codemirror/lib/util/simple-hint.css">
25 <link rel="stylesheet" href="imports/codemirror/theme/neat.css">
26 <link rel="stylesheet" href="imports/codemirror/theme/elegant.css">
27 <link rel="stylesheet" href="imports/codemirror/theme/night.css">
28 <link rel="stylesheet" href="imports/codemirror/theme/monokai.css">
29 <link rel="stylesheet" href="imports/codemirror/theme/cobalt.css">
30 <link rel="stylesheet" href="imports/codemirror/theme/eclipse.css">
31 <link rel="stylesheet" href="js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css">
32 <link rel="stylesheet" href="js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css">
33 <link rel="stylesheet" href="js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css">
34
24 35
25 <style type="text/css"> 36 <style type="text/css">
26 html, body 37 html, body
@@ -214,10 +225,23 @@
214 <!-- End Ridge Uncompiled --> 225 <!-- End Ridge Uncompiled -->
215 226
216 <script type="text/javascript" src="imports/codemirror/lib/codemirror.js"></script> 227 <script type="text/javascript" src="imports/codemirror/lib/codemirror.js"></script>
228 <!-- // modes // -->
217 <script type="text/javascript" src="imports/codemirror/mode/htmlmixed/htmlmixed.js"></script> 229 <script type="text/javascript" src="imports/codemirror/mode/htmlmixed/htmlmixed.js"></script>
218 <script type="text/javascript" src="imports/codemirror/mode/xml/xml.js"></script> 230 <script type="text/javascript" src="imports/codemirror/mode/xml/xml.js"></script>
219 <script type="text/javascript" src="imports/codemirror/mode/javascript/javascript.js"></script> 231 <script type="text/javascript" src="imports/codemirror/mode/javascript/javascript.js"></script>
220 <script type="text/javascript" src="imports/codemirror/mode/css/css.js"></script> 232 <script type="text/javascript" src="imports/codemirror/mode/css/css.js"></script>
233 <script type="text/javascript" src="imports/codemirror/mode/php/php.js"></script>
234 <script type="text/javascript" src="imports/codemirror/mode/clike/clike.js"></script>
235 <script type="text/javascript" src="imports/codemirror/mode/perl/perl.js"></script>
236 <script type="text/javascript" src="imports/codemirror/mode/python/python.js"></script>
237 <script type="text/javascript" src="imports/codemirror/mode/ruby/ruby.js"></script>
238 <!-- functionality libraries -->
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>
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>
243 <script type="text/javascript" src="imports/codemirror/lib/util/formatting.js"></script>
244 <!-- -->
221 245
222 <script type="text/javascript" src="node_modules/montage/montage.js"></script> 246 <script type="text/javascript" src="node_modules/montage/montage.js"></script>
223 247
@@ -233,7 +257,7 @@
233 } 257 }
234 } 258 }
235 </script> 259 </script>
236 260
237 </head> 261 </head>
238 262
239 <body> 263 <body>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 13:16:32 +0000