diff options
| author | PayBas <contact@paybas.com> | 2014-06-02 23:28:18 +0200 |
|---|---|---|
| committer | PayBas <contact@paybas.com> | 2014-09-15 14:53:04 +0200 |
| commit | 726573f10004a68174da8d6313457655c2f2c344 (patch) | |
| tree | 0619417044dbf4ffcc5db69c33159206822473de /phpBB/adm/style | |
| parent | da716058fa679db65a31be3090820fe98a2a296e (diff) | |
| download | forums-726573f10004a68174da8d6313457655c2f2c344.tar forums-726573f10004a68174da8d6313457655c2f2c344.tar.gz forums-726573f10004a68174da8d6313457655c2f2c344.tar.bz2 forums-726573f10004a68174da8d6313457655c2f2c344.tar.xz forums-726573f10004a68174da8d6313457655c2f2c344.zip | |
[ticket/10472] More clearing and white-space fixes
PHPBB3-10472
Diffstat (limited to 'phpBB/adm/style')
| -rw-r--r-- | phpBB/adm/style/acp_attachments.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_inactive.html | 4 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_logs.html | 3 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_main.html | 4 | ||||
| -rw-r--r-- | phpBB/adm/style/admin.css | 70 |
5 files changed, 27 insertions, 56 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"> </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 879b976c5e..93a91f4bce 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; @@ -182,12 +185,6 @@ li { margin-bottom: 10px; } -#page-header:after { - content: ''; - clear: both; - display: block; -} - .rtl #page-header { text-align: left; background: url("../images/phpbb_logo.png") top right no-repeat; @@ -212,16 +209,6 @@ li { min-width: 650px; } -#page-body:after { - content: ''; - clear: both; - display: block; -} - -#page-footer { - clear: both; -} - .copyright { font-size: 0.75em; text-align: center; @@ -346,12 +333,6 @@ li { padding: 0; } -#tabs > ul:after { - content: ''; - display: block; - clear: both; -} - #tabs .tab { display: inline-block; float: left; @@ -486,7 +467,6 @@ li { /* Main Panel ---------------------------------------- */ #acp { - clear: both; position: relative; top: -2px; margin: 0 0 2px; @@ -498,12 +478,6 @@ li { box-shadow: #FFF 0 0 0 1px inset; } -#acp:after { - content: ''; - clear: both; - display: block; -} - #acp:first-child { top: 0; } @@ -740,6 +714,7 @@ td { .table1 { border-collapse: separate; border-spacing: 1px; + clear: both; } dt#color_palette_placeholder table { @@ -1247,8 +1222,8 @@ fieldset.quick legend { fieldset.tabulated { background: none; margin: 0; + margin-top: 5px; padding: 0; - padding-top: 5px; border: 0; } @@ -1697,12 +1672,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 { @@ -1898,17 +1873,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, fieldset dl { +.row, fieldset dl { overflow: hidden; } @@ -2491,3 +2456,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; +} |