diff options
| author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
| commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
| tree | c51112223ceb9121cd595a60335eb2795215590f /js/components/ui/input-group.reel/input-group.css | |
| parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
| parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
| download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz | |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/components/ui/input-group.reel/input-group.css')
| -rwxr-xr-x[-rw-r--r--] | js/components/ui/input-group.reel/input-group.css | 2 |
1 files changed, 1 insertions, 1 deletions
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 100644..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 @@ | |||
| 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 .textfield | 26 | .prop-controller .nj-skinned |
| 27 | { | 27 | { |
| 28 | border: 1px solid black; | 28 | border: 1px solid black; |
| 29 | width: 30px !important; | 29 | width: 30px !important; |