diff options
author | Ananya Sen | 2012-02-23 17:57:06 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-23 17:57:06 -0800 |
commit | a23455a887982d306d794b6afca497259cfa7f4a (patch) | |
tree | 7396eb7b5e0759035f666a7eee9d325979887d4a /js/panels/Timeline/TimelinePanel.reel/css | |
parent | 6e66f411ba02eaaeb33471115345ecf3c7ce4ce9 (diff) | |
parent | 97d6314f96f309332a655d49b95ec651c378bcf2 (diff) | |
download | ninja-a23455a887982d306d794b6afca497259cfa7f4a.tar.gz |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/css')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css index cbae49c8..26dd272c 100644 --- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css +++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | |||
@@ -236,7 +236,7 @@ | |||
236 | position: absolute; | 236 | position: absolute; |
237 | top: 6px; | 237 | top: 6px; |
238 | left: -3px; | 238 | left: -3px; |
239 | z-index: 912; | 239 | z-index: 92; |
240 | background-color: #b50003; | 240 | background-color: #b50003; |
241 | opacity: 0.5; | 241 | opacity: 0.5; |
242 | } | 242 | } |
@@ -244,8 +244,25 @@ | |||
244 | height: 100%; | 244 | height: 100%; |
245 | width: 1px; | 245 | width: 1px; |
246 | background-color: #cccccc; | 246 | background-color: #cccccc; |
247 | top: 0px; | 247 | top: 0; |
248 | left: 0px; | 248 | left: 0; |
249 | position: absolute; | 249 | position: absolute; |
250 | z-index: 913; | 250 | z-index: 91; |
251 | } | ||
252 | .timebar{ | ||
253 | height: 3px; | ||
254 | width:0; | ||
255 | background-color: #ff0003; | ||
256 | opacity: 0.3; | ||
257 | top:10px; | ||
258 | position: absolute; | ||
259 | border-top: #c7a19f thin solid; | ||
260 | border-right: #ffffff thin solid; | ||
261 | } | ||
262 | .endhottext{ | ||
263 | float: right; | ||
264 | font-family: 'Droid Sans'; | ||
265 | font-size: 12px; | ||
266 | text-shadow: 1px 1px 1px black; | ||
267 | color: white; | ||
251 | } \ No newline at end of file | 268 | } \ No newline at end of file |