Merge branch 'refs/heads/Ninja-Internal' into FileIO

3 files changed, 17 insertions, 1 deletions

diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js
index 5ea6f70f..d68e8a56 100755
--- a/js/components/layout/tools-list.reel/tools-list.js
+++ b/js/components/layout/tools-list.reel/tools-list.js
@@ -56,6 +56,7 @@ exports.ToolsList = Montage.create(Component, {
             this.SubselectionTool.options = this.application.ninja.toolsProperties.subSelectionProperties;
 
             this.Rotate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties;
+            this.Translate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties;
             this.TagTool.options = this.application.ninja.toolsProperties.tagProperties;
             this.PenTool.options = this.application.ninja.toolsProperties.penProperties;
             this.TextTool.options = this.application.ninja.toolsProperties.textProperties;
diff --git a/js/components/ui/color-chip.reel/color-chip.js b/js/components/ui/color-chip.reel/color-chip.js
index 7a7411da..4e64b2e8 100755
--- a/js/components/ui/color-chip.reel/color-chip.js
+++ b/js/components/ui/color-chip.reel/color-chip.js
@@ -56,6 +56,8 @@ var ColorChip = exports.ColorChip = Montage.create(Component, {
             if(this.hasIcon) {
                 var icon = this.iconType || this.mode + "Icon";
                 this.application.ninja.colorController.addButton(icon, this.icon);
+            } else {
+                this.icon.style.display = "none";
             }
 
             this.chipBtn.props = {side: 'right', align: 'top', wheel: true, palette: true, gradient: true, image: true, offset: this.offset};
diff --git a/js/components/ui/input-group.reel/input-group.css b/js/components/ui/input-group.reel/input-group.css
index 0b7cd1ef..5707b17e 100755
--- a/js/components/ui/input-group.reel/input-group.css
+++ b/js/components/ui/input-group.reel/input-group.css
@@ -23,11 +23,24 @@
 
 .propControl .inputRow div .hottext,
 .propControl .inputRow div .hottextInput,
-.prop-controller .nj-skinned
+.prop-controller .nj-skinned,
+.prop-controller .hottext,
+.prop-controller .hottextInput
 {
     border: 1px solid black;
     width: 30px !important;
     float:left;
     margin: 2px 0;
     text-align: center;
+}
+
+.prop-controller .file-path
+{
+    width: 170px !important;
+}
+
+.propControl .inputRow div.propControl
+{
+    float:left;
+    margin: 2px 0;
 }
\ No newline at end of file