diff options
| author | Eric Guzman | 2012-02-27 11:13:35 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-27 11:13:35 -0800 |
| commit | 1a6604a50f6cfbbf0cd6f45ab94b63a001d02162 (patch) | |
| tree | bbfc75d1be1ff98d22042dbbed4ca93b4a845e0c /js/panels/presets | |
| parent | 9e8cd4448a6d0f809a55c3bdea8b45ed75339794 (diff) | |
| parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
| download | ninja-1a6604a50f6cfbbf0cd6f45ab94b63a001d02162.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
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 | ||