diff --git a/styles/prosilver/template/portal/_block_config.html b/styles/prosilver/template/portal/_block_config.html index c87b8ea9..edfd608b 100644 --- a/styles/prosilver/template/portal/_block_config.html +++ b/styles/prosilver/template/portal/_block_config.html @@ -2,13 +2,13 @@ - + - + diff --git a/styles/prosilver/template/portal/portal.js b/styles/prosilver/template/portal/portal.js new file mode 100644 index 00000000..1cb65b26 --- /dev/null +++ b/styles/prosilver/template/portal/portal.js @@ -0,0 +1,39 @@ +/** +* +* @package Board3 Portal v2.1 - javascript code +* @copyright (c) 2014 Board3 Group ( www.board3.de ) +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +(function($) { // Avoid conflicts with other libraries + +"use strict"; + +/** + * Correctly align the right column underneath the left column. + * This will make sure that the right column doesn't start before the end of + * the center column but rather right after the last module of the left column. + */ +phpbb.b3p_fix_right_column_margin = function() { + var width = $(window).width(); + + if (width <= 700) { + // Get height of left and center column + var center_height = $('#portal-center').outerHeight(); + var left_height = $('#portal-left').outerHeight(); + + $('#portal-right').css('margin-top', -(center_height - left_height) + 'px'); + } else { + $('#portal-right').css('margin-top', '0px'); + } +}; + +$(document).ready(function() { + phpbb.b3p_fix_right_column_margin(); + $(window).resize(function() { + phpbb.b3p_fix_right_column_margin(); + }); +}); + +})(jQuery); // Avoid conflicts with other libraries diff --git a/styles/prosilver/template/portal/portal_body.html b/styles/prosilver/template/portal/portal_body.html index 67bfb358..392eddde 100644 --- a/styles/prosilver/template/portal/portal_body.html +++ b/styles/prosilver/template/portal/portal_body.html @@ -112,4 +112,6 @@ + + diff --git a/styles/prosilver/theme/portal.css b/styles/prosilver/theme/portal.css index 4882c236..82ffb467 100644 --- a/styles/prosilver/theme/portal.css +++ b/styles/prosilver/theme/portal.css @@ -117,6 +117,7 @@ span.portal-corners-top-inner, span.portal-corners-bottom-inner{ #portal-body #viewpoll { margin-left: 0px; + margin-right: 0px; } /** @@ -130,6 +131,10 @@ span.portal-corners-top-inner, span.portal-corners-bottom-inner{ margin: 0; } +.portal-clear { + clear: both; +} + /* RTL language fixes */ .rtl .portal-navigation ul li a{ background-image: url("./images/portal/arrowbullet_rtl.gif"); diff --git a/styles/prosilver/theme/responsive.css b/styles/prosilver/theme/responsive.css index 8edfb950..198c316d 100644 --- a/styles/prosilver/theme/responsive.css +++ b/styles/prosilver/theme/responsive.css @@ -52,4 +52,6 @@ dt#a { width: 125% !important; } #portal-left ul.topiclist dd, #portal-right ul.topiclist dd { display: block !important; } .portal-responsive-show { display: block !important; } .portal-responsive-hide { display: none !important; } + #portal-body { padding-top: 0px !important; } + .portal-clear { display: none !important; } }