aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/properties.css
diff options
context:
space:
mode:
authorJonathan Duran2012-05-22 10:32:03 -0700
committerJonathan Duran2012-05-22 10:32:03 -0700
commit7b76e4664b35f044e9f24c060f1e092cb5e5c4b0 (patch)
treef0f6168b083aa929d34f37edca6c87ce7c3743bd /js/panels/properties.reel/properties.css
parent0dc43f8b6d7db6d9ed698e8c4568e942d8e3d8eb (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-7b76e4664b35f044e9f24c060f1e092cb5e5c4b0.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels/properties.reel/properties.css')
-rwxr-xr-xjs/panels/properties.reel/properties.css15
1 files changed, 15 insertions, 0 deletions
diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css
index 0928da3a..eee44561 100755
--- a/js/panels/properties.reel/properties.css
+++ b/js/panels/properties.reel/properties.css
@@ -4,6 +4,21 @@
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/* Cleanup TODO - now that we removed the color toolbar from the tools panel, we no longer load the colortoolbar reel.
8 Currently the color chips in the property inspector rely on the colortoolbar button style so we
9 copied the class here. When we do the color feature cleanup we should remove this dependency.
10*/
11.colortoolbar button {
12 float: left;
13 clear: both;
14 width: 27px;
15 height: 27px;
16 background: black;
17 border: 1px solid #000;
18 padding: 0;
19 margin: 0px;
20}
21
7.propertiesPanel { 22.propertiesPanel {
8 color:#FFF; 23 color:#FFF;
9 overflow-x: hidden; 24 overflow-x: hidden;