diff options
author | hwc487 | 2012-04-05 17:09:51 -0700 |
---|---|---|
committer | hwc487 | 2012-04-05 17:09:51 -0700 |
commit | 2d21b01d6dd64af643f5f38818b57fcace05ea0b (patch) | |
tree | 44fac83294dae2efad48389ddb44cb1dbe06caad /js/panels/Timeline | |
parent | 7656b6eac7aec59697c6cddbe2a507fe9e4aa187 (diff) | |
parent | 96bfeee2e6b735b87e8482d6e2cf24d5224c6417 (diff) | |
download | ninja-2d21b01d6dd64af643f5f38818b57fcace05ea0b.tar.gz |
Merge branch 'Snapping' of github.com:ericmueller/ninja-internal into Snapping_II
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css index 067285ae..129b9771 100644 --- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css +++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | |||
@@ -10,12 +10,12 @@ | |||
10 | height: 100%; | 10 | height: 100%; |
11 | } | 11 | } |
12 | .maintimeline{ | 12 | .maintimeline{ |
13 | border-style: double; | ||
13 | -webkit-box-flex: 1; | 14 | -webkit-box-flex: 1; |
14 | display: -webkit-box; | 15 | display: -webkit-box; |
15 | -webkit-box-orient: horizontal; | 16 | -webkit-box-orient: horizontal |
16 | height : 100%; | 17 | height : 100%; |
17 | position: relative; | 18 | position: relative; |
18 | margin-top:1px; | ||
19 | } | 19 | } |
20 | .leftinside{ | 20 | .leftinside{ |
21 | height: 100%; | 21 | height: 100%; |