diff options
author | Valerio Virgillito | 2012-06-20 21:56:18 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-20 21:56:18 -0700 |
commit | c8fc6d15e1570e89243abe527cd149e354f7e11f (patch) | |
tree | f648fa7842f3dc6011da08aaab0bedb445d43b58 /js/panels/Timeline/PropertyTrack.reel/css | |
parent | 392a559e90357d48c910a07617261483b2b45476 (diff) | |
parent | 58bca4771ab1e043cd5c11239c1936a022080096 (diff) | |
download | ninja-c8fc6d15e1570e89243abe527cd149e354f7e11f.tar.gz |
Merge pull request #316 from imix23ways/Timeline-merge-candidate
Timeline merge candidate
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel/css')
-rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css index cb119a14..5d71e2e7 100644 --- a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css +++ b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css | |||
@@ -8,12 +8,19 @@ | |||
8 | */ | 8 | */ |
9 | /* line 19, ../scss/PropertyTrack.scss */ | 9 | /* line 19, ../scss/PropertyTrack.scss */ |
10 | .content-main .collapsible-content .timeline-track { | 10 | .content-main .collapsible-content .timeline-track { |
11 | height: 20px; | 11 | height: 18px; |
12 | padding-top: 2px; | ||
12 | border-bottom: 1px solid #505050; | 13 | border-bottom: 1px solid #505050; |
13 | background-image: url("../images/gridline.jpg"); | 14 | background-image: url("../images/gridline.jpg"); |
14 | } | 15 | } |
15 | 16 | ||
16 | /* line 26, ../scss/PropertyTrack.scss */ | 17 | /* line 27, ../scss/PropertyTrack.scss */ |
17 | .timeline-track .content-main { | 18 | .timeline-track .content-main { |
18 | background-color: #474747; | 19 | background-color: #474747; |
19 | } | 20 | } |
21 | |||
22 | /* line 31, ../scss/PropertyTrack.scss */ | ||
23 | .prop-track .collapsible-content.collapsible-collapsed { | ||
24 | overflow: hidden; | ||
25 | height: 0px; | ||
26 | } | ||