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

Conflicts:
	phpBB/styles/prosilver/theme/tweaks.css

phpBB/styles/prosilver/theme/common.css

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

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/theme.cfg

@@ -1,21 +0,0 @@
-#
-# phpBB Theme Configuration File
-#
-# @package phpBB3
-# @copyright (c) 2006 phpBB Group
-# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-#
-#
-# At the left is the name, please do not change this
-# At the right the value is entered
-# For on/off options the valid values are on, off, 1, 0, true and false
-#
-# Values get trimmed, if you want to add a space in front or at the end of
-# the value, then enclose the value with single or double quotes.
-# Single and double quotes do not need to be escaped.
-#
-
-# General Information about this theme
-name = prosilver
-copyright = © phpBB Group, 2007
-version = 3.1.0-dev

phpBB/styles/prosilver/theme/tweaks.css

@@ -4,8 +4,9 @@ These style definitions are IE 7 and 8 specific
 tweaks required due to its poor CSS support.
 -------------------------------------------------*/
 
-table.table1 {
-	width: 100%;
+/* Clear float fix for IE7 */
+.inner {
+	zoom: 1;
 }
 
 /* Align checkboxes/radio buttons nicely */
@@ -28,9 +29,4 @@ dl.details dd {
 /* Headerbar height fix for IE7 */
 #site-description p {
 	*margin-bottom: 1.0em;
-}
-
-/* Clear float fix for IE7 */
-.inner {
-	zoom: 1;
 }