diff options
| author | Jon Reid | 2012-02-08 10:29:00 -0800 |
|---|---|---|
| committer | Jon Reid | 2012-02-08 10:29:00 -0800 |
| commit | 687ef6c8c8aad9728f106b1802cf0bfc5ce745f0 (patch) | |
| tree | db790c730001b9339f2a7083b522d33587de8efc /js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | |
| parent | 6ce7a6c94b2ea24a3a3a2aba7230864e924e952b (diff) | |
| parent | 91df2e8030db394060667202a97138db3f871fa5 (diff) | |
| download | ninja-687ef6c8c8aad9728f106b1802cf0bfc5ce745f0.tar.gz | |
Merge branch 'Timeline-jduran' into Timeline-jreid
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css index f5fb9378..cbae49c8 100644 --- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css +++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | |||
| @@ -143,6 +143,7 @@ | |||
| 143 | left: 0px; | 143 | left: 0px; |
| 144 | height: 20px; | 144 | height: 20px; |
| 145 | width: 100%; | 145 | width: 100%; |
| 146 | border-bottom-style: solid; | ||
| 146 | } | 147 | } |
| 147 | 148 | ||
| 148 | .masterlayer{ | 149 | .masterlayer{ |