From 4a8de38c01e57b7975fbd0100040d3985a838d98 Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Thu, 2 Apr 2015 10:58:58 -0700
Subject: [PATCH] Bug 947242 - DevTools themes - switch to new theme
 colors;r=jsantell

---
 browser/devtools/shared/test/browser_theme.js |  4 +--
 browser/themes/shared/devtools/dark-theme.css | 27 ++++++++++---------
 .../themes/shared/devtools/light-theme.css    | 20 +++++++-------
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/browser/devtools/shared/test/browser_theme.js b/browser/devtools/shared/test/browser_theme.js
index 632e4538f55a..d720b371b147 100644
--- a/browser/devtools/shared/test/browser_theme.js
+++ b/browser/devtools/shared/test/browser_theme.js
@@ -37,8 +37,8 @@ function testSetTheme () {
 }
 
 function testGetColor () {
-  let BLUE_DARK = "#3689b2";
-  let BLUE_LIGHT = "hsl(208,56%,40%)";
+  let BLUE_DARK = "#46afe3";
+  let BLUE_LIGHT = "#0088cc";
   let originalTheme = getTheme();
 
   setTheme("dark");
diff --git a/browser/themes/shared/devtools/dark-theme.css b/browser/themes/shared/devtools/dark-theme.css
index eb93f5f3705c..47ec37648416 100644
--- a/browser/themes/shared/devtools/dark-theme.css
+++ b/browser/themes/shared/devtools/dark-theme.css
@@ -3,10 +3,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* According to:
- * https://bugzilla.mozilla.org/show_bug.cgi?id=715472#c17
+/* Colors are taken from:
+ * https://developer.mozilla.org/en-US/docs/Tools/DevToolsColors
  */
 :root {
+
   --theme-body-background: #14171a;
   --theme-sidebar-background: #181d20;
   --theme-contrast-background: #b28025;
@@ -14,25 +15,25 @@
   --theme-tab-toolbar-background: #252c33;
   --theme-toolbar-background: #343c45;
   --theme-selection-background: #1d4f73;
-  --theme-selection-color: #f5f7fa;
   --theme-selection-background-semitransparent: rgba(29, 79, 115, .5);
+  --theme-selection-color: #f5f7fa;
   --theme-splitter-color: black;
-  --theme-comment: #5c6773;
+  --theme-comment: #757873;
 
-  --theme-body-color: #a9bacb;
+  --theme-body-color: #8fa1b2;
   --theme-body-color-alt: #b6babf;
   --theme-content-color1: #a9bacb;
   --theme-content-color2: #8fa1b2;
-  --theme-content-color3: #667380;
+  --theme-content-color3: #5f7387;
 
-  --theme-highlight-green: #5c9966;
-  --theme-highlight-blue: #3689b2;
+  --theme-highlight-green: #70bf53;
+  --theme-highlight-blue: #46afe3;
   --theme-highlight-bluegrey: #5e88b0;
-  --theme-highlight-purple: #6270b2;
-  --theme-highlight-lightorange: #a18650;
-  --theme-highlight-orange: #b26b47;
-  --theme-highlight-red: #bf5656;
-  --theme-highlight-pink: #a673bf;
+  --theme-highlight-purple: #6b7abb;
+  --theme-highlight-lightorange: #d99b28;
+  --theme-highlight-orange: #d96629;
+  --theme-highlight-red: #eb5368;
+  --theme-highlight-pink: #df80ff;
 }
 
 .theme-body {
diff --git a/browser/themes/shared/devtools/light-theme.css b/browser/themes/shared/devtools/light-theme.css
index 278dd9f486a7..aa9a33a9be18 100644
--- a/browser/themes/shared/devtools/light-theme.css
+++ b/browser/themes/shared/devtools/light-theme.css
@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* According to:
- * https://bugzilla.mozilla.org/show_bug.cgi?id=715472#c17
+/* Colors are taken from:
+ * https://developer.mozilla.org/en-US/docs/Tools/DevToolsColors
  */
 :root {
   --theme-body-background: #fcfcfc;
@@ -14,10 +14,10 @@
   --theme-tab-toolbar-background: #ebeced;
   --theme-toolbar-background: #f0f1f2;
   --theme-selection-background: #4c9ed9;
-  --theme-selection-color: #f5f7fa;
   --theme-selection-background-semitransparent: rgba(76, 158, 217, .23);
+  --theme-selection-color: #f5f7fa;
   --theme-splitter-color: #aaaaaa;
-  --theme-comment: hsl(90,2%,46%);
+  --theme-comment: #757873;
 
   --theme-body-color: #18191a;
   --theme-body-color-alt: #585959;
@@ -25,13 +25,13 @@
   --theme-content-color2: #8fa1b2;
   --theme-content-color3: #667380;
 
-  --theme-highlight-green: hsl(72,100%,27%);
-  --theme-highlight-blue: hsl(208,56%,40%);
-  --theme-highlight-bluegrey: hsl(208,81%,21%);
+  --theme-highlight-green: #2cbb0f;
+  --theme-highlight-blue: #0088cc;
+  --theme-highlight-bluegrey: #5f88b0;
   --theme-highlight-purple: #5b5fff;
-  --theme-highlight-lightorange: #a18650;
-  --theme-highlight-orange: hsl(24,85%,39%);
-  --theme-highlight-red: #bf5656;
+  --theme-highlight-lightorange: #d97e00;
+  --theme-highlight-orange: #f13c00;
+  --theme-highlight-red: #ed2655;
   --theme-highlight-pink: #b82ee5;
 }