aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/scss
diff options
context:
space:
mode:
authorAnanya Sen2012-06-21 11:07:11 -0700
committerAnanya Sen2012-06-21 11:07:11 -0700
commit6915d6607f2d768f363baed84287f6593925ae1e (patch)
tree306738165c11fab764a27c3e76d93c2e4d86f297 /js/panels/Timeline/TimelinePanel.reel/scss
parent8db9e73ca68c006769af3997034959f6b7008add (diff)
parentc8fc6d15e1570e89243abe527cd149e354f7e11f (diff)
downloadninja-6915d6607f2d768f363baed84287f6593925ae1e.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/scss')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
index 716ee3d3..d4789d65 100644
--- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
+++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
@@ -48,7 +48,7 @@
48 position:absolute; 48 position:absolute;
49} 49}
50.tl_leftpane{ 50.tl_leftpane{
51 min-width: 200px; 51 min-width: 210px;
52 max-width: 500px; 52 max-width: 500px;
53 position: relative; 53 position: relative;
54 overflow: hidden; 54 overflow: hidden;
@@ -310,6 +310,7 @@
310 background: none; 310 background: none;
311 float:left; 311 float:left;
312 margin-left: 5%; 312 margin-left: 5%;
313 visibility: hidden;
313} 314}
314 315
315/* Configuration menu */ 316/* Configuration menu */