Skip to content

Commit 55e9389

Browse files
committed
Fix theme path and include theme vars only
1 parent 7b46d2c commit 55e9389

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

data/markup-tooltip.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ function initialize(data) {
4141
// 'devtools.theme' preference, so make sure to properly
4242
// convert it into class name.
4343
document.body.classList.add("theme-" + data.theme);
44+
document.documentElement.classList.add("theme-" + data.theme);
4445

4546
// Get content ready for rendering.
4647
var store = new GripStore();

lib/data-tooltip.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,15 @@ DataTooltip.prototype =
116116
let data = JSON.stringify(this.jQueryData);
117117
let theme = Services.prefs.getCharPref("devtools.theme");
118118

119+
// xxxHonza: can be removed as soon as Fx44 is the
120+
// minimum requirement.
119121
loadSheet(win, "chrome://browser/skin/devtools/" + theme +
120122
"-theme.css", "author");
121123

124+
// Theme paths have changed in Fx44. Also, it should be enough
125+
// to included only them variables.
126+
loadSheet(win, "resource://devtools/client/themes/variables.css", "author");
127+
122128
// The tooltip is opened for clicked jQuery data, so pass
123129
// it in together with the current active theme.
124130
let input = Content.cloneIntoContentScope(win, {

0 commit comments

Comments
 (0)