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/css/TimelinePanel.css | |
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/css/TimelinePanel.css')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css index f7e9234e..d8293d77 100644 --- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css +++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | |||
@@ -132,7 +132,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
132 | .timeline-dnd-helper { -webkit-transform: scale(0.9, 0.9); } | 132 | .timeline-dnd-helper { -webkit-transform: scale(0.9, 0.9); } |
133 | 133 | ||
134 | /* line 308, ../scss/TimelinePanel.scss */ | 134 | /* line 308, ../scss/TimelinePanel.scss */ |
135 | .tl_slider { width: 65px; height: 5px; background: none; float: left; margin-left: 5%; visibility: hidden; } | 135 | .tl_slider { width: 65px; height: 5px; background: none; float: left; margin-left: 5%;} |
136 | 136 | ||
137 | /* Configuration menu */ | 137 | /* Configuration menu */ |
138 | /* line 318, ../scss/TimelinePanel.scss */ | 138 | /* line 318, ../scss/TimelinePanel.scss */ |