diff options
| author | Ananya Sen | 2012-06-04 10:43:29 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-04 10:43:29 -0700 |
| commit | 6fb29883329c9c42a8b406128b92c0e6323a47be (patch) | |
| tree | 07f46e88bccf9cdb7d4e6818e1b646b0d19f05b9 /js/panels/css-panel/style-declaration.reel/style-declaration.css | |
| parent | cf097ec69e35c07ecae5a105ed5eeb78291c9ac2 (diff) | |
| parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
| download | ninja-6fb29883329c9c42a8b406128b92c0e6323a47be.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Ananya Sen <Ananya.Sen@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 |