diff options
author | Jonathan Duran | 2012-06-29 15:16:11 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-29 15:16:11 -0700 |
commit | 5496f0060c5f43e7951a110241a18b9e631761bb (patch) | |
tree | bd1c8f20eb5b6ae0e24fcae28f16eb13cb969747 /js/panels/properties.reel/properties.css | |
parent | 3aa1242147264351b7d827fa25ecb5dc42bc2fb0 (diff) | |
parent | ec69c8761f798eaf39c4a154997f8bc54b7e47f4 (diff) | |
download | ninja-5496f0060c5f43e7951a110241a18b9e631761bb.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/properties.reel/properties.css')
-rwxr-xr-x | js/panels/properties.reel/properties.css | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css index d1aa750a..786eb57a 100755 --- a/js/panels/properties.reel/properties.css +++ b/js/panels/properties.reel/properties.css | |||
@@ -314,11 +314,11 @@ input label { | |||
314 | width:45px; | 314 | width:45px; |
315 | } | 315 | } |
316 | 316 | ||
317 | .propertiesPanel div.montage-button:disabled { | 317 | .propertiesPanel div[type=button]:disabled { |
318 | opacity: 0.4; | 318 | opacity: 0.4; |
319 | } | 319 | } |
320 | 320 | ||
321 | .propertiesPanel div.montage-button { | 321 | .propertiesPanel div[type=button] { |
322 | font-size: 9px; | 322 | font-size: 9px; |
323 | cursor: pointer; | 323 | cursor: pointer; |
324 | display: block; | 324 | display: block; |
@@ -336,10 +336,10 @@ input label { | |||
336 | height: 14px; | 336 | height: 14px; |
337 | } | 337 | } |
338 | 338 | ||
339 | .propertiesPanel div.montage-button:active { | 339 | .propertiesPanel div[type=button]:active { |
340 | background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%); | 340 | background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%); |
341 | } | 341 | } |
342 | 342 | ||
343 | .propertiesPanel div.montage-button:hover { | 343 | .propertiesPanel div[type=button]:hover { |
344 | -webkit-box-shadow: 0px 0px 3px #b4b4b4; | 344 | -webkit-box-shadow: 0px 0px 3px #b4b4b4; |
345 | } \ No newline at end of file | 345 | } \ No newline at end of file |