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/css/TimelinePanel.css | |
| 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/css/TimelinePanel.css')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css index 29bf8d38..cbe91eaa 100644 --- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css +++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | .rightinside { height: 100%; width: 100%; display: -webkit-box; -webkit-box-orient: vertical; position: absolute; } | 14 | .rightinside { height: 100%; width: 100%; display: -webkit-box; -webkit-box-orient: vertical; position: absolute; } |
| 15 | 15 | ||
| 16 | /* line 50, ../scss/TimelinePanel.scss */ | 16 | /* line 50, ../scss/TimelinePanel.scss */ |
| 17 | .tl_leftpane { min-width: 200px; max-width: 500px; position: relative; overflow: hidden; -webkit-box-flex: 0; } | 17 | .tl_leftpane { min-width: 210px; max-width: 500px; position: relative; overflow: hidden; -webkit-box-flex: 0; } |
| 18 | 18 | ||
| 19 | /* line 57, ../scss/TimelinePanel.scss */ | 19 | /* line 57, ../scss/TimelinePanel.scss */ |
| 20 | .tl_rightpane { width: 100%; position: relative; -webkit-box-flex: 1; } | 20 | .tl_rightpane { width: 100%; position: relative; -webkit-box-flex: 1; } |