1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-30 19:49:54 +02:00

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

Conflicts:
	phpBB/styles/prosilver/theme/tweaks.css
This commit is contained in:
Shibu Lijack
2012-04-10 21:46:14 +05:30
125 changed files with 3795 additions and 5220 deletions

View File

@@ -97,6 +97,22 @@ ul.cplist {
width: 100%;
}
.tabs-container h2 {
float: left;
margin-bottom: 0px;
}
.tabs-container #minitabs {
float: right;
margin-top: 19px;
}
.tabs-container:after {
display: block;
clear: both;
content: '';
}
/* CP tabbed menu
----------------------------------------*/
#tabs {