diff options
author | Nivesh Rajbhandari | 2012-04-04 10:39:32 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-04 10:39:32 -0700 |
commit | b9032fb0f656a6c029ef0c71c490bb5d5cd10d94 (patch) | |
tree | 0faee331bf5d28877bdafd46ea26a269abaa91b2 /js/panels/Timeline | |
parent | df0389e6a191ebbff4e4b5d6625007873c0737bd (diff) | |
parent | dc9650af5760b1f93d6e93a383eabceacfdc0ad8 (diff) | |
download | ninja-b9032fb0f656a6c029ef0c71c490bb5d5cd10d94.tar.gz |
Merge branch 'refs/heads/EricSnapping' into WebGLFileIO
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%; |