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

phpBB/styles/prosilver/template/mcp_topic.html

@@ -1,5 +1,6 @@
 <!-- INCLUDE mcp_header.html -->
 
+<div class="tabs-container">
 <h2><a href="{U_VIEW_TOPIC}">{L_TOPIC}: {TOPIC_TITLE}</a></h2>
 
 <script type="text/javascript">
@@ -35,6 +36,7 @@ onload_functions.push('subPanels()');
 		</li>
 	</ul>
 </div>
+</div>
 
 <form id="mcp" method="post" action="{S_MCP_ACTION}">
 

phpBB/styles/prosilver/theme/cp.css

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

phpBB/styles/prosilver/theme/tweaks.css

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