From a5c4e4f3cebdd75aba415b9106d554e61d55154e Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Tue, 29 Oct 2013 01:15:44 +0200 Subject: [PATCH 1/5] [ticket/11984] Prevent AJAX background animation flicker in ACP PHPBB3-11984 --- phpBB/adm/style/admin.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 512c714fcc..e97412da68 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1587,6 +1587,8 @@ input.button1:focus, input.button2:focus, input.button3:focus { #darkenwrapper { display: none; + position: relative; + z-index: 44; } #darken { From 094da3ba167e1075a8d3e75096c7e83712d74f87 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Tue, 29 Oct 2013 01:16:30 +0200 Subject: [PATCH 2/5] [ticket/11984] Prevent AJAX background animation flicker in prosilver PHPBB3-11984 --- phpBB/styles/prosilver/theme/common.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 225673a932..9714e87af2 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -810,6 +810,8 @@ li.pagination ul { #darkenwrapper { display: none; + position: relative; + z-index: 44; } #darken { @@ -819,6 +821,7 @@ li.pagination ul { width: 100%; height: 100%; opacity: 0.5; + z-index: 45; } #loading_indicator { From 366a224a248a9cac50a1d0df50ae91c89954aabc Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Wed, 30 Oct 2013 01:17:11 +0200 Subject: [PATCH 3/5] [ticket/11984] Fix stray and active tab hover in ACP PHPBB3-11984 --- phpBB/adm/style/admin.css | 18 ++++++++---------- phpBB/adm/style/overall_header.html | 1 - 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index e97412da68..c7f91d9a8a 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -381,6 +381,14 @@ li { color: #BC2A4D; } +#tabs a:hover { + background-position: 0 -69px; +} + +#tabs a:hover span { + background-position: 100% -69px; +} + #tabs .activetab a { background-position: 0 0; border-bottom: 1px solid #DCDEE2; @@ -392,14 +400,6 @@ li { color: #23649F; } -#tabs a:hover { - background-position: 0 -69px; -} - -#tabs a:hover span { - background-position: 100% -69px; -} - #tabs .activetab a:hover span { color: #115098; } @@ -1587,8 +1587,6 @@ input.button1:focus, input.button2:focus, input.button3:focus { #darkenwrapper { display: none; - position: relative; - z-index: 44; } #darken { diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index 455446f8e3..fcef3bb8ac 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -153,7 +153,6 @@ function popup(url, width, height, name) -
From 796e22d67557f15fe2902130eead74809b481177 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Wed, 30 Oct 2013 19:17:00 +0200 Subject: [PATCH 4/5] [ticket/11984] Hide for invalid extensions PHPBB3-11984 --- phpBB/adm/style/admin.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js index e9f0f1e512..dd46124f97 100644 --- a/phpBB/adm/style/admin.js +++ b/phpBB/adm/style/admin.js @@ -133,6 +133,9 @@ function parse_document(container) column += colspan; }); }); + + // Remove in disabled extensions list + $this.find('tr.ext_disabled > .empty:nth-child(2) + .empty').siblings(':first-child').children('dfn').remove(); }); /** From 739f1a3bdd733a45d9192d1e0d8da4e44caa1a3d Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Thu, 31 Oct 2013 10:29:46 +0200 Subject: [PATCH 5/5] [ticket/11984] Do not resize textarea on touch devices PHPBB3-11984 --- phpBB/assets/javascript/core.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index a3a6d75dd2..238bfad90b 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -15,6 +15,7 @@ var dark = $('#darkenwrapper'); var loadingIndicator = $('#loading_indicator'); var phpbbAlertTimer = null; +var isTouch = (window && typeof window.ontouchstart !== 'undefined'); /** * Display a loading screen @@ -623,8 +624,9 @@ phpbb.resizeTextArea = function(items, options) { resetCallback: function(item) { } }; - if (arguments.length > 1) - { + if (isTouch) return; + + if (arguments.length > 1) { configuration = $.extend(configuration, options); }