diff options
| author | Kruti Shah | 2012-06-12 13:09:11 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-06-12 13:09:11 -0700 |
| commit | d648c842905c7c53e0f89b943982493d2b79f56e (patch) | |
| tree | eb5585f92061975215f6d19305a8d1b76262e2fc /js | |
| parent | bedb38e14887b29eae3cdf1c8d435259c920257c (diff) | |
| parent | cf3b96822665751dae7a64644db3cb3960733c3d (diff) | |
| download | ninja-d648c842905c7c53e0f89b943982493d2b79f56e.tar.gz | |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/document/_toDelete/html-document.js
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js')
126 files changed, 5492 insertions, 3987 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 6130382b..aeaf604c 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 | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | height: 20px; | 18 | height: 20px; |
| 19 | } | 19 | } |
| 20 | 20 | ||
| 21 | .viewOptions .autoCodeComplete span{ | 21 | .viewOptions .autoCodeComplete label{ |
| 22 | vertical-align: middle; | 22 | vertical-align: middle; |
| 23 | } | 23 | } |
| 24 | |||