aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/scss
diff options
context:
space:
mode:
authorKruti Shah2012-06-26 09:46:59 -0700
committerKruti Shah2012-06-26 09:46:59 -0700
commit4b4a95140d52e191e5e637371dfc369e50e7f9c8 (patch)
tree274b55f66527a9925032c5d6da4baa6f12be8ada /js/panels/Timeline/TimelinePanel.reel/scss
parent4bf8e4cdc179c3b388fc06f26008808aa4b77eb0 (diff)
parentf0d4d89d856b99da1ca8dd3366c48bb76ba6b1f6 (diff)
downloadninja-4b4a95140d52e191e5e637371dfc369e50e7f9c8.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
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;