Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 9d9fdb0c11a81af1870efb6401db3fa1f592711b 2 parents 05bd866 + 0deacb8
Nils Adermann naderman authored
7 phpBB/styles/prosilver/theme/colours.css
View
@@ -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");
16 phpBB/styles/prosilver/theme/common.css
View
@@ -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 {
11 phpBB/styles/prosilver/theme/responsive.css
View
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.