From 705fd0ff6e932eaa025c265142fbedb7d5720841 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 13 Nov 2012 12:56:18 -0500 Subject: [PATCH] Fix merge conflicts --- ChangeLog | 1 + themes/pmahomme/css/codemirror.css.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cbef965b6523..e36108ba9dc5 100644 --- 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 index 6192cddb9fe3..a82d0713fbb7 100644 --- 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;