Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO

author: Ananya Sen 2012-02-02 12:38:29 -0800
committer: Ananya Sen 2012-02-02 12:38:29 -0800
commit: e806afea0eb1b66ac457471983db0e3d5942d222 (patch)
tree: d2b712293dc0c8b5f6d9dfe77f7b7eebfd62ac7c /index.html
parent: 0e595c4e11ce9b44eff157de8616ed15fcd5d6fc (diff)
parent: 33e655cbbb0816340c5a2e5d5cc0a6b0c7d9f53c (diff)
download: ninja-e806afea0eb1b66ac457471983db0e3d5942d222.tar.gz
1 files changed, 4 insertions, 52 deletions
diff --git a/index.html b/index.html
index 9ee3e381..2fbf524a 100755
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> -->
-<!-- <html manifest="ninja.appcache"> -->
 <html>
        <head lang="en">
@@ -44,13 +44,7 @@
                                background-size: auto, 115%;
                                background-color: rgba(150, 0, 0, 1);
                                background-position: center center;
-                                background-repeat: no-repeat;/*
+                                background-repeat: no-repeat;
-                                -webkit-animation-name: background-animation;
-                                -webkit-animation-duration: 3s;
-                                -webkit-animation-iteration-count: infinite;
-                                -webkit-animation-timing-function: linear;
-*/
                        }
                        
                .montage-app-loaded body
@@ -81,10 +75,6 @@
                                left: 50%;
                                margin: -160px 0px 0px -160px;
                                overflow: visible;
-                                -webkit-animation-name: zoom;
-                                -webkit-animation-duration: 3s;
-                                -webkit-animation-iteration-count: infinite;
-                                -webkit-animation-timing-function: ease-in-out;
                        }
                        
                        #ninja_logo .gradient
@@ -118,51 +108,13 @@
                                border-radius: 50%;
                                position: absolute;
                                top: 0px;
-                                left: 0px;/*
+                                left: 0px;
-                                -webkit-animation-name: solid-animation;
-                                -webkit-animation-duration: 3s;
-                                -webkit-animation-iteration-count: infinite;
-                                -webkit-animation-timing-function: linear;
-*/
                        }
                        
                        #ninja_logo canvas
                        {
                                position: absolute;
-                                margin: -45px -110px;/*
+                                margin: -45px -110px;
-                                -webkit-animation-name: rotate;
-                                -webkit-animation-duration: 1.5s;
-                                -webkit-animation-iteration-count: infinite;
-                                -webkit-animation-timing-function: linear;
-*/
-                        }
-                        
-                        @-webkit-keyframes solid-animation {
-                                0% {background: #000;}
-                                50% {background: #666;}
-                                100% {background: #000;}
-                        }
-                        
-                        @-webkit-keyframes background-animation {
-                                0% {background-size: 200%}
-                                50% {background-size: 100%}
-                                100% {background-size: 200%}
-                        }
-                        
-                        @-webkit-keyframes rotate {
-                                0%              {-webkit-transform: rotate(0deg); margin: -45px -110px;}                                
-                                25%     {-webkit-transform: rotate(90deg); margin: -90px -55px;}        
-                                50%     {-webkit-transform: rotate(180deg); margin: -55px 0px;} 
-                                75%     {-webkit-transform: rotate(270deg); margin: 0px -55px;}
-                                100%    {-webkit-transform: rotate(360deg); margin: -45px -110px;}      
-                        }
-                        
-                        @-webkit-keyframes zoom {
-                                0% {-webkit-transform: scale(.9);}
-                                50% {-webkit-transform: scale(.5);}
-                                100% {-webkit-transform: scale(.9);}
                        }
                        
                </style>
author	Ananya Sen	2012-02-02 12:38:29 -0800
committer	Ananya Sen	2012-02-02 12:38:29 -0800
commit	e806afea0eb1b66ac457471983db0e3d5942d222 (patch)
tree	d2b712293dc0c8b5f6d9dfe77f7b7eebfd62ac7c /index.html
parent	0e595c4e11ce9b44eff157de8616ed15fcd5d6fc (diff)
parent	33e655cbbb0816340c5a2e5d5cc0a6b0c7d9f53c (diff)
download	ninja-e806afea0eb1b66ac457471983db0e3d5942d222.tar.gz

diff --git a/index.html b/index.html index 9ee3e381..2fbf524a 100755 --- a/index.html +++ b/index.html
@@ -4,7 +4,7 @@
4	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>	4	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
5	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.	5	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
6	</copyright> -->	6	</copyright> -->
7	<!-- <html manifest="ninja.appcache"> -->	7
8	<html>	8	<html>
9		9
10	<head lang="en">	10	<head lang="en">
@@ -44,13 +44,7 @@
44	background-size: auto, 115%;	44	background-size: auto, 115%;
45	background-color: rgba(150, 0, 0, 1);	45	background-color: rgba(150, 0, 0, 1);
46	background-position: center center;	46	background-position: center center;
47	background-repeat: no-repeat;/*	47	background-repeat: no-repeat;
48
49	-webkit-animation-name: background-animation;
50	-webkit-animation-duration: 3s;
51	-webkit-animation-iteration-count: infinite;
52	-webkit-animation-timing-function: linear;
53	*/
54	}	48	}
55		49
56	.montage-app-loaded body	50	.montage-app-loaded body
@@ -81,10 +75,6 @@
81	left: 50%;	75	left: 50%;
82	margin: -160px 0px 0px -160px;	76	margin: -160px 0px 0px -160px;
83	overflow: visible;	77	overflow: visible;
84	-webkit-animation-name: zoom;
85	-webkit-animation-duration: 3s;
86	-webkit-animation-iteration-count: infinite;
87	-webkit-animation-timing-function: ease-in-out;
88	}	78	}
89		79
90	#ninja_logo .gradient	80	#ninja_logo .gradient
@@ -118,51 +108,13 @@
118	border-radius: 50%;	108	border-radius: 50%;
119	position: absolute;	109	position: absolute;
120	top: 0px;	110	top: 0px;
121	left: 0px;/*	111	left: 0px;
122
123	-webkit-animation-name: solid-animation;
124	-webkit-animation-duration: 3s;
125	-webkit-animation-iteration-count: infinite;
126	-webkit-animation-timing-function: linear;
127	*/
128	}	112	}
129		113
130	#ninja_logo canvas	114	#ninja_logo canvas
131	{	115	{
132	position: absolute;	116	position: absolute;
133	margin: -45px -110px;/*	117	margin: -45px -110px;
134
135	-webkit-animation-name: rotate;
136	-webkit-animation-duration: 1.5s;
137	-webkit-animation-iteration-count: infinite;
138	-webkit-animation-timing-function: linear;
139	*/
140	}
141
142	@-webkit-keyframes solid-animation {
143	0% {background: #000;}
144	50% {background: #666;}
145	100% {background: #000;}
146	}
147
148	@-webkit-keyframes background-animation {
149	0% {background-size: 200%}
150	50% {background-size: 100%}
151	100% {background-size: 200%}
152	}
153
154	@-webkit-keyframes rotate {
155	0% {-webkit-transform: rotate(0deg); margin: -45px -110px;}
156	25% {-webkit-transform: rotate(90deg); margin: -90px -55px;}
157	50% {-webkit-transform: rotate(180deg); margin: -55px 0px;}
158	75% {-webkit-transform: rotate(270deg); margin: 0px -55px;}
159	100% {-webkit-transform: rotate(360deg); margin: -45px -110px;}
160	}
161
162	@-webkit-keyframes zoom {
163	0% {-webkit-transform: scale(.9);}
164	50% {-webkit-transform: scale(.5);}
165	100% {-webkit-transform: scale(.9);}
166	}	118	}
167		119
168	</style>	120	</style>