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/presets | |
parent | 9dabdd11b7fc8a042e139457748547ffe2232468 (diff) | |
parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
download | ninja-1bc2de516c86f67c2107bd50df0589a273f4c5ab.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into Timeline
Diffstat (limited to 'js/panels/presets')
-rw-r--r-- | js/panels/presets/content.reel/content.css | 6 | ||||
-rw-r--r-- | js/panels/presets/style-presets.reel/style-presets.css | 5 | ||||
-rw-r--r-- | js/panels/presets/transitions-presets.reel/transitions-presets.css | 5 |
3 files changed, 16 insertions, 0 deletions
diff --git a/js/panels/presets/content.reel/content.css b/js/panels/presets/content.reel/content.css index 08e1d53b..c0ccbad4 100644 --- a/js/panels/presets/content.reel/content.css +++ b/js/panels/presets/content.reel/content.css | |||
@@ -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 | .presetsPanel { | 7 | .presetsPanel { |
2 | display: -webkit-box; | 8 | display: -webkit-box; |
3 | text-shadow: 1px 1px 1px #000; | 9 | text-shadow: 1px 1px 1px #000; |
diff --git a/js/panels/presets/style-presets.reel/style-presets.css b/js/panels/presets/style-presets.reel/style-presets.css index e69de29b..0441c1cf 100644 --- a/js/panels/presets/style-presets.reel/style-presets.css +++ b/js/panels/presets/style-presets.reel/style-presets.css | |||
@@ -0,0 +1,5 @@ | |||
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> */ \ No newline at end of file | ||
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.css b/js/panels/presets/transitions-presets.reel/transitions-presets.css index e69de29b..0441c1cf 100644 --- a/js/panels/presets/transitions-presets.reel/transitions-presets.css +++ b/js/panels/presets/transitions-presets.reel/transitions-presets.css | |||
@@ -0,0 +1,5 @@ | |||
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> */ \ No newline at end of file | ||