diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /index.html | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-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 'index.html')
| -rwxr-xr-x | index.html | 29 |
1 files changed, 26 insertions, 3 deletions
| @@ -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,18 +225,30 @@ | |||
| 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 | ||
| 224 | <script type="text/montage-serialization"> | 248 | <script type="text/montage-serialization"> |
| 225 | { | 249 | { |
| 226 | "owner": { | 250 | "owner": { |
| 227 | "module": "montage/ui/loader.reel", | 251 | "prototype": "montage/ui/loader.reel", |
| 228 | "name": "Loader", | ||
| 229 | "properties": { | 252 | "properties": { |
| 230 | "mainModule": "js/ninja.reel", | 253 | "mainModule": "js/ninja.reel", |
| 231 | "mainName": "Ninja", | 254 | "mainName": "Ninja", |
| @@ -234,7 +257,7 @@ | |||
| 234 | } | 257 | } |
| 235 | } | 258 | } |
| 236 | </script> | 259 | </script> |
| 237 | 260 | ||
| 238 | </head> | 261 | </head> |
| 239 | 262 | ||
| 240 | <body> | 263 | <body> |