aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-11 11:34:06 -0700
committerJohn Mayhew2012-05-11 11:34:06 -0700
commitec886fe3c46f6e3e54fe4e1df769dabed5588063 (patch)
treea58ad8b64cf642c58d2e6be8def001376c2c2e38
parentd5995fd5dfcc0cb0cb2361b1099911fa4fc51189 (diff)
downloadninja-ec886fe3c46f6e3e54fe4e1df769dabed5588063.tar.gz
fixed bug introduced when we removed the color toolbar. The styling of the color chips in the PI was broken due to a reliance on a css class from the colortoolbar reel. The requried class was copied to the properties.css file as a temporary fix.
-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;