From d2f4d5e5f6742d53b6324d585a700566f73c992a Mon Sep 17 00:00:00 2001
From: mqg734
Date: Tue, 21 Feb 2012 16:49:11 -0800
Subject: Updated Materials Library and Materials Editor Popup to work with
latest version of Montage.
We had to change our css to not use id's.
Also, updated the popup to use Montage's Popup component.
It looks like bump material has a bug. So loading that material results in a runtime error.
---
js/components/ui/input-group.reel/input-group.html | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'js/components/ui/input-group.reel')
diff --git a/js/components/ui/input-group.reel/input-group.html b/js/components/ui/input-group.reel/input-group.html
index c99e29d6..0050b8cb 100755
--- a/js/components/ui/input-group.reel/input-group.html
+++ b/js/components/ui/input-group.reel/input-group.html
@@ -11,7 +11,7 @@
-
+
--
cgit v1.2.3
From 3730bbc7cc5d5f07b3d788885475a8f9810b480e Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 22 Feb 2012 21:34:21 -0800
Subject: Updating textfield to only use nj-skinned class and updating
input-group to check for nj-skinned class instead of textfield class for
styling.
Signed-off-by: Nivesh Rajbhandari
---
js/components/ui/input-group.reel/input-group.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/components/ui/input-group.reel')
diff --git a/js/components/ui/input-group.reel/input-group.css b/js/components/ui/input-group.reel/input-group.css
index 8e2267eb..0b7cd1ef 100755
--- a/js/components/ui/input-group.reel/input-group.css
+++ b/js/components/ui/input-group.reel/input-group.css
@@ -23,7 +23,7 @@
.propControl .inputRow div .hottext,
.propControl .inputRow div .hottextInput,
-.prop-controller .textfield
+.prop-controller .nj-skinned
{
border: 1px solid black;
width: 30px !important;
--
cgit v1.2.3