diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-02-28 22:25:09 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-02-28 22:25:09 +0100 |
| commit | 50d234b9af81dadfe64efb826b34c5c7dd45b4f2 (patch) | |
| tree | ab50208e53b2889bf94e14619b0c1d2e9c00a6cc /phpBB | |
| parent | 23e845d0663d4ff83c521d3b7dab91df7d719e25 (diff) | |
| parent | f6cf8782c8c1cd99832709e52dc646b54fd041d1 (diff) | |
| download | forums-50d234b9af81dadfe64efb826b34c5c7dd45b4f2.tar forums-50d234b9af81dadfe64efb826b34c5c7dd45b4f2.tar.gz forums-50d234b9af81dadfe64efb826b34c5c7dd45b4f2.tar.bz2 forums-50d234b9af81dadfe64efb826b34c5c7dd45b4f2.tar.xz forums-50d234b9af81dadfe64efb826b34c5c7dd45b4f2.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
Conflicts:
phpBB/styles/prosilver/template/memberlist_leaders.html
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/styles/prosilver/template/memberlist_body.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/memberlist_leaders.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/search_body.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewonline_body.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 14 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/tweaks.css | 4 |
6 files changed, 17 insertions, 9 deletions
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html index ff53e42119..504d1b80ef 100644 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ b/phpBB/styles/prosilver/template/memberlist_body.html @@ -80,7 +80,7 @@ <span class="corners-bottom"><span></span></span></div> </div> <!-- ENDIF --> -<div class="forumbg"> +<div class="forumbg forumbg-table"> <div class="inner"><span class="corners-top"><span></span></span> <table class="table1" cellspacing="1"> diff --git a/phpBB/styles/prosilver/template/memberlist_leaders.html b/phpBB/styles/prosilver/template/memberlist_leaders.html index 1a63793bc3..bce1a69619 100644 --- a/phpBB/styles/prosilver/template/memberlist_leaders.html +++ b/phpBB/styles/prosilver/template/memberlist_leaders.html @@ -5,7 +5,7 @@ <form method="post" action="{S_MODE_ACTION}"> <!-- BEGIN group --> -<div class="forumbg"> +<div class="forumbg forumbg-table"> <div class="inner"><span class="corners-top"><span></span></span> <table class="table1" cellspacing="1"> diff --git a/phpBB/styles/prosilver/template/search_body.html b/phpBB/styles/prosilver/template/search_body.html index 6616b95a73..4b1d30d77d 100644 --- a/phpBB/styles/prosilver/template/search_body.html +++ b/phpBB/styles/prosilver/template/search_body.html @@ -98,7 +98,7 @@ </form> <!-- IF .recentsearch --> -<div class="forumbg"> +<div class="forumbg forumbg-table"> <div class="inner"><span class="corners-top"><span></span></span> <table class="table1" cellspacing="1"> diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html index b111d743f9..3f1f0e64bf 100644 --- a/phpBB/styles/prosilver/template/viewonline_body.html +++ b/phpBB/styles/prosilver/template/viewonline_body.html @@ -7,7 +7,7 @@ <li class="rightside pagination"><!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE -->{PAGE_NUMBER}<!-- ENDIF --></li> </ul> -<div class="forumbg"> +<div class="forumbg forumbg-table"> <div class="inner"><span class="corners-top"><span></span></span> <table class="table1" cellspacing="1"> diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 8b5e09297e..7eb00bd808 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -418,7 +418,19 @@ table.info tbody th { } .forumbg table.table1 { - margin: 0 -2px -1px -1px; + margin: 0; +} + +.forumbg-table > .inner { + margin: 0 -1px; +} + +.forumbg-table > .inner > span.corners-top { + margin: 0 -4px -1px -4px; +} + +.forumbg-table > .inner > span.corners-bottom { + margin: -1px -4px 0 -4px; } /* Misc layout styles diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css index 089bc6f764..ae724e1419 100644 --- a/phpBB/styles/prosilver/theme/tweaks.css +++ b/phpBB/styles/prosilver/theme/tweaks.css @@ -87,10 +87,6 @@ dl.icon { float: none; } -* html .forumbg table.table1 { - margin: 0 -2px 0px -1px; -} - /* Headerbar height fix for IE7 and below */ * html #site-description p { margin-bottom: 1.0em; |