Merge branch 'new-easing-menu' into timeline-local

1 files changed, 2 insertions, 10 deletions

diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html
index a1f3afeb..6e643daa 100644
--- a/js/panels/Timeline/Span.reel/Span.html
+++ b/js/panels/Timeline/Span.reel/Span.html
@@ -15,8 +15,7 @@
                             "properties": {
                                 "element": {"#": "spanspace"},
                                 "container_easing" : {"#" : "container_easing"},
-                                "easing_choice" : {"#": "easing_choice"},
-                                "easing_choices" : {"#" : "easing_choices"}
+                                "easing_choice" : {"#": "easing_choice"}
                             }
                         }
 
@@ -27,17 +26,10 @@
 
         <div data-montage-id="spanspace" class="tween_span">
                 <div class="tween_span_bar"></div>
-                <div data-montage-id="container_easing" class="container-easing">
+                <div data-montage-id="container_easing" class="container-easing-choice">
                         <div data-montage-id="easing_choice" class="easing-choice">
                                 ease-out
                         </div>
-                        <ul data-montage-id="easing_choices" class="easing-choices">
-                                <li data-ninja-ease="ease">ease</li>
-                                <li data-ninja-ease="ease-out" class="easing-selected">ease-out</li>
-                                <li data-ninja-ease="ease-in">ease-in</li>
-                                <li data-ninja-ease="ease-in-out">ease-in-out</li>
-                                <li data-ninja-ease="linear">linear</li>
-                        </ul>
                 </div>
         </div>