aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel/scss
diff options
context:
space:
mode:
authorhwc4872012-07-09 09:31:29 -0700
committerhwc4872012-07-09 09:31:29 -0700
commitd9f7793442f49582afdd06c7f01095df1d15dfdf (patch)
tree5de15c3c3fa95bba2bb9e38b33770b2224dd0d9a /js/panels/Timeline/Layer.reel/scss
parente95aadc605cfe57067e98a247d4e2fd6e2d76895 (diff)
parentaedd14b18695d031f695d27dfbd94df5614495bb (diff)
downloadninja-d9f7793442f49582afdd06c7f01095df1d15dfdf.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Diffstat (limited to 'js/panels/Timeline/Layer.reel/scss')
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss32
1 files changed, 28 insertions, 4 deletions
diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss
index 5220d0f1..cf8def42 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -1,10 +1,34 @@
1@charset "UTF-8"; 1@charset "UTF-8";
2 2
3/* <copyright> 3/* <copyright>
4 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 4Copyright (c) 2012, Motorola Mobility, Inc
5 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 5All Rights Reserved.
6 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 6BSD License.
7 </copyright> */ 7
8Redistribution and use in source and binary forms, with or without
9modification, are permitted provided that the following conditions are met:
10
11 - Redistributions of source code must retain the above copyright notice,
12 this list of conditions and the following disclaimer.
13 - Redistributions in binary form must reproduce the above copyright
14 notice, this list of conditions and the following disclaimer in the
15 documentation and/or other materials provided with the distribution.
16 - Neither the name of Motorola Mobility nor the names of its contributors
17 may be used to endorse or promote products derived from this software
18 without specific prior written permission.
19
20THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
24LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30POSSIBILITY OF SUCH DAMAGE.
31</copyright> */
8 32
9/* Layer.scss 33/* Layer.scss
10 * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. 34 * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css.