aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/css
diff options
context:
space:
mode:
authorKruti Shah2012-02-08 09:45:29 -0800
committerKruti Shah2012-02-08 09:45:29 -0800
commit6787bda807ad3974b29cab77628cc5c3c1b06a9d (patch)
tree61d2439e2edb0dd9c84b5f32fe35e57707b87637 /js/panels/Timeline/TimelinePanel.reel/css
parent2cfa420f48735e2718cd0824d4e945c72158d0fa (diff)
parent91df2e8030db394060667202a97138db3f871fa5 (diff)
downloadninja-6787bda807ad3974b29cab77628cc5c3c1b06a9d.tar.gz
Merge branch 'refs/heads/Timeline' into Timeline_updated
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/css')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css2
1 files changed, 2 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
index 0a73705a..cbae49c8 100644
--- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
+++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
@@ -27,6 +27,7 @@
27} 27}
28.tl_leftpane{ 28.tl_leftpane{
29 min-width: 200px; 29 min-width: 200px;
30 max-width: 500px;
30 position: relative; 31 position: relative;
31 overflow: hidden; 32 overflow: hidden;
32 -webkit-box-flex: 0; 33 -webkit-box-flex: 0;
@@ -142,6 +143,7 @@
142 left: 0px; 143 left: 0px;
143 height: 20px; 144 height: 20px;
144 width: 100%; 145 width: 100%;
146 border-bottom-style: solid;
145} 147}
146 148
147.masterlayer{ 149.masterlayer{