aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-28 11:49:39 -0700
committerPushkar Joshi2012-03-28 11:49:39 -0700
commit22f0b9c06d8964f473dcb70dc3e2f8acac71bb0a (patch)
tree4adc40f81090a4f3f3165c3cbd6b90152dec53e6 /js/panels/Timeline
parent3fd098981077e40841c013a8ac305036d08a215b (diff)
parentfa5c9dbdc3e8618d494e142e0967fa69049d0c97 (diff)
downloadninja-22f0b9c06d8964f473dcb70dc3e2f8acac71bb0a.tar.gz
Merge branch 'brushtool' into pentool
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css4
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%;