aboutsummaryrefslogtreecommitdiff
path: root/js/panels/css-panel/style-declaration.reel/style-declaration.css
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-05-31 15:40:03 -0700
committerJose Antonio Marquez2012-05-31 15:40:03 -0700
commite88e42ec2b4fdf1bbd04765b56d17c7cbcdbc4ee (patch)
tree90e7217f3c8086f9bdaac6ef4826fb14fc72ae43 /js/panels/css-panel/style-declaration.reel/style-declaration.css
parent450a3e64576d002787c2a611010d593d1967f3b7 (diff)
parent6042bdc5f2aada4412912fd01602d32c9088dc26 (diff)
downloadninja-e88e42ec2b4fdf1bbd04765b56d17c7cbcdbc4ee.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Components
Diffstat (limited to 'js/panels/css-panel/style-declaration.reel/style-declaration.css')
-rw-r--r--js/panels/css-panel/style-declaration.reel/style-declaration.css3
1 files changed, 3 insertions, 0 deletions
diff --git a/js/panels/css-panel/style-declaration.reel/style-declaration.css b/js/panels/css-panel/style-declaration.reel/style-declaration.css
index 6be8d33c..d4755b04 100644
--- a/js/panels/css-panel/style-declaration.reel/style-declaration.css
+++ b/js/panels/css-panel/style-declaration.reel/style-declaration.css
@@ -10,4 +10,7 @@
10} 10}
11.drag-over { 11.drag-over {
12 /*background-color: red;*/ 12 /*background-color: red;*/
13}
14.css-animation-prevent * {
15 -webkit-transition-duration: 0 !important;
13} \ No newline at end of file 16} \ No newline at end of file