Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/components/layout/bread-crumb.reel/bread-crumb.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 19 insertions, 0 deletions

diff --git a/js/document/templates/montage-web/default_html.css b/js/document/templates/montage-web/default_html.css
new file mode 100755
index 00000000..db069d4e
--- /dev/null
+++ b/js/document/templates/montage-web/default_html.css
@@ -0,0 +1,19 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+* {
+    -webkit-transition-duration: 0s !important;
+    -webkit-animation-duration: 0s !important;
+    -webkit-animation-name: none !important;
+}
+
+.active-element-outline {
+  outline: #adff2f solid 2px;
+}
+
+.nj-preset-transition {
+    -webkit-transition: all 450ms linear !important;
+}
\ No newline at end of file