From 1b7e627ae290dacec3a242445f3e6c5de302626a Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 23 Mar 2012 10:51:26 -0700 Subject: Tweaking some styles in the materials popup. Signed-off-by: Nivesh Rajbhandari --- js/components/ui/color-chip.reel/color-chip.js | 2 ++ js/components/ui/input-group.reel/input-group.css | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'js/components/ui') 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 -- cgit v1.2.3