diff options
| author | Kruti Shah | 2012-06-27 12:42:02 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-06-27 12:42:02 -0700 |
| commit | efdca7dd7aa521e03f5d34348bcf250ccb8505c5 (patch) | |
| tree | 2a08d2929f2577cbc08258c490d93d23037dfef9 /js/document | |
| parent | 37fd59d6574b4230df5ff8022e300d8d310c380d (diff) | |
| parent | 50fba97d221041660f0757725ee46b3a6ceb3aa0 (diff) | |
| download | ninja-efdca7dd7aa521e03f5d34348bcf250ccb8505c5.tar.gz | |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/document')
| -rwxr-xr-x | js/document/templates/banner/index.html | 1 | ||||
| -rwxr-xr-x | js/document/templates/html/index.html | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html index 626dc0bc..773baa03 100755 --- a/js/document/templates/banner/index.html +++ b/js/document/templates/banner/index.html | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | -webkit-transition-duration: 0s !important; | 21 | -webkit-transition-duration: 0s !important; |
| 22 | -webkit-animation-duration: 0s !important; | 22 | -webkit-animation-duration: 0s !important; |
| 23 | -webkit-animation-name: none !important; | 23 | -webkit-animation-name: none !important; |
| 24 | -webkit-animation-fill-mode: none !important; | ||
| 24 | } | 25 | } |
| 25 | 26 | ||
| 26 | body { | 27 | body { |
diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html index 8fc0d82f..d7a44129 100755 --- a/js/document/templates/html/index.html +++ b/js/document/templates/html/index.html | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | -webkit-transition-duration: 0s !important; | 24 | -webkit-transition-duration: 0s !important; |
| 25 | -webkit-animation-duration: 0s !important; | 25 | -webkit-animation-duration: 0s !important; |
| 26 | -webkit-animation-name: none !important; | 26 | -webkit-animation-name: none !important; |
| 27 | -webkit-animation-fill-mode: none !important; | ||
| 27 | } | 28 | } |
| 28 | 29 | ||
| 29 | body { | 30 | body { |