Skip to content

Commit

Permalink
Merge branch 'ticket/12562' of https://github.com/PayBas/phpbb into d…
Browse files Browse the repository at this point in the history
…evelop-ascraeus

* 'ticket/12562' of https://github.com/PayBas/phpbb:
  [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
naderman committed Jul 3, 2014
2 parents 0232fcc + 8222eea commit 0deacb8
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 10 deletions.
7 changes: 6 additions & 1 deletion phpBB/styles/prosilver/theme/colours.css
Expand Up @@ -5,7 +5,7 @@ Colours and backgrounds for common.css

html, body {
color: #536482;
background-color: #FFFFFF;
background-color: #F5F7FA;
}

h1 {
Expand Down Expand Up @@ -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");
Expand Down
16 changes: 13 additions & 3 deletions phpBB/styles/prosilver/theme/common.css
Expand Up @@ -59,7 +59,7 @@ body {
font-size: 10px;
line-height: normal;
margin: 0;
padding: 12px 0;
padding: 0;
word-wrap: break-word;
}

Expand Down Expand Up @@ -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 {
Expand Down
11 changes: 5 additions & 6 deletions phpBB/styles/prosilver/theme/responsive.css
Expand Up @@ -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
Expand Down

0 comments on commit 0deacb8

Please sign in to comment.