Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-07-20 04:22:11 +02:00
commit 6206ee13cf
3 changed files with 1 additions and 12 deletions

View File

@ -241,10 +241,7 @@ function PMA_getHtmlForServerVariablesItems($variable_doc_links)
$output .= '<span title="'
. __('This is a read-only variable and can not be edited')
. '" class="read_only_var" >'
. PMA_Util::getImage(
's_error2.png',
''
)
. PMA_Util::getIcon('bd_edit.png', __('Edit'))
. '</span>';
}

View File

@ -247,10 +247,6 @@ fieldset .formelement {
white-space: nowrap;
}
.read_only_var {
padding: 20%;
}
/* revert for Gecko */
fieldset div[class=formelement] {
white-space: normal;

View File

@ -530,10 +530,6 @@ fieldset .formelement {
white-space: nowrap;
}
.read_only_var {
padding: 20%;
}
/* revert for Gecko */
fieldset div[class=formelement] {
white-space: normal;