aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-21 14:30:46 -0700
committerValerio Virgillito2012-06-21 14:30:46 -0700
commit01dc38612c10c2d07596f3de0ca1897243a54a96 (patch)
tree9cbfd72644568daae9c5b9f43126ddc214d260dc /js/panels
parentc8fc6d15e1570e89243abe527cd149e354f7e11f (diff)
parent4b186e0c3f97f704d1ac671a63cd02084e19fe0e (diff)
downloadninja-01dc38612c10c2d07596f3de0ca1897243a54a96.tar.gz
Merge pull request #318 from joseeight/Color
Color
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/properties.reel/properties.css10
1 files changed, 9 insertions, 1 deletions
diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css
index 84f52ed4..d1aa750a 100755
--- a/js/panels/properties.reel/properties.css
+++ b/js/panels/properties.reel/properties.css
@@ -239,8 +239,9 @@ padding-right:6px;
239} 239}
240 240
241.propertiesPanel .colortoolbar div { 241.propertiesPanel .colortoolbar div {
242 margin: 0px 10px 0px 20px; 242 margin: 0px 5px 0px 10px;
243 clear:none; 243 clear:none;
244 float: left;
244} 245}
245 246
246/* color select */ 247/* color select */
@@ -250,6 +251,13 @@ padding-right:6px;
250 clear:none; 251 clear:none;
251} 252}
252 253
254.propertiesPanel .colortoolbar .chipContainer {
255 margin-top: 2px;
256 background: url(../../../../../images/colorpanel/transparent.png) repeat;
257 width: 40px;
258 height: 20px;
259}
260
253.propertiesPanel .button:active { 261.propertiesPanel .button:active {
254 outline: none; 262 outline: none;
255} 263}