diff options
author | Valerio Virgillito | 2012-02-28 12:44:31 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-28 12:44:31 -0800 |
commit | 7c9291a5bab4abd849547f8878f6fb962fc88250 (patch) | |
tree | d5dd4ee6ff901c00b40f3e89c3cfb620e60a5051 /js/panels/Timeline/PropertyTrack.reel/css | |
parent | 6054d13cf1254447d2396889eafc6a953f0b8d4a (diff) | |
parent | 700611c9aaee6093bbf4e86503c1decb5ac65c83 (diff) | |
download | ninja-7c9291a5bab4abd849547f8878f6fb962fc88250.tar.gz |
Merge branch 'refs/heads/integration-candidate'
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 | } |