diff options
| author | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
| commit | 278769df00ced8620fd73371e38fe2e43f07ca3b (patch) | |
| tree | deb505c8a66b660eee1f17a2c6c4c575c7939f6f /js/panels/css-panel/style-declaration.reel/style-declaration.css | |
| parent | 555fd6efa605b937800b3979a4c68fa7eb8666ae (diff) | |
| parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
| download | ninja-278769df00ced8620fd73371e38fe2e43f07ca3b.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/document/models/html.js
js/document/views/design.js
js/ninja.reel/ninja.js
Signed-off-by: Armen Kesablyan <armen@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 |