From eda3c36b1c38ec19515f0a6da2ae6413334edc0d Mon Sep 17 00:00:00 2001 From: PayBas Date: Mon, 2 Jun 2014 19:23:56 +0200 Subject: [PATCH 1/9] [ticket/12648] Improve UCP/MCP/Posting tabs PHPBB3-12648 --- phpBB/styles/prosilver/template/forum_fn.js | 4 +- .../styles/prosilver/template/mcp_header.html | 2 +- .../styles/prosilver/template/mcp_topic.html | 12 +- .../prosilver/template/posting_editor.html | 8 +- .../styles/prosilver/template/ucp_header.html | 2 +- phpBB/styles/prosilver/theme/colours.css | 47 +++--- phpBB/styles/prosilver/theme/cp.css | 147 ++++++------------ 7 files changed, 82 insertions(+), 140 deletions(-) diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index 7e4875d7bc..ea2b815e77 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -805,7 +805,7 @@ function parse_document(container) ul = $this.children(), tabs = ul.children().not('[data-skip-responsive]'), links = tabs.children('a'), - item = ul.append('').find('li.responsive-tab'), + item = ul.append('').find('li.responsive-tab'), menu = item.find('.dropdown-contents'), maxHeight = 0, lastWidth = false, @@ -847,7 +847,7 @@ function parse_document(container) for (i = total - 1; i >= 0; i --) { tab = availableTabs.eq(i); - menu.prepend(tab.clone(true)); + menu.prepend(tab.clone(true).removeClass('tab')); tab.hide(); if ($this.height() <= maxHeight) { menu.find('a').click(function() { check(true); }); diff --git a/phpBB/styles/prosilver/template/mcp_header.html b/phpBB/styles/prosilver/template/mcp_header.html index bdfa254741..df03de725a 100644 --- a/phpBB/styles/prosilver/template/mcp_header.html +++ b/phpBB/styles/prosilver/template/mcp_header.html @@ -11,7 +11,7 @@
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index a83b42dba0..cf93c90b06 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -13,14 +13,14 @@
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index 081c267a94..5d533c6bb1 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -101,13 +101,11 @@
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 8222c85354..4b7532ab8a 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -50,7 +50,7 @@ hr { } .navbar { - background-color: #CADCEB; + background-color: #cadceb; } .forabg { @@ -92,7 +92,7 @@ table.zebra-list tr:nth-child(even) td, ul.zebra-list li:nth-child(even) { background-color: #e1ebf2; } -.bg3 { background-color: #CADCEB; } +.bg3 { background-color: #cadceb; } .ucprowbg { background-color: #DCDEE2; From 919fee6b1b4e62bb65667693eefb78625a38f8bc Mon Sep 17 00:00:00 2001 From: PayBas Date: Fri, 13 Jun 2014 16:01:00 +0200 Subject: [PATCH 8/9] [ticket/12648] Slightly clear ACP active tab border PHPBB3-12648 --- phpBB/adm/style/admin.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 7204e4e53c..024651cbd9 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -392,10 +392,11 @@ li { background: -ms-linear-gradient(top, #F2F2F2 0%, #DCDEE2 100%); background: linear-gradient(to bottom, #F2F2F2 0%, #DCDEE2 100%); border-color: #999; + border-bottom: 1px solid #DCDEE2; box-shadow: 0 1px 1px #FFF inset; color: #23649F; margin: 0 1px 0 0; - padding: 7px 10px 6px; + padding: 7px 10px 5px; } #tabs .activetab > a:hover { From 7517cc0e05558bf71e87950f75625c9cc0bf4a65 Mon Sep 17 00:00:00 2001 From: PayBas Date: Sat, 14 Jun 2014 01:52:22 +0200 Subject: [PATCH 9/9] [ticket/12648] RTL fix & ACP border fix PHPBB3-12648 --- phpBB/adm/style/admin.css | 4 +-- phpBB/styles/prosilver/theme/bidi.css | 45 ++++++++++++++++++++++----- phpBB/styles/prosilver/theme/cp.css | 14 +-------- 3 files changed, 40 insertions(+), 23 deletions(-) diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 024651cbd9..b8f55e66c5 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -392,11 +392,11 @@ li { background: -ms-linear-gradient(top, #F2F2F2 0%, #DCDEE2 100%); background: linear-gradient(to bottom, #F2F2F2 0%, #DCDEE2 100%); border-color: #999; - border-bottom: 1px solid #DCDEE2; + border-bottom: 2px solid #DCDEE2; box-shadow: 0 1px 1px #FFF inset; color: #23649F; margin: 0 1px 0 0; - padding: 7px 10px 5px; + padding: 7px 10px 4px; } #tabs .activetab > a:hover { diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index d8d568c7a5..2e9253928e 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -684,34 +684,63 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a { /* CP tabbed menu ----------------------------------------*/ .rtl #tabs { - margin: 20px 7px -1px 0; + margin-left: 0; + margin-right: 7px; } -.rtl #tabs a { +.rtl #tabs .tab { float: right; } -/*.rtl #tabs a span { - float: right; -}*/ +.rtl #tabs .tab > a { + margin-left: 1px; + margin-right: 0; +} /* Mini tabbed menu used in MCP ----------------------------------------*/ .rtl #minitabs { + float: left; margin-right: 0; margin-left: 7px; } -.rtl .tabs-container #minitabs { +.rtl #minitabs .tab { float: left; } -.rtl #minitabs li { - float: left; +.rtl #minitabs .tab > a { margin-right: 2px; margin-left: 0; } +/* Responsive tabs +----------------------------------------*/ +.rtl #tabs .dropdown { + margin-left: -2px; +} + +.rtl #tabs .dropdown li { + text-align: left; +} + +.rtl #minitabs .dropdown { + margin-left: -4px; +} + +.rtl #minitabs .dropdown li { + text-align: right; +} + +/* Responsive *CP navigation +----------------------------------------*/ +@media only screen and (max-width: 900px), only screen and (max-device-width: 900px) +{ + .rtl #cp-menu, .rtl #navigation, .rtl #cp-main { + float: none; + } +} + /* UCP navigation menu ----------------------------------------*/ diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css index a4f5da1770..e144c74f20 100644 --- a/phpBB/styles/prosilver/theme/cp.css +++ b/phpBB/styles/prosilver/theme/cp.css @@ -158,12 +158,8 @@ ul.cplist { /* Mini tabbed menu used in MCP ----------------------------------------*/ #minitabs { - margin: -20px 7px 0 0; -} - -.tabs-container #minitabs { float: right; - margin-top: 15px; + margin: 15px 7px 0 0; max-width: 50%; } @@ -222,14 +218,6 @@ ul.cplist { top: auto; } -#minitabs .dropdown-up .dropdown { - bottom: 18px; -} - -#tabs .dropdown-right .dropdown, #minitabs .dropdown-right .dropdown { - margin-left: -41px; -} - #tabs .dropdown li { text-align: right; }