diff options
author | hwc487 | 2012-07-09 16:08:02 -0700 |
---|---|---|
committer | hwc487 | 2012-07-09 16:08:02 -0700 |
commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/tools-properties/oval-properties.reel/oval-properties.css | |
parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/tools-properties/oval-properties.reel/oval-properties.css')
-rwxr-xr-x | js/components/tools-properties/oval-properties.reel/oval-properties.css | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.css b/js/components/tools-properties/oval-properties.reel/oval-properties.css index f75355c6..a6fff483 100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.css +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.css | |||
@@ -33,9 +33,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
33 | 33 | ||
34 | .ovalProperties hottextunit { | 34 | .ovalProperties hottextunit { |
35 | width: 22px; | 35 | width: 22px; |
36 | } | 36 | } |
37 | 37 | ||
38 | .ovalProperties label { | 38 | .ovalProperties label { |
39 | margin-left: 6px; | 39 | margin-left: 6px; |
40 | margin-right: 6px; | 40 | margin-right: 6px; |
41 | } | 41 | } |