mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
Merge branch '3.1.x'
This commit is contained in:
commit
f86c5d905b
1 changed files with 10 additions and 3 deletions
|
@ -376,12 +376,19 @@ function parseDocument($container) {
|
||||||
|
|
||||||
function resize() {
|
function resize() {
|
||||||
var width = 0,
|
var width = 0,
|
||||||
diff = $left.outerWidth(true) - $left.width();
|
diff = $left.outerWidth(true) - $left.width(),
|
||||||
|
minWidth = Math.max($this.width() / 3, 240),
|
||||||
|
maxWidth;
|
||||||
|
|
||||||
$right.each(function() {
|
$right.each(function() {
|
||||||
width += $(this).outerWidth(true);
|
var $this = $(this);
|
||||||
|
if ($this.is(':visible')) {
|
||||||
|
width += $this.outerWidth(true);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
$left.css('max-width', Math.floor($this.width() - width - diff) + 'px');
|
|
||||||
|
maxWidth = $this.width() - width - diff;
|
||||||
|
$left.css('max-width', Math.floor(Math.max(maxWidth, minWidth)) + 'px');
|
||||||
}
|
}
|
||||||
|
|
||||||
resize();
|
resize();
|
||||||
|
|
Loading…
Add table
Reference in a new issue