From ec15c5ed111f8d2608941c2ce86fb4b6f68117a0 Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Thu, 12 Jul 2012 14:21:31 -0700 Subject: Zooming the tweens Signed-off-by: Kruti Shah --- js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss | 1 - 1 file changed, 1 deletion(-) (limited to 'js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss') diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss index 460fe5e3..4fbcc400 100644 --- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss +++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss @@ -335,7 +335,6 @@ POSSIBILITY OF SUCH DAMAGE. background: none; float:left; margin-left: 5%; - visibility: hidden; } /* Configuration menu */ -- cgit v1.2.3 From cdcc677c827b65e3c689d4207c0117f94e4d6d57 Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Mon, 16 Jul 2012 16:27:58 -0700 Subject: Styling of Zoom Slider + Grid Cut off limit taken care of + Hot text Bug (left,top,width,height) changing it now changes the element on stage Signed-off-by: Kruti Shah --- .../TimelinePanel.reel/scss/TimelinePanel.scss | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss') diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss index 4fbcc400..d3529444 100644 --- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss +++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss @@ -396,3 +396,26 @@ POSSIBILITY OF SUCH DAMAGE. .layer-hidden { display: none; } + +.tl_slider { + width: 127px; + height:5px; + float: left; + clear: none; + margin: 2px 0px 0px 0px; +} + +.slider-track { + background: #29292; + width: 127px +}, + +.sliderClass { + float: left; + width: 127px +} + +.sliderClass .knob { + background: url(../images/knob.png) no-repeat transparent center center; + margin-bottom: 2px; +} -- cgit v1.2.3 From 4a87ff575693509ac578d46af26fa137c0dc3f58 Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Tue, 17 Jul 2012 11:22:52 -0700 Subject: Timeline: Style zoom slider. --- js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss') diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss index ccb421d0..91947ac6 100644 --- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss +++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss @@ -406,10 +406,13 @@ POSSIBILITY OF SUCH DAMAGE. margin: 2px 0px 0px 0px; } -.slider-track { +.tl_slider .slider-track { background: #29292; - width: 127px -}, + width: 127px; + height: 4px; + border: 1px solid #000; + top: 3px; +} .sliderClass { float: left; -- cgit v1.2.3 From 49233086e159137bf6d6b0ee73947475b0d08092 Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Tue, 17 Jul 2012 17:29:26 -0700 Subject: Multi Doc Zoom Slider Handling Signed-off-by: Kruti Shah --- js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss') diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss index 91947ac6..d2d813bb 100644 --- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss +++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss @@ -407,7 +407,7 @@ POSSIBILITY OF SUCH DAMAGE. } .tl_slider .slider-track { - background: #29292; + background: #292929; width: 127px; height: 4px; border: 1px solid #000; -- cgit v1.2.3 From 7b7f4157dfd1d3ad2b4a266c92594da56a619254 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Thu, 19 Jul 2012 11:58:23 -0700 Subject: Improve keyframe selection by moving playhead marker to lower z-index Signed-off-by: Jonathan Duran --- js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss') 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. top: 0; left: 0; position: absolute; - z-index: 91; + z-index: 1; opacity: 0.7; } .timebar{ -- cgit v1.2.3 From 6403ec6d21048c93138ddcbcc59fc4677121ed5e Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 19 Jul 2012 15:53:54 -0700 Subject: Timeline: updated livePreview to timeline play. Hide canvas and draw red outline - Changed the play button to a toggle button - livePreview code in stage activated via bindings - Draw a red outline of the canvas when in play Signed-off-by: Valerio Virgillito --- .../TimelinePanel.reel/scss/TimelinePanel.scss | 26 +++++++++++++++------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss') diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss index d2d813bb..cf6df347 100644 --- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss +++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss @@ -148,20 +148,30 @@ POSSIBILITY OF SUCH DAMAGE. padding-right: 5px; } .playbutton{ - background-image: url('../images/play.png'); - background-repeat: no-repeat; + background: transparent url("../images/play.png") no-repeat; height: 18px; width: 18px; float: left; padding-right: 5px; + + border: none; + margin: 0; + min-width: 0; + opacity: 0.8; +} +.playbutton:hover { + background-color: #474747; + opacity: 1; +} +.playbutton.active:hover { + background-color: #474747; + opacity: 1; +} +.playbutton:focus { + -webkit-box-shadow: none; } .pausebutton{ - background-image: url('../images/pause.png'); - background-repeat: no-repeat; - height: 18px; - width: 18px; - float: left; - padding-right: 5px; + background-image: url("../images/pause.png"); } .forwardbutton{ background-image: url('../images/play_next.png'); -- cgit v1.2.3