From 3568eec4dfa602cbb5ad3b13aabea90690a4874b Mon Sep 17 00:00:00 2001 From: PayBas Date: Tue, 1 Jul 2014 18:41:56 +0200 Subject: [ticket/12562] Add max-width to proSilver PHPBB3-12562 --- phpBB/styles/prosilver/theme/colours.css | 8 +++++++- phpBB/styles/prosilver/theme/common.css | 18 +++++++++++++++++- phpBB/styles/prosilver/theme/responsive.css | 9 ++++++--- phpBB/styles/prosilver/theme/tweaks.css | 5 +++++ 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 4b7532ab8a..9b31693ee5 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: #DDDDE0; } h1 { @@ -43,6 +43,12 @@ hr { /* Round cornered boxes and backgrounds ---------------------------------------- */ +#wrap { + background-color: #FFF; + border-color: #FFF; + box-shadow: 0 0 10px rgba(16, 82, 137, 0.12), inset 0 0 10px rgba(16, 82, 137, 0.08); +} + .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..b6d1f567f5 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -175,8 +175,24 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul { /* Main blocks ---------------------------------------- */ #wrap { - padding: 0 20px; + border: 1px solid transparent; + border-radius: 12px; + margin: 0 auto; + max-width: 1152px; min-width: 650px; + padding: 12px 20px; +} + +@media only screen and (max-width: 1192px), only screen and (max-device-width: 1192px) +{ + body { + padding: 0; + } + + #wrap { + border: none; + border-radius: 0; + } } #simple-wrap { diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index e27a2292b3..327795bdac 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -13,12 +13,15 @@ html { } body { - padding: 0 5px; + padding: 0; } #wrap { - min-width: 300px; - padding: 0; + border: none; + border-radius: 0; + box-shadow: none; + min-width: 290px; + padding: 0 5px; } /* Common block wrappers diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css index 9a8ed5d399..683824b8f1 100644 --- a/phpBB/styles/prosilver/theme/tweaks.css +++ b/phpBB/styles/prosilver/theme/tweaks.css @@ -4,6 +4,11 @@ These style definitions are IE 7 and 8 specific tweaks required due to its poor CSS support. -------------------------------------------------*/ +/* No body padding since IE8 doesn't support media-queries */ +body { + padding: 0; +} + /* Clear float fix for IE7 */ .inner { zoom: 1; -- cgit v1.2.1 From e99b25e273e932243bb2fbb48999e9a92ff0a4c7 Mon Sep 17 00:00:00 2001 From: PayBas Date: Wed, 2 Jul 2014 17:47:16 +0200 Subject: [ticket/12562] Increase mq trigger screen size to hide border PHPBB3-12562 --- phpBB/styles/prosilver/theme/common.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index b6d1f567f5..e19b3e57ab 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -183,7 +183,7 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul { padding: 12px 20px; } -@media only screen and (max-width: 1192px), only screen and (max-device-width: 1192px) +@media only screen and (max-width: 1210px), only screen and (max-device-width: 1210px) { body { padding: 0; -- cgit v1.2.1 From c23c56f31ce91c91ee1db687fae8a57f8bf5a0ac Mon Sep 17 00:00:00 2001 From: PayBas Date: Thu, 3 Jul 2014 13:42:12 +0200 Subject: [ticket/12562] Use Hanakin's version PHPBB3-12562 --- phpBB/styles/prosilver/theme/colours.css | 5 ++--- phpBB/styles/prosilver/theme/common.css | 6 +++--- phpBB/styles/prosilver/theme/responsive.css | 1 - 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 9b31693ee5..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: #DDDDE0; + background-color: #F5F7FA; } h1 { @@ -45,8 +45,7 @@ hr { ---------------------------------------- */ #wrap { background-color: #FFF; - border-color: #FFF; - box-shadow: 0 0 10px rgba(16, 82, 137, 0.12), inset 0 0 10px rgba(16, 82, 137, 0.08); + border-color: #E6E9ED; } .headerbar { diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index e19b3e57ab..65af559b48 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -176,14 +176,14 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul { ---------------------------------------- */ #wrap { border: 1px solid transparent; - border-radius: 12px; + border-radius: 8px; margin: 0 auto; max-width: 1152px; min-width: 650px; - padding: 12px 20px; + padding: 15px; } -@media only screen and (max-width: 1210px), only screen and (max-device-width: 1210px) +@media only screen and (max-width: 1220px), only screen and (max-device-width: 1220px) { body { padding: 0; diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 327795bdac..5efe8ab64e 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -19,7 +19,6 @@ body { #wrap { border: none; border-radius: 0; - box-shadow: none; min-width: 290px; padding: 0 5px; } -- cgit v1.2.1 From 8222eeaaff04ebd341fd00f9bcc156f6b78c2589 Mon Sep 17 00:00:00 2001 From: PayBas Date: Thu, 3 Jul 2014 14:41:04 +0200 Subject: [ticket/12562] Use border for all sizes except responsive PHPBB3-12562 --- phpBB/styles/prosilver/theme/common.css | 16 +++++----------- phpBB/styles/prosilver/theme/responsive.css | 5 +---- phpBB/styles/prosilver/theme/tweaks.css | 5 ----- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 65af559b48..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; } @@ -177,21 +177,15 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul { #wrap { border: 1px solid transparent; border-radius: 8px; - margin: 0 auto; + margin: 12px auto; max-width: 1152px; - min-width: 650px; + min-width: 625px; padding: 15px; } -@media only screen and (max-width: 1220px), only screen and (max-device-width: 1220px) -{ - body { - padding: 0; - } - +@media only screen and (max-width: 1220px), only screen and (max-device-width: 1220px) { #wrap { - border: none; - border-radius: 0; + margin: 12px; } } diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 5efe8ab64e..ec3cafd5f1 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -12,13 +12,10 @@ html { height: auto; } -body { - padding: 0; -} - #wrap { border: none; border-radius: 0; + margin: 0; min-width: 290px; padding: 0 5px; } diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css index 683824b8f1..9a8ed5d399 100644 --- a/phpBB/styles/prosilver/theme/tweaks.css +++ b/phpBB/styles/prosilver/theme/tweaks.css @@ -4,11 +4,6 @@ These style definitions are IE 7 and 8 specific tweaks required due to its poor CSS support. -------------------------------------------------*/ -/* No body padding since IE8 doesn't support media-queries */ -body { - padding: 0; -} - /* Clear float fix for IE7 */ .inner { zoom: 1; -- cgit v1.2.1