aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/scss
diff options
context:
space:
mode:
authorJonathan Duran2012-06-26 08:14:04 -0700
committerJonathan Duran2012-06-26 08:14:04 -0700
commiteb9aab570b1d1d6e7544a3f3907e15e0d565bb00 (patch)
tree2e1e960ee9fcaf1ded81487b0cfbf6c056ba6fd7 /js/panels/Timeline/TimelinePanel.reel/scss
parent1bc2fb4441387877bc6b1aef78e4e466f526f60f (diff)
parent874c3f17deb946a576d2cbefffe189e51ca7cb9a (diff)
downloadninja-eb9aab570b1d1d6e7544a3f3907e15e0d565bb00.tar.gz
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/scss')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
index d4789d65..86e22779 100644
--- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
+++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
@@ -261,6 +261,7 @@
261 z-index: 92; 261 z-index: 92;
262 background-color: #b50003; 262 background-color: #b50003;
263 opacity: 0.5; 263 opacity: 0.5;
264 visibility: hidden;
264} 265}
265.playheadmarker{ 266.playheadmarker{
266 height: 100%; 267 height: 100%;
@@ -282,7 +283,7 @@
282 border-top: #c7a19f thin solid; 283 border-top: #c7a19f thin solid;
283 border-right: #ffffff thin solid; 284 border-right: #ffffff thin solid;
284} 285}
285.endhottext{ 286.timelinegutter .endhottext{
286 float: right; 287 float: right;
287 font-family: 'Droid Sans'; 288 font-family: 'Droid Sans';
288 font-size: 12px; 289 font-size: 12px;