diff options
| author | Ananya Sen | 2012-02-23 13:52:32 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-23 13:52:32 -0800 |
| commit | ec3d07c2fea4e79c68606234074f43d694982e5b (patch) | |
| tree | dc7c830c361d35c04a4d9b6d55c6c36d7a5d61cd /js/components/ui/input-group.reel/input-group.css | |
| parent | 7283884c39df537694b21419a3ea9e3ca7793b4b (diff) | |
| parent | 287a0bad5b774a380ec6c8b3ddf24dc03234e248 (diff) | |
| download | ninja-ec3d07c2fea4e79c68606234074f43d694982e5b.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/document/html-document.js
js/helper-classes/3D/snap-manager.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/ui/input-group.reel/input-group.css')
| -rwxr-xr-x | 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 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; |