1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-22 16:22:58 +02:00

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10699] Long h2 title breaks div.minitabs in MCP
  [ticket/10699] Long h2 title breaks div.minitabs in MCP

Conflicts:
	phpBB/styles/prosilver/theme/tweaks.css
This commit is contained in:
Vjacheslav Trushkin
2012-04-02 16:20:21 +03:00
3 changed files with 28 additions and 0 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 {

View File

@@ -24,4 +24,14 @@ dl.details dd {
/* Headerbar height fix for IE7 */
#site-description p {
*margin-bottom: 1.0em;
}
/* #minitabs fix for IE */
.tabs-container {
zoom: 1;
}
#minitabs {
white-space: nowrap;
*min-width: 50%;
}