diff options
| author | Cesar G <prototech91@gmail.com> | 2014-06-23 20:57:54 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-06-23 20:57:54 -0700 |
| commit | 5bf8ac475bee6cbfcbbe12bf86a6ce5a65640886 (patch) | |
| tree | fc11955d7273f3b7115d488a8b33170dd0a1cad8 /phpBB | |
| parent | a6e8dea019d01e3ce5e3b0401d21e3419416ba81 (diff) | |
| parent | 0b4abd01c89e81c6bbd4674378525664be39cffc (diff) | |
| download | forums-5bf8ac475bee6cbfcbbe12bf86a6ce5a65640886.tar forums-5bf8ac475bee6cbfcbbe12bf86a6ce5a65640886.tar.gz forums-5bf8ac475bee6cbfcbbe12bf86a6ce5a65640886.tar.bz2 forums-5bf8ac475bee6cbfcbbe12bf86a6ce5a65640886.tar.xz forums-5bf8ac475bee6cbfcbbe12bf86a6ce5a65640886.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12562] Add max-width to proSilver
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 6 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/responsive.css | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index a52f5e494d..2aa126c3d1 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: 12px 0; + padding: 0; word-wrap: break-word; } @@ -175,8 +175,10 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul { /* Main blocks ---------------------------------------- */ #wrap { - padding: 0 20px; min-width: 650px; + max-width: 1152px; + margin: 0 auto; + padding: 12px; } #simple-wrap { diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index e27a2292b3..ebae9f6a17 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -13,12 +13,12 @@ html { } body { - padding: 0 5px; + padding: 0; } #wrap { min-width: 300px; - padding: 0; + padding: 0 5px; } /* Common block wrappers |