aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel
diff options
context:
space:
mode:
authorEric Guzman2012-03-29 16:29:04 -0700
committerEric Guzman2012-03-29 16:29:04 -0700
commitccd57d8610a7839cf14b2c9e354b64acf53093a7 (patch)
treef11b4418483fd21831b72ca6dc0451422a25bfe2 /js/panels/Timeline/TimelinePanel.reel
parent7aefa059c79c9bef5c7a8a93cdfbd1ce55f69118 (diff)
parentf4949cab544886702e7ad6eeaa6215125c7b067a (diff)
downloadninja-ccd57d8610a7839cf14b2c9e354b64acf53093a7.tar.gz
Merge branch 'refs/heads/master' into PresetsPI
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-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%;