From e6aaae658ce30c9bd3aaba36d0e69e6df59f6cdb Mon Sep 17 00:00:00 2001
From: Tim Nguyen <ntim007@gmail.com>
Date: Fri, 16 May 2014 14:48:00 +0200
Subject: [PATCH] Bug 973691 - Make the code mirror find/go to line match the
 devtools theme. r=bgrins

---
 .../sourceeditor/codemirror/mozilla.css       | 25 ++++++++-----------
 browser/themes/shared/devtools/dark-theme.css |  3 ++-
 .../themes/shared/devtools/light-theme.css    |  3 ++-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/browser/devtools/sourceeditor/codemirror/mozilla.css b/browser/devtools/sourceeditor/codemirror/mozilla.css
index c2691bdf1f44..31ae8e55d445 100644
--- a/browser/devtools/sourceeditor/codemirror/mozilla.css
+++ b/browser/devtools/sourceeditor/codemirror/mozilla.css
@@ -85,20 +85,6 @@ selector in floating-scrollbar-light.css across all platforms. */
   min-width: 10px;
 }
 
-/* This is to make CodeMirror's dialogs more DevTool-ey. */
-
-.CodeMirror-dialog {
-  font: message-box;
-  padding: 5px 4px;
-  color: hsl(210,30%,85%);
-  background-image: url("chrome://browser/skin/devtools/background-noise-toolbar.png"),
-    linear-gradient(#3e4750, #3e4750);
-}
-
-.CodeMirror-dialog input {
-  font: message-box;
-}
-
 .cm-trailingspace {
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QUXCToH00Y1UgAAACFJREFUCNdjPMDBUc/AwNDAAAFMTAwMDA0OP34wQgX/AQBYgwYEx4f9lQAAAABJRU5ErkJggg==");
   opacity: 0.75;
@@ -106,6 +92,17 @@ selector in floating-scrollbar-light.css across all platforms. */
   background-repeat: repeat-x;
 }
 
+/* CodeMirror dialogs styling */
+
+.CodeMirror-dialog {
+  padding: 4px 3px;
+}
+
+.CodeMirror-dialog,
+.CodeMirror-dialog input {
+  font: message-box;
+}
+
 /* Fold addon */
 
 .CodeMirror-foldmarker {
diff --git a/browser/themes/shared/devtools/dark-theme.css b/browser/themes/shared/devtools/dark-theme.css
index 368b551e2e93..20f6696a60bf 100644
--- a/browser/themes/shared/devtools/dark-theme.css
+++ b/browser/themes/shared/devtools/dark-theme.css
@@ -156,7 +156,8 @@
 
 .theme-toolbar,
 .devtools-toolbar,
-.devtools-sidebar-tabs > tabs { /* General toolbar styling */
+.devtools-sidebar-tabs > tabs,
+.CodeMirror-dialog { /* General toolbar styling */
   color: #b6babf;
   background-color: #343c45;
   border-color: hsla(210,8%,5%,.6);
diff --git a/browser/themes/shared/devtools/light-theme.css b/browser/themes/shared/devtools/light-theme.css
index b58ff015a483..6b37ee1b8ef7 100644
--- a/browser/themes/shared/devtools/light-theme.css
+++ b/browser/themes/shared/devtools/light-theme.css
@@ -159,7 +159,8 @@
 
 .theme-toolbar,
 .devtools-toolbar,
-.devtools-sidebar-tabs > tabs { /* General toolbar styling */
+.devtools-sidebar-tabs > tabs,
+.CodeMirror-dialog { /* General toolbar styling */
   color: #585959;
   background-color: #f0f1f2;
   border-color: #aaa;