diff options
| author | Jon Reid | 2012-07-16 09:22:30 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-07-16 09:22:30 -0700 |
| commit | aa13b63108d8f4f03af26abe2baa534f24d99192 (patch) | |
| tree | f21db97414542d549311306fffe2091d10ea19a6 /js/panels/Timeline/TimelinePanel.reel/scss | |
| parent | 15edcb5fe22793aab024c1ef7dde109b36977dd8 (diff) | |
| parent | ec15c5ed111f8d2608941c2ce86fb4b6f68117a0 (diff) | |
| download | ninja-aa13b63108d8f4f03af26abe2baa534f24d99192.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Conflicts:
js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
Resolved by using both; both were needed.
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/scss')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss index 460fe5e3..4fbcc400 100644 --- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss +++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss | |||
| @@ -335,7 +335,6 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 335 | background: none; | 335 | background: none; |
| 336 | float:left; | 336 | float:left; |
| 337 | margin-left: 5%; | 337 | margin-left: 5%; |
| 338 | visibility: hidden; | ||
| 339 | } | 338 | } |
| 340 | 339 | ||
| 341 | /* Configuration menu */ | 340 | /* Configuration menu */ |