From bda9f8f5829c943486f8850e68c991e83f8fb8c8 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Sat, 24 Mar 2012 13:50:46 -0700
Subject: Adding logic for flatten checkbox in PI.

This requires minor modifications to both StageController and ComponentController.

Also removing unused global3DSettings CSS.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/document/templates/montage-html/default_html.css | 5 -----
 js/document/templates/montage-html/index.html       | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'js/document/templates/montage-html')

diff --git a/js/document/templates/montage-html/default_html.css b/js/document/templates/montage-html/default_html.css
index 68300edf..1cdd7114 100755
--- a/js/document/templates/montage-html/default_html.css
+++ b/js/document/templates/montage-html/default_html.css
@@ -65,11 +65,6 @@ 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;
 }
\ No newline at end of file
diff --git a/js/document/templates/montage-html/index.html b/js/document/templates/montage-html/index.html
index edfab2b0..b3f68030 100755
--- a/js/document/templates/montage-html/index.html
+++ b/js/document/templates/montage-html/index.html
@@ -40,7 +40,7 @@
 		
 		<ninja-div id="Viewport" class="stageDimension">
 			
-			<ninja-div id="UserContent" class="stageView stageDimension global3DSettings"></ninja-div>
+			<ninja-div id="UserContent" class="stageView stageDimension"></ninja-div>
 			
 		</ninja-div>
 
-- 
cgit v1.2.3


From 4d132fcbde4540c2cac6c0df613940353e2690f6 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Tue, 3 Apr 2012 12:03:16 -0700
Subject: Give user feedback about which element the Fill/InkBottle tools will
 act on.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/document/templates/montage-html/default_html.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js/document/templates/montage-html')

diff --git a/js/document/templates/montage-html/default_html.css b/js/document/templates/montage-html/default_html.css
index 6c2b415f..424c5801 100755
--- a/js/document/templates/montage-html/default_html.css
+++ b/js/document/templates/montage-html/default_html.css
@@ -70,8 +70,8 @@ body
   -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 {
-- 
cgit v1.2.3