diff options
author | Jonathan Duran | 2012-02-25 16:20:16 -0800 |
---|---|---|
committer | Jonathan Duran | 2012-02-25 16:20:16 -0800 |
commit | 4e15de39bc1ea1a4c1141373d08b858b20106987 (patch) | |
tree | ef3030d561a0bef731f84078d5ece503cd60f37e /js/panels/Timeline/PropertyTrack.reel/css | |
parent | 1bc2de516c86f67c2107bd50df0589a273f4c5ab (diff) | |
parent | f14bc1ace048e46cbcb7148dbe37a5d2065a3779 (diff) | |
download | ninja-4e15de39bc1ea1a4c1141373d08b858b20106987.tar.gz |
Merge branch 'refs/heads/Timeline-local' into Timeline
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel/css')
-rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css index 8e45305a..cb119a14 100644 --- a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css +++ b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css | |||
@@ -3,17 +3,17 @@ | |||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<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. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | |||
7 | /* PropertyTrack.scss | 6 | /* PropertyTrack.scss |
8 | * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css. | 7 | * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css. |
9 | */ | 8 | */ |
10 | /* line 13, ../scss/PropertyTrack.scss */ | 9 | /* line 19, ../scss/PropertyTrack.scss */ |
11 | .content-main .collapsible-content .timeline-track { | 10 | .content-main .collapsible-content .timeline-track { |
12 | height: 20px; | 11 | height: 20px; |
13 | border-bottom: 1px solid #505050; | 12 | border-bottom: 1px solid #505050; |
13 | background-image: url("../images/gridline.jpg"); | ||
14 | } | 14 | } |
15 | 15 | ||
16 | /* line 19, ../scss/PropertyTrack.scss */ | 16 | /* line 26, ../scss/PropertyTrack.scss */ |
17 | .timeline-track .content-main { | 17 | .timeline-track .content-main { |
18 | background-color: #474747; | 18 | background-color: #474747; |
19 | } | 19 | } |