diff options
| author | Kruti Shah | 2012-06-12 13:09:11 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-06-12 13:09:11 -0700 |
| commit | d648c842905c7c53e0f89b943982493d2b79f56e (patch) | |
| tree | eb5585f92061975215f6d19305a8d1b76262e2fc /js/panels/css-panel/style-declaration.reel/style-declaration.css | |
| parent | bedb38e14887b29eae3cdf1c8d435259c920257c (diff) | |
| parent | cf3b96822665751dae7a64644db3cb3960733c3d (diff) | |
| download | ninja-d648c842905c7c53e0f89b943982493d2b79f56e.tar.gz | |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/document/_toDelete/html-document.js
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@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 |