aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/scss
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-21 14:36:32 -0700
committerArmen Kesablyan2012-06-21 14:36:32 -0700
commitd9f9a65226dfe26500e82061cc38a7dda302f720 (patch)
tree32ae4d83164e71f83bf60eaaf0969d80a4d1e8b4 /js/panels/Timeline/TimelinePanel.reel/scss
parent1830a7cf4150087ee12711ea75f1162e6e3c2934 (diff)
parent9fe9bc495af74d963fa7061d4d1a479720133a56 (diff)
downloadninja-d9f9a65226dfe26500e82061cc38a7dda302f720.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/components/hintable.reel/hintable.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
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 */