Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping_II

Conflicts:
	js/helper-classes/3D/view-utils.js
	js/panels/presets/animations-presets.reel/animations-presets.js
	js/panels/presets/style-presets.reel/style-presets.js
	js/panels/presets/transitions-presets.reel/transitions-presets.js
	js/tools/Translate3DToolBase.js

1 files changed, 2 insertions, 7 deletions

diff --git a/js/document/templates/montage-html/default_html.css b/js/document/templates/montage-html/default_html.css
index 6c2b415f..04b21c6f 100755
--- a/js/document/templates/montage-html/default_html.css
+++ b/js/document/templates/montage-html/default_html.css
@@ -65,13 +65,8 @@ body
         display: none;
 }
 
-.global3DSettings {
-  -webkit-transform-style: preserve-3d;
-  -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
-}
-
-.elem-red-outline {
-  outline: red solid thin;
+.active-element-outline {
+  outline: #adff2f solid 2px;
 }
 
 .nj-preset-transition {