diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-07-03 15:58:33 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-07-03 15:58:33 +0200 |
| commit | 9d9fdb0c11a81af1870efb6401db3fa1f592711b (patch) | |
| tree | 0f70497b7f04c49807e220455ab90619750e15d3 | |
| parent | 05bd866cb3e0938c034bff45014c4cb3c760dcd9 (diff) | |
| parent | 0deacb843865bea01f24d39040209c73eb087056 (diff) | |
| download | forums-9d9fdb0c11a81af1870efb6401db3fa1f592711b.tar forums-9d9fdb0c11a81af1870efb6401db3fa1f592711b.tar.gz forums-9d9fdb0c11a81af1870efb6401db3fa1f592711b.tar.bz2 forums-9d9fdb0c11a81af1870efb6401db3fa1f592711b.tar.xz forums-9d9fdb0c11a81af1870efb6401db3fa1f592711b.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12562] Use border for all sizes except responsive
[ticket/12562] Use Hanakin's version
[ticket/12562] Increase mq trigger screen size to hide border
[ticket/12562] Add max-width to proSilver
| -rw-r--r-- | phpBB/styles/prosilver/theme/colours.css | 7 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 16 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/responsive.css | 11 |
3 files changed, 24 insertions, 10 deletions
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 4b7532ab8a..de0a068ec4 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -5,7 +5,7 @@ Colours and backgrounds for common.css html, body { color: #536482; - background-color: #FFFFFF; + background-color: #F5F7FA; } h1 { @@ -43,6 +43,11 @@ hr { /* Round cornered boxes and backgrounds ---------------------------------------- */ +#wrap { + background-color: #FFF; + border-color: #E6E9ED; +} + .headerbar { background-color: #12A3EB; background-image: url("./images/bg_header.gif"); diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index a52f5e494d..3357561a62 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,18 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul { /* Main blocks ---------------------------------------- */ #wrap { - padding: 0 20px; - min-width: 650px; + border: 1px solid transparent; + border-radius: 8px; + margin: 12px auto; + max-width: 1152px; + min-width: 625px; + padding: 15px; +} + +@media only screen and (max-width: 1220px), only screen and (max-device-width: 1220px) { + #wrap { + margin: 12px; + } } #simple-wrap { diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index e27a2292b3..ec3cafd5f1 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -12,13 +12,12 @@ html { height: auto; } -body { - padding: 0 5px; -} - #wrap { - min-width: 300px; - padding: 0; + border: none; + border-radius: 0; + margin: 0; + min-width: 290px; + padding: 0 5px; } /* Common block wrappers |