1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-07 16:15:22 +02:00

Merge pull request #1834 from cyberalien/ticket/11984

Move responsive design adjustments
This commit is contained in:
Nathan Guse 2013-11-21 13:42:48 -08:00
commit 355ceac4a0
5 changed files with 18 additions and 11 deletions

View File

@ -381,6 +381,14 @@ li {
color: #BC2A4D; color: #BC2A4D;
} }
#tabs a:hover {
background-position: 0 -69px;
}
#tabs a:hover span {
background-position: 100% -69px;
}
#tabs .activetab a { #tabs .activetab a {
background-position: 0 0; background-position: 0 0;
border-bottom: 1px solid #DCDEE2; border-bottom: 1px solid #DCDEE2;
@ -392,14 +400,6 @@ li {
color: #23649F; color: #23649F;
} }
#tabs a:hover {
background-position: 0 -69px;
}
#tabs a:hover span {
background-position: 100% -69px;
}
#tabs .activetab a:hover span { #tabs .activetab a:hover span {
color: #115098; color: #115098;
} }

View File

@ -133,6 +133,9 @@ function parse_document(container)
column += colspan; column += colspan;
}); });
}); });
// Remove <dfn> in disabled extensions list
$this.find('tr.ext_disabled > .empty:nth-child(2) + .empty').siblings(':first-child').children('dfn').remove();
}); });
/** /**

View File

@ -153,7 +153,6 @@ function popup(url, width, height, name)
</ul> </ul>
</div> </div>
<!-- ENDIF --> <!-- ENDIF -->
</ul>
</div> </div>
<div id="main"> <div id="main">

View File

@ -15,6 +15,7 @@ var dark = $('#darkenwrapper');
var loadingIndicator = $('#loading_indicator'); var loadingIndicator = $('#loading_indicator');
var phpbbAlertTimer = null; var phpbbAlertTimer = null;
var isTouch = (window && typeof window.ontouchstart !== 'undefined');
/** /**
* Display a loading screen * Display a loading screen
@ -623,8 +624,9 @@ phpbb.resizeTextArea = function(items, options) {
resetCallback: function(item) { } resetCallback: function(item) { }
}; };
if (arguments.length > 1) if (isTouch) return;
{
if (arguments.length > 1) {
configuration = $.extend(configuration, options); configuration = $.extend(configuration, options);
} }

View File

@ -815,6 +815,8 @@ li.pagination ul {
#darkenwrapper { #darkenwrapper {
display: none; display: none;
position: relative;
z-index: 44;
} }
#darken { #darken {
@ -824,6 +826,7 @@ li.pagination ul {
width: 100%; width: 100%;
height: 100%; height: 100%;
opacity: 0.5; opacity: 0.5;
z-index: 45;
} }
#loading_indicator { #loading_indicator {