5 files changed, 36 insertions, 43 deletions
diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 59b10f597e..da8a0096ea 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -284,8 +284,6 @@
 	</fieldset>
 	</form>
 
-	<br />
-
 	<form id="change_ext" method="post" action="{U_ACTION}">
 
 	<fieldset class="tabulated">
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html
index 1cdc1abe6b..409ea46de5 100644
--- a/phpBB/adm/style/acp_inactive.html
+++ b/phpBB/adm/style/acp_inactive.html
@@ -2,14 +2,12 @@
 
 <a id="maincontent"></a>
 
-<h2>{L_INACTIVE_USERS}</h2>
+<h1>{L_INACTIVE_USERS}</h1>
 
 <p>{L_INACTIVE_USERS_EXPLAIN}</p>
 
 <form id="inactive" method="post" action="{U_ACTION}">
 
-<div class="clearfix"></div>
-
 <!-- IF .pagination -->
 <div class="pagination">
 	<!-- INCLUDE pagination.html -->
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html
index ec2065f906..4f67f46e24 100644
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -18,9 +18,6 @@
 </div>
 <!-- ENDIF -->
 
-<div class="clearfix">&nbsp;</div>
-<div><br style="clear: both;" /></div>
-
 <!-- IF .log -->
 	<table class="table1 zebra-table fixed-width-table">
 	<thead>
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 9a9b3ff2b9..065dd7ac4f 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -243,9 +243,6 @@
 		<!-- END log -->
 		</tbody>
 		</table>
-
-		<br />
-
 	<!-- ENDIF -->
 
 	<!-- IF S_INACTIVE_USERS -->
@@ -287,7 +284,6 @@
 		<!-- END inactive -->
 		</tbody>
 		</table>
-
 	<!-- ENDIF -->
 
 <!-- ENDIF -->
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index b8f55e66c5..b83750875a 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -154,6 +154,10 @@ a:active {
 	font-weight: bold;
 }
 
+a#maincontent, a#acl, a#assigned_to {
+	display: block;
+}
+
 /* List items */
 ul, ol {
 	list-style-position: inside;
@@ -174,7 +178,6 @@ li {
 }
 
 #page-header {
-	clear: both;
 	text-align: right;
 	background: url("../images/phpbb_logo.png") top left no-repeat;
 	height: 54px;
@@ -203,14 +206,9 @@ li {
 }
 
 #page-body {
-	clear: both;
 	min-width: 650px;
 }
 
-#page-footer {
-	clear: both;
-}
-
 .copyright {
 	font-size: 0.75em;
 	text-align: center;
@@ -335,12 +333,6 @@ li {
 	padding: 0;
 }
 
-#tabs > ul:after {
-	content: '';
-	display: block;
-	clear: both;
-}
-
 #tabs .tab {
 	display: inline-block;
 	float: left;
@@ -475,7 +467,6 @@ li {
 /* Main Panel
 ---------------------------------------- */
 #acp {
-	clear: both;
 	position: relative;
 	top: -2px;
 	margin: 0 0 2px;
@@ -723,6 +714,7 @@ td {
 .table1 {
 	border-collapse: separate;
 	border-spacing: 1px;
+	clear: both;
 }
 
 dt#color_palette_placeholder table {
@@ -862,10 +854,10 @@ table.zebra-table tbody tr:nth-child(even) {
 }
 
 /* Deactivated row */
-.row-inactive { 
-	color: #999; 
+.row-inactive {
+	color: #999;
 }
-.row-inactive a, .row-inactive strong { 
+.row-inactive a, .row-inactive strong {
 	color: #888;
 }
 .row-inactive a:hover {
@@ -1132,6 +1124,11 @@ input.langvalue, textarea.langvalue {
 	width: 90%;
 }
 
+input[type="number"] {
+	width: 60px;
+	-moz-padding-end: 0;
+}
+
 optgroup, select {
 	background-color: #FAFAFA;
 	border: 1px solid #666666;
@@ -1226,8 +1223,8 @@ fieldset.quick legend {
 fieldset.tabulated {
 	background: none;
 	margin: 0;
+	margin-top: 5px;
 	padding: 0;
-	padding-top: 5px;
 	border: 0;
 }
 
@@ -1464,7 +1461,7 @@ input:focus, textarea:focus {
 {
 	select, dd select, dd input {
 		max-width: 240px;
-	}	
+	}
 }
 
 /* Submit button fieldset or paragraph
@@ -1676,12 +1673,12 @@ input.button1:focus, input.button2:focus {
 	height: 1%; /* IE tweak (holly hack) */
 	width: auto;
 	text-align: right;
-	margin-top: 5px;
+	margin: 5px 0;
 }
 
 .top-pagination {
 	float: right;
-	margin: 15px 0 2px 0;
+	margin: 15px 0 5px 0;
 }
 
 .rtl .pagination {
@@ -1877,17 +1874,7 @@ li.pagination ul {
 	vertical-align: middle;
 }
 
-/* Nice method for clearing floated blocks without having to insert any extra markup
-	From http://www.positioniseverything.net/easyclearing.html
-.clearfix:after, #tabs:after, .row:after, #content:after, fieldset dl:after, #page-body:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
-}*/
-
-.clearfix, .row, #content, fieldset dl, #page-body {
+.row, fieldset dl {
 	overflow: hidden;
 }
 
@@ -2470,3 +2457,20 @@ fieldset.permissions .padding {
 	.responsive-show-inline { display: inline !important; }
 	.responsive-show-inline-block { display: inline-block !important; }
 }
+
+.clearfix {
+	overflow: hidden;
+}
+
+.pagination:after,
+#page-header:after,
+#page-body:after,
+#tabs:after,
+#tabs > ul:after,
+#tabs li:after,
+#acp:after,
+#content:after {
+	content: '';
+	clear: both;
+	display: block;
+}