diff options
| author | Eric Guzman | 2012-02-13 15:48:37 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-13 15:48:37 -0800 |
| commit | b2672478decd3ee3bfacf86b525551c997f9604d (patch) | |
| tree | 79a88684406d3adf00350246a4da884b97fb0eac /user-document-templates | |
| parent | a738121a921e4c721b280434952b415b9ab3b1a8 (diff) | |
| parent | 0620e2f788861e824d6e49fa319da4d20b18a556 (diff) | |
| download | ninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz | |
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts:
js/controllers/styles-controller.js
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{ |