diff options
| author | Cesar G <prototech91@gmail.com> | 2014-07-07 01:33:34 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-07-07 01:33:34 -0700 |
| commit | 3a317edc9295812343038146caa6082e8b6f7483 (patch) | |
| tree | 3ae84ab0c25ebca14c5ed96d044067f57f936a96 /phpBB/styles/prosilver | |
| parent | 0b91c5488afce733a33762fc307cf81e439b3e33 (diff) | |
| parent | 3c223c29782f843f7e8c746ff24b5ab72e417466 (diff) | |
| download | forums-3a317edc9295812343038146caa6082e8b6f7483.tar forums-3a317edc9295812343038146caa6082e8b6f7483.tar.gz forums-3a317edc9295812343038146caa6082e8b6f7483.tar.bz2 forums-3a317edc9295812343038146caa6082e8b6f7483.tar.xz forums-3a317edc9295812343038146caa6082e8b6f7483.zip | |
Merge remote-tracking branch 'VSEphpbb/ticket/12811' into develop-ascraeus
* VSEphpbb/ticket/12811:
[ticket/12811] Responsive adjustments to margin changes
[ticket/12811] Fix padding/margin bug affecting bottom layout
Diffstat (limited to 'phpBB/styles/prosilver')
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 6 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/responsive.css | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 5ef75c06ea..e33bf99965 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; @@ -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 698f402618..241b4d132e 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; |