aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-07-02 09:23:13 -0700
committerNivesh Rajbhandari2012-07-02 09:23:13 -0700
commit2bae1b3148233288ec0bc50876935bdfea1f288c (patch)
tree686fa3b5b9615941bb7013f35c91e8f326b049db /js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
parent2da05a4c71bfe9b136384d9e94fbfbef19f24550 (diff)
parent12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff)
downloadninja-2bae1b3148233288ec0bc50876935bdfea1f288c.tar.gz
Merge branch 'refs/heads/ninja-internal' into MaterialsUI
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.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;