Fix merge conflicts

phpmyadmin · Nov 13, 2012 · 705fd0f · 705fd0f
1 parent fb3c180
commit 705fd0f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -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

diff --git a/themes/pmahomme/css/codemirror.css.php b/themes/pmahomme/css/codemirror.css.php
@@ -14,7 +14,7 @@
 }
 ?>
 .CodeMirror {
-  font-size: 140%;
+  font-size: 100%;
   font-family: monospace;
   background: #fff;
   border: 1px solid #000;