From 8643ca63035cd0ee4825ca04912747c502d9bee0 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 4 Jul 2014 10:26:17 -0700 Subject: [PATCH 1/2] [ticket/12811] Fix padding/margin bug affecting bottom layout PHPBB3-12811 --- phpBB/styles/prosilver/theme/common.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 749d02c50c..28861d29a0 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -59,7 +59,7 @@ body { font-size: 10px; line-height: normal; margin: 0; - padding: 0; + padding: 12px 0; word-wrap: break-word; } @@ -177,7 +177,7 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul { #wrap { border: 1px solid transparent; border-radius: 8px; - margin: 12px auto; + margin: 0 auto; max-width: 1152px; min-width: 625px; padding: 15px; From 3c223c29782f843f7e8c746ff24b5ab72e417466 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 4 Jul 2014 10:36:33 -0700 Subject: [PATCH 2/2] [ticket/12811] Responsive adjustments to margin changes PHPBB3-12811 --- phpBB/styles/prosilver/theme/common.css | 2 +- phpBB/styles/prosilver/theme/responsive.css | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 28861d29a0..47662ef414 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -185,7 +185,7 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul { @media only screen and (max-width: 1220px), only screen and (max-device-width: 1220px) { #wrap { - margin: 12px; + margin: 0 12px; } } diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 9615f1a0b4..c0bacf6586 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -12,6 +12,10 @@ html { height: auto; } +body { + padding: 0; +} + #wrap { border: none; border-radius: 0;