mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 20:24:08 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103

Browse Source 
Conflicts:
	phpBB/install/schemas/mssql_schema.sql
	phpBB/report.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
This commit is contained in:
Nathaniel Guse
2012-11-10 10:58:44 -06:00
parent 6c8c54d4d2 f5ed04f8ff
commit 68363e362d
290 changed files with 2456 additions and 1755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/styles/prosilver/theme/colours.css
View File

@@ -151,9 +151,9 @@ dl.details dd {
border-color: #B4BAC0;
}
.pagination li.ellipsis span {
.pagination li.ellipsis span {
background-color: transparent;
color: #000
color: #000000;
}
.pagination li.active span {
@@ -165,7 +165,7 @@ dl.details dd {
.pagination li a:hover, .pagination .active a:hover {
border-color: #368AD2;
background-color: #368AD2;
color: #FFF;
color: #FFFFFF;
}
.pagination li a:active, .pagination li.active a:active {

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

@@ -510,9 +510,16 @@ li.pagination {
margin-bottom: 0;
}
.pagination ul li, dl .pagination ul li, dl.icon .pagination ul li {
li.pagination ul {
margin-top: -2px;
vertical-align: middle;
}
.pagination ul li, dl .pagination ul li, dl.icon .pagination ul li {
display: inline;
padding: 0;
font-size: 100%;
line-height: normal;
}
.pagination li a, .pagnation li span, li .pagination li a, li .pagnation li span, .pagination li.active span, .pagination li.ellipsis span {