aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-24 10:39:39 -0800
committerValerio Virgillito2012-02-24 10:39:39 -0800
commit60845326f5313b7e34f0ad8d9815bc6605ed4c18 (patch)
tree2357eb8c914f57b7da71982d454ca2b4b9a2dee3 /js/panels/presets
parentafc53c6f553c97ab778154154aa2b7a146cb5fef (diff)
parent23a22195f42f8d7025cd4c70eab9ec26a19c1dc1 (diff)
downloadninja-60845326f5313b7e34f0ad8d9815bc6605ed4c18.tar.gz
Merge branch 'refs/heads/master' into local-storage-version
Diffstat (limited to 'js/panels/presets')
-rw-r--r--js/panels/presets/content.reel/content.css6
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.css5
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.css5
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