diff options
| author | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
| commit | bd2c28100f347afc10243c80b8a288746370eee2 (patch) | |
| tree | db507fe0fdbe8e6f98f7d0f022b29c8d5942b4f7 /js/panels/css-panel/style-declaration.reel/style-declaration.css | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
| download | ninja-bd2c28100f347afc10243c80b8a288746370eee2.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
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.css | 3 |
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 |