makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* 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
This commit is contained in:
Nils Adermann 2014-07-03 15:58:33 +02:00
commit 9d9fdb0c11
3 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/styles/prosilver/theme/colours.css
View file

@ -5,7 +5,7 @@ Colours and backgrounds for common.css
html, body { html, body {
color: #536482; color: #536482;
background-color: #FFFFFF; background-color: #F5F7FA;
} }
h1 { h1 {
@ -43,6 +43,11 @@ hr {
/* Round cornered boxes and backgrounds /* Round cornered boxes and backgrounds
---------------------------------------- */ ---------------------------------------- */
#wrap {
background-color: #FFF;
border-color: #E6E9ED;
}
.headerbar { .headerbar {
background-color: #12A3EB; background-color: #12A3EB;
background-image: url("./images/bg_header.gif"); background-image: url("./images/bg_header.gif");

16
phpBB/styles/prosilver/theme/common.css
View file

@ -59,7 +59,7 @@ body {
font-size: 10px; font-size: 10px;
line-height: normal; line-height: normal;
margin: 0; margin: 0;
padding: 12px 0; padding: 0;
word-wrap: break-word; word-wrap: break-word;
} }
@ -175,8 +175,18 @@ ol ol ul, ol ul ul, ul ol ul, ul ul ul {
/* Main blocks /* Main blocks
---------------------------------------- */ ---------------------------------------- */
#wrap { #wrap {
padding: 0 20px; border: 1px solid transparent;
min-width: 650px; 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 { #simple-wrap {

11
phpBB/styles/prosilver/theme/responsive.css
View file

@ -12,13 +12,12 @@ html {
height: auto; height: auto;
} }
body {
padding: 0 5px;
}
#wrap { #wrap {
min-width: 300px; border: none;
padding: 0; border-radius: 0;
margin: 0;
min-width: 290px;
padding: 0 5px;
} }
/* Common block wrappers /* Common block wrappers