diff options
| author | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
| commit | 081f17954c735fc8b946d72a25b0ee60d370ef9b (patch) | |
| tree | de7b50f2d02365df897ef4356f953d3833c9cabd /user-document-templates/montage-application-cloud | |
| parent | 47df0aff81c25334b129047bb227ea5015357eda (diff) | |
| parent | 1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff) | |
| download | ninja-081f17954c735fc8b946d72a25b0ee60d370ef9b.tar.gz | |
Merge branch 'refs/heads/master' into components
Conflicts:
js/components/treeview/ninja-leaf.reel/ninja-leaf.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'user-document-templates/montage-application-cloud')
| -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{ |