aboutsummaryrefslogtreecommitdiff
path: root/js/components/colorwheel.reel/css
diff options
context:
space:
mode:
authorJonathan Duran2012-07-09 08:58:33 -0700
committerJonathan Duran2012-07-09 08:58:33 -0700
commitf20b1985dd672d36db1dc61fa30c53d9af6aacef (patch)
tree2086c531d8f884471a2ff33574a93f1d8b40b487 /js/components/colorwheel.reel/css
parentd01efeb5918622783f1315136ccdb38f82ad33bb (diff)
parentaedd14b18695d031f695d27dfbd94df5614495bb (diff)
downloadninja-f20b1985dd672d36db1dc61fa30c53d9af6aacef.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/colorwheel.reel/css')
-rwxr-xr-xjs/components/colorwheel.reel/css/colorwheel.css30
-rwxr-xr-xjs/components/colorwheel.reel/css/colorwheel.scss34
2 files changed, 56 insertions, 8 deletions
diff --git a/js/components/colorwheel.reel/css/colorwheel.css b/js/components/colorwheel.reel/css/colorwheel.css
index 3917bd52..f8ee7370 100755
--- a/js/components/colorwheel.reel/css/colorwheel.css
+++ b/js/components/colorwheel.reel/css/colorwheel.css
@@ -1,9 +1,33 @@
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. 4Copyright (c) 2012, Motorola Mobility, Inc
5 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. 5All Rights Reserved.
6 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 6BSD License.
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.
7</copyright> 31</copyright>
8*/ 32*/
9/* line 11, colorwheel.scss */ 33/* line 11, colorwheel.scss */
diff --git a/js/components/colorwheel.reel/css/colorwheel.scss b/js/components/colorwheel.reel/css/colorwheel.scss
index cca0a982..d5455c0f 100755
--- a/js/components/colorwheel.reel/css/colorwheel.scss
+++ b/js/components/colorwheel.reel/css/colorwheel.scss
@@ -1,9 +1,33 @@
1@charset "UTF-8"; 1@charset "UTF-8";
2/* <copyright> 2/* <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3Copyright (c) 2012, Motorola Mobility, Inc
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4All Rights Reserved.
5 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 5BSD License.
6 </copyright> */ 6
7Redistribution and use in source and binary forms, with or without
8modification, are permitted provided that the following conditions are met:
9
10 - Redistributions of source code must retain the above copyright notice,
11 this list of conditions and the following disclaimer.
12 - Redistributions in binary form must reproduce the above copyright
13 notice, this list of conditions and the following disclaimer in the
14 documentation and/or other materials provided with the distribution.
15 - Neither the name of Motorola Mobility nor the names of its contributors
16 may be used to endorse or promote products derived from this software
17 without specific prior written permission.
18
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE.
30</copyright> */
7 31
8.colorwheel 32.colorwheel
9{ 33{
@@ -14,4 +38,4 @@
14.colorwheel canvas 38.colorwheel canvas
15{ 39{
16 position: absolute; 40 position: absolute;
17} \ No newline at end of file 41}