diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html index 4d52b901c3..ac65754a14 100644 --- a/phpBB/adm/style/permission_mask.html +++ b/phpBB/adm/style/permission_mask.html @@ -75,7 +75,6 @@

style="display: none;"> -

@@ -128,7 +127,6 @@ -

-- cgit v1.2.1 From 64e26e8c71c4f5d59e421c293f1bd6a17d13e341 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Thu, 24 Oct 2013 22:53:57 +0300 Subject: [ticket/11957] Remove menu toggle PHPBB3-11957 --- phpBB/adm/images/toggle.gif | Bin 788 -> 0 bytes phpBB/adm/style/admin.css | 30 ------------------- phpBB/adm/style/overall_header.html | 57 ------------------------------------ 3 files changed, 87 deletions(-) delete mode 100644 phpBB/adm/images/toggle.gif (limited to 'phpBB') diff --git a/phpBB/adm/images/toggle.gif b/phpBB/adm/images/toggle.gif deleted file mode 100644 index 8af6861bd1..0000000000 Binary files a/phpBB/adm/images/toggle.gif and /dev/null differ diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index bbd2844689..87f430c077 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -326,36 +326,6 @@ li { /* Sub-navigation Menu ---------------------------------------- */ -/* Toggle */ -#toggle { - padding: 5px; - width: 5%; - height: 100px; - position: absolute; - left: 15%; - top: 28px; - margin-left: 2px; -} - -.rtl #toggle { - left: 75%; - margin-right: 0; - margin-left: 6px; -} - -#toggle-handle { - display: block; - width: 18px; - height: 19px; - float: right; - background-image: url(../images/toggle.gif); -} - -.rtl #toggle-handle { - background-image: url(../images/toggle.gif); - background-position: 100% 50%; -} - /* Menu */ #menu { float: left; diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index d091e6ad07..0636f9bb26 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -15,9 +15,6 @@ var on_page = '{ON_PAGE}'; var per_page = '{PER_PAGE}'; var base_url = '{BASE_URL|e('js')}'; -var menu_state = 'shown'; - - /** * Jump to page */ @@ -104,56 +101,6 @@ function popup(url, width, height, name) return false; } -/** -* Hiding/Showing the side menu -*/ -function switch_menu() -{ - var menu = document.getElementById('menu'); - var main = document.getElementById('main'); - var toggle = document.getElementById('toggle'); - var handle = document.getElementById('toggle-handle'); - - switch (menu_state) - { - // hide - case 'shown': - main.style.width = '93%'; - menu_state = 'hidden'; - menu.style.display = 'none'; - toggle.style.width = '20px'; - handle.style.backgroundImage = 'url(images/toggle.gif)'; - handle.style.backgroundRepeat = 'no-repeat'; - - - handle.style.backgroundPosition = '0% 50%'; - toggle.style.left = '96%'; - - handle.style.backgroundPosition = '100% 50%'; - toggle.style.left = '0'; - - break; - - // show - case 'hidden': - main.style.width = '76%'; - menu_state = 'shown'; - menu.style.display = 'block'; - toggle.style.width = '5%'; - handle.style.backgroundImage = 'url(images/toggle.gif)'; - handle.style.backgroundRepeat = 'no-repeat'; - - - handle.style.backgroundPosition = '100% 50%'; - toggle.style.left = '75%'; - - handle.style.backgroundPosition = '0% 50%'; - toggle.style.left = '15%'; - - break; - } -} - // ]]> @@ -179,10 +126,6 @@ function switch_menu()

- -

{L_LOGGED_IN_AS}
{USERNAME} [ {L_LOGOUT} ][ {L_ADM_LOGOUT} ]

Date: Fri, 25 Oct 2013 18:22:39 +0300 Subject: [ticket/11957] Responsive layout and menu PHPBB3-11957 --- phpBB/adm/style/admin.css | 102 ++++++++++++++++++++++++++++++++++-- phpBB/adm/style/install_header.html | 2 + phpBB/adm/style/overall_header.html | 11 ++-- 3 files changed, 106 insertions(+), 9 deletions(-) (limited to 'phpBB') diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 87f430c077..b70b98c9a5 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -18,11 +18,11 @@ body, div, p, th, td, li, dd { font-size: x-small; voice-family: "\"}\""; voice-family: inherit; - font-size: small + font-size: small; } html>body, html>div, html>p, html>th, html>td, html>li, html>dd { - font-size: small + font-size: small; } html { @@ -31,6 +31,7 @@ html { /* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-ie browsers */ height: 100%; margin-bottom: 1px; + word-wrap: break-word; } body { @@ -105,6 +106,16 @@ hr { display: none; } +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ + html, body { + height: auto; + margin: 0; + padding: 0; + } +} + + /* General links */ a:link, a:visited { color: #105289; @@ -136,6 +147,7 @@ li { list-style-type: inherit; } + /* Main blocks ---------------------------------------- */ #wrap { @@ -216,6 +228,41 @@ li { min-width: 0; } +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ + #wrap, #page-body, #page-body.simple-page-body { + padding: 0; + min-width: 300px; + } + + #page-header { + margin: 5px; + padding-left: 160px; + height: auto; + min-height: 54px; + overflow: hidden; + } + + .rtl #page-header { + padding-right: 160px; + padding-left: 0; + } + + #page-header h1 { + font-size: 1.2em; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + #main, .rtl #main { + float: none; + width: auto; + margin: 0; + } +} + + /* Tabbed menu Based on: http://www.alistapart.com/articles/slidingdoors2/ ----------------------------------------*/ @@ -323,6 +370,15 @@ li { overflow: hidden; } +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ + #acp { + min-width: 0; + min-height: 0; + } +} + + /* Sub-navigation Menu ---------------------------------------- */ @@ -352,12 +408,12 @@ li { } /* Default list state */ -#menu li { +#menu li, #menu .header { padding: 0; margin: 0; font-size: 0.85em; font-weight: bold; - display: inline; + display: block; } /* Link styles for the sub-section links */ @@ -422,7 +478,7 @@ li { background: url("../images/arrow_down.gif") 99% 50% no-repeat; } -#menu li.header { +#menu .header { font-family: Tahoma, Helvetica, sans-serif; display: block; font-weight: bold; @@ -432,8 +488,44 @@ li { margin-top: 15px; text-transform: uppercase; font-size: 0.75em; + text-decoration: none; + cursor: inherit; +} + +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ + #menu { + float: none; + width: auto; + border-width: 0; + max-width: 200px; + margin: 0 auto 10px; + } + + #menu .menu-block .header { + margin-top: 0; + cursor: pointer; + border-bottom-width: 0; + } + + #menu .menu-block .header:focus { + color: #D31141; + } + + #menu .menu-block ul { + display: none; + } + + #menu .menu-block:hover ul, #menu .menu-block.active ul, #menu .menu-block.no-header ul { + display: block; + } + + #menu .menu-block li:last-child { + border-bottom: 1px solid #327AA5; + } } + /* Table styles ---------------------------------------- */ diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html index 8b2f006508..13f4a6dbf4 100644 --- a/phpBB/adm/style/install_header.html +++ b/phpBB/adm/style/install_header.html @@ -63,6 +63,7 @@ function dE(n, s, type)

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index 0636f9bb26..80e254227b 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -128,14 +128,16 @@ function popup(url, width, height, name)

-- cgit v1.2.1 From 8567adf5dbfc1d6363deb78b6ebf25a76857c9ac Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Fri, 25 Oct 2013 18:32:31 +0300 Subject: [ticket/11957] Include admin.js in footer Include admin.js in footer, swap .hasjs and .nojs PHPBB3-11957 --- phpBB/adm/style/admin.js | 18 ++++++++++++++++++ phpBB/adm/style/install_footer.html | 2 ++ phpBB/adm/style/install_header.html | 2 +- phpBB/adm/style/overall_footer.html | 1 + phpBB/adm/style/overall_header.html | 2 +- 5 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 phpBB/adm/style/admin.js (limited to 'phpBB') diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js new file mode 100644 index 0000000000..9b2c9313ac --- /dev/null +++ b/phpBB/adm/style/admin.js @@ -0,0 +1,18 @@ +/** +* phpBB3 ACP functions +*/ + +/** +* Run onload functions +*/ +(function($) { + $(document).ready(function() { + // Swap .nojs and .hasjs + $('body.nojs').toggleClass('nojs hasjs'); + + // Focus forms + $('form[data-focus]:first').each(function() { + $('#' + this.getAttribute('data-focus')).focus(); + }); + }); +})(jQuery); diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html index cbb28407c1..7a5fc666f8 100644 --- a/phpBB/adm/style/install_footer.html +++ b/phpBB/adm/style/install_footer.html @@ -11,6 +11,8 @@ + +{$SCRIPTS} diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html index 13f4a6dbf4..182abe8875 100644 --- a/phpBB/adm/style/install_header.html +++ b/phpBB/adm/style/install_header.html @@ -35,7 +35,7 @@ function dE(n, s, type) - +

{L_INSTALL_PANEL}

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index 6d54ee266d..98a3a598e4 100644 --- a/phpBB/adm/style/overall_footer.html +++ b/phpBB/adm/style/overall_footer.html @@ -35,6 +35,7 @@ + {$SCRIPTS} diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index 80e254227b..658f1c49b0 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -106,7 +106,7 @@ function popup(url, width, height, name) - +

-- cgit v1.2.1 From 43b9314390db962aaef2411e22642f86730a6eb6 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Fri, 25 Oct 2013 19:59:45 +0300 Subject: [ticket/11957] Enhance responsive nav with JS PHPBB3-11957 --- phpBB/adm/style/admin.css | 22 ++++++++++++++++++---- phpBB/adm/style/admin.js | 22 ++++++++++++++++++++++ 2 files changed, 40 insertions(+), 4 deletions(-) (limited to 'phpBB') diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index b70b98c9a5..eceea8fe03 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -494,7 +494,7 @@ li { @media only screen and (max-width: 700px), only screen and (max-device-width: 700px) { - #menu { + #menu, .rtl #menu { float: none; width: auto; border-width: 0; @@ -502,27 +502,41 @@ li { margin: 0 auto 10px; } + #menu .menu-block.active { + margin: 0 -10px; + padding: 0 10px; + background: rgba(255, 255, 255, .5); + border-radius: 5px; + } + #menu .menu-block .header { - margin-top: 0; + margin-top: 5px; cursor: pointer; border-bottom-width: 0; + position: relative; + text-decoration: underline; } - #menu .menu-block .header:focus { + #menu .menu-block .header:focus, #menu .menu-block.active .header { color: #D31141; + text-decoration: none; } #menu .menu-block ul { display: none; } - #menu .menu-block:hover ul, #menu .menu-block.active ul, #menu .menu-block.no-header ul { + .nojs #menu .menu-block:hover ul, #menu .menu-block.active ul, #menu .menu-block.no-header ul { display: block; } #menu .menu-block li:last-child { border-bottom: 1px solid #327AA5; } + + #menu .menu-block:last-child li:last-child, #menu .menu-block.active li:last-child { + border-bottom-width: 0; + } } diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js index 9b2c9313ac..208afedce8 100644 --- a/phpBB/adm/style/admin.js +++ b/phpBB/adm/style/admin.js @@ -2,6 +2,26 @@ * phpBB3 ACP functions */ +/** +* Parse document block +*/ +function parse_document(container) +{ + var test = document.createElement('div'), + oldBrowser = (typeof test.style.borderRadius == 'undefined'); + + delete test; + + /** + * Navigation + */ + container.find('#menu .menu-block > a.header').click(function() { + $(this).parent().toggleClass('active'); + }); + + container.find('#activemenu').parents('.menu-block').addClass('active'); +} + /** * Run onload functions */ @@ -14,5 +34,7 @@ $('form[data-focus]:first').each(function() { $('#' + this.getAttribute('data-focus')).focus(); }); + + parse_document($('body')); }); })(jQuery); -- cgit v1.2.1 From 1b3daa1ad876e9b3adf87bca754ee313a0cdaa13 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Fri, 25 Oct 2013 21:40:39 +0300 Subject: [ticket/11957] Adjustments to ACP layout, menu and some elements PHPBB3-11957 --- phpBB/adm/style/admin.css | 51 ++++++++++++++++++++++++++++++++++++++++++++--- phpBB/adm/style/admin.js | 24 ++++++++++++++++++---- 2 files changed, 68 insertions(+), 7 deletions(-) (limited to 'phpBB') diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index eceea8fe03..40224be021 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -260,6 +260,33 @@ li { width: auto; margin: 0; } + + #content { + background: #F3F3F3 url("../images/innerbox_bg.gif") repeat-x top; + padding: 5px; + } + + #page-footer { + padding: 0 5px 5px; + } +} + +@media only screen and (max-width: 400px), only screen and (max-device-width: 400px) +{ + #page-header { + background-size: 76px 26.5px; + padding-left: 80px; + min-height: 30px; + } + + .rtl #page-header { + padding-right: 80px; + } + + #page-header h1 { + padding-top: 0; + font-size: 1.1em; + } } @@ -375,10 +402,14 @@ li { #acp { min-width: 0; min-height: 0; + border-radius: 0; + border-width: 1px 0; + background: #fff; + padding: 1px 0; + box-shadow: none; } } - /* Sub-navigation Menu ---------------------------------------- */ @@ -490,6 +521,7 @@ li { font-size: 0.75em; text-decoration: none; cursor: inherit; + outline-style: none; } @media only screen and (max-width: 700px), only screen and (max-device-width: 700px) @@ -502,13 +534,21 @@ li { margin: 0 auto 10px; } + #menu p { + text-align: center; + } + #menu .menu-block.active { - margin: 0 -10px; - padding: 0 10px; + margin: 0 -5px; + padding: 0 5px 3px; background: rgba(255, 255, 255, .5); border-radius: 5px; } + #menu .menu-block.no-header.active { + padding-top: 3px; + } + #menu .menu-block .header { margin-top: 5px; cursor: pointer; @@ -537,6 +577,10 @@ li { #menu .menu-block:last-child li:last-child, #menu .menu-block.active li:last-child { border-bottom-width: 0; } + + #menu .menu-block li a span { + border-radius: 2px; + } } @@ -707,6 +751,7 @@ fieldset { border-left: 1px solid #D7D7D7; background-color: #FFFFFF; position: relative; + border-radius: 3px; } .rtl fieldset { diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js index 208afedce8..a9e00ab9d7 100644 --- a/phpBB/adm/style/admin.js +++ b/phpBB/adm/style/admin.js @@ -15,11 +15,27 @@ function parse_document(container) /** * Navigation */ - container.find('#menu .menu-block > a.header').click(function() { - $(this).parent().toggleClass('active'); - }); + container.find('#menu').each(function() { + var menu = $(this), + blocks = menu.children('.menu-block'); + + if (!blocks.length) { + return; + } + + // Set onclick event + blocks.children('a.header').click(function() { + $(this).parent().toggleClass('active'); + }); + + // Set active menu + menu.find('#activemenu').parents('.menu-block').addClass('active'); - container.find('#activemenu').parents('.menu-block').addClass('active'); + // Check if there is active menu + if (!blocks.filter('.active').length) { + blocks.filter(':first').addClass('active'); + } + }); } /** -- cgit v1.2.1 From 5f39fd470c7c2742e852e8b24de88de02a544250 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Fri, 25 Oct 2013 23:29:47 +0300 Subject: [ticket/11957] Use fixed width for sidebar Use fixed width for sidebar and few minor fixes for other items PHPBB3-11957 --- phpBB/adm/style/admin.css | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'phpBB') diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 40224be021..79b88cf52f 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -106,6 +106,13 @@ hr { display: none; } +@media only screen and (max-width: 800px), only screen and (max-device-width: 800px) +{ + body { + margin: 5px 5px 0; + } +} + @media only screen and (max-width: 700px), only screen and (max-device-width: 700px) { html, body { @@ -186,7 +193,7 @@ li { #page-body { clear: both; - min-width: 700px; + min-width: 650px; } #page-footer { @@ -207,15 +214,11 @@ li { } #main { - float: left; - width: 76%; - margin: 0 0 0 3%; - min-height: 350px; + margin: 0 0 0 210px; } .rtl #main { - float: right; - margin: 0 3% 0 0; + margin: 0 210px 0 0; } * html #main { @@ -255,6 +258,10 @@ li { text-overflow: ellipsis; } + #page-header fieldset { + margin-top: 5px; + } + #main, .rtl #main { float: none; width: auto; @@ -416,7 +423,7 @@ li { /* Menu */ #menu { float: left; - width: 20%; + width: 200px; font-size: 1.00em; padding: 0; border-right: 1px solid #CCCFD3; @@ -436,6 +443,7 @@ li { list-style: none; margin: 0; padding: 0; + word-wrap: normal; } /* Default list state */ @@ -461,6 +469,12 @@ li { padding: 3px 8px 3px 3px; } +#menu li span, #menu .header { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + #menu li a:hover, #menu li a:hover span { text-decoration: none; background-color: #FFFFFF; -- cgit v1.2.1 From b80f213995df6456cf35897a7a35d7943baa5ebb Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sat, 26 Oct 2013 00:46:20 +0300 Subject: [ticket/11957] Responsive ACP tables PHPBB3-11957 --- phpBB/adm/style/acp_main.html | 2 +- phpBB/adm/style/admin.css | 98 +++++++++++++++++++++++++++++++++++++++++++ phpBB/adm/style/admin.js | 97 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 196 insertions(+), 1 deletion(-) (limited to 'phpBB') diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index d9e7fb7eeb..b6d520130a 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -78,7 +78,7 @@ -

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 79b88cf52f..2cd8d0005c 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -754,6 +754,104 @@ td.name { color: #BC2A4D; } +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ + table.responsive, table.responsive tbody, table.responsive tr, table.responsive td { + display: block; + } + + table.responsive thead, table.responsive th, table.responsive colgroup { + display: none; + } + + table.responsive.show-header thead, table.responsive.show-header th:first-child, table.responsive caption { + display: block; + width: auto !important; + text-align: left !important; + margin: 0; + } + + table.responsive { + background: transparent none; + border-width: 0; + } + + table.responsive caption { + padding: 3px 4px; + color: #FFFFFF; + background: #70AED3 url("../images/gradient2b.gif") bottom left repeat-x; + border-top: 1px solid #6DACD2; + border-bottom: 1px solid #327AA5; + text-align: left; + font-size: 0.75em; + font-weight: bold; + text-transform: uppercase; + } + + table.responsive.show-header th:first-child span.rank-img, table.responsive.no-caption caption, table.responsive.no-header thead { + display: none; + } + + table.responsive tr { + margin: 2px 0; + border: 1px solid #CCCFD3; + background-color: #FFFFFF; + padding: 1px 1px 0; + overflow: hidden; + } + + table.responsive tr.row1 td { background-color: #F9F9F9; } + table.responsive tr.row2 td { background-color: #DCEBFE; } + table.responsive tr.row3 td { background-color: #DBDFE2; } + table.responsive tr.row4 td { background-color: #E4E8EB; } + table.responsive tr.col1 td { background-color: #DCEBFE; } + table.responsive tr.col2 td { background-color: #F9F9F9; } + table.responsive tr.row1a td { background-color: #F9F9F9; } + table.responsive tr.row1b td { background-color: #F6F6F6; } + table.responsive tr.row2a td { background-color: #E7EEF4; } + table.responsive tr.row2b td { background-color: #E3EBF2; } + + table.responsive td { + width: auto !important; + text-align: left !important; + padding: 4px; + margin-bottom: 1px; + } + + table.responsive td.empty { + display: none !important; + } + + table.responsive td > dfn { + display: inline-block !important; + } + + table.responsive td > dfn:after { + content: ':'; + padding-right: 5px; + } + + table.responsive.two-columns td { + width: 50% !important; + float: left; + -moz-box-sizing: border-box; + box-sizing: border-box; + } + + table.responsive.two-columns td:nth-child(2n+1) { + clear: left; + } + + table.responsive span.rank-img { + float: none; + padding-right: 5px; + } + + table.responsive#memberlist td:first-child input[type="checkbox"] { + float: right; + } +} + /* General form styles ----------------------------------------*/ fieldset { diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js index a9e00ab9d7..385e49dc87 100644 --- a/phpBB/adm/style/admin.js +++ b/phpBB/adm/style/admin.js @@ -36,6 +36,103 @@ function parse_document(container) blocks.filter(':first').addClass('active'); } }); + + /** + * Responsive tables + */ + container.find('table').not('.not-responsive').each(function() { + var $this = $(this), + th = $this.find('thead > tr > th'), + columns = th.length, + headers = [], + totalHeaders = 0, + i, headersLength; + + // Find columns + $this.find('colgroup:first').children().each(function(i) { + var column = $(this); + if (column.hasClass('col1')) { + $this.find('td:nth-child(' + (i + 1) + ')').addClass('col1'); + } + if (column.hasClass('col2')) { + $this.find('td:nth-child(' + (i + 1) + ')').addClass('col2'); + } + }); + + // Find each header + if (!$this.data('no-responsive-header')) + { + th.each(function(column) { + var cell = $(this), + colspan = parseInt(cell.attr('colspan')), + dfn = cell.attr('data-dfn'), + text = dfn ? dfn : cell.text(); + + colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan; + + for (i=0; i + $this.addClass('responsive'); + + if (totalHeaders < 2) { + $this.addClass('show-header'); + return; + } + + $this.find('tbody > tr').each(function() { + var row = $(this), + cells = row.children('td'), + column = 0; + + if (cells.length == 1) { + row.addClass('big-column'); + return; + } + + cells.each(function() { + var cell = $(this), + colspan = parseInt(cell.attr('colspan')), + text = cell.text().trim(); + + if (headersLength <= column) { + return; + } + + if (text.length && text !== '-') { + cell.prepend(''); + } + else { + cell.addClass('empty'); + } + + colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan; + column += colspan; + }); + }); + }); + + /** + * Hide empty responsive tables + */ + container.find('table.responsive > tbody').each(function() { + var items = $(this).children('tr'); + if (items.length == 0) + { + $(this).parent('table:first').addClass('responsive-hide'); + } + }); } /** -- cgit v1.2.1 From 9a8b463c334c27ca958ab4de8e660fd591bf4e95 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sat, 26 Oct 2013 00:58:36 +0300 Subject: [ticket/11957] Remove IE6 hacks PHPBB3-11957 --- phpBB/adm/style/admin.css | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'phpBB') diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 2cd8d0005c..68c5645d9c 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -221,10 +221,6 @@ li { margin: 0 210px 0 0; } -* html #main { - height: 350px; -} - #page-body.simple-page-body { padding: 0; padding-right: 10px; @@ -873,10 +869,6 @@ fieldset { border-left: 1px solid #CCCCCC; } -* html fieldset { - padding: 0 10px 5px 10px; -} - fieldset p { font-size: 0.85em; } @@ -895,18 +887,6 @@ legend { vertical-align: middle; } -* html legend { - margin: 0 0 -10px -7px; - line-height: 1em; - font-size: .85em; -} - -/* Holly hack, .rtl comes after html */ -* html .rtl legend { - margin: 0; - margin-right: -7px; -} - input, textarea { font-family: Verdana, Helvetica, Arial, sans-serif; font-size: 0.90em; @@ -1245,7 +1225,6 @@ textarea.full { width: 99%; } -* html input.full, * html textarea.full { width: 95%;} input.medium { width: 50%;} input.narrow { width: 25%;} input.tiny { width: 10%;} @@ -1472,8 +1451,6 @@ li.pagination ul { background-color: #BC2A4D; } -* html .errorbox, * html .successbox { height: 1%; } /* Pixel shift fix for IE */ - .successbox h3, .errorbox h3 { color: #FFFFFF; margin: 0 0 0.5em; -- cgit v1.2.1 From c23c64cb6d848382542fc5d50899f9a921ffe805 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sat, 26 Oct 2013 01:07:04 +0300 Subject: [ticket/11957] Responsive jQuery popups PHPBB3-11957 --- phpBB/adm/style/admin.css | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'phpBB') diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 68c5645d9c..f644adb0d4 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1288,8 +1288,10 @@ input.button1:focus, input.button2:focus, input.button3:focus { position: fixed; display: none; top: 150px; - left: 25%; - width: 50%; + left: 0; + right: 0; + max-width: 600px; + margin: 0 auto; z-index: 50; padding: 25px; padding: 0 25px 20px 25px; @@ -1345,6 +1347,21 @@ input.button1:focus, input.button2:focus, input.button3:focus { opacity: 0.5; } +@media only screen and (max-height: 500px), only screen and (max-device-width: 500px) +{ + .phpbb_alert { + top: 25px; + } +} + +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ + .phpbb_alert { + max-width: none; + margin: 0 25px; + } +} + /* Pagination ---------------------------------------- */ .pagination { -- cgit v1.2.1 From 365d07ff6c481e604cd83425abe128eff3af70f0 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sat, 26 Oct 2013 09:51:07 +0300 Subject: [ticket/11957] Responsive forms PHPBB3-11957 --- phpBB/adm/style/admin.css | 60 +++++++++++++++++++++++++++++++++++++++++++++++ phpBB/adm/style/admin.js | 11 +++++++++ 2 files changed, 71 insertions(+) (limited to 'phpBB') diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index f644adb0d4..a98bcffe3b 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1053,6 +1053,13 @@ select#full_folder_action { width: 95%; } +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ + fieldset { + padding: 5px; + } +} + /* Definition list layout for forms Other general def. list properties defined in prosilver_main.css ---------------------------------------- */ @@ -1184,6 +1191,51 @@ input:focus, textarea:focus { outline-style: none; } +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ + fieldset dl { + margin-bottom: 5px; + padding-bottom: 5px; + border-bottom: 1px solid #e8e8e8; + } + + fieldset > dl:last-child, fieldset > form:last-child > dl:last-child { + border-bottom-width: 0; + margin-bottom: 0; + } + + fieldset dt, .rtl fieldset dt, fieldset dd, .rtl fieldset dd { + border-width: 0; + margin-left: 0; + margin-right: 0; + float: none; + width: auto; + } + + .ltr fieldset dd { + padding-left: 20px; + } + + .rtl fieldset dd { + padding-right: 20px; + } + + dd select, dd input { + max-width: 300px; + } + + dd input[type="number"] { + max-width: 70px; + } +} + +@media only screen and (max-width: 400px), only screen and (max-device-width: 400px) +{ + dd select, dd input { + max-width: 240px; + } +} + /* Submit button fieldset or paragraph ---------------------------------------- */ fieldset.submit-buttons { @@ -1926,3 +1978,11 @@ fieldset.permissions .padding { color: #FFFFFF; font-size: 1.4em; } + +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ + .responsive-hide { display: none !important; } + .responsive-show { display: block !important; } + .responsive-show-inline { display: inline !important; } + .responsive-show-inline-block { display: inline-block !important; } +} diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js index 385e49dc87..342859ce54 100644 --- a/phpBB/adm/style/admin.js +++ b/phpBB/adm/style/admin.js @@ -133,6 +133,17 @@ function parse_document(container) $(this).parent('table:first').addClass('responsive-hide'); } }); + + /** + * Fieldsets with empty + */ + container.find('fieldset dt > span:last-child').each(function() { + var $this = $(this); + if ($this.html() == ' ') { + $this.addClass('responsive-hide'); + } + + }); } /** -- cgit v1.2.1 From 10f0c8b3337001743fc310539da43363873dcf0a Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sat, 26 Oct 2013 10:12:12 +0300 Subject: [ticket/11957] Change avatars gallery from table to list PHPBB3-11957 --- phpBB/adm/style/acp_avatar_options_local.html | 20 ++++++++---------- phpBB/adm/style/admin.css | 29 +++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 12 deletions(-) (limited to 'phpBB') diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html index 148efd051b..0cdb3644d7 100644 --- a/phpBB/adm/style/acp_avatar_options_local.html +++ b/phpBB/adm/style/acp_avatar_options_local.html @@ -8,18 +8,14 @@ -

- - - - - - - - - - + +

+ +

+ -

${avatar_local_row.avatar_local_col.AVATAR_NAME}$

+ diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index a98bcffe3b..b3f086b6d2 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1956,6 +1956,35 @@ fieldset.permissions .padding { padding: 0; } +/* Avatars gallery +---------------------------------------- */ +#gallery { + display: block; + margin: 0 -5px; + padding: 0; + overflow: hidden; +} + +#gallery li { + display: block; + float: left; + border: 1px solid #ccc; + border-radius: 2px; + background: #fff; + padding: 5px; + margin: 5px; +} + +#gallery li:hover { + background-color: #eee; +} + +#gallery li label { + display: block; + text-align: center; + padding: 0; +} + /* Classes for additional tasks ---------------------------------------- */ -- cgit v1.2.1 From b107b4c0e2ff5f946e71eb962622295ded7f54ea Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sat, 26 Oct 2013 11:01:23 +0300 Subject: [ticket/11957] Responsive forums list PHPBB3-11957 --- phpBB/adm/style/acp_forums.html | 8 ++++---- phpBB/adm/style/admin.css | 43 +++++++++++++++++++++++++++++++++++++++++ phpBB/adm/style/admin.js | 7 +------ 3 files changed, 48 insertions(+), 10 deletions(-) (limited to 'phpBB') diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 7b1466cfbd..3fd2f18d67 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -440,19 +440,19 @@

{NAVIGATION} [{L_EDIT} | {L_DELETE} | {L_RESYNC}]

- +

- - + -

{forums.FOLDER_IMAGE}

{forums.FORUM_IMAGE}

{forums.FORUM_NAME}{forums.FORUM_NAME}
{forums.FORUM_DESCRIPTION}

{L_TOPICS}{L_COLON} {forums.FORUM_TOPICS} / {L_POSTS}{L_COLON} {forums.FORUM_POSTS}

{ICON_MOVE_UP_DISABLED} {ICON_MOVE_DOWN} diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index b3f086b6d2..48b1712871 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -750,6 +750,19 @@ td.name { color: #BC2A4D; } +/* Forums list */ +table.forums td.folder { + width: 27px; + text-align: center; +} + +table.forums td.actions { + vertical-align: middle; + width: 100px; + text-align: right; + white-space: nowrap; +} + @media only screen and (max-width: 700px), only screen and (max-device-width: 700px) { table.responsive, table.responsive tbody, table.responsive tr, table.responsive td { @@ -846,6 +859,36 @@ td.name { table.responsive#memberlist td:first-child input[type="checkbox"] { float: right; } + + /* Forums list */ + table.responsive.forums td.folder { + float: left; + width: 27px; + background: transparent; + } + .rtl table.responsive.forums td.folder { + float: right; + } + + table.responsive.forums td.forum-desc { + margin-left: 35px; + min-height: 27px; + background: transparent; + } + + .rtl table.responsive.forums td.forum-desc { + margin-left: 0; + margin-right: 35px; + } + + table.responsive.forums td.actions { + clear: both; + text-align: right !important; + } + + .rtl table.responsive.forums td.actions { + text-align: left !important; + } } /* General form styles diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js index 342859ce54..648d542325 100644 --- a/phpBB/adm/style/admin.js +++ b/phpBB/adm/style/admin.js @@ -51,12 +51,7 @@ function parse_document(container) // Find columns $this.find('colgroup:first').children().each(function(i) { var column = $(this); - if (column.hasClass('col1')) { - $this.find('td:nth-child(' + (i + 1) + ')').addClass('col1'); - } - if (column.hasClass('col2')) { - $this.find('td:nth-child(' + (i + 1) + ')').addClass('col2'); - } + $this.find('td:nth-child(' + (i + 1) + ')').addClass(column.prop('className')); }); // Find each header -- cgit v1.2.1 From 7b3f63e8a37375b3ab087f775fdfbc54cd902380 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sat, 26 Oct 2013 11:02:16 +0300 Subject: [ticket/11957] More responsive forms adjustments PHPBB3-11957 --- phpBB/adm/style/admin.css | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'phpBB') diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 48b1712871..1d3c78c1da 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -934,7 +934,6 @@ input, textarea { font-family: Verdana, Helvetica, Arial, sans-serif; font-size: 0.90em; font-weight: normal; - cursor: text; vertical-align: middle; padding: 2px; color: #111111; @@ -1101,6 +1100,10 @@ select#full_folder_action { fieldset { padding: 5px; } + + fieldset.quick, p.quick { + text-align: center; + } } /* Definition list layout for forms @@ -1305,6 +1308,13 @@ fieldset.submit-buttons legend { display: none; } +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ + p.submit-buttons { + margin-top: 0; + } +} + /* Input field styles ---------------------------------------- */ -- cgit v1.2.1 From 49e30b12432966711e31a884feb8460dd3555d92 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sat, 26 Oct 2013 11:56:03 +0300 Subject: [ticket/11957] Responsive styles list PHPBB3-11957 --- phpBB/adm/style/acp_styles.html | 12 ++++++------ phpBB/adm/style/admin.css | 15 +++++++++++++++ phpBB/adm/style/admin.js | 10 ++++++++++ 3 files changed, 31 insertions(+), 6 deletions(-) (limited to 'phpBB') diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 3dc4c2d616..55904253a9 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -79,7 +79,7 @@ - +

@@ -97,9 +97,9 @@ - - + - {styles_list.EXTRA} -

{L_STYLE_NAME}	+	- + checked="checked" title="{L_STYLE_DEFAULT}" /> @@ -117,9 +117,9 @@	{styles_list.USERS}	{styles_list.USERS}	+	\| @@ -129,7 +129,7 @@	+	diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 1d3c78c1da..e225a6752c 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -763,6 +763,11 @@ table.forums td.actions { white-space: nowrap; } +/* Styles list / +table.styles td.users, table.styles td.actions, table.styles td.mark { + text-align: center; +} + @media only screen and (max-width: 700px), only screen and (max-device-width: 700px) { table.responsive, table.responsive tbody, table.responsive tr, table.responsive td { @@ -889,6 +894,16 @@ table.forums td.actions { .rtl table.responsive.forums td.actions { text-align: left !important; } + + / Styles list / + table.responsive.styles tr.responsive-style-row td:first-child { + padding-left: 4px !important; + padding-right: 4px !important; + } + + table.responsive.styles td:first-child > dfn, table.responsive.styles td.actions > dfn { + display: none !important; + } } / General form styles diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js index 648d542325..b466c02071 100644 --- a/phpBB/adm/style/admin.js +++ b/phpBB/adm/style/admin.js @@ -54,6 +54,16 @@ function parse_document(container) $this.find('td:nth-child(' + (i + 1) + ')').addClass(column.prop('className')); }); + // Styles table + if ($this.hasClass('styles')) { + $this.find('td:first-child[style]').each(function() { + var style = $(this).attr('style'); + if (style.length) { + $(this).parent('tr').attr('style', style.toLowerCase().replace('padding', 'margin')).addClass('responsive-style-row'); + } + }); + } + // Find each header if (!$this.data('no-responsive-header')) { -- cgit v1.2.1 From c1ca57fcdb60ee772434e577de34107b2aa88cb1 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sat, 26 Oct 2013 12:21:38 +0300 Subject: [ticket/11957] Misc responsive changes PHPBB3-11957 --- phpBB/adm/style/admin.css \| 19 +++++++++++++++++++ phpBB/adm/style/admin.js \| 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) (limited to 'phpBB') diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index e225a6752c..a4fef1f4ec 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -788,6 +788,7 @@ table.styles td.users, table.styles td.actions, table.styles td.mark { table.responsive { background: transparent none; border-width: 0; + padding: 0; } table.responsive caption { @@ -1119,6 +1120,10 @@ select#full_folder_action { fieldset.quick, p.quick { text-align: center; } + + fieldset.display-options { + clear: both; + } } /* Definition list layout for forms @@ -1563,6 +1568,20 @@ li.pagination ul { border-color: #B4BAC0; } +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ + .pagination, .rtl .pagination { + float: none; + text-align: center; + margin: 5px 0; + } + + .pagination li a, .pagination li span { + display: inline-block; + min-width: 10px; + } +} + /* Action Highlighting ---------------------------------------- */ .successbox, .errorbox { diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js index b466c02071..45cec5f716 100644 --- a/phpBB/adm/style/admin.js +++ b/phpBB/adm/style/admin.js @@ -115,7 +115,7 @@ function parse_document(container) return; } - if (text.length && text !== '-') { + if ((text.length && text !== '-') \|\| cell.children().length) { cell.prepend('' + headers[column] + ''); } else { -- cgit v1.2.1 From 2a1db92955d9c1d20cfa3e49da158a10961eb081 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Sat, 26 Oct 2013 12:51:10 +0300 Subject: [ticket/11957] Wrap content in double div PHPBB3-11957 --- phpBB/adm/style/admin.css \| 18 +++++++++++++++--- phpBB/adm/style/install_footer.html \| 6 +++--- phpBB/adm/style/install_header.html \| 1 + phpBB/adm/style/install_update_diff.html \| 2 +- phpBB/adm/style/overall_footer.html \| 6 +++--- phpBB/adm/style/overall_header.html \| 1 + 6 files changed, 24 insertions(+), 10 deletions(-) (limited to 'phpBB') diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index a4fef1f4ec..9d281d4703 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -214,11 +214,23 @@ li { } #main { - margin: 0 0 0 210px; + float: right; + width: 100%; + margin: 0 0 0 -210px; } .rtl #main { - margin: 0 210px 0 0; + float: right; + margin: 0 -210px 0 0; +} + +.main { + margin-left: 210px; +} + +.rtl .main { + margin-left: 0; + margin-right: 210px; } #page-body.simple-page-body { @@ -258,7 +270,7 @@ li { margin-top: 5px; } - #main, .rtl #main { + #main, .rtl #main, .main, .rtl .main { float: none; width: auto; margin: 0; diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html index 7a5fc666f8..c5356e7b9d 100644 --- a/phpBB/adm/style/install_footer.html +++ b/phpBB/adm/style/install_footer.html @@ -1,7 +1,7 @@ - - + + - + diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html index 182abe8875..d2dbf4bea7 100644 --- a/phpBB/adm/style/install_header.html +++ b/phpBB/adm/style/install_header.html @@ -76,3 +76,4 @@ function dE(n, s, type) + \ No newline at end of file diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index 3f2d1b71f4..c27304a425 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -34,7 +34,7 @@ window.onresize = resize_panel;