aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorJonathan Duran2012-07-19 11:58:23 -0700
committerJonathan Duran2012-07-19 11:58:23 -0700
commit7b7f4157dfd1d3ad2b4a266c92594da56a619254 (patch)
tree856f73446068c430cb4e9218aab34f9d8bbd4169 /js/panels/Timeline
parent6431037185722a63064c2f2fb31fe0e325c9653a (diff)
downloadninja-7b7f4157dfd1d3ad2b4a266c92594da56a619254.tar.gz
Improve keyframe selection by moving playhead marker to lower z-index
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css4
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss2
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js6
3 files changed, 9 insertions, 3 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
index f9f5e98c..201b530e 100644
--- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
+++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
@@ -113,7 +113,7 @@ POSSIBILITY OF SUCH DAMAGE.
113.playhead { height: 14px; width: 6px; position: absolute; top: 6px; left: -3px; z-index: 92; background-color: #b50003; opacity: 0.5; visibility: hidden; } 113.playhead { height: 14px; width: 6px; position: absolute; top: 6px; left: -3px; z-index: 92; background-color: #b50003; opacity: 0.5; visibility: hidden; }
114 114
115/* line 291, ../scss/TimelinePanel.scss */ 115/* line 291, ../scss/TimelinePanel.scss */
116.playheadmarker { height: 100%; width: 1px; background-color: white; top: 0; left: 0; position: absolute; z-index: 91; opacity: 0.7; } 116.playheadmarker { height: 100%; width: 1px; background-color: white; top: 0; left: 0; position: absolute; z-index: 1; opacity: 0.7; }
117 117
118/* line 301, ../scss/TimelinePanel.scss */ 118/* line 301, ../scss/TimelinePanel.scss */
119.timebar { height: 3px; width: 0; background-color: #ff0003; opacity: 0.3; top: 10px; position: absolute; border-top: #c7a19f thin solid; border-right: #ffffff thin solid; } 119.timebar { height: 3px; width: 0; background-color: #ff0003; opacity: 0.3; top: 10px; position: absolute; border-top: #c7a19f thin solid; border-right: #ffffff thin solid; }
@@ -165,7 +165,7 @@ POSSIBILITY OF SUCH DAMAGE.
165.tl_slider { width: 127px; height: 5px; float: left; clear: none; margin: 2px 0px 0px 0px; } 165.tl_slider { width: 127px; height: 5px; float: left; clear: none; margin: 2px 0px 0px 0px; }
166 166
167/* line 409, ../scss/TimelinePanel.scss */ 167/* line 409, ../scss/TimelinePanel.scss */
168.tl_slider .slider-track { background: #29292; width: 127px; height: 4px; border: 1px solid #000; top: 3px; } 168.tl_slider .slider-track { background: #292929; width: 127px; height: 4px; border: 1px solid #000; top: 3px; }
169 169
170/* line 417, ../scss/TimelinePanel.scss */ 170/* line 417, ../scss/TimelinePanel.scss */
171.sliderClass { float: left; width: 127px; } 171.sliderClass { float: left; width: 127px; }
diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
index d2d813bb..b07c50b2 100644
--- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
+++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
@@ -295,7 +295,7 @@ POSSIBILITY OF SUCH DAMAGE.
295 top: 0; 295 top: 0;
296 left: 0; 296 left: 0;
297 position: absolute; 297 position: absolute;
298 z-index: 91; 298 z-index: 1;
299 opacity: 0.7; 299 opacity: 0.7;
300} 300}
301.timebar{ 301.timebar{
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index e3f9e71a..c9b59253 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -377,6 +377,12 @@ var Tween = exports.Tween = Montage.create(Component, {
377 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "left", [currentLeft], "Change", "tween"); 377 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "left", [currentLeft], "Change", "tween");
378 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "width", [currentWidth], "Change", "tween"); 378 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "width", [currentWidth], "Change", "tween");
379 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "height", [currentHeight], "Change", "tween"); 379 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "height", [currentHeight], "Change", "tween");
380
381 if(this.parentComponent.parentComponent.enabled3D){
382 var current3DMatrix = this.tweenedProperties["-webkit-transform"];
383 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "-webkit-transform", [current3DMatrix], "Change", "tween");
384 }
385
380 } 386 }
381 } 387 }
382 }, 388 },