mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-17 22:28:46 +01:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* 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
This commit is contained in:
Andreas Fischer 2012-02-28 22:25:09 +01:00
commit 50d234b9af
6 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/styles/prosilver/template/memberlist_body.html
View File

@ -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">

2
phpBB/styles/prosilver/template/memberlist_leaders.html
View File

@ -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">

2
phpBB/styles/prosilver/template/search_body.html
View File

@ -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">

2
phpBB/styles/prosilver/template/viewonline_body.html
View File

@ -7,7 +7,7 @@
<li class="rightside pagination"><!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <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">

14
phpBB/styles/prosilver/theme/common.css
View File

@ -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

4
phpBB/styles/prosilver/theme/tweaks.css
View File

@ -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;