diff options
author | Ananya Sen | 2012-04-17 18:11:55 -0700 |
---|---|---|
committer | Ananya Sen | 2012-04-17 18:11:55 -0700 |
commit | 35abad196cc9feb76ef50c1b63032a38233a6d51 (patch) | |
tree | 914689c66d4ab6c6e088b571eade0a0e35082916 /js/components/ui | |
parent | 1f891c58bad0b7746659aa4138001b5ee76d9a0e (diff) | |
parent | 616a8532099fec2a15855eac97cd85cb60c4451c (diff) | |
download | ninja-35abad196cc9feb76ef50c1b63032a38233a6d51.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/components/ui')
-rwxr-xr-x | js/components/ui/color-chip.reel/color-chip.js | 2 | ||||
-rwxr-xr-x | js/components/ui/input-group.reel/input-group.css | 15 |
2 files changed, 16 insertions, 1 deletions
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, { | |||
56 | if(this.hasIcon) { | 56 | if(this.hasIcon) { |
57 | var icon = this.iconType || this.mode + "Icon"; | 57 | var icon = this.iconType || this.mode + "Icon"; |
58 | this.application.ninja.colorController.addButton(icon, this.icon); | 58 | this.application.ninja.colorController.addButton(icon, this.icon); |
59 | } else { | ||
60 | this.icon.style.display = "none"; | ||
59 | } | 61 | } |
60 | 62 | ||
61 | this.chipBtn.props = {side: 'right', align: 'top', wheel: true, palette: true, gradient: true, image: true, offset: this.offset}; | 63 | 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 @@ | |||
23 | 23 | ||
24 | .propControl .inputRow div .hottext, | 24 | .propControl .inputRow div .hottext, |
25 | .propControl .inputRow div .hottextInput, | 25 | .propControl .inputRow div .hottextInput, |
26 | .prop-controller .nj-skinned | 26 | .prop-controller .nj-skinned, |
27 | .prop-controller .hottext, | ||
28 | .prop-controller .hottextInput | ||
27 | { | 29 | { |
28 | border: 1px solid black; | 30 | border: 1px solid black; |
29 | width: 30px !important; | 31 | width: 30px !important; |
30 | float:left; | 32 | float:left; |
31 | margin: 2px 0; | 33 | margin: 2px 0; |
32 | text-align: center; | 34 | text-align: center; |
35 | } | ||
36 | |||
37 | .prop-controller .file-path | ||
38 | { | ||
39 | width: 170px !important; | ||
40 | } | ||
41 | |||
42 | .propControl .inputRow div.propControl | ||
43 | { | ||
44 | float:left; | ||
45 | margin: 2px 0; | ||
33 | } \ No newline at end of file | 46 | } \ No newline at end of file |