aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/scss
diff options
context:
space:
mode:
authorJonathan Duran2012-07-17 18:42:58 -0700
committerJonathan Duran2012-07-17 18:42:58 -0700
commit1cc51014b0e1465316f26e6cf31e78ac0e32ff18 (patch)
treec52db7f9827d6efc961b6d296ed44e623daa42dc /js/panels/Timeline/TimelinePanel.reel/scss
parent42a51e0c27f2e2cd825d07b3af5ec05b0e5208b3 (diff)
parent49233086e159137bf6d6b0ee73947475b0d08092 (diff)
downloadninja-1cc51014b0e1465316f26e6cf31e78ac0e32ff18.tar.gz
Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/scss')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss2
1 files changed, 1 insertions, 1 deletions
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.
407} 407}
408 408
409.tl_slider .slider-track { 409.tl_slider .slider-track {
410 background: #29292; 410 background: #292929;
411 width: 127px; 411 width: 127px;
412 height: 4px; 412 height: 4px;
413 border: 1px solid #000; 413 border: 1px solid #000;