diff options
| author | Jon Reid | 2012-02-24 13:04:35 -0800 |
|---|---|---|
| committer | Jon Reid | 2012-02-24 13:04:35 -0800 |
| commit | ae94ea8c3a419ed29fa0c4c16a817e3fea469901 (patch) | |
| tree | 5f3d5e295fdcc4648e262f35c3efe2dfd5b688b9 /js/panels/Timeline/Style.reel | |
| parent | c615e1d305424f16f64aca16cf38da760a5eec87 (diff) | |
| parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
| download | ninja-ae94ea8c3a419ed29fa0c4c16a817e3fea469901.tar.gz | |
Merge remote-tracking branch 'ninja-internal/master' into Timeline-local
Diffstat (limited to 'js/panels/Timeline/Style.reel')
| -rw-r--r-- | js/panels/Timeline/Style.reel/Style.html | 5 | ||||
| -rw-r--r-- | js/panels/Timeline/Style.reel/Style.js | 6 | ||||
| -rw-r--r-- | js/panels/Timeline/Style.reel/scss/Style.scss | 6 |
3 files changed, 17 insertions, 0 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html index c6f29626..48714432 100644 --- a/js/panels/Timeline/Style.reel/Style.html +++ b/js/panels/Timeline/Style.reel/Style.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/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js index e6e03901..027f3a40 100644 --- a/js/panels/Timeline/Style.reel/Style.js +++ b/js/panels/Timeline/Style.reel/Style.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 | /* | 7 | /* |
| 2 | * Style component: Edits and manages a single style rule for a Layer in the Timeline. | 8 | * Style component: Edits and manages a single style rule for a Layer in the Timeline. |
| 3 | * Public Properties: | 9 | * Public Properties: |
diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss index 827a0c43..30bf43fe 100644 --- a/js/panels/Timeline/Style.reel/scss/Style.scss +++ b/js/panels/Timeline/Style.reel/scss/Style.scss | |||
| @@ -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 | /* Layer.scss | 7 | /* Layer.scss |
| 2 | * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. | 8 | * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. |
| 3 | */ | 9 | */ |