diff options
author | Eric Guzman | 2012-02-27 11:13:35 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-27 11:13:35 -0800 |
commit | 1a6604a50f6cfbbf0cd6f45ab94b63a001d02162 (patch) | |
tree | bbfc75d1be1ff98d22042dbbed4ca93b4a845e0c /js/panels/Timeline/TimelinePanel.reel/css | |
parent | 9e8cd4448a6d0f809a55c3bdea8b45ed75339794 (diff) | |
parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
download | ninja-1a6604a50f6cfbbf0cd6f45ab94b63a001d02162.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/css')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 31 |
1 files changed, 27 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..c122b18f 100644 --- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css +++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | |||
@@ -1,3 +1,9 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
1 | .tl_container{ | 7 | .tl_container{ |
2 | display: -webkit-box; | 8 | display: -webkit-box; |
3 | -webkit-box-orient: vertical; | 9 | -webkit-box-orient: vertical; |
@@ -236,7 +242,7 @@ | |||
236 | position: absolute; | 242 | position: absolute; |
237 | top: 6px; | 243 | top: 6px; |
238 | left: -3px; | 244 | left: -3px; |
239 | z-index: 912; | 245 | z-index: 92; |
240 | background-color: #b50003; | 246 | background-color: #b50003; |
241 | opacity: 0.5; | 247 | opacity: 0.5; |
242 | } | 248 | } |
@@ -244,8 +250,25 @@ | |||
244 | height: 100%; | 250 | height: 100%; |
245 | width: 1px; | 251 | width: 1px; |
246 | background-color: #cccccc; | 252 | background-color: #cccccc; |
247 | top: 0px; | 253 | top: 0; |
248 | left: 0px; | 254 | left: 0; |
255 | position: absolute; | ||
256 | z-index: 91; | ||
257 | } | ||
258 | .timebar{ | ||
259 | height: 3px; | ||
260 | width:0; | ||
261 | background-color: #ff0003; | ||
262 | opacity: 0.3; | ||
263 | top:10px; | ||
249 | position: absolute; | 264 | position: absolute; |
250 | z-index: 913; | 265 | border-top: #c7a19f thin solid; |
266 | border-right: #ffffff thin solid; | ||
267 | } | ||
268 | .endhottext{ | ||
269 | float: right; | ||
270 | font-family: 'Droid Sans'; | ||
271 | font-size: 12px; | ||
272 | text-shadow: 1px 1px 1px black; | ||
273 | color: white; | ||
251 | } \ No newline at end of file | 274 | } \ No newline at end of file |