gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Marc Delisle 2012-11-13 12:56:18 -05:00
parent fb3c180910
commit 705fd0ff6e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -77,6 +77,7 @@ VerboseMultiSubmit, ReplaceHelpImg
- bug #3563824 [export] Support Apache's mod_deflate
- bug #3585523 [interface] Inline query editing broken after row update
- bug #3586389 [setup] Cannot switch language in /setup
- bug #3585695 [CSS] Font size in inline query editor is way too big
3.5.4.0 (not yet released)
- bug #3570212 [edit] uuid_short() is a no-arguments function

2
themes/pmahomme/css/codemirror.css.php
View File

@ -14,7 +14,7 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
}
?>
.CodeMirror {
font-size: 140%;
font-size: 100%;
font-family: monospace;
background: #fff;
border: 1px solid #000;