aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-05 10:31:45 -0700
committerNivesh Rajbhandari2012-04-05 10:31:45 -0700
commit55f4835aa33546f5cd27e501ed461a0f7eb5038b (patch)
tree2bac6f39d12fcf2116a7f79acf45c1672d6f5522 /js/panels/Timeline
parent4ae2fd54e3844d788536dd00814c6aad0aa9f121 (diff)
downloadninja-55f4835aa33546f5cd27e501ed461a0f7eb5038b.tar.gz
Undoing mistakes from auto-merge.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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..ca6fe6fd 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%;