aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/scss
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-21 09:55:35 -0700
committerJose Antonio Marquez2012-06-21 09:55:35 -0700
commit28aa1276ffb6cefca7f7d58906cf8380fc6253eb (patch)
treec9a4a6f5d18693c39fbc668567125211151c9213 /js/panels/Timeline/TimelinePanel.reel/scss
parent4eff115126ab946c5852d787fd596e07b156c9a5 (diff)
parentc8fc6d15e1570e89243abe527cd149e354f7e11f (diff)
downloadninja-28aa1276ffb6cefca7f7d58906cf8380fc6253eb.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
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 */