diff options
author | Eric Guzman | 2012-06-27 15:29:41 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-27 15:29:41 -0700 |
commit | 61a41e74154715b0b42a429158fa1f2a44d2eb9a (patch) | |
tree | 2084e8df8c40708c9cc15d53d921a20718c8f006 /js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss | |
parent | 230a1a2f2848c27edf7d01f8d3a5585c8d0d4ac9 (diff) | |
parent | 07e7e2f28b863b0a4d139cc7e649a630b162e0da (diff) | |
download | ninja-61a41e74154715b0b42a429158fa1f2a44d2eb9a.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Bindables_GIO
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss | 3 |
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; |