aboutsummaryrefslogtreecommitdiff
path: root/user-document-templates/montage-application-cloud
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-10 15:33:20 -0800
committerJose Antonio Marquez2012-02-10 15:33:20 -0800
commitf7f445e8ced728d04de4bf1c5711f6756488a71e (patch)
treeb09f00c28ff7123354af40509283ddec846f438d /user-document-templates/montage-application-cloud
parent632a5daca17acb774b9344ccc0e9107f1643924c (diff)
parent48977780443d97b9e97b047066639c9056788041 (diff)
downloadninja-f7f445e8ced728d04de4bf1c5711f6756488a71e.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
Diffstat (limited to 'user-document-templates/montage-application-cloud')
-rwxr-xr-xuser-document-templates/montage-application-cloud/default_html.css1
1 files changed, 1 insertions, 0 deletions
diff --git a/user-document-templates/montage-application-cloud/default_html.css b/user-document-templates/montage-application-cloud/default_html.css
index 05aaf1d0..68300edf 100755
--- a/user-document-templates/montage-application-cloud/default_html.css
+++ b/user-document-templates/montage-application-cloud/default_html.css
@@ -7,6 +7,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
7* { 7* {
8 -webkit-transition-duration: 0s !important; 8 -webkit-transition-duration: 0s !important;
9 -webkit-animation-duration: 0s !important; 9 -webkit-animation-duration: 0s !important;
10 -webkit-animation-name: none !important;
10} 11}
11 12
12html{ 13html{