aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-28 22:44:35 -0700
committerValerio Virgillito2012-03-28 22:44:35 -0700
commit7542f62ee7a4845c2472834d0dbe91bf669634da (patch)
tree657e63dfec155ba18dc8c170d1b8f8179a936603 /js/panels/Timeline
parentf09921e6085f4b16c6e69ac8bfd67eef644fc04e (diff)
parent3fd2cdb59027b3f973b9165db9db4fdd22026941 (diff)
downloadninja-7542f62ee7a4845c2472834d0dbe91bf669634da.tar.gz
Merge branch 'refs/heads/master' into components
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%;