diff options
| author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
| commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
| tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/components/tools-properties/selection-properties.reel/selection-properties.css | |
| parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| download | ninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz | |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/components/tools-properties/selection-properties.reel/selection-properties.css')
| -rwxr-xr-x | js/components/tools-properties/selection-properties.reel/selection-properties.css | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.css b/js/components/tools-properties/selection-properties.reel/selection-properties.css index e3fe1755..7f1b0f7f 100755 --- a/js/components/tools-properties/selection-properties.reel/selection-properties.css +++ b/js/components/tools-properties/selection-properties.reel/selection-properties.css | |||
| @@ -4,6 +4,3 @@ | |||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
| 5 | </copyright> */ | 5 | </copyright> */ |
| 6 | 6 | ||
| 7 | .selectionProperties { | ||
| 8 | margin-top: -6px; | ||
| 9 | } \ No newline at end of file | ||