diff options
| author | Jose Antonio Marquez | 2012-02-28 13:33:31 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-28 13:33:31 -0800 |
| commit | 3a25881b3a463e4f695be2f663f141710ba1d1c1 (patch) | |
| tree | 657d55ad394de168dd627cf89b875906d10584e2 /js/panels/Timeline/Style.reel | |
| parent | d764428023d87446fbbb153d8e04a23b900d71d5 (diff) | |
| parent | 7c9291a5bab4abd849547f8878f6fb962fc88250 (diff) | |
| download | ninja-3a25881b3a463e4f695be2f663f141710ba1d1c1.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
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 | 12 |
3 files changed, 20 insertions, 3 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 f15f553d..30bf43fe 100644 --- a/js/panels/Timeline/Style.reel/scss/Style.scss +++ b/js/panels/Timeline/Style.reel/scss/Style.scss | |||
| @@ -1,13 +1,19 @@ | |||
| 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 | */ |
| 4 | 10 | ||
| 5 | // Import theme settings | 11 | // Import theme settings |
| 6 | @import "../../../../../_scss/imports/themes/default/colors"; | 12 | @import "../../../../../scss/imports/themes/default/colors"; |
| 7 | @import "../../../../../_scss/imports/themes/default/mixins"; | 13 | @import "../../../../../scss/imports/themes/default/mixins"; |
| 8 | 14 | ||
| 9 | // Import generic mixins and styles | 15 | // Import generic mixins and styles |
| 10 | @import "../../../../../_scss/imports/scss/mixins"; | 16 | @import "../../../../../scss/imports/scss/mixins"; |
| 11 | 17 | ||
| 12 | .hidden { | 18 | .hidden { |
| 13 | display: none; | 19 | display: none; |