aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/selection-properties.reel/selection-properties.css
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-16 16:06:56 -0700
committerValerio Virgillito2012-05-16 16:06:56 -0700
commit92fcb770aff434e994e7a39a61d8fac4a017dca0 (patch)
treee385beee8f2694596f6305bf90eb7eb4521de2e2 /js/components/tools-properties/selection-properties.reel/selection-properties.css
parentbdd4b24c9e738c65ab8f6f9942358c59fe60edf1 (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-92fcb770aff434e994e7a39a61d8fac4a017dca0.tar.gz
Merge branch 'refs/heads/master' into dom-architecture
Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/components/tools-properties/selection-properties.reel/selection-properties.css')
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.css3
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