From 381e371657adae4c3de58545f999c6cf7f4c0631 Mon Sep 17 00:00:00 2001
From: oonuma ryouyu <oonuma.ry0uyu@gmail.com>
Date: Tue, 3 May 2016 02:48:49 +0900
Subject: [PATCH] fix devediton newtab-color.change css load place.

---
 content/treestyletab/treestyletab.xul     |  7 -------
 modules/themeManager.js                   | 10 ++++++++++
 skin/classic/treestyletab/base-colors.css |  9 +++++++++
 skin/classic/treestyletab/base.css        |  4 ++--
 4 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 skin/classic/treestyletab/base-colors.css

diff --git a/content/treestyletab/treestyletab.xul b/content/treestyletab/treestyletab.xul
index db04de7d..7294cbae 100644
--- a/content/treestyletab/treestyletab.xul
+++ b/content/treestyletab/treestyletab.xul
@@ -3,13 +3,6 @@
 <?xml-stylesheet href="treestyletab.css" type="text/css"?>
 <?xml-stylesheet href="treestyletab-tmp.css" type="text/css"?><!-- hacks for Tab Mix Plus -->
 
-<?xml-stylesheet href="chrome://treestyletab/skin/base.css" type="text/css"?>
-<?xml-stylesheet href="chrome://treestyletab/skin/twisty/twisty.css" type="text/css"?>
-<?xml-stylesheet href="chrome://treestyletab/skin/ui.css" type="text/css"?>
-<?xml-stylesheet href="chrome://treestyletab/skin/tmp.css" type="text/css"?><!-- hacks for Tab Mix Plus -->
-<?xml-stylesheet href="chrome://treestyletab/skin/platform-base.css" type="text/css"?>
-<?xml-stylesheet href="chrome://treestyletab/skin/pseudo-tree.css" type="text/css"?>
-
 <!DOCTYPE overlay SYSTEM "chrome://treestyletab/locale/treestyletab.dtd">
 <overlay id="treestyletab-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/modules/themeManager.js b/modules/themeManager.js
index 26126a67..3ed138f0 100644
--- a/modules/themeManager.js
+++ b/modules/themeManager.js
@@ -64,6 +64,16 @@ TreeStyleTabThemeManager.prototype = {
 		this._lastStyles = null;
 
 		var styles = [];
+
+		styles.push(BASE+'base-colors.css');
+
+		styles.push('chrome://treestyletab/skin/base.css');
+		styles.push('chrome://treestyletab/skin/twisty/twisty.css');
+		styles.push('chrome://treestyletab/skin/ui.css');
+		styles.push('chrome://treestyletab/skin/tmp.css');
+		styles.push('chrome://treestyletab/skin/platform-base.css');
+		styles.push('chrome://treestyletab/skin/pseudo-tree.css');
+		
 		switch (aStyle)
 		{
 			default:
diff --git a/skin/classic/treestyletab/base-colors.css b/skin/classic/treestyletab/base-colors.css
new file mode 100644
index 00000000..127eab4d
--- /dev/null
+++ b/skin/classic/treestyletab/base-colors.css
@@ -0,0 +1,9 @@
+:root[devtoolstheme="light"]{
+    --tabs-newtab-button-background:-moz-dialog;
+    --tabs-newtab-button-background-hover:ThreeDHighlight;
+}
+
+:root[devtoolstheme="dark"]{
+    --tabs-newtab-button-background:#39424D;
+    --tabs-newtab-button-background-hover:#49525D;
+}
\ No newline at end of file
diff --git a/skin/classic/treestyletab/base.css b/skin/classic/treestyletab/base.css
index 7d704234..bdeb6fb0 100644
--- a/skin/classic/treestyletab/base.css
+++ b/skin/classic/treestyletab/base.css
@@ -16,11 +16,11 @@
 	border-radius: 0;
 	-moz-border-radius: 0;
 	border-top: 1px solid ThreeDShadow !important;
-	background: -moz-dialog !important;
+	background: var(--tabs-newtab-button-background) !important;
 }
 .tabbrowser-tabs[treestyletab-mode="vertical"] .tabs-newtab-button:hover,
 .treestyletab-tabbar-toolbar[treestyletab-mode="vertical"] > toolbarbutton:hover {
-	background: ThreeDHighlight !important;
+	background: var(--tabs-newtab-button-background-hover) !important;
 }
 
 /* for Mac OS X */