Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12562] Revert "Add max-width to proSilver"
This commit is contained in:
Andreas Fischer 2014-06-24 21:10:44 +02:00
commit 7172c1a78b
2 changed files with 4 additions and 6 deletions

View file

@ -59,7 +59,7 @@ body {
font-size: 10px;
line-height: normal;
margin: 0;
padding: 0;
padding: 12px 0;
word-wrap: break-word;
}
@ -175,10 +175,8 @@ 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 {

View file

@ -13,12 +13,12 @@ html {
}
body {
padding: 0;
padding: 0 5px;
}
#wrap {
min-width: 300px;
padding: 0 5px;
padding: 0;
}
/* Common block wrappers