From 50125608bba2ebfae24c1e13ec030fe7a7128158 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 29 Mar 2012 17:13:28 -0700
Subject: merge from main

---
 js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js/panels/Timeline')

diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
index 067285ae..129b9771 100644
--- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
+++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
@@ -10,12 +10,12 @@
     height: 100%;
 }
 .maintimeline{
+    border-style: double;
     -webkit-box-flex: 1;
     display: -webkit-box;
-    -webkit-box-orient: horizontal;
+    -webkit-box-orient: horizontal
     height : 100%;
     position: relative;
-    margin-top:1px;
 }
 .leftinside{
     height: 100%;
-- 
cgit v1.2.3