diff options
author | hwc487 | 2012-04-13 11:52:13 -0700 |
---|---|---|
committer | hwc487 | 2012-04-13 11:52:13 -0700 |
commit | 4f2fb5764703cab4ce3ada719b1395ed1e2f3b7c (patch) | |
tree | 3dc2e3c5a041179eed38eab1a00f851554e50005 /js/components/ui/input-group.reel/input-group.css | |
parent | 521df0ed9242efff45715998837068c87aca7efd (diff) | |
parent | 4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff) | |
download | ninja-4f2fb5764703cab4ce3ada719b1395ed1e2f3b7c.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping_II
Conflicts:
js/helper-classes/3D/view-utils.js
js/panels/presets/animations-presets.reel/animations-presets.js
js/panels/presets/style-presets.reel/style-presets.js
js/panels/presets/transitions-presets.reel/transitions-presets.js
js/tools/Translate3DToolBase.js
Diffstat (limited to 'js/components/ui/input-group.reel/input-group.css')
-rwxr-xr-x | js/components/ui/input-group.reel/input-group.css | 15 |
1 files changed, 14 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 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 |