[ticket/641] Use CSS for aligning portal columns

B3P-641
This commit is contained in:
Marc Alexander
2015-07-21 14:48:07 +02:00
parent a1748116f6
commit c61971e7eb
3 changed files with 24 additions and 7 deletions

View File

@@ -42,21 +42,16 @@ phpbb.b3p_fix_right_column_margin = function() {
} else { } else {
$portal_right.css(marginLeft, - ($portal_right.width() + 1)); $portal_right.css(marginLeft, - ($portal_right.width() + 1));
} }
$portal_right.css('margin-top', $portal_center.height() + 'px');
$portal_left.css('margin-top', $portal_center.height() + 'px');
} else { } else {
$portal_right.css(marginLeft, 0); $portal_right.css(marginLeft, 0);
$portal_right.css('margin-top', 0);
} }
} else { } else {
$portal_right.css('margin-top', '0px');
if (!$portal_center.length && $portal_left.length) { if (!$portal_center.length && $portal_left.length) {
$portal_right.css(marginLeft, 0); $portal_right.css(marginLeft, 0);
} else { } else {
$portal_right.css(marginLeft, -portal_right_width); $portal_right.css(marginLeft, -portal_right_width);
} }
$portal_right.width(portal_right_width); $portal_right.width(portal_right_width);
$portal_left.css('margin-top', 0);
phpbb.b3pFixLeftColumnMargin(); phpbb.b3pFixLeftColumnMargin();
} }
}; };

View File

@@ -4,6 +4,10 @@
display: block; display: block;
} }
.rtl .portal-body-wrapper {
float: right;
}
#portal-page-body { #portal-page-body {
clear: both; clear: both;
margin: 4px 0; margin: 4px 0;

View File

@@ -23,8 +23,26 @@
@media only screen and (max-width: 895px), only screen and (max-device-width: 895px) @media only screen and (max-width: 895px), only screen and (max-device-width: 895px)
{ {
div#portal-right { width: 49% !important; } div#portal-right {
div#portal-left { width: 50% !important; } width: 49% !important;
margin-left: 1% !important;
}
div#portal-left {
width: 50% !important;
margin-left: 0 !important;
}
.rtl div#portal-right {
margin-left: 0 !important;
margin-right: 1% !important;
}
.rtl div#portal-left {
margin-left: 0 !important;
margin-right: 0 !important;
}
div#portal-center { div#portal-center {
margin-right: 0 !important; margin-right: 0 !important;
margin-left: 0 !important; margin-left: 0 !important;