diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-11-21 13:42:48 -0800 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-11-21 13:42:48 -0800 |
| commit | 355ceac4a04f4b83b23de9851e178faade263e53 (patch) | |
| tree | 9642327ea22870b57b5da6e3e46b49ba8b3841a9 | |
| parent | 6f419b0049c5b4ec2bba9fc40a8515a35ced6fb4 (diff) | |
| parent | 739f1a3bdd733a45d9192d1e0d8da4e44caa1a3d (diff) | |
| download | forums-355ceac4a04f4b83b23de9851e178faade263e53.tar forums-355ceac4a04f4b83b23de9851e178faade263e53.tar.gz forums-355ceac4a04f4b83b23de9851e178faade263e53.tar.bz2 forums-355ceac4a04f4b83b23de9851e178faade263e53.tar.xz forums-355ceac4a04f4b83b23de9851e178faade263e53.zip | |
Merge pull request #1834 from cyberalien/ticket/11984
Move responsive design adjustments
| -rw-r--r-- | phpBB/adm/style/admin.css | 16 | ||||
| -rw-r--r-- | phpBB/adm/style/admin.js | 3 | ||||
| -rw-r--r-- | phpBB/adm/style/overall_header.html | 1 | ||||
| -rw-r--r-- | phpBB/assets/javascript/core.js | 6 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 3 |
5 files changed, 18 insertions, 11 deletions
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 512c714fcc..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; } 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 <dfn> in disabled extensions list + $this.find('tr.ext_disabled > .empty:nth-child(2) + .empty').siblings(':first-child').children('dfn').remove(); }); /** 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) </ul> </div> <!-- ENDIF --> - </ul> </div> <div id="main"> diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 69a09427fe..98f00e1d58 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); } diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index de55b8188f..dced25f541 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -815,6 +815,8 @@ li.pagination ul { #darkenwrapper { display: none; + position: relative; + z-index: 44; } #darken { @@ -824,6 +826,7 @@ li.pagination ul { width: 100%; height: 100%; opacity: 0.5; + z-index: 45; } #loading_indicator { |