Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/10472] Remove dd selector and use -moz-padding-end
  [ticket/10472] Fix weird padding on input type=number
  [ticket/10472] More clearing and white-space fixes
  [ticket/10472] Fix ACP overflow:hidden problem for medium-sized screens
This commit is contained in:
Cesar G 2014-09-15 06:58:52 -07:00
commit 674ea44bc6
5 changed files with 36 additions and 43 deletions

View file

@ -284,8 +284,6 @@
</fieldset> </fieldset>
</form> </form>
<br />
<form id="change_ext" method="post" action="{U_ACTION}"> <form id="change_ext" method="post" action="{U_ACTION}">
<fieldset class="tabulated"> <fieldset class="tabulated">

View file

@ -2,14 +2,12 @@
<a id="maincontent"></a> <a id="maincontent"></a>
<h2>{L_INACTIVE_USERS}</h2> <h1>{L_INACTIVE_USERS}</h1>
<p>{L_INACTIVE_USERS_EXPLAIN}</p> <p>{L_INACTIVE_USERS_EXPLAIN}</p>
<form id="inactive" method="post" action="{U_ACTION}"> <form id="inactive" method="post" action="{U_ACTION}">
<div class="clearfix"></div>
<!-- IF .pagination --> <!-- IF .pagination -->
<div class="pagination"> <div class="pagination">
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->

View file

@ -18,9 +18,6 @@
</div> </div>
<!-- ENDIF --> <!-- ENDIF -->
<div class="clearfix">&nbsp;</div>
<div><br style="clear: both;" /></div>
<!-- IF .log --> <!-- IF .log -->
<table class="table1 zebra-table fixed-width-table"> <table class="table1 zebra-table fixed-width-table">
<thead> <thead>

View file

@ -243,9 +243,6 @@
<!-- END log --> <!-- END log -->
</tbody> </tbody>
</table> </table>
<br />
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_INACTIVE_USERS --> <!-- IF S_INACTIVE_USERS -->
@ -287,7 +284,6 @@
<!-- END inactive --> <!-- END inactive -->
</tbody> </tbody>
</table> </table>
<!-- ENDIF --> <!-- ENDIF -->
<!-- ENDIF --> <!-- ENDIF -->

View file

@ -154,6 +154,10 @@ a:active {
font-weight: bold; font-weight: bold;
} }
a#maincontent, a#acl, a#assigned_to {
display: block;
}
/* List items */ /* List items */
ul, ol { ul, ol {
list-style-position: inside; list-style-position: inside;
@ -174,7 +178,6 @@ li {
} }
#page-header { #page-header {
clear: both;
text-align: right; text-align: right;
background: url("../images/phpbb_logo.png") top left no-repeat; background: url("../images/phpbb_logo.png") top left no-repeat;
height: 54px; height: 54px;
@ -203,14 +206,9 @@ li {
} }
#page-body { #page-body {
clear: both;
min-width: 650px; min-width: 650px;
} }
#page-footer {
clear: both;
}
.copyright { .copyright {
font-size: 0.75em; font-size: 0.75em;
text-align: center; text-align: center;
@ -335,12 +333,6 @@ li {
padding: 0; padding: 0;
} }
#tabs > ul:after {
content: '';
display: block;
clear: both;
}
#tabs .tab { #tabs .tab {
display: inline-block; display: inline-block;
float: left; float: left;
@ -475,7 +467,6 @@ li {
/* Main Panel /* Main Panel
---------------------------------------- */ ---------------------------------------- */
#acp { #acp {
clear: both;
position: relative; position: relative;
top: -2px; top: -2px;
margin: 0 0 2px; margin: 0 0 2px;
@ -723,6 +714,7 @@ td {
.table1 { .table1 {
border-collapse: separate; border-collapse: separate;
border-spacing: 1px; border-spacing: 1px;
clear: both;
} }
dt#color_palette_placeholder table { dt#color_palette_placeholder table {
@ -862,10 +854,10 @@ table.zebra-table tbody tr:nth-child(even) {
} }
/* Deactivated row */ /* Deactivated row */
.row-inactive { .row-inactive {
color: #999; color: #999;
} }
.row-inactive a, .row-inactive strong { .row-inactive a, .row-inactive strong {
color: #888; color: #888;
} }
.row-inactive a:hover { .row-inactive a:hover {
@ -1132,6 +1124,11 @@ input.langvalue, textarea.langvalue {
width: 90%; width: 90%;
} }
input[type="number"] {
width: 60px;
-moz-padding-end: 0;
}
optgroup, select { optgroup, select {
background-color: #FAFAFA; background-color: #FAFAFA;
border: 1px solid #666666; border: 1px solid #666666;
@ -1226,8 +1223,8 @@ fieldset.quick legend {
fieldset.tabulated { fieldset.tabulated {
background: none; background: none;
margin: 0; margin: 0;
margin-top: 5px;
padding: 0; padding: 0;
padding-top: 5px;
border: 0; border: 0;
} }
@ -1464,7 +1461,7 @@ input:focus, textarea:focus {
{ {
select, dd select, dd input { select, dd select, dd input {
max-width: 240px; max-width: 240px;
} }
} }
/* Submit button fieldset or paragraph /* Submit button fieldset or paragraph
@ -1676,12 +1673,12 @@ input.button1:focus, input.button2:focus {
height: 1%; /* IE tweak (holly hack) */ height: 1%; /* IE tweak (holly hack) */
width: auto; width: auto;
text-align: right; text-align: right;
margin-top: 5px; margin: 5px 0;
} }
.top-pagination { .top-pagination {
float: right; float: right;
margin: 15px 0 2px 0; margin: 15px 0 5px 0;
} }
.rtl .pagination { .rtl .pagination {
@ -1877,17 +1874,7 @@ li.pagination ul {
vertical-align: middle; vertical-align: middle;
} }
/* Nice method for clearing floated blocks without having to insert any extra markup .row, fieldset dl {
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 {
overflow: hidden; overflow: hidden;
} }
@ -2470,3 +2457,20 @@ fieldset.permissions .padding {
.responsive-show-inline { display: inline !important; } .responsive-show-inline { display: inline !important; }
.responsive-show-inline-block { display: inline-block !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;
}