aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2014-06-23 20:57:31 -0700
committerCesar G <prototech91@gmail.com>2014-06-23 20:57:31 -0700
commit0b4abd01c89e81c6bbd4674378525664be39cffc (patch)
tree90afb22e165f6181d4463199d3f5a663183a22af /phpBB
parent8c44b2721ceba7c98f6a0851ebaec6ed882df87a (diff)
parent5bbcc39b667fe86dc3bd725902112428ec8e03b4 (diff)
downloadforums-0b4abd01c89e81c6bbd4674378525664be39cffc.tar
forums-0b4abd01c89e81c6bbd4674378525664be39cffc.tar.gz
forums-0b4abd01c89e81c6bbd4674378525664be39cffc.tar.bz2
forums-0b4abd01c89e81c6bbd4674378525664be39cffc.tar.xz
forums-0b4abd01c89e81c6bbd4674378525664be39cffc.zip
Merge remote-tracking branch 'PayBas/ticket/12562' into develop-ascraeus
* PayBas/ticket/12562: [ticket/12562] Add max-width to proSilver
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/styles/prosilver/theme/common.css6
-rw-r--r--phpBB/styles/prosilver/theme/responsive.css4
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