diff options
| author | Valerio Virgillito | 2012-02-09 13:35:15 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-09 13:35:15 -0800 |
| commit | cebd27bd649d01c8b8713651df3878da14b5e9a8 (patch) | |
| tree | 3d20d838f2f6892a07cf16c4c959e234f96ee60b /user-document-templates | |
| parent | 666ae3e9119410cbf7fa974274d95336aaff091c (diff) | |
| parent | 2092acf520e3f346f15e42c76c2f616e7d094c97 (diff) | |
| download | ninja-cebd27bd649d01c8b8713651df3878da14b5e9a8.tar.gz | |
Merge branch 'Timeline' of https://github.com/imix23ways/ninja-internal into feature-branch
Conflicts:
js/helper-classes/RDGE/Materials/FlatMaterial.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'user-document-templates')
| -rw-r--r-- | user-document-templates/montage-application-cloud/default_html.css | 1 |
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 100644 --- 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 | ||
| 12 | html{ | 13 | html{ |