diff options
| author | Jonathan Duran | 2012-02-25 16:17:51 -0800 |
|---|---|---|
| committer | Jonathan Duran | 2012-02-25 16:17:51 -0800 |
| commit | 1bc2de516c86f67c2107bd50df0589a273f4c5ab (patch) | |
| tree | bd30d9c6512b47ecdb27695bd5a2900f63e62996 /js/panels/Timeline/Layer.reel | |
| parent | 9dabdd11b7fc8a042e139457748547ffe2232468 (diff) | |
| parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
| download | ninja-1bc2de516c86f67c2107bd50df0589a273f4c5ab.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into Timeline
Diffstat (limited to 'js/panels/Timeline/Layer.reel')
| -rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.html | 5 | ||||
| -rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 6 | ||||
| -rw-r--r-- | js/panels/Timeline/Layer.reel/css/Layer.css | 6 | ||||
| -rw-r--r-- | js/panels/Timeline/Layer.reel/scss/Layer.scss | 6 |
4 files changed, 23 insertions, 0 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index e262afe2..a3fbd5b1 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html | |||
| @@ -1,4 +1,9 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- <copyright> | ||
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 6 | </copyright> --> | ||
| 2 | <html lang="en"> | 7 | <html lang="en"> |
| 3 | <head> | 8 | <head> |
| 4 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 2e9a8f1a..f62c0b90 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | /* <copyright> | ||
| 2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 5 | </copyright> */ | ||
| 6 | |||
| 1 | var Montage = require("montage/core/core").Montage; | 7 | var Montage = require("montage/core/core").Montage; |
| 2 | var Component = require("montage/ui/component").Component; | 8 | var Component = require("montage/ui/component").Component; |
| 3 | var Collapser = require("js/panels/Timeline/Collapser").Collapser; | 9 | var Collapser = require("js/panels/Timeline/Collapser").Collapser; |
diff --git a/js/panels/Timeline/Layer.reel/css/Layer.css b/js/panels/Timeline/Layer.reel/css/Layer.css index 3547a15e..833c921c 100644 --- a/js/panels/Timeline/Layer.reel/css/Layer.css +++ b/js/panels/Timeline/Layer.reel/css/Layer.css | |||
| @@ -1,4 +1,10 @@ | |||
| 1 | @charset "UTF-8"; | 1 | @charset "UTF-8"; |
| 2 | /* <copyright> | ||
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 6 | </copyright> */ | ||
| 7 | |||
| 2 | /* Layer.scss | 8 | /* Layer.scss |
| 3 | * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. | 9 | * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. |
| 4 | */ | 10 | */ |
diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss index c66a6267..dda0c951 100644 --- a/js/panels/Timeline/Layer.reel/scss/Layer.scss +++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | @charset "UTF-8"; | 1 | @charset "UTF-8"; |
| 2 | 2 | ||
| 3 | /* <copyright> | ||
| 4 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 5 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 6 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 7 | </copyright> */ | ||
| 8 | |||
| 3 | /* Layer.scss | 9 | /* Layer.scss |
| 4 | * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. | 10 | * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. |
| 5 | */ | 11 | */ |