From da716058fa679db65a31be3090820fe98a2a296e Mon Sep 17 00:00:00 2001 From: PayBas Date: Mon, 2 Jun 2014 20:48:41 +0200 Subject: [PATCH 1/4] [ticket/10472] Fix ACP overflow:hidden problem for medium-sized screens PHPBB3-10472 --- phpBB/adm/style/admin.css | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index b8f55e66c5..879b976c5e 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -182,6 +182,12 @@ 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; @@ -203,10 +209,15 @@ li { } #page-body { - clear: both; min-width: 650px; } +#page-body:after { + content: ''; + clear: both; + display: block; +} + #page-footer { clear: both; } @@ -487,6 +498,12 @@ li { box-shadow: #FFF 0 0 0 1px inset; } +#acp:after { + content: ''; + clear: both; + display: block; +} + #acp:first-child { top: 0; } @@ -1132,6 +1149,10 @@ input.langvalue, textarea.langvalue { width: 90%; } +input[type="number"], dd input[type="number"] { + width: 60px; +} + optgroup, select { background-color: #FAFAFA; border: 1px solid #666666; @@ -1887,7 +1908,7 @@ li.pagination ul { visibility: hidden; }*/ -.clearfix, .row, #content, fieldset dl, #page-body { +.clearfix, .row, fieldset dl { overflow: hidden; } From 726573f10004a68174da8d6313457655c2f2c344 Mon Sep 17 00:00:00 2001 From: PayBas Date: Mon, 2 Jun 2014 23:28:18 +0200 Subject: [PATCH 2/4] [ticket/10472] More clearing and white-space fixes PHPBB3-10472 --- phpBB/adm/style/acp_attachments.html | 2 - phpBB/adm/style/acp_inactive.html | 4 +- phpBB/adm/style/acp_logs.html | 3 -- phpBB/adm/style/acp_main.html | 4 -- 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 @@ -
-
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 @@ -

{L_INACTIVE_USERS}

+

{L_INACTIVE_USERS}

{L_INACTIVE_USERS_EXPLAIN}

-
- -
 
-

- 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 @@
- -
- @@ -287,7 +284,6 @@ - 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; +} From 38830f9cbb41c116aa3a0d579d450c6e5cd70dd7 Mon Sep 17 00:00:00 2001 From: PayBas Date: Wed, 25 Jun 2014 16:06:48 +0200 Subject: [PATCH 3/4] [ticket/10472] Fix weird padding on input type=number PHPBB3-10472 --- phpBB/adm/style/admin.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 93a91f4bce..7d570fa68f 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1125,8 +1125,13 @@ input.langvalue, textarea.langvalue { } input[type="number"], dd input[type="number"] { + padding-right: 0; width: 60px; } +.rtl input[type="number"], .rtl dd input[type="number"] { + padding-left: 2px; + padding-right: 2px; +} optgroup, select { background-color: #FAFAFA; From 6488d236ec1a828648abca65e79a3bd4a921343f Mon Sep 17 00:00:00 2001 From: PayBas Date: Mon, 15 Sep 2014 14:58:57 +0200 Subject: [PATCH 4/4] [ticket/10472] Remove dd selector and use -moz-padding-end PHPBB3-10472 --- phpBB/adm/style/admin.css | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 7d570fa68f..b83750875a 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -854,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 { @@ -1124,13 +1124,9 @@ input.langvalue, textarea.langvalue { width: 90%; } -input[type="number"], dd input[type="number"] { - padding-right: 0; +input[type="number"] { width: 60px; -} -.rtl input[type="number"], .rtl dd input[type="number"] { - padding-left: 2px; - padding-right: 2px; + -moz-padding-end: 0; } optgroup, select { @@ -1465,7 +1461,7 @@ input:focus, textarea:focus { { select, dd select, dd input { max-width: 240px; - } + } } /* Submit button fieldset or paragraph