diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss | 2 |
1 files changed, 1 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..43c6b7f4 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; |