diff options
author | Pushkar Joshi | 2012-03-28 11:15:45 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-28 11:15:45 -0700 |
commit | fa5c9dbdc3e8618d494e142e0967fa69049d0c97 (patch) | |
tree | 2b1574c193f91cee04975f95d19d025080c7cea2 /js/panels/Timeline | |
parent | 0f5967e1124da8d65e1c35d2a9e1ef6259269348 (diff) | |
parent | a25e50a429dfa87522ed7616dcae7b472f3c785c (diff) | |
download | ninja-fa5c9dbdc3e8618d494e142e0967fa69049d0c97.tar.gz |
Merge branch 'master' into brushtool
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 129b9771..067285ae 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; | ||
14 | -webkit-box-flex: 1; | 13 | -webkit-box-flex: 1; |
15 | display: -webkit-box; | 14 | display: -webkit-box; |
16 | -webkit-box-orient: horizontal | 15 | -webkit-box-orient: horizontal; |
17 | height : 100%; | 16 | height : 100%; |
18 | position: relative; | 17 | position: relative; |
18 | margin-top:1px; | ||
19 | } | 19 | } |
20 | .leftinside{ | 20 | .leftinside{ |
21 | height: 100%; | 21 | height: 100%; |