diff options
author | Jonathan Duran | 2012-03-12 16:59:57 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-03-12 16:59:57 -0700 |
commit | 3cd58ed17120810d2eee8a53f7bf7c49fbe0a656 (patch) | |
tree | 260907d70ad71c12ae1144128d3c4939a5c6673d /js/panels/Timeline/TimelinePanel.reel/css | |
parent | e4c13b0febab589b881b2c997ce122c4d359c560 (diff) | |
parent | be59c44f9232104ded1a9c4cd888d70021eba33e (diff) | |
download | ninja-3cd58ed17120810d2eee8a53f7bf7c49fbe0a656.tar.gz |
Merge branch 'refs/heads/Timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/css')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css index c122b18f..129b9771 100644 --- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css +++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | |||
@@ -15,6 +15,7 @@ | |||
15 | display: -webkit-box; | 15 | display: -webkit-box; |
16 | -webkit-box-orient: horizontal | 16 | -webkit-box-orient: horizontal |
17 | height : 100%; | 17 | height : 100%; |
18 | position: relative; | ||
18 | } | 19 | } |
19 | .leftinside{ | 20 | .leftinside{ |
20 | height: 100%; | 21 | height: 100%; |
@@ -271,4 +272,15 @@ | |||
271 | font-size: 12px; | 272 | font-size: 12px; |
272 | text-shadow: 1px 1px 1px black; | 273 | text-shadow: 1px 1px 1px black; |
273 | color: white; | 274 | color: white; |
274 | } \ No newline at end of file | 275 | } |
276 | .timeline-disabled { | ||
277 | position: absolute; | ||
278 | top: 0px; | ||
279 | left: 0px; | ||
280 | width: 100%; | ||
281 | height: 100%; | ||
282 | background-color: rgba(30,30,30, 0.796); | ||
283 | z-index: 100; | ||
284 | display: none; | ||
285 | box-shadow: rgb(17, 17, 17) 0px 0px 14px inset; | ||
286 | } | ||