mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-09-01 04:22:11 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into ticket/10734

Browse Source 
Conflicts:
	phpBB/styles/prosilver/theme/tweaks.css
This commit is contained in:
Shibu Lijack
2012-04-10 21:46:14 +05:30
parent daee253403 41e03164c1
commit fd55c8664a
125 changed files with 3795 additions and 5220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -355,7 +355,7 @@ ul.rightside {
/* Table styles
----------------------------------------*/
table.table1 {
/* See tweaks.css */
width: 100%;
}
#ucp-main table.table1 {
@@ -548,7 +548,7 @@ li.pagination {
border: 1px solid transparent;
position: fixed;
display: none;
top: 100px;
top: 40%;
left: 35%;
width: 30%;
z-index: 50;
@@ -667,3 +667,7 @@ p.rules a {
.hidden {
display: none;
}
.smilies {
vertical-align: text-bottom;
}