- *
- * ***** END LICENSE BLOCK ***** */
-
-// Minimum console height, in pixels.
-const MINIMUM_CONSOLE_HEIGHT = 150;
-
-// Minimum page height, in pixels. This prevents the Web Console from
-// remembering a height that covers the whole page.
-const MINIMUM_PAGE_HEIGHT = 50;
-const HEIGHT_PREF = "devtools.hud.height";
-
-let hud, newHeight, height, innerHeight, testDriver;
-
-function testGen()
-{
- height = parseInt(hud.style.height);
-
- toggleConsole();
- yield;
-
- is(newHeight, height, "same height after reopening the console");
- is(Services.prefs.getIntPref(HEIGHT_PREF), HUDService.lastConsoleHeight,
- "pref is correct");
-
- setHeight(Math.ceil(innerHeight * 0.5));
- toggleConsole();
- yield;
-
- is(newHeight, height, "same height after reopening the console");
- is(Services.prefs.getIntPref(HEIGHT_PREF), HUDService.lastConsoleHeight,
- "pref is correct");
-
- setHeight(MINIMUM_CONSOLE_HEIGHT - 1);
- toggleConsole();
- yield;
-
- is(newHeight, MINIMUM_CONSOLE_HEIGHT, "minimum console height is respected");
- is(Services.prefs.getIntPref(HEIGHT_PREF), HUDService.lastConsoleHeight,
- "pref is correct");
-
- setHeight(innerHeight - MINIMUM_PAGE_HEIGHT + 1);
- toggleConsole();
- yield;
-
- is(newHeight, innerHeight - MINIMUM_PAGE_HEIGHT,
- "minimum page height is respected");
- is(Services.prefs.getIntPref(HEIGHT_PREF), HUDService.lastConsoleHeight,
- "pref is correct");
-
- setHeight(Math.ceil(innerHeight * 0.6));
- Services.prefs.setIntPref(HEIGHT_PREF, -1);
- toggleConsole();
- yield;
-
- is(newHeight, height, "same height after reopening the console");
- is(Services.prefs.getIntPref(HEIGHT_PREF), -1, "pref is not updated");
-
- closeConsole();
- HUDService.lastConsoleHeight = 0;
- Services.prefs.setIntPref(HEIGHT_PREF, 0);
-
- hud = testDriver = null;
- executeSoon(finishTest);
-
- yield;
-}
-
-function toggleConsole()
-{
- closeConsole(null, function() {
- openConsole(null, function() {
- let hudId = HUDService.getHudIdByWindow(content);
- hud = HUDService.hudReferences[hudId].iframe;
- newHeight = parseInt(hud.style.height);
-
- testDriver.next();
- });
- });
-}
-
-function setHeight(aHeight)
-{
- height = aHeight;
- hud.style.height = height + "px";
-}
-
-function test()
-{
- addTab("data:text/html;charset=utf-8,Web Console test for bug 601909");
- browser.addEventListener("load", function onLoad() {
- browser.removeEventListener("load", onLoad, true);
- innerHeight = content.innerHeight;
- openConsole(null, function(aHud) {
- hud = aHud.iframe;
- testDriver = testGen();
- testDriver.next();
- });
- }, true);
-}
-
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_602572_log_bodies_checkbox.js b/browser/devtools/webconsole/test/browser_webconsole_bug_602572_log_bodies_checkbox.js
index 5623f52b2cb2..d22a50c9b3ec 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_602572_log_bodies_checkbox.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_602572_log_bodies_checkbox.js
@@ -46,7 +46,6 @@ function startTest()
let win2 = tabs[runCount*2 + 1].linkedBrowser.contentWindow;
let hudId2 = HUDService.getHudIdByWindow(win2);
huds[1] = HUDService.hudReferences[hudId2];
- HUDService.disableAnimation(hudId2);
if (runCount == 0) {
menuitems[1] = huds[1].ui.rootElement.querySelector("#saveBodies");
@@ -115,7 +114,6 @@ function onpopupshown2b(aEvent)
let win1 = tabs[runCount*2].linkedBrowser.contentWindow;
let hudId1 = HUDService.getHudIdByWindow(win1);
huds[0] = HUDService.hudReferences[hudId1];
- HUDService.disableAnimation(hudId1);
info("iframe1 height " + huds[0].iframe.clientHeight);
info("iframe1 root height " + huds[0].ui.rootElement.clientHeight);
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js b/browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js
index 9e451d0ca175..1fd615fb9556 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js
@@ -1,8 +1,6 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
-let prefService = Services.prefs;
-
let prefs = {
"net": [
"network",
@@ -28,7 +26,7 @@ function test() {
// Set all prefs to true
for (let category in prefs) {
prefs[category].forEach(function(pref) {
- prefService.setBoolPref("devtools.webconsole.filter." + pref, true);
+ Services.prefs.setBoolPref("devtools.webconsole.filter." + pref, true);
});
}
@@ -107,12 +105,11 @@ function onConsoleReopen2(hud) {
// Clear prefs
for (let category in prefs) {
prefs[category].forEach(function(pref) {
- prefService.clearUserPref("devtools.webconsole.filter." + pref);
+ Services.prefs.clearUserPref("devtools.webconsole.filter." + pref);
});
}
- prefs = prefService = null;
- gBrowser.removeCurrentTab();
+ prefs = null;
finishTest();
}
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js b/browser/devtools/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js
index 4eeaec88a687..22eba17a0454 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js
@@ -44,18 +44,17 @@ function setupHighlighterTests()
{
let h1 = content.document.querySelector("h1");
ok(h1, "we have the header node");
- Services.obs.addObserver(runSelectionTests,
- InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
- InspectorUI.toggleInspectorUI();
+
+ openInspector(runSelectionTests);
}
-function runSelectionTests()
+function runSelectionTests(aInspector)
{
- Services.obs.removeObserver(runSelectionTests,
- InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+ aInspector.highlighter.unlock();
+ aInspector.highlighter.outline.setAttribute("disable-transitions", "true");
executeSoon(function() {
- InspectorUI.highlighter.addListener("nodeselected", performTestComparisons);
+ aInspector.selection.once("new-node", performTestComparisons);
let h1 = content.document.querySelector("h1");
EventUtils.synthesizeMouse(h1, 2, 2, {type: "mousemove"}, content);
});
@@ -63,19 +62,24 @@ function runSelectionTests()
function performTestComparisons()
{
- InspectorUI.highlighter.removeListener("nodeselected", performTestComparisons);
+ let target = TargetFactory.forTab(gBrowser.selectedTab);
+ let inspector = gDevTools.getPanelForTarget("inspector", target);
+ inspector.highlighter.lock();
- InspectorUI.stopInspecting();
+ let isHighlighting =
+ !(inspector.highlighter.outline.getAttribute("hidden") == "true");
+
+ ok(isHighlighting, "inspector is highlighting");
let h1 = content.document.querySelector("h1");
- is(InspectorUI.highlighter.node, h1, "node selected");
- is(InspectorUI.selection, h1, "selection matches node");
+ is(inspector.selection.node, h1, "selection matches node");
openConsole(gBrowser.selectedTab, performWebConsoleTests);
}
function performWebConsoleTests(hud)
{
+ let target = TargetFactory.forTab(gBrowser.selectedTab);
let jsterm = hud.jsterm;
outputNode = hud.outputNode;
@@ -112,7 +116,8 @@ function performWebConsoleTests(hud)
let node = outputNode.querySelector(".webconsole-msg-output");
isnot(node.textContent.indexOf("bug653531"), -1,
"correct output for $0.textContent");
- is(InspectorUI.selection.textContent, "bug653531",
+ let inspector = gDevTools.getPanelForTarget("inspector", target);
+ is(inspector.selection.node.textContent, "bug653531",
"node successfully updated");
executeSoon(finishUp);
@@ -122,7 +127,6 @@ function performWebConsoleTests(hud)
}
function finishUp() {
- InspectorUI.closeInspectorUI();
finishTest();
}
@@ -130,8 +134,8 @@ function test()
{
waitForExplicitFinish();
gBrowser.selectedTab = gBrowser.addTab();
- gBrowser.selectedBrowser.addEventListener("load", function() {
- gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+ gBrowser.selectedBrowser.addEventListener("load", function onLoad() {
+ gBrowser.selectedBrowser.removeEventListener("load", onLoad, true);
waitForFocus(createDocument, content);
}, true);
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_660806_history_nav.js b/browser/devtools/webconsole/test/browser_webconsole_bug_660806_history_nav.js
index 0f685f88e672..ade0c09363ae 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_660806_history_nav.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_660806_history_nav.js
@@ -21,10 +21,11 @@ function consoleOpened(HUD)
let jsterm = HUD.jsterm;
let popup = jsterm.autocompletePopup;
- popup._panel.addEventListener("popupshown", function() {
- popup._panel.removeEventListener("popupshown", arguments.callee, false);
+ let onShown = function() {
ok(false, "popup shown");
- }, false);
+ };
+
+ popup._panel.addEventListener("popupshown", onShown, false);
ok(!popup.isOpen, "popup is not open");
@@ -41,6 +42,7 @@ function consoleOpened(HUD)
executeSoon(function() {
ok(!popup.isOpen, "popup is not open");
+ popup._panel.removeEventListener("popupshown", onShown, false);
executeSoon(finishTest);
});
}
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_663443_panel_title.js b/browser/devtools/webconsole/test/browser_webconsole_bug_663443_panel_title.js
deleted file mode 100644
index b485165d7069..000000000000
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_663443_panel_title.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-const TEST_URI = "data:text/html;charset=utf-8,test for bug 663443. test1";
-
-const POSITION_PREF = "devtools.webconsole.position";
-const POSITION_WINDOW = "window";
-
-function consoleOpened() {
- document.removeEventListener("popupshown", consoleOpened, false);
-
- let HUD = HUDService.getHudByWindow(content);
- ok(HUD.consolePanel, "Web Console opened in a panel");
-
- let waitForTitleChange = {
- name: "panel title change",
- validatorFn: function() {
- return HUD.consolePanel.label.indexOf("test2") > -1;
- },
- successFn: testEnd,
- failureFn: testEnd,
- };
-
- waitForSuccess({
- name: "initial panel title",
- validatorFn: function() {
- return HUD.consolePanel.label.indexOf("test1") > -1;
- },
- successFn: function() {
- content.location = "data:text/html;charset=utf-8,
test2 for bug 663443";
- waitForSuccess(waitForTitleChange);
- },
- failureFn: testEnd,
- });
-}
-
-function testEnd() {
- closeConsole(null, finishTest);
-}
-
-function test() {
- addTab(TEST_URI);
- browser.addEventListener("load", function onLoad() {
- browser.removeEventListener("load", onLoad, true);
-
- Services.prefs.setCharPref(POSITION_PREF, POSITION_WINDOW);
-
- registerCleanupFunction(function() {
- Services.prefs.clearUserPref(POSITION_PREF);
- });
-
- document.addEventListener("popupshown", consoleOpened, false);
-
- openConsole();
- }, true);
-}
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js b/browser/devtools/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js
index 48614c9cc024..e3d214aa5282 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js
@@ -39,7 +39,9 @@ function testViewSource(aHud)
nodes = hud.outputNode.querySelectorAll(selector);
is(nodes.length, 2, "correct number of css messages");
- Services.ww.registerNotification(observer);
+ let target = TargetFactory.forTab(gBrowser.selectedTab);
+ let toolbox = gDevTools.getToolboxForTarget(target);
+ toolbox.once("styleeditor-selected", onStyleEditorReady);
EventUtils.sendMouseEvent({ type: "click" }, nodes[0]);
},
@@ -47,88 +49,75 @@ function testViewSource(aHud)
});
}
-let observer = {
- observe: function(aSubject, aTopic, aData)
- {
- if (aTopic != "domwindowopened") {
- return;
- }
- Services.ww.unregisterNotification(observer);
- info("Style Editor window was opened in response to clicking " +
- "the location node");
+function onStyleEditorReady(aEvent, aPanel)
+{
+ info(aEvent + " event fired");
- function sheetForNode(aNode)
- {
- let href = aNode.getAttribute("title");
- let sheet, i = 0;
- while((sheet = content.document.styleSheets[i++])) {
- if (sheet.href == href) {
- return sheet;
- }
+ SEC = aPanel.styleEditorChrome;
+ let win = aPanel.panelWindow;
+ ok(win, "Style Editor Window is defined");
+ ok(SEC, "Style Editor Chrome is defined");
+
+ function sheetForNode(aNode)
+ {
+ let href = aNode.getAttribute("title");
+ let sheet, i = 0;
+ while((sheet = content.document.styleSheets[i++])) {
+ if (sheet.href == href) {
+ return sheet;
}
}
+ }
- executeSoon(function() {
- let styleEditorWin = window.StyleEditor.StyleEditorManager
- .getEditorForWindow(content.window);
- ok(styleEditorWin, "Style Editor window is defined");
+ waitForFocus(function() {
+ info("style editor window focused");
- waitForFocus(function() {
- SEC = styleEditorWin.styleEditorChrome;
- ok(SEC, "Style Editor Chrome is defined");
+ let sheet = sheetForNode(nodes[0]);
+ ok(sheet, "sheet found");
+ let line = nodes[0].sourceLine;
+ ok(line, "found source line");
- let sheet = sheetForNode(nodes[0]);
- ok(sheet, "sheet found");
- let line = nodes[0].sourceLine;
- ok(line, "found source line");
+ checkStyleEditorForSheetAndLine(sheet, line - 1, function() {
+ info("first check done");
- checkStyleEditorForSheetAndLine(sheet, line - 1, function() {
- let sheet = sheetForNode(nodes[1]);
- ok(sheet, "sheet found");
- let line = nodes[1].sourceLine;
- ok(line, "found source line");
+ let target = TargetFactory.forTab(gBrowser.selectedTab);
+ let toolbox = gDevTools.getToolboxForTarget(target);
- EventUtils.sendMouseEvent({ type: "click" }, nodes[1]);
+ let sheet = sheetForNode(nodes[1]);
+ ok(sheet, "sheet found");
+ let line = nodes[1].sourceLine;
+ ok(line, "found source line");
+
+ toolbox.once("webconsole-selected", function(aEvent) {
+ info(aEvent + " event fired");
+
+ toolbox.once("styleeditor-selected", function() {
+ info(aEvent + " event fired");
checkStyleEditorForSheetAndLine(sheet, line - 1, function() {
- window.StyleEditor.toggle();
+ info("second check done");
finishTest();
});
});
- }, styleEditorWin);
+
+ EventUtils.sendMouseEvent({ type: "click" }, nodes[1]);
+ });
+
+ toolbox.selectTool("webconsole");
});
- }
-};
+ }, win);
+}
function checkStyleEditorForSheetAndLine(aStyleSheet, aLine, aCallback)
{
- let editor = null;
-
- let performLineCheck = {
- name: "source editor load",
- validatorFn: function()
- {
- return editor.sourceEditor;
- },
- successFn: function()
- {
- is(editor.sourceEditor.getCaretPosition().line, aLine,
- "correct line is selected");
- is(SEC.selectedStyleSheetIndex, editor.styleSheetIndex,
- "correct stylesheet is selected in the editor");
-
- executeSoon(aCallback);
- },
- failureFn: aCallback,
- };
-
+ let foundEditor = null;
waitForSuccess({
- name: "editor for stylesheet",
+ name: "style editor for stylesheet",
validatorFn: function()
{
- for (let item of SEC.editors) {
- if (item.styleSheet == aStyleSheet) {
- editor = item;
+ for (let editor of SEC.editors) {
+ if (editor.styleSheet == aStyleSheet) {
+ foundEditor = editor;
return true;
}
}
@@ -136,8 +125,31 @@ function checkStyleEditorForSheetAndLine(aStyleSheet, aLine, aCallback)
},
successFn: function()
{
- waitForSuccess(performLineCheck);
+ performLineCheck(foundEditor, aLine, aCallback);
},
failureFn: finishTest,
});
}
+
+function performLineCheck(aEditor, aLine, aCallback)
+{
+ function checkForCorrectState()
+ {
+ is(aEditor.sourceEditor.getCaretPosition().line, aLine,
+ "correct line is selected");
+ is(SEC.selectedStyleSheetIndex, aEditor.styleSheetIndex,
+ "correct stylesheet is selected in the editor");
+
+ aCallback && executeSoon(aCallback);
+ }
+
+ waitForSuccess({
+ name: "source editor load",
+ validatorFn: function()
+ {
+ return aEditor.sourceEditor;
+ },
+ successFn: checkForCorrectState,
+ failureFn: finishTest,
+ });
+}
diff --git a/browser/devtools/webconsole/test/browser_webconsole_menustatus.js b/browser/devtools/webconsole/test/browser_webconsole_menustatus.js
deleted file mode 100644
index 794122beefce..000000000000
--- a/browser/devtools/webconsole/test/browser_webconsole_menustatus.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-function test() {
- var tab1 = gBrowser.addTab();
- var tab2 = gBrowser.addTab();
- gBrowser.selectedTab = tab2;
-
- openConsole(tab2, function() {
- let cmd = document.getElementById("Tools:WebConsole");
- is(cmd.getAttribute("checked"), "true", " is checked.");
-
- gBrowser.selectedTab = tab1;
-
- is(cmd.getAttribute("checked"), "false", " is unchecked after tab switch.");
-
- gBrowser.selectedTab = tab2;
-
- is(cmd.getAttribute("checked"), "true", " is checked.");
-
- closeConsole(tab2, function() {
- is(cmd.getAttribute("checked"), "false", " is checked once closed.");
-
- gBrowser.removeTab(tab1);
- gBrowser.removeTab(tab2);
-
- finish();
- });
- });
-}
diff --git a/browser/devtools/webconsole/test/browser_webconsole_position_ui.js b/browser/devtools/webconsole/test/browser_webconsole_position_ui.js
deleted file mode 100644
index 3639b9a86ae3..000000000000
--- a/browser/devtools/webconsole/test/browser_webconsole_position_ui.js
+++ /dev/null
@@ -1,207 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-const TEST_URI = "data:text/html;charset=utf-8,test for bug 577721";
-
-const POSITION_PREF = "devtools.webconsole.position";
-const TOP_PREF = "devtools.webconsole.top";
-const LEFT_PREF = "devtools.webconsole.left";
-const WIDTH_PREF = "devtools.webconsole.width";
-const HEIGHT_PREF = "devtools.hud.height";
-
-let hudRef, boxHeight, panelWidth;
-
-function test() {
- addTab(TEST_URI);
- browser.addEventListener("load", function onLoad() {
- browser.removeEventListener("load", onLoad, true);
- openConsole(null, consoleOpened);
- }, true);
- registerCleanupFunction(testEnd);
-}
-
-function testEnd() {
- hudRef = null;
- Services.prefs.clearUserPref(POSITION_PREF);
- Services.prefs.clearUserPref(WIDTH_PREF);
- Services.prefs.clearUserPref(HEIGHT_PREF);
- Services.prefs.clearUserPref(TOP_PREF);
- Services.prefs.clearUserPref(LEFT_PREF);
-}
-
-function waitForPosition(aPosition, aCallback) {
- waitForSuccess({
- name: "web console position changed to '" + aPosition + "'",
- validatorFn: function()
- {
- return hudRef._currentUIPosition == aPosition;
- },
- successFn: executeSoon.bind(null, aCallback),
- failureFn: finishTest,
- });
-}
-
-function consoleOpened(aHudRef) {
- hudRef = aHudRef;
- testMenuitems();
-
- let hudBox = hudRef.iframe;
-
- is(hudBox.parentNode.childNodes[2].getAttribute("id"), hudRef.hudId,
- "initial console position is correct");
-
- is(hudRef.ui.positionMenuitems.below.getAttribute("checked"), "true",
- "position menu checkbox is below");
- is(Services.prefs.getCharPref(POSITION_PREF), "below", "pref is below");
-
- executeSoon(function() {
- hudRef.positionConsole("above");
- waitForPosition("above", onPositionAbove);
- });
-}
-
-function onPositionAbove() {
- let hudBox = hudRef.iframe;
-
- let id = hudBox.parentNode.childNodes[0].getAttribute("id");
- is(id, hudRef.hudId, "above position is correct");
-
- is(hudRef.ui.positionMenuitems.above.getAttribute("checked"), "true",
- "position menu checkbox is above");
- is(Services.prefs.getCharPref(POSITION_PREF), "above", "pref is above");
-
- boxHeight = content.innerHeight * 0.5;
- panelWidth = content.innerWidth * 0.5;
-
- hudBox.style.height = boxHeight + "px";
-
- boxHeight = hudBox.clientHeight;
-
- Services.prefs.setIntPref(WIDTH_PREF, panelWidth);
- Services.prefs.setIntPref(TOP_PREF, 50);
- Services.prefs.setIntPref(LEFT_PREF, 51);
-
- executeSoon(function() {
- hudRef.positionConsole("window");
- waitForPosition("window", onPositionWindow);
- });
-}
-
-function onPositionWindow() {
- let hudBox = hudRef.iframe;
-
- let id = hudBox.parentNode.getAttribute("id");
- is(id, "console_window_" + hudRef.hudId, "window position is correct");
- is(Services.prefs.getCharPref(POSITION_PREF), "window", "pref is window");
-
- let diffHeight = Math.abs(hudBox.clientHeight - boxHeight);
- ok(diffHeight < 8, "hudBox height is correct");
-
- let consolePanel = hudRef.consolePanel;
-
- is(consolePanel.getAttribute("width"), panelWidth, "panel width is correct");
- is(consolePanel.getAttribute("top"), 50, "panel top position is correct");
- is(consolePanel.getAttribute("left"), 51, "panel left position is correct");
-
- let panelHeight = parseInt(consolePanel.getAttribute("height"));
- let boxWidth = hudBox.clientWidth;
- boxHeight = hudBox.clientHeight;
-
- hudRef.consolePanel.sizeTo(panelWidth - 15, panelHeight - 13);
-
- let popupBoxObject = consolePanel.popupBoxObject;
- let screenX = popupBoxObject.screenX;
- let screenY = popupBoxObject.screenY;
- consolePanel.moveTo(screenX - 11, screenY - 13);
-
- isnot(hudBox.clientWidth, boxWidth, "hudBox width was updated");
- isnot(hudBox.clientHeight, boxHeight, "hudBox height was updated");
-
- isnot(popupBoxObject.screenX, screenX, "panel screenX was updated");
- isnot(popupBoxObject.screenY, screenY, "panel screenY was updated");
-
- panelWidth = consolePanel.clientWidth;
- boxHeight = hudBox.clientHeight;
-
- executeSoon(function() {
- hudRef.positionConsole("below");
- waitForPosition("below", onPositionBelow);
- });
-}
-
-function onPositionBelow() {
- let hudBox = hudRef.iframe;
-
- let id = hudBox.parentNode.childNodes[2].getAttribute("id");
- is(id, hudRef.hudId, "below position is correct after reopen");
-
- let diffHeight = Math.abs(hudBox.clientHeight - boxHeight);
- // dump("Diffheight: " + diffHeight + " clientHeight: " + hudBox.clientHeight + " boxHeight: " + boxHeight + "\n");
- // XXX TODO bug 702707
- ok(diffHeight < 8, "hudBox height is still correct");
-
- is(Services.prefs.getCharPref(POSITION_PREF), "below", "pref is below");
-
- // following three disabled due to bug 674562
- // is(Services.prefs.getIntPref(WIDTH_PREF), panelWidth, "width pref updated - bug 674562");
- // isnot(Services.prefs.getIntPref(TOP_PREF), 50, "top location pref updated - bug 674562");
- // isnot(Services.prefs.getIntPref(LEFT_PREF), 51, "left location pref updated - bug 674562");
-
- Services.obs.addObserver(onConsoleClose, "web-console-destroyed", false);
-
- // Close the window console via the toolbar button
- let btn = hudRef.ui.closeButton;
- executeSoon(function() {
- EventUtils.synthesizeMouse(btn, 2, 2, {}, hudRef.iframeWindow);
- });
-}
-
-function onConsoleClose()
-{
- Services.obs.removeObserver(onConsoleClose, "web-console-destroyed");
-
- executeSoon(function() {
- hudRef = null;
- openConsole(null, onConsoleReopen);
- });
-}
-
-function onConsoleReopen(aHudRef) {
- let hudBox = aHudRef.iframe;
-
- let id = hudBox.parentNode.childNodes[2].getAttribute("id");
- is(id, aHudRef.hudId, "below position is correct after another reopen");
-
- is(aHudRef.ui.positionMenuitems.below.getAttribute("checked"), "true",
- "position menu checkbox is below");
-
- executeSoon(finishTest);
-}
-
-function testMenuitems() {
- let positionConsole = hudRef.positionConsole;
- is(typeof positionConsole, "function", "positionConsole() is available");
-
- let param = null;
- hudRef.positionConsole = function(aPosition) {
- param = aPosition;
- };
-
- // Make sure the menuitems call the correct method.
-
- hudRef.ui.positionMenuitems.above.doCommand();
-
- is(param, "above", "menuitem for above positioning calls positionConsole() correctly");
-
- hudRef.ui.positionMenuitems.below.doCommand();
-
- is(param, "below", "menuitem for below positioning calls positionConsole() correctly");
-
- hudRef.ui.positionMenuitems.window.doCommand();
-
- is(param, "window", "menuitem for window positioning calls positionConsole() correctly");
-
- hudRef.positionConsole = positionConsole;
-}
-
diff --git a/browser/devtools/webconsole/test/browser_webconsole_window_zombie.js b/browser/devtools/webconsole/test/browser_webconsole_window_zombie.js
deleted file mode 100644
index d4ce62aa41fd..000000000000
--- a/browser/devtools/webconsole/test/browser_webconsole_window_zombie.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-const TEST_URI = "data:text/html;charset=utf-8,
test for bug 577721";
-
-const POSITION_PREF = "devtools.webconsole.position";
-
-function test() {
- addTab(TEST_URI);
- browser.addEventListener("load", function onLoad() {
- browser.removeEventListener("load", onLoad, true);
- openConsole(null, consoleOpened);
- }, true);
- registerCleanupFunction(testEnd);
-}
-
-function testEnd() {
- Services.prefs.clearUserPref(POSITION_PREF);
-}
-
-function consoleOpened(hudRef) {
- let hudBox = hudRef.HUDBox;
-
- // listen for the panel popupshown event.
- document.addEventListener("popupshown", function popupShown() {
- document.removeEventListener("popupshown", popupShown, false);
-
- ok(hudRef.consolePanel, "console is in a panel");
-
- Services.obs.addObserver(function onWebConsoleClose() {
- Services.obs.removeObserver(onWebConsoleClose, "web-console-destroyed");
- executeSoon(finishTest);
- }, "web-console-destroyed", false);
-
- // Close the window console via the menu item
- let menu = document.getElementById("webConsole");
- menu.click();
- }, false);
-
- hudRef.positionConsole("window");
-}
diff --git a/browser/devtools/webconsole/test/head.js b/browser/devtools/webconsole/test/head.js
index 4e285568d715..c556de529a68 100644
--- a/browser/devtools/webconsole/test/head.js
+++ b/browser/devtools/webconsole/test/head.js
@@ -8,6 +8,11 @@ Cu.import("resource:///modules/HUDService.jsm", tempScope);
let HUDService = tempScope.HUDService;
Cu.import("resource://gre/modules/devtools/WebConsoleUtils.jsm", tempScope);
let WebConsoleUtils = tempScope.WebConsoleUtils;
+Cu.import("resource:///modules/devtools/gDevTools.jsm", tempScope);
+let gDevTools = tempScope.gDevTools;
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
+
const WEBCONSOLE_STRINGS_URI = "chrome://browser/locale/devtools/webconsole.properties";
let WCU_l10n = new WebConsoleUtils.l10n(WEBCONSOLE_STRINGS_URI);
@@ -32,8 +37,7 @@ let tab, browser, hudId, hud, hudBox, filterBox, outputNode, cs;
function addTab(aURL)
{
- gBrowser.selectedTab = gBrowser.addTab();
- content.location.assign(aURL);
+ gBrowser.selectedTab = gBrowser.addTab(aURL);
tab = gBrowser.selectedTab;
browser = gBrowser.getBrowserForTab(tab);
}
@@ -133,23 +137,24 @@ function findLogEntry(aString)
* Optional function to invoke after the Web Console completes
* initialization (web-console-created).
*/
-function openConsole(aTab, aCallback)
+function openConsole(aTab, aCallback = function() { })
{
- function onWebConsoleOpen(aSubject, aTopic)
+ function onWebConsoleOpen(aEvent, aPanel)
{
- if (aTopic == "web-console-created") {
- Services.obs.removeObserver(onWebConsoleOpen, "web-console-created");
- aSubject.QueryInterface(Ci.nsISupportsString);
- let hud = HUDService.getHudReferenceById(aSubject.data);
- executeSoon(aCallback.bind(null, hud));
- }
+ executeSoon(aCallback.bind(null, aPanel.hud));
}
- if (aCallback) {
- Services.obs.addObserver(onWebConsoleOpen, "web-console-created", false);
+ let target = TargetFactory.forTab(aTab || tab);
+ let toolbox = gDevTools.getToolboxForTarget(target);
+ if (toolbox) {
+ toolbox.once("webconsole-selected", onWebConsoleOpen);
+ toolbox.selectTool("webconsole");
+ }
+ else {
+ let target = TargetFactory.forTab(aTab || tab);
+ toolbox = gDevTools.openToolboxForTab(target, "webconsole");
+ toolbox.once("webconsole-selected", onWebConsoleOpen);
}
-
- HUDService.activateHUDForContext(aTab || tab);
}
/**
@@ -162,23 +167,27 @@ function openConsole(aTab, aCallback)
* Optional function to invoke after the Web Console completes
* closing (web-console-destroyed).
*/
-function closeConsole(aTab, aCallback)
+function closeConsole(aTab, aCallback = function() { })
{
- function onWebConsoleClose(aSubject, aTopic)
- {
- if (aTopic == "web-console-destroyed") {
- Services.obs.removeObserver(onWebConsoleClose, "web-console-destroyed");
- aSubject.QueryInterface(Ci.nsISupportsString);
- let hudId = aSubject.data;
- executeSoon(aCallback.bind(null, hudId));
+ let target = TargetFactory.forTab(aTab || tab);
+ let toolbox = gDevTools.getToolboxForTarget(target);
+ if (toolbox) {
+ let panel = gDevTools.getPanelForTarget("webconsole", target);
+ if (panel) {
+ let hudId = panel.hud.hudId;
+ panel.once("destroyed", function() {
+ executeSoon(aCallback.bind(null, hudId));
+ });
+ }
+ else {
+ toolbox.once("destroyed", aCallback.bind(null, null));
}
- }
- if (aCallback) {
- Services.obs.addObserver(onWebConsoleClose, "web-console-destroyed", false);
+ toolbox.destroy();
+ }
+ else {
+ aCallback();
}
-
- HUDService.deactivateHUDForContext(aTab || tab);
}
/**
@@ -250,7 +259,8 @@ function finishTest()
function tearDown()
{
- HUDService.deactivateHUDForContext(gBrowser.selectedTab);
+ let target = TargetFactory.forTab(gBrowser.selectedTab);
+ gDevTools.closeToolbox(target);
while (gBrowser.tabs.length > 1) {
gBrowser.removeCurrentTab();
}
@@ -307,3 +317,17 @@ function waitForSuccess(aOptions)
wait(aOptions.validatorFn, aOptions.successFn, aOptions.failureFn);
}
+
+function openInspector(aCallback, aTab = gBrowser.selectedTab)
+{
+ let target = TargetFactory.forTab(aTab);
+ let inspector = gDevTools.getPanelForTarget("inspector", target);
+ if (inspector && inspector.isReady) {
+ aCallback(inspector);
+ } else {
+ let toolbox = gDevTools.openToolboxForTab(target, "inspector");
+ toolbox.once("inspector-ready", function _onSelect(aEvent, aPanel) {
+ aCallback(aPanel);
+ });
+ }
+}
diff --git a/browser/devtools/webconsole/webconsole.js b/browser/devtools/webconsole/webconsole.js
index 4116fa3f2e07..973c06a27d5b 100644
--- a/browser/devtools/webconsole/webconsole.js
+++ b/browser/devtools/webconsole/webconsole.js
@@ -177,10 +177,8 @@ const PREF_CONNECTION_TIMEOUT = "devtools.debugger.remote-timeout";
*
* @param object aWebConsoleOwner
* The WebConsole owner object.
- * @param string aPosition
- * Tells the UI location for the Web Console.
*/
-function WebConsoleFrame(aWebConsoleOwner, aPosition)
+function WebConsoleFrame(aWebConsoleOwner)
{
this.owner = aWebConsoleOwner;
this.hudId = this.owner.hudId;
@@ -191,7 +189,6 @@ function WebConsoleFrame(aWebConsoleOwner, aPosition)
this._networkRequests = {};
this._toggleFilter = this._toggleFilter.bind(this);
- this._onPositionConsoleCommand = this._onPositionConsoleCommand.bind(this);
this._flushMessageQueue = this._flushMessageQueue.bind(this);
this._connectionTimeout = this._connectionTimeout.bind(this);
@@ -200,7 +197,7 @@ function WebConsoleFrame(aWebConsoleOwner, aPosition)
this._initDefaultFilterPrefs();
this._commandController = new CommandController(this);
- this.positionConsole(aPosition, window);
+ this.positionConsole(window);
this.jsterm = new JSTerm(this);
this.jsterm.inputNode.focus();
@@ -373,10 +370,7 @@ WebConsoleFrame.prototype = {
*/
_initConnection: function WCF__initConnection()
{
- this.proxy = new WebConsoleConnectionProxy(this, {
- host: this.owner.remoteHost,
- port: this.owner.remotePort,
- });
+ this.proxy = new WebConsoleConnectionProxy(this, this.owner.target);
let timeout = Services.prefs.getIntPref(PREF_CONNECTION_TIMEOUT);
this._connectTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
@@ -439,7 +433,6 @@ WebConsoleFrame.prototype = {
this.inputNode = doc.querySelector(".jsterm-input-node");
this._setFilterTextBoxEvents();
- this._initPositionUI();
this._initFilterButtons();
let fontSize = Services.prefs.getIntPref("devtools.webconsole.fontSize");
@@ -483,10 +476,6 @@ WebConsoleFrame.prototype = {
!this.getFilterState("network");
}.bind(this));
- this.closeButton = doc.getElementById("webconsole-close-button");
- this.closeButton.addEventListener("command",
- this.owner.onCloseButton.bind(this.owner));
-
let clearButton = doc.getElementsByClassName("webconsole-clear-console-button")[0];
clearButton.addEventListener("command", function WCF__onClearButton() {
this.owner._onClearButton();
@@ -544,31 +533,6 @@ WebConsoleFrame.prototype = {
this.filterBox.addEventListener("input", onChange, false);
},
- /**
- * Initialize the UI for re-positioning the console
- * @private
- */
- _initPositionUI: function WCF__initPositionUI()
- {
- let doc = this.document;
-
- let itemAbove = doc.querySelector("menuitem[consolePosition='above']");
- itemAbove.addEventListener("command", this._onPositionConsoleCommand, false);
-
- let itemBelow = doc.querySelector("menuitem[consolePosition='below']");
- itemBelow.addEventListener("command", this._onPositionConsoleCommand, false);
-
- let itemWindow = doc.querySelector("menuitem[consolePosition='window']");
- itemWindow.addEventListener("command", this._onPositionConsoleCommand, false);
-
- this.positionMenuitems = {
- last: null,
- above: itemAbove,
- below: itemBelow,
- window: itemWindow,
- };
- },
-
/**
* Creates one of the filter buttons on the toolbar.
*
@@ -615,19 +579,6 @@ WebConsoleFrame.prototype = {
Services.obs.notifyObservers(id, "web-console-created", null);
},
- /**
- * Handle the "command" event for the buttons that allow the user to
- * reposition the Web Console UI.
- *
- * @private
- * @param nsIDOMEvent aEvent
- */
- _onPositionConsoleCommand: function WCF__onPositionConsoleCommand(aEvent)
- {
- let position = aEvent.target.getAttribute("consolePosition");
- this.owner.positionConsole(position);
- },
-
/**
* Position the console in a different location.
*
@@ -635,15 +586,12 @@ WebConsoleFrame.prototype = {
* instance that owns this iframe. You need to call this if you write
* a different owner or you manually reposition the iframe.
*
- * @param string aPosition
- * The new Web Console iframe location: "above" (the page), "below" or
- * "window".
* @param object aNewWindow
* Repositioning causes the iframe to reload - bug 254144. You need to
* provide the new window object so we can reinitialize the UI as
* needed.
*/
- positionConsole: function WCF_positionConsole(aPosition, aNewWindow)
+ positionConsole: function WCF_positionConsole(aNewWindow)
{
this.window = aNewWindow;
this.document = this.window.document;
@@ -657,14 +605,6 @@ WebConsoleFrame.prototype = {
this._initUI();
this.jsterm && this.jsterm._initUI();
- this.closeButton.hidden = aPosition == "window";
-
- this.positionMenuitems[aPosition].setAttribute("checked", true);
- if (this.positionMenuitems.last) {
- this.positionMenuitems.last.setAttribute("checked", false);
- }
- this.positionMenuitems.last = this.positionMenuitems[aPosition];
-
if (oldOutputNode && oldOutputNode.childNodes.length) {
let parentNode = this.outputNode.parentNode;
parentNode.replaceChild(oldOutputNode, this.outputNode);
@@ -1791,7 +1731,9 @@ WebConsoleFrame.prototype = {
onLocationChange: function WCF_onLocationChange(aURI, aTitle)
{
this.contentLocation = aURI;
- this.owner.onLocationChange(aURI, aTitle);
+ if (this.owner.onLocationChange) {
+ this.owner.onLocationChange(aURI, aTitle);
+ }
},
/**
@@ -4028,14 +3970,13 @@ CommandController.prototype = {
* @constructor
* @param object aWebConsole
* The Web Console instance that owns this connection proxy.
- * @param object aOptions
- * Connection options: host and port.
+ * @param RemoteTarget aTarget
+ * The target that the console will connect to.
*/
-function WebConsoleConnectionProxy(aWebConsole, aOptions = {})
+function WebConsoleConnectionProxy(aWebConsole, aTarget)
{
this.owner = aWebConsole;
- this.remoteHost = aOptions.host;
- this.remotePort = aOptions.port;
+ this.target = aTarget;
this._onPageError = this._onPageError.bind(this);
this._onConsoleAPICall = this._onConsoleAPICall.bind(this);
@@ -4111,16 +4052,17 @@ WebConsoleConnectionProxy.prototype = {
*/
connect: function WCCP_connect(aCallback)
{
- let transport;
- if (this.remoteHost) {
- transport = debuggerSocketConnect(this.remoteHost, this.remotePort);
+ // TODO: convert the non-remote path to use the target API as well.
+ let transport, client;
+ if (this.target.isRemote) {
+ client = this.client = this.target.client;
}
else {
this.initServer();
transport = DebuggerServer.connectPipe();
- }
- let client = this.client = new DebuggerClient(transport);
+ client = this.client = new DebuggerClient(transport);
+ }
client.addListener("pageError", this._onPageError);
client.addListener("consoleAPICall", this._onConsoleAPICall);
@@ -4129,6 +4071,18 @@ WebConsoleConnectionProxy.prototype = {
client.addListener("fileActivity", this._onFileActivity);
client.addListener("locationChange", this._onLocationChange);
+ if (this.target.isRemote) {
+ this._consoleActor = this.target.form.consoleActor;
+ if (!this.target.chrome) {
+ this.owner.onLocationChange(this.target.url, this.target.name);
+ }
+
+ let listeners = ["PageError", "ConsoleAPI", "NetworkActivity",
+ "FileActivity", "LocationChange"];
+ this.client.attachConsole(this._consoleActor, listeners,
+ this._onAttachConsole.bind(this, aCallback));
+ return;
+ }
client.connect(function(aType, aTraits) {
client.listTabs(this._onListTabs.bind(this, aCallback));
}.bind(this));
@@ -4145,32 +4099,7 @@ WebConsoleConnectionProxy.prototype = {
*/
_onListTabs: function WCCP__onListTabs(aCallback, aResponse)
{
- let selectedTab;
-
- if (this.remoteHost) {
- this.owner._connectTimer.cancel();
-
- let tabs = [];
- for (let tab of aResponse.tabs) {
- tabs.push(tab.title);
- }
-
- tabs.push(l10n.getStr("listTabs.globalConsoleActor"));
-
- let selected = {};
- let result = Services.prompt.select(null,
- l10n.getStr("remoteWebConsoleSelectTabTitle"),
- l10n.getStr("remoteWebConsoleSelectTabMessage"),
- tabs.length, tabs, selected);
-
- if (result && selected.value < aResponse.tabs.length) {
- selectedTab = aResponse.tabs[selected.value];
- }
- }
- else {
- selectedTab = aResponse.tabs[aResponse.selected];
- }
-
+ let selectedTab = aResponse.tabs[aResponse.selected];
if (selectedTab) {
this._consoleActor = selectedTab.consoleActor;
this.owner.onLocationChange(selectedTab.url, selectedTab.title);
@@ -4403,7 +4332,9 @@ WebConsoleConnectionProxy.prototype = {
this.client.removeListener("locationChange", this._onLocationChange);
try {
- this.client.close(onDisconnect);
+ if (!this.target.isRemote) {
+ this.client.close(onDisconnect);
+ }
}
catch (ex) {
Cu.reportError("Web Console disconnect exception: " + ex);
diff --git a/browser/devtools/webconsole/webconsole.xul b/browser/devtools/webconsole/webconsole.xul
index ff602c90dd42..9669d1a46ce7 100644
--- a/browser/devtools/webconsole/webconsole.xul
+++ b/browser/devtools/webconsole/webconsole.xul
@@ -63,12 +63,6 @@
-#ifdef XP_MACOSX
-
-#endif
-
@@ -119,29 +113,10 @@
-
-
-
-
-
-
-
-
-
-#ifndef XP_MACOSX
-
-#endif
+
+
+
-
-
-
-
-
-
-
@@ -233,40 +229,15 @@ These should match what Safari and other Apple applications use on OS X Lion. --
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -634,15 +605,6 @@ just addresses the organization to follow, e.g. "This site is run by " -->
-
-
-
-
-
diff --git a/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd b/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd
new file mode 100644
index 000000000000..c00aa6a5ce46
--- /dev/null
+++ b/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/browser/locales/en-US/chrome/browser/devtools/debugger.properties b/browser/locales/en-US/chrome/browser/devtools/debugger.properties
index a31821535a97..3547726e5d61 100644
--- a/browser/locales/en-US/chrome/browser/devtools/debugger.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/debugger.properties
@@ -19,6 +19,14 @@ confirmTabSwitch.buttonSwitch.accessKey=S
confirmTabSwitch.buttonOpen=Open anyway
confirmTabSwitch.buttonOpen.accessKey=O
+# LOCALIZATION NOTE (open.commandkey): The key used to open the debugger in
+# combination to e.g. ctrl + shift
+open.commandkey=S
+
+# LOCALIZATION NOTE (debuggerMenu.accesskey): The access key used to open the
+# debugger.
+debuggerMenu.accesskey=D
+
# LOCALIZATION NOTE (chromeDebuggerWindowTitle): The title displayed for the
# chrome (browser) debugger window.
chromeDebuggerWindowTitle=Browser Debugger
@@ -173,6 +181,11 @@ watchExpressionsScopeLabel=Watch expressions
# the global scope.
globalScopeLabel=Global
+# LOCALIZATION NOTE (ToolboxDebugger.label):
+# This string is displayed in the title of the tab when the debugger is
+# displayed inside the developer tools window and in the Developer Tools Menu.
+ToolboxDebugger.label=Debugger
+
# LOCALIZATION NOTE (variablesEditableNameTooltip): The text that is displayed
# in the variables list on an item with an editable name.
variablesEditableNameTooltip=Double click to edit
diff --git a/browser/locales/en-US/chrome/browser/devtools/inspector.dtd b/browser/locales/en-US/chrome/browser/devtools/inspector.dtd
new file mode 100644
index 000000000000..897552ca002a
--- /dev/null
+++ b/browser/locales/en-US/chrome/browser/devtools/inspector.dtd
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/browser/locales/en-US/chrome/browser/devtools/inspector.properties b/browser/locales/en-US/chrome/browser/devtools/inspector.properties
index 13cb5e1b9e84..c4989cab16c2 100644
--- a/browser/locales/en-US/chrome/browser/devtools/inspector.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/inspector.properties
@@ -14,38 +14,22 @@
# LOCALIZATION NOTE (confirmNavigationAway): Used in the Inspector tool, when
# the user tries to navigate away from a web page, to confirm the change of
# page.
-confirmNavigationAway.message=Leaving this page will close the Inspector and the changes you have made will be lost.
+confirmNavigationAway.message2=If you leave this page, the changes you have made will be lost.
confirmNavigationAway.buttonLeave=Leave Page
confirmNavigationAway.buttonLeaveAccesskey=L
confirmNavigationAway.buttonStay=Stay on Page
confirmNavigationAway.buttonStayAccesskey=S
breadcrumbs.siblings=Siblings
-# LOCALIZATION NOTE (htmlPanel): Used in the Inspector tool's openInspectorUI
-# method when registering the HTML panel.
-
-# LOCALIZATION NOTE (inspectButtonWithShortcutKey.tooltip):
-# This button appears in the Inspector Toolbar. inspectButton is stateful,
-# if it's pressed users can select an element with the mouse.
-# %S is the keyboard shortcut.
-inspectButtonWithShortcutKey.tooltip=Select element with mouse (%S)
-
-# LOCALIZATION NOTE (inspectButton.tooltip):
-# Same as inspectButtonWithShortcutKey.tooltip but used when an add-on
-# overrides the shortcut key.
-inspectButton.tooltip=Select element with mouse
-
-# LOCALIZATION NOTE (markupButton.*):
-# This button is the button located at the beginning of the breadcrumbs
-# in the inspector toolbar. Its tooltip is built dynamically.
-# markupButton.tooltip is used on Mac.
-# On Windows and Linux, we use markupButton.tooltipWithAccesskey, where we append
-# the keyboard shortcut.
-markupButton.tooltip=Markup Panel
-markupButton.tooltipWithAccesskey=Markup Panel (%S)
-
# LOCALIZATION NOTE (nodeMenu.tooltiptext)
# This menu appears in the Infobar (on top of the highlighted node) once
# the node is selected.
nodeMenu.tooltiptext=Node operations
+
+
+# LOCALIZATION NOTE (inspector.*)
+# Used for the menuitem in the tool menu
+inspector.label=Inspector
+inspector.commandkey=I
+inspector.accesskey=I
diff --git a/browser/locales/en-US/chrome/browser/devtools/layoutview.dtd b/browser/locales/en-US/chrome/browser/devtools/layoutview.dtd
index e88902ff4a49..53aaf605c553 100644
--- a/browser/locales/en-US/chrome/browser/devtools/layoutview.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/layoutview.dtd
@@ -16,6 +16,7 @@
- The text appears on the bottom right corner of the layout view when
- the corresponding box is hovered. -->
+
diff --git a/browser/locales/en-US/chrome/browser/devtools/scratchpad.dtd b/browser/locales/en-US/chrome/browser/devtools/scratchpad.dtd
index 6ac78727fa23..7210060e0c1d 100644
--- a/browser/locales/en-US/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/scratchpad.dtd
@@ -117,9 +117,3 @@
- the same name in browser.dtd.
-->
-
-
-
diff --git a/browser/locales/en-US/chrome/browser/devtools/styleeditor.properties b/browser/locales/en-US/chrome/browser/devtools/styleeditor.properties
index 2e08c8d07c3b..dca0bc6d81c9 100644
--- a/browser/locales/en-US/chrome/browser/devtools/styleeditor.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/styleeditor.properties
@@ -52,6 +52,14 @@ saveStyleSheet.title=Save style sheet
# LOCALIZATION NOTE (saveStyleSheet.title): This is the *.css filter title
saveStyleSheet.filter=CSS files
+# LOCALIZATION NOTE (open.commandkey): This the key to use in
+# conjunction with shift to open the style editor
+open.commandkey=VK_F7
+
+# LOCALIZATION NOTE (open.accesskey): The access key used to open the style
+# editor.
+open.accesskey=y
+
# LOCALIZATION NOTE (saveStyleSheet.commandkey): This the key to use in
# conjunction with accel (Command on Mac or Ctrl on other platforms) to Save
saveStyleSheet.commandkey=S
@@ -66,3 +74,7 @@ undo.commandkey=Z
# platforms) to Redo a change in the editor.
redo.commandkey=Z
+# LOCALIZATION NOTE (ToolboxStyleEditor.label):
+# This string is displayed in the title of the tab when the debugger is
+# displayed inside the developer tools window and in the Developer Tools Menu.
+ToolboxStyleEditor.label=Style Editor
diff --git a/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd b/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd
index f9f86b819139..e28e4e07b416 100644
--- a/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd
@@ -41,3 +41,7 @@
+
+
+
+
diff --git a/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties b/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties
index 5eab4a7b9913..5f7f1861025d 100644
--- a/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties
@@ -36,13 +36,6 @@ rule.sourceElement=element
# e.g "Inherited from body#bodyID"
rule.inheritedFrom=Inherited from %S
-# LOCALIZATION NOTE (style.highlighter.button): These strings are used inside
-# sidebar of the Highlighter for the style inspector button.
-# "Computed" refers to the Computed Style of the element.
-style.highlighter.button.label2=Computed
-style.highlighter.accesskey2=C
-style.highlighter.button.tooltip2=Inspect element computed styles
-
# LOCALIZATION NOTE (helpLinkTitle): For each style property
# the user can hover it and get a help link button which allows one to
# quickly jump to the documentation from the Mozilla Developer Network site.
@@ -126,12 +119,6 @@ rule.contextmenu.copypropertyvalue=Copy property value
# view's context menu copy property value access key.
rule.contextmenu.copypropertyvalue.accesskey=U
-# LOCALIZATION NOTE (ruleView.*): Button label, accesskey and tooltip text
-# associated with the Highlighter's CSS Rule View in the Style Sidebar.
-ruleView.label=Rules
-ruleView.accesskey=R
-ruleView.tooltiptext=View and Edit CSS
-
# LOCALIZATION NOTE (ruleView.empty): Text displayed when the highlighter is
# first opened and there's no node selected in the rule view.
rule.empty=No element selected.
diff --git a/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd b/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
new file mode 100644
index 000000000000..29b63269353b
--- /dev/null
+++ b/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
@@ -0,0 +1,7 @@
+
+
+
+
+
diff --git a/browser/locales/en-US/chrome/browser/devtools/webConsole.dtd b/browser/locales/en-US/chrome/browser/devtools/webConsole.dtd
index b72bd488a518..e442518b66ce 100644
--- a/browser/locales/en-US/chrome/browser/devtools/webConsole.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/webConsole.dtd
@@ -60,30 +60,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/browser/locales/en-US/chrome/browser/devtools/webconsole.properties b/browser/locales/en-US/chrome/browser/devtools/webconsole.properties
index 68b02d014377..75784473847f 100644
--- a/browser/locales/en-US/chrome/browser/devtools/webconsole.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/webconsole.properties
@@ -32,6 +32,8 @@ close.button=Close
close.accesskey=C
update.button=Update
update.accesskey=U
+cmd.commandkey=k
+webConsoleCmd.accesskey=W
# LOCALIZATION NOTE FOR `jsPropertyTitle` AND `jsPropertyInspectTitle`:
#
# The "PropertyPanel" is used to display a JS object to the user.
@@ -166,6 +168,12 @@ remoteWebConsoleSelectTabMessage=Select one of the tabs you want to attach to, o
# global console in the tabs selection.
listTabs.globalConsoleActor=*Global Console*
+# LOCALIZATION NOTE (ToolboxWebconsole.label):
+# This string is displayed in the title of the tab when the web console is
+# displayed inside the developer tools window it is probably the same string
+# as webConsoleWindowTitleAndURL before the '-'
+ToolboxWebconsole.label=Web Console
+
# LOCALIZATION NOTE (longStringEllipsis): The string displayed after a long
# string. This string is clickable such that the rest of the string is retrieved
# from the server.
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index 1cde24633f19..eb46acb04180 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -37,6 +37,9 @@
locale/browser/devtools/sourceeditor.dtd (%chrome/browser/devtools/sourceeditor.dtd)
locale/browser/devtools/layoutview.dtd (%chrome/browser/devtools/layoutview.dtd)
locale/browser/devtools/responsiveUI.properties (%chrome/browser/devtools/responsiveUI.properties)
+ locale/browser/devtools/toolbox.dtd (%chrome/browser/devtools/toolbox.dtd)
+ locale/browser/devtools/inspector.dtd (%chrome/browser/devtools/inspector.dtd)
+ locale/browser/devtools/connection-screen.dtd (%chrome/browser/devtools/connection-screen.dtd)
locale/browser/newTab.dtd (%chrome/browser/newTab.dtd)
locale/browser/newTab.properties (%chrome/browser/newTab.properties)
locale/browser/openLocation.dtd (%chrome/browser/openLocation.dtd)
diff --git a/browser/makefiles.sh b/browser/makefiles.sh
index 762153c4b980..2931b979c177 100644
--- a/browser/makefiles.sh
+++ b/browser/makefiles.sh
@@ -39,7 +39,7 @@ browser/components/tabview/Makefile
browser/components/thumbnails/Makefile
browser/devtools/Makefile
browser/devtools/debugger/Makefile
-browser/devtools/highlighter/Makefile
+browser/devtools/inspector/Makefile
browser/devtools/scratchpad/Makefile
browser/devtools/shared/Makefile
browser/devtools/sourceeditor/Makefile
@@ -119,7 +119,7 @@ if [ "$ENABLE_TESTS" ]; then
browser/components/test/Makefile
browser/components/thumbnails/test/Makefile
browser/devtools/debugger/test/Makefile
- browser/devtools/highlighter/test/Makefile
+ browser/devtools/inspector/test/Makefile
browser/devtools/scratchpad/test/Makefile
browser/devtools/shared/test/Makefile
browser/devtools/sourceeditor/test/Makefile
diff --git a/browser/themes/gnomestripe/browser.css b/browser/themes/gnomestripe/browser.css
index 4c9964a0f79f..4bf94b8d4b96 100644
--- a/browser/themes/gnomestripe/browser.css
+++ b/browser/themes/gnomestripe/browser.css
@@ -1970,51 +1970,26 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
/* Highlighter */
-#highlighter-outline {
+.highlighter-outline {
box-shadow: 0 0 0 1px black;
outline: 1px dashed white;
outline-offset: -1px;
}
-#highlighter-outline[locked] {
+.highlighter-outline[locked] {
box-shadow: 0 0 0 1px rgba(0,0,0,0.3);
outline-color: rgba(255,255,255,0.7);
}
-/* Highlighter toolbar */
+/* Developer toolbar */
-#inspector-inspect-toolbutton {
- list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
- -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-#inspector-inspect-toolbutton[checked=true] {
- -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-#inspector-toolbar,
#developer-toolbar {
border-top: 1px solid hsla(210, 8%, 5%, .65);
}
-#devtools-side-splitter {
- -moz-appearance: none;
- border: 0;
- -moz-border-start: 1px solid #242b33;
- min-width: 0;
- width: 3px;
- background-color: transparent;
- -moz-margin-end: -3px;
- position: relative;
-}
-
-#devtools-sidebar-box {
- background-color: -moz-Field;
-}
-
/* Highlighter - Node Infobar */
-#highlighter-nodeinfobar {
+.highlighter-nodeinfobar {
color: hsl(200, 100%, 65%);
border: 1px solid hsla(210, 19%, 63%, .5);
border-radius: 3px;
@@ -2023,21 +1998,21 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
/* Highlighter - Node Infobar - text */
-#highlighter-nodeinfobar-text {
+.highlighter-nodeinfobar-text {
/* 100% - size of the buttons and margins */
max-width: calc(100% - 2 * (26px + 6px));
padding-bottom: 1px;
}
-html|*#highlighter-nodeinfobar-tagname {
+html|*.highlighter-nodeinfobar-tagname {
color: white;
}
-html|*#highlighter-nodeinfobar-id {
+html|*.highlighter-nodeinfobar-id {
color: hsl(90, 79%, 52%);
}
-html|*#highlighter-nodeinfobar-pseudo-classes {
+html|*.highlighter-nodeinfobar-pseudo-classes {
color: hsl(20, 100%, 70%);
}
@@ -2051,7 +2026,7 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
min-height: 26px;
}
-#highlighter-nodeinfobar-inspectbutton {
+.highlighter-nodeinfobar-inspectbutton {
-moz-border-end-width: 1px;
box-shadow: 1px 0 0 hsla(210,16%,76%,.15), -1px 0 0 hsla(210,16%,76%,.15) inset;
-moz-margin-end: 6px;
@@ -2059,26 +2034,26 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
-moz-image-region: rect(0px 16px 16px 0px);
}
-#highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
+.highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
box-shadow: -1px 0 0 hsla(210,16%,76%,.15), 1px 0 0 hsla(210,16%,76%,.15) inset;
}
-#highlighter-nodeinfobar-inspectbutton:active:hover,
-#highlighter-nodeinfobar-container:not([locked]) > #highlighter-nodeinfobar > #highlighter-nodeinfobar-inspectbutton {
+.highlighter-nodeinfobar-inspectbutton:active:hover,
+.highlighter-nodeinfobar-container:not([locked]) > .highlighter-nodeinfobar > .highlighter-nodeinfobar-inspectbutton {
-moz-image-region: rect(0px 32px 16px 16px);
}
-#highlighter-nodeinfobar-menu {
+.highlighter-nodeinfobar-menu {
-moz-border-start-width: 1px;
box-shadow: -1px 0 0 hsla(210,16%,76%,.15), 1px 0 0 hsla(210,16%,76%,.15) inset;
-moz-margin-start: 6px;
}
-#highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
+.highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
box-shadow: 1px 0 0 hsla(210,16%,76%,.15), -1px 0 0 hsla(210,16%,76%,.15) inset;
}
-#highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
+.highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
-moz-appearance: none !important;
list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
-moz-box-align: center;
@@ -2097,7 +2072,7 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
background-repeat: no-repeat;
}
-#highlighter-nodeinfobar-arrow-top {
+.highlighter-nodeinfobar-arrow-top {
margin-bottom: -8px;
margin-top: 8px;
border-right-color: hsla(210, 19%, 63%, .5);
@@ -2105,7 +2080,7 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
background-image: -moz-linear-gradient(bottom left, transparent 50%, hsl(209, 18%, 30%) 50%);
}
-#highlighter-nodeinfobar-arrow-bottom {
+.highlighter-nodeinfobar-arrow-bottom {
margin-top: -8px;
margin-bottom: 8px;
border-left-color: hsla(210, 19%, 63%, .5);
@@ -2113,12 +2088,12 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
background-image: -moz-linear-gradient(top right, transparent 50%, hsl(210, 24%, 16%) 50%);
}
-#highlighter-nodeinfobar-container[position="top"] > #highlighter-nodeinfobar,
-#highlighter-nodeinfobar-container[position="overlap"] > #highlighter-nodeinfobar {
+.highlighter-nodeinfobar-container[position="top"] > .highlighter-nodeinfobar,
+.highlighter-nodeinfobar-container[position="overlap"] > .highlighter-nodeinfobar {
box-shadow: 0 1px 0 hsla(0, 0%, 100%, .1) inset;
}
-#highlighter-nodeinfobar-container[hide-arrow] > #highlighter-nodeinfobar {
+.highlighter-nodeinfobar-container[hide-arrow] > .highlighter-nodeinfobar {
margin: 7px 0;
}
@@ -2148,259 +2123,6 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
font-size: 120%;
}
-/* Highlighter toolbar - breadcrumbs */
-
-#inspector-breadcrumbs {
- -moz-margin-end: 3px;
- /* A fake 1px-shadow is included in the border-images of the
- inspector-breadcrumbs-buttons, to match toolbar-buttons style.
- This negative margin compensate the extra row of pixels created
- by the shadow.*/
- margin-bottom: -1px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up,
-#inspector-breadcrumbs > .scrollbutton-down {
- -moz-appearance: none;
- border: 1px solid hsla(210,8%,5%,.45);
- background: -moz-linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
- box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
- margin: 0 0 1px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up {
- -moz-border-start-width: 0;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
-#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
- border-color: hsla(210,8%,5%,.6);
- background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
- box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
-}
-
-#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
- -moz-image-region: rect(0px 14px 16px 7px);
-}
-
-#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
- -moz-appearance: none;
- list-style-image: url("chrome://browser/skin/devtools/breadcrumbs-scrollbutton.png");
- -moz-image-region: rect(0px 7px 16px 0px);
- margin: 0 5px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
- opacity: 0.5;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
-#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
- transform: scaleX(-1);
-}
-
-.inspector-breadcrumbs-button {
- -moz-appearance: none;
- background-color: transparent;
- border-style: solid;
- border-width: 1px 13px 2px 13px;
- color: hsl(210,30%,85%);
- width: 85px; /* Can't use max-width. See bug 723132 */
- /* The content of the button can be larger than the button */
- overflow: hidden;
- min-height: 25px;
-
- margin: 0 -11px 0 0;
- padding: 0 9px;
-}
-
-.inspector-breadcrumbs-button:-moz-focusring > label {
- border-bottom: 1px dotted hsla(210,30%,85%,0.4);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
- color: hsl(208,100%,60%);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
- color: hsl(205,100%,70%);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
- color: hsl(20, 100%, 70%);
-}
-
-.inspector-breadcrumbs-id,
-.inspector-breadcrumbs-classes {
- color: #8d99a6;
-}
-
-.inspector-breadcrumbs-pseudo-classes {
- color: hsl(20, 100%, 85%);
-}
-
-/* Highlighter toolbar - breadcrumbs - LTR */
-
-.inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
- margin-left: 0;
- border-left-width: 0;
-}
-
-.inspector-breadcrumbs-button {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]),
-.inspector-breadcrumbs-button:not([checked]):hover:active {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked] {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked][siblings-menu-open],
-.inspector-breadcrumbs-button[checked]:hover:active {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]),
-.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked] {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked],
-.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 1 13 2 13 fill stretch;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
- border-right-width: 0;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]),
-.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked] {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked],
-.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-/* Highlighter toolbar - breadcrumbs - RTL */
-
-.inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
- margin-right: 0;
- border-right-width: 0;
-}
-
-.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]):-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked][siblings-menu-open]:-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]):-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked]:-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 1 13 2 13 fill stretch;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
- border-left-width: 0;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]):-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked]:-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-/* Highlighter toolbar - HTML Tree */
-
-#inspector-treepanel-toolbutton {
- list-style-image: url("chrome://browser/skin/devtools/treepanel-button.png");
- -moz-margin-end: 0;
- -moz-image-region: rect(0px 18px 16px 0px);
-}
-
-#inspector-treepanel-toolbutton[checked] {
- -moz-image-region: rect(0px 36px 16px 18px);
-}
-
-#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(rtl),
-#inspector-treepanel-toolbutton:-moz-locale-dir(ltr) {
- border-radius: 3px 0 0 3px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(ltr),
-#inspector-treepanel-toolbutton:-moz-locale-dir(rtl) {
- border-radius: 0 3px 3px 0;
-}
-
-/* Highlight toolbar - Option menu */
-
-#inspector-option-toolbarbutton:-moz-focusring {
- outline: 1px dotted hsla(210,30%,85%,0.4);
- outline-offset: -2px;
-}
-
html|*#gcli-tooltip-frame,
html|*#gcli-output-frame {
padding: 0;
@@ -2584,33 +2306,13 @@ html|*#gcli-output-frame {
background: rgba(0,0,0,.4);
}
-#developer-toolbar-webconsole {
- -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-#developer-toolbar-inspector {
- -moz-image-region: rect(16px, 16px, 32px, 0);
-}
-
-#developer-toolbar-styleeditor {
- -moz-image-region: rect(32px, 16px, 48px, 0);
-}
-
-#developer-toolbar-debugger {
- -moz-image-region: rect(48px, 16px, 64px, 0);
-}
-
-#developer-toolbar-other-tools {
- -moz-image-region: rect(64px, 16px, 80px, 0);
-}
-
-#developer-toolbar-other-tools > .toolbarbutton-menu-dropmarker {
- display: none;
+#developer-toolbar-toolbox-button {
+ -moz-image-region: rect(64px, 22px, 80px, 0);
}
/* Error counter */
-#developer-toolbar-webconsole[error-count]:before {
+#developer-toolbar-toolbox-button[error-count]:before {
color: #FDF3DE;
min-width: 16px;
text-shadow: none;
diff --git a/browser/themes/gnomestripe/devtools/command-responsivemode.png b/browser/themes/gnomestripe/devtools/command-responsivemode.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbfa599048c1065c7250a5cd74b9684724f3ded3
GIT binary patch
literal 1083
zcmV-B1jPG^P){UzO0owih;|zVdoglM>cwC%#$YhU7`2<(IQxCw_q6}zaJu(MZ+h|J_xtPTd++so
zJ)EP$j~+kQsO_iXh4I1^PauOVU#LN7^a3-A^a_`}z>Ffl2!DBj8D(s0Nm}ydo%?w`
z1C|$%K~_Ed?*r@^4a|ZIqePKEM~O04@0yv_{;d@_;0)&V(-Q&D#&MBA{H!e9*c-hF?ynud0
z0rdcTU;pKdDbv%?b`mDedI7r69h@D(B~J%9eDWKJJx`wn%xb=20i!Uu@Rh0)MK3Jg
zkQtZtRyrom^7F(u58YBg_5l5e0_p(w9cURlCe9HBIDK#iaBpMI&bMJF4xjuAxL?)t
zI6L$7S-`8GUbBEvv@?5ATWCxN$HduD
z0DbP@Gk8<;UO*MV
z{`b&ug}m`JIagxh>?nXfcW?@DZ)U!gvss|$^vO?vdmnTCoPEwbeHJit_XP`}fQ6s*
z|Bw~zD#>lUIEaa}@lO2&J}<=SzFt5OV8^v5`1Q#@JXdh|GQo)vT=H~Q3l5+B2%_Xa
zcK9q{M%_6J7%R5Vjhp>;8m|8*%qyH>Z2T;BUc;Gvs`S81x~~_o4PbX62Oj{t?sEq{
zM7gj^=oZ}kd&DhYAq+Tt7LZZhYXPI6G7Hzfj@$;vy|(jM`|RLx-1jHzzFxpq;8uWq
z3-N*De65-H~
zDBvR?yAS6m_-vn9aD<8xR($B+hXcl>Z_8WH5KZ3k-u@FY|OgvDx-7;DMJ4%mXj$_lD)+ftT{%L2m!>
zc~~AEczJ;#!)Q4Kc;KZ1AAwn9A%uB&DPJ%gD=F{-gWy{-)$wJ0<8cj~F%N5+`=kEaG
WYW7HKLO22d0000s
literal 0
HcmV?d00001
diff --git a/browser/themes/gnomestripe/devtools/command-tilt.png b/browser/themes/gnomestripe/devtools/command-tilt.png
new file mode 100644
index 0000000000000000000000000000000000000000..f816bba59cedb2fb2069b4d0a4ff09225e99cdb7
GIT binary patch
literal 1668
zcmV-~27CF5P)7@lZbk!4AxRxGAezZD@!&{M4i(X$6bSLi4nr{%1$IzT
z(FkL7Fbiey)=J}aIhSL(1+|&&`_R75uN{6fP5sdypXuB8d7k&(-^0$kuR8rN{?Hjd
z^0j{hvj2PD>%{%P?Q|k?B!nI@h8PDhV+W1(BCGuY@c+7mC9#;;3^el$Xq*GEyWxZr
zv5`0mG_y0be~{NF77%H~J)oI=plNw=V1dvj3<#sqF>(vrgV%!H(#zy;WZta~BOJ`4CU`2JUH^7V?G^q$LFO|MsN9>+XX`
z&QB_;>{?ZwGJqL7Xz;*`3{yY>?b18Cd&4TKYTn}Ip}_+$GE4y~I$&8>@3Z8pTE$Xc
z9vVFGB7>~3Jay8XBe&E}UzFC(Oewx(^>O}Q*^b<3t2lXxMVx#Mz>FO1z>FOFQVhUS*g#}(Dy$S?(*?d^Y_PsN<4
zLl!hDThr;k8z}1rFk=Ue?s15&^&T=z0ZRH-C_B3QTG~3gTFG;xMb()|-xe=`89Qin
zk85V2}Z<+PVi1w`?n
zn@Ksp!BI>BIXrlIXiNb$Ja~C%Vgb{47N~g$UaQ@ulV%!9M^Dx#bO}Msumx=90evW-
zF$J9B0i6S@RdV6yE5!mVw&kmN2!0XPIJ8Gnp^k`{VGG#AgI54FrhpS%_y=IM$2@p>
zXkr28(Rpef&^00pUELGYEtQ5d@7XAd?4l27z!Sc4}$A@X*Rj
zhqod1Vb{
zflf$?S;R`(h0zn)4;it5lIx|j=xH5Bb2@QM3-R^Zi%21k(o;PY8ED|v-TQ8;?%sVg
z-zFYtA--Pw6Bmg)^k$ky8Fy$BSO4*bfeGQp>%P8W8h-qxY4`~>ix8OLY!IGlZWEi6
z=n|KwaEO(^G!4zTW)$@4Mq~#I&^&1LqqoM5uU6F0p`WqUbny^Cx(g9Z^M~}4I0qhh
zkr4|J^JxbU8Pm@lUYqyRK10J|;vjKA*`^ABN6hzYJZz?4gvr0@>-YMT
z%4#oqZH=cg;%WBAPRzf`aPmu*`5V?K8s4QhzHG{$!i?Qec|70`68cgT`*HLaw#2tW;;_g;Vl&@dI>liuG .toolbarbutton-text {
+ display: none;
+}
+
.devtools-toolbarbutton:not([checked=true]):hover:active {
border-color: hsla(210,8%,5%,.6);
background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
@@ -188,6 +192,65 @@
position: relative;
}
+/* In-tools sidebar */
+
+.devtools-sidebar-tabs {
+ -moz-appearance: none;
+ margin: 0;
+}
+
+.devtools-sidebar-tabs > tabpanels {
+ -moz-appearance: none;
+ padding: 0;
+ border: 0;
+}
+
+.devtools-sidebar-tabs > tabs {
+ -moz-appearance: none;
+ position: static;
+ box-shadow: 0 1px 0 0 hsla(210, 16%, 76%, .2) inset;
+ background-image: linear-gradient(to bottom, hsl(210,11%,36%), hsl(210,11%,18%));
+ color: hsl(210,30%,85%);
+ margin-bottom: 0;
+ padding: 0;
+}
+
+.devtools-sidebar-tabs > tabs > .tabs-right,
+.devtools-sidebar-tabs > tabs > .tabs-left {
+ display: none;
+}
+
+.devtools-sidebar-tabs > tabs > tab {
+ -moz-appearance: none;
+ padding: 0;
+ margin: 0;
+ min-width: 78px;
+ min-height: 22px;
+ text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
+ text-align: center;
+ color: inherit;
+ -moz-box-flex: 1;
+ border-width: 0;
+ -moz-border-end-width: 1px;
+ border-color: hsla(210,8%,5%,.6);
+ border-style: solid;
+ background: transparent;
+ border-radius: 0;
+}
+
+.devtools-sidebar-tabs > tabs > tab:-moz-focusring {
+ position: static;
+}
+
+.devtools-sidebar-tabs > tabs > tab:last-of-type {
+ -moz-border-end-width: 0;
+}
+
+.devtools-sidebar-tabs > tabs > tab[selected=true] {
+ background-image: linear-gradient(to bottom, hsl(201,45%,34%), hsl(205,44%,22%));
+ color: white !important;
+}
+
/* Theme */
.devtools-theme-background {
diff --git a/browser/themes/gnomestripe/devtools/dock-bottom.png b/browser/themes/gnomestripe/devtools/dock-bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..83842f236ef5ede55a268e67077532fc1764746f
GIT binary patch
literal 487
zcmVdbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#RU^m#7D5O5DNKh
zIOvAfv{}Bpy}3APx_hQ+E}SZkWA*&<`f+)6eGl{!f$e6~t!l(Liq(<<1g?8r1-8-x
zYak{7r)TG5uj2=R%rNc4gZ=u`oaHojd>f8ks77z^u{G13$|4$*j7bGs-Kr9=kg|q0LGK>
zJ!#C#^DL;Ww?9D5ENB?E+8#=&7+4reskqhl&@coLT5IghS{Xqd*vZ(+Lj?5D1oFGv
d7ytene*n2yf``D{mBs)7002ovPDHLkV1mh##`^#O
literal 0
HcmV?d00001
diff --git a/browser/themes/gnomestripe/devtools/dock-side.png b/browser/themes/gnomestripe/devtools/dock-side.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a940bc1e4e50a63d1522fc5604cb2cf44b05e82
GIT binary patch
literal 536
zcmV+z0_XjSP)dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#RSoj`_MNAq&5H*Pw
z3NaSm5~HhonXzzJ)=Nxb;lR(pFz4{i;f!dl`O7l?qz1YG%z?BC4ESSq&?uk@+}IDb
zmoEP>v9Y$YoX=&4Baui)s&b{;oSmCr0WJcAWGp5G}8!KIdEm%}dK31KIqEP)dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#Rc7@u?RTxEB5kmh%P)N(7
zT`i)>qChBuC?O1glu}BRT7)w?m6JZ7^WK|x@7KZt6L)^g?{Ln6^PP_o5q2_c>!Lii
zyS#bd-dMmeN|lt`l7tX4lU@8dJw1~ZTfxg0`;K&Xo;;DNPjID(6VZPrn#PsmdUAYh
zB6F$#%FV3;C3UsYhK6LEy?HzKJCj{p*M;VT{nd~Po|5K)))u{`Wq*Zfnzf=b(G)p<
z_DnjRZjb#~%9_zwGAcA?Umv(JH}vrCYXIw;3_Ji$PoKX!To;X+j^hMGJRVPVcXu66
z)hEnSgTp0QR>3a@gTYw<;{dj%Y#BzN*_Sd1fVh-0l1e4*sSnc&Ev;>zZ{5DLTo%++
zC=~LyAp?LCLKKO}Q$*lWN=PY-wr%I%O^gg{oM$x7lx0~40DT()({(-KoVy?*A(bL2
zRnas}8$hn6y1E{K-O=9G7&1$aMj{cL^NkQS>B_}rt1(kRTqhsUw?BddbV4M?U%x!GkWjq>saY$!;
z?aSA1`kHMU05Kv$G9L3nC5AsaHMKHu?dk-88~_UlSYl;mHGl8^13J~!S!k$_>rx?j
zOoz(>2iWMk0_4cV$KdSTd=9{S0P-rFDnc035UZ`-}m+HPRBWCQb}w1SN@Zm
k|31GNV>|suz9Tk(KRCWA;;1x%9RL6T07*qoM6N<$g8X4xGynhq
literal 0
HcmV?d00001
diff --git a/browser/themes/gnomestripe/devtools/inspector.css b/browser/themes/gnomestripe/devtools/inspector.css
new file mode 100644
index 000000000000..054658534278
--- /dev/null
+++ b/browser/themes/gnomestripe/devtools/inspector.css
@@ -0,0 +1,214 @@
+#inspector-inspect-toolbutton {
+ list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
+ -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#inspector-inspect-toolbutton[checked=true] {
+ -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+/* Highlighter toolbar - breadcrumbs */
+
+#inspector-breadcrumbs {
+ -moz-margin-end: 3px;
+ /* A fake 1px-shadow is included in the border-images of the
+ inspector-breadcrumbs-buttons, to match toolbar-buttons style.
+ This negative margin compensate the extra row of pixels created
+ by the shadow.*/
+ margin-bottom: -1px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up,
+#inspector-breadcrumbs > .scrollbutton-down {
+ -moz-appearance: none;
+ border: 1px solid hsla(210,8%,5%,.45);
+ background: -moz-linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
+ box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
+ margin: 0 0 1px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
+ border-color: hsla(210,8%,5%,.6);
+ background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
+ box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
+ -moz-image-region: rect(0px 14px 16px 7px);
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
+ -moz-appearance: none;
+ list-style-image: url("chrome://browser/skin/devtools/breadcrumbs-scrollbutton.png");
+ -moz-image-region: rect(0px 7px 16px 0px);
+ margin: 0 5px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
+ opacity: 0.5;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
+ transform: scaleX(-1);
+}
+
+.inspector-breadcrumbs-button {
+ -moz-appearance: none;
+ background-color: transparent;
+ border-style: solid;
+ border-width: 1px 13px 2px 13px;
+ color: hsl(210,30%,85%);
+ width: 85px; /* Can't use max-width. See bug 723132 */
+ /* The content of the button can be larger than the button */
+ overflow: hidden;
+ min-height: 25px;
+
+ margin: 0 -11px 0 0;
+ padding: 0 9px;
+}
+
+.inspector-breadcrumbs-button:-moz-focusring > label {
+ border-bottom: 1px dotted hsla(210,30%,85%,0.4);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
+ color: hsl(208,100%,60%);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
+ color: hsl(205,100%,70%);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
+ color: hsl(20, 100%, 70%);
+}
+
+.inspector-breadcrumbs-id,
+.inspector-breadcrumbs-classes {
+ color: #8d99a6;
+}
+
+.inspector-breadcrumbs-pseudo-classes {
+ color: hsl(20, 100%, 85%);
+}
+
+/* Highlighter toolbar - breadcrumbs - LTR */
+
+.inspector-breadcrumbs-button {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:not([checked]):hover:active {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked] {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:hover:active {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked] {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 1 13 2 13 fill stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
+ border-left-width: 0;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
+ border-right-width: 0;
+}
+
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked] {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+/* Highlighter toolbar - breadcrumbs - RTL */
+
+.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 1 13 2 13 fill stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
+ border-right-width: 0;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+ border-left-width: 0;
+}
+
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 1 13 2 13 fill stretch;
+}
diff --git a/browser/themes/gnomestripe/devtools/layout-background.png b/browser/themes/gnomestripe/devtools/layout-background.png
deleted file mode 100644
index 6991cc0f2ab221e7488be16c3f9e4aa4d6228e73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 981
zcmV;`11kK9P)y@%BDT)H`J*U$N?>)QSj&)sG*Oe^Gn5Kznx7)F88^#!>X+mpFmSrr<
zf^&}3>BKM$EXzU&fxhpNQW8QS%QA!zeEIT)BuS7_6mhv+`1qQA#n6BUM!)gy8AviMp=o
z`~HSOUDv$4ydZ>l`<0Z;^Ncjc;JrsFMb~xA^Gs0`SZjHGeWk8zq?Fv>-}CzVijV94L{Y@U!vj$ip?>-8)BB(N2q8Ee4h+M9bMD4g2!YGxf>H`=Ek#iTfh0+YH`&3?T$$*L4iTK;QQ_&Z??H
zDaC%jrz}f`VW21qwr%74_wRIFhf<0pNl4R_JkN2?p+5cj*ZZH~g%ED1Ow+`&EO_s^
zySpQbB8)Kr9FIqwbN`!}rs>U1t@RC!d7jy}4XrhC9N+5C&(BzENz)W#3~8Dogur``
zbB;XEk>~T7IF6a;nd9+zi=U=x$n%`@`Hc4-V+>VQF^(f`+cJ(L)>^#x0DSxQ?M+$R
zw)B0E5Q4kAJC4WW4GVy2n#i(@%jH5{*J!PA&hg>H2SNz!b~}oqK>hmZkM~g&aXOvo
z`=0Cdddn^EJ^THhWmy=8;TBWZ>lLLGLWtYqaUA&%hHv{do)ciN00000NkvXXu0mjf
DG;`Ue
diff --git a/browser/themes/gnomestripe/devtools/layout-buttons.png b/browser/themes/gnomestripe/devtools/layout-buttons.png
deleted file mode 100644
index 8705bc51475de5e6759371cc30a32e67187f455a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 447
zcmV;w0YLtVP)*HF4|i4HQFuB3#bx}l_*jrJ4(_VH;~JMbe0AA!TePMr
zwT0zI8wYo`Z_M+90}k#LUQLlHcH=q!3+nHE99;8p{A-sk40-+udd!$_2aFUpL$t6H
z&lU#iZ2~n}bOr}^%1NzR4W{_mYd^=#M@B*}`rG@=qc?_t@=!J7QxKW?Jmn%J!
z1)c+HGWDLAG2afjQ&`u})6}A#Ew>LKqsI)hIJi+?G+eqkVo`WRWcedKy;BYI?SP)b
zGyOc5dfpas@+f5Vm|+%&Jn9EjwP?UX90-;VwYd>>_jbzzQyp4VTTtU~R^6f=nc73l{
p$6eJAU$BJOT9O3rs{a4K;U}VSGM> #header > #togglebutton {
- background-position: -16px 0;
-}
diff --git a/browser/themes/gnomestripe/devtools/toolbox.css b/browser/themes/gnomestripe/devtools/toolbox.css
new file mode 100644
index 000000000000..b3f7c6ad93f7
--- /dev/null
+++ b/browser/themes/gnomestripe/devtools/toolbox.css
@@ -0,0 +1,94 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+#toolbox-tabs {
+ margin: 0;
+}
+
+#toolbox-dock-bottom {
+ list-style-image: url("chrome://browser/skin/devtools/dock-bottom.png");
+}
+
+#toolbox-dock-side {
+ list-style-image: url("chrome://browser/skin/devtools/dock-side.png");
+}
+
+#toolbox-dock-window {
+ list-style-image: url("chrome://browser/skin/devtools/dock-window.png");
+}
+
+#command-button-responsive {
+ list-style-image: url(chrome://browser/skin/devtools/command-responsivemode.png);
+ -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+#command-button-responsive:hover {
+ -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+#command-button-responsive:hover:active {
+ -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+#command-button-responsive[checked=true] {
+ -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+#command-button-tilt {
+ list-style-image: url(chrome://browser/skin/devtools/command-tilt.png);
+ -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+#command-button-tilt:hover {
+ -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+#command-button-tilt:hover:active {
+ -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+#command-button-tilt[checked=true] {
+ -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+#command-button-scratchpad {
+ list-style-image: url(chrome://browser/skin/devtools/command-scratchpad.png);
+ -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+#command-button-scratchpad:hover {
+ -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+#command-button-scratchpad:hover:active {
+ -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+
+/* Tabs */
+
+.devtools-tabbar {
+ -moz-appearance: none;
+ background-image: linear-gradient(to bottom, hsl(210,11%,36%), hsl(210,11%,18%));
+ color: hsl(210,30%,85%);
+ padding: 4px 3px 3px;
+ box-shadow: 0 -3px 0 0 rgb(20,20,20) inset, 0 -4px 0 0 rgba(0,0,0,0.8) inset;
+}
+
+.devtools-tab {
+ -moz-appearance: none;
+ min-width: 78px;
+ min-height: 22px;
+ text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
+ border-radius: 3px 3px 0 0;
+ color: inherit;
+ border-style: solid;
+ border-color: transparent;
+ border-width: 1px 1px 0;
+ margin: 0 5px;
+ padding: 0 10px 1px;
+}
+
+.devtools-tab[selected=true] {
+ border-color: hsla(210,8%,5%,.6);
+ background-color: rgb(20,20,20);
+ text-shadow: none;
+ color: white;
+}
diff --git a/browser/themes/gnomestripe/devtools/treepanel-button.png b/browser/themes/gnomestripe/devtools/treepanel-button.png
deleted file mode 100644
index 2a8802216bf178bc05813fc592df30d91cd49415..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 805
zcmV+=1KRwFP)5$VXf7@J4|UBGmWoNkFo+B=7IV;tniNex>IV$MLwpTQ?d3;XfCB6w1LF^KBG>F_-H+(p2QOJ&
z=qI(xQRtVtI}78ax~0>Nl`T>!E)#AoiVyU?eDUP^NF>}Y)8d&gNiBBy>KiD0o`@X+
zKN@h;xZ3NDl3s619>&;gX6pGB`uZ^*7F{f;GZYN!hRMn@1&xHm8XO%J4nbWvOz@*T
z@kMnecO^Mh8sUTIEo&lI=TSuM#9t*0SwF(qy|hy .toolbarbutton-menu-dropmarker {
/* Highlighter */
-#highlighter-outline {
+.highlighter-outline {
box-shadow: 0 0 0 1px black;
outline: 1px dashed white;
outline-offset: -1px;
}
-#highlighter-outline[locked] {
+.highlighter-outline[locked] {
box-shadow: 0 0 0 1px rgba(0,0,0,0.3);
outline-color: rgba(255,255,255,0.7);
}
-/* Highlighter toolbar */
+/* Developer toolbar */
-#inspector-inspect-toolbutton {
- list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
- -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-#inspector-inspect-toolbutton[checked=true] {
- -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-#inspector-toolbar,
#developer-toolbar {
border-top: 1px solid hsla(210, 8%, 5%, .65);
padding-top: 4px;
padding-bottom: 4px;
}
-#inspector-toolbar:-moz-locale-dir(ltr),
#developer-toolbar:-moz-locale-dir(ltr) {
padding-left: 2px;
padding-right: 16px; /* use -moz-padding-end when/if bug 631729 gets fixed */
}
-#inspector-toolbar:-moz-locale-dir(rtl),
#developer-toolbar:-moz-locale-dir(rtl) {
padding-left: 4px;
padding-right: 18px; /* use -moz-padding-end when/if bug 631729 gets fixed */
}
-#devtools-side-splitter {
- background-image: none !important;
- border: 0;
- -moz-border-start: 1px solid #242b33;
- min-width: 0;
- width: 3px;
- background-color: transparent;
- -moz-margin-end: -3px;
- position: relative;
-}
-
/* Lion Fullscreen window styling */
@media (-moz-mac-lion-theme) {
#navigator-toolbox[inFullscreen][tabsontop="true"]:not(:-moz-lwtheme)::before {
@@ -3434,13 +3411,9 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
}
}
-#devtools-sidebar-box {
- background-color: -moz-Field;
-}
-
/* Highlighter - Node Infobar */
-#highlighter-nodeinfobar {
+.highlighter-nodeinfobar {
color: hsl(200, 100%, 65%);
border: 1px solid hsla(210, 19%, 63%, .5);
border-radius: 3px;
@@ -3449,21 +3422,21 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
/* Highlighter - Node Infobar - text */
-#highlighter-nodeinfobar-text {
+.highlighter-nodeinfobar-text {
/* 100% - size of the buttons + margins */
max-width: calc(100% - 2 * (26px + 6px));
padding-bottom: 1px;
}
-html|*#highlighter-nodeinfobar-tagname {
+html|*.highlighter-nodeinfobar-tagname {
color: white;
}
-html|*#highlighter-nodeinfobar-id {
+html|*.highlighter-nodeinfobar-id {
color: hsl(90, 79%, 52%);
}
-html|*#highlighter-nodeinfobar-pseudo-classes {
+html|*.highlighter-nodeinfobar-pseudo-classes {
color: hsl(20, 100%, 70%);
}
@@ -3478,7 +3451,7 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
background-color: transparent;
}
-#highlighter-nodeinfobar-inspectbutton {
+.highlighter-nodeinfobar-inspectbutton {
-moz-border-end-width: 1px;
box-shadow: 1px 0 0 hsla(210,16%,76%,.15), -1px 0 0 hsla(210,16%,76%,.15) inset;
-moz-margin-end: 6px;
@@ -3486,26 +3459,26 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
-moz-image-region: rect(0px 16px 16px 0px);
}
-#highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
+.highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
box-shadow: -1px 0 0 hsla(210,16%,76%,.15), 1px 0 0 hsla(210,16%,76%,.15) inset;
}
-#highlighter-nodeinfobar-inspectbutton:active:hover,
-#highlighter-nodeinfobar-container:not([locked]) > #highlighter-nodeinfobar > #highlighter-nodeinfobar-inspectbutton {
+.highlighter-nodeinfobar-inspectbutton:active:hover,
+.highlighter-nodeinfobar-container:not([locked]) > .highlighter-nodeinfobar > .highlighter-nodeinfobar-inspectbutton {
-moz-image-region: rect(0px 32px 16px 16px);
}
-#highlighter-nodeinfobar-menu {
+.highlighter-nodeinfobar-menu {
-moz-border-start-width: 1px;
box-shadow: -1px 0 0 hsla(210,16%,76%,.15), 1px 0 0 hsla(210,16%,76%,.15) inset;
-moz-margin-start: 6px;
}
-#highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
+.highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
box-shadow: 1px 0 0 hsla(210,16%,76%,.15), -1px 0 0 hsla(210,16%,76%,.15) inset;
}
-#highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
+.highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
-moz-appearance: none !important;
list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
-moz-box-align: center;
@@ -3524,7 +3497,7 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
background-repeat: no-repeat;
}
-#highlighter-nodeinfobar-arrow-top {
+.highlighter-nodeinfobar-arrow-top {
margin-bottom: -8px;
margin-top: 8px;
border-right-color: hsla(210, 19%, 63%, .5);
@@ -3532,7 +3505,7 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
background-image: -moz-linear-gradient(bottom left, transparent 50%, hsl(209, 18%, 30%) 50%);
}
-#highlighter-nodeinfobar-arrow-bottom {
+.highlighter-nodeinfobar-arrow-bottom {
margin-top: -8px;
margin-bottom: 8px;
border-left-color: hsla(210, 19%, 63%, .5);
@@ -3540,12 +3513,12 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
background-image: -moz-linear-gradient(top right, transparent 50%, hsl(210, 24%, 16%) 50%);
}
-#highlighter-nodeinfobar-container[position="top"] > #highlighter-nodeinfobar,
-#highlighter-nodeinfobar-container[position="overlap"] > #highlighter-nodeinfobar {
+.highlighter-nodeinfobar-container[position="top"] > .highlighter-nodeinfobar,
+.highlighter-nodeinfobar-container[position="overlap"] > .highlighter-nodeinfobar {
box-shadow: 0 1px 0 hsla(0, 0%, 100%, .1) inset;
}
-#highlighter-nodeinfobar-container[hide-arrow] > #highlighter-nodeinfobar {
+.highlighter-nodeinfobar-container[hide-arrow] > .highlighter-nodeinfobar {
margin: 7px 0;
}
@@ -3575,256 +3548,6 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
font-size: 120%;
}
-/* Highlighter toolbar - breadcrumbs */
-
-#inspector-breadcrumbs {
- -moz-margin-end: 3px;
- /* A fake 1px-shadow is included in the border-images of the
- inspector-breadcrumbs-buttons, to match toolbar-buttons style.
- This negative margin compensate the extra row of pixels created
- by the shadow.*/
- margin-bottom: -1px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up,
-#inspector-breadcrumbs > .scrollbutton-down {
- -moz-appearance: none;
- border: 1px solid hsla(210,8%,5%,.45);
- background: -moz-linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
- box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
- margin: 0 0 1px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up {
- -moz-border-start-width: 0;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
-#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
- border-color: hsla(210,8%,5%,.6);
- background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
- box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
-}
-
-#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
- -moz-appearance: none;
- list-style-image: url("chrome://browser/skin/devtools/breadcrumbs-scrollbutton.png");
- -moz-image-region: rect(0px 7px 16px 0px);
- margin: 0 5px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
- opacity: 0.5;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
- -moz-image-region: rect(0px 14px 16px 7px);
-}
-
-#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
-#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
- transform: scaleX(-1);
-}
-
-.inspector-breadcrumbs-button {
- -moz-appearance: none;
- border-style: solid;
- border-width: 1px 13px 2px 13px;
- color: hsl(210,30%,85%);
- width: 85px; /* Can't use max-width. See bug 723132 */
- /* The content of the button can be larger than the button */
- overflow: hidden;
- min-height: 25px;
-
- margin: 0 -11px 0 0;
- padding: 0 9px;
-}
-
-.inspector-breadcrumbs-button:-moz-focusring > label {
- border-bottom: 1px dotted hsla(210,30%,85%,0.4);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
- color: hsl(208,100%,60%);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
- color: hsl(205,100%,70%);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
- color: hsl(20, 100%, 70%);
-}
-
-.inspector-breadcrumbs-id,
-.inspector-breadcrumbs-classes {
- color: #8d99a6;
-}
-
-.inspector-breadcrumbs-pseudo-classes {
- color: hsl(20, 100%, 85%);
-}
-
-/* Highlighter toolbar - breadcrumbs - LTR */
-
-.inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
- border-left-width: 0;
-}
-
-.inspector-breadcrumbs-button {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]),
-.inspector-breadcrumbs-button:not([checked]):hover:active {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked] {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked][siblings-menu-open],
-.inspector-breadcrumbs-button[checked]:hover:active {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]),
-.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked] {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked],
-.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 1 13 2 13 fill stretch;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
- border-right-width: 0;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]),
-.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked] {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked],
-.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-/* Highlighter toolbar - breadcrumbs - RTL */
-
-.inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
- border-right-width: 0;
-}
-
-.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]):-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked][siblings-menu-open]:-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]):-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked]:-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 1 13 2 13 fill stretch;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
- border-left-width: 0;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]):-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked]:-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-/* Highlighter toolbar - HTML Tree */
-
-#inspector-treepanel-toolbutton {
- list-style-image: url("chrome://browser/skin/devtools/treepanel-button.png");
- -moz-margin-end: 0;
- -moz-image-region: rect(0px 18px 16px 0px);
-}
-
-#inspector-treepanel-toolbutton[checked] {
- -moz-image-region: rect(0px 36px 16px 18px);
-}
-
-#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(rtl),
-#inspector-treepanel-toolbutton:-moz-locale-dir(ltr) {
- border-radius: @toolbarbuttonCornerRadius@ 0 0 @toolbarbuttonCornerRadius@;
-}
-
-#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(ltr),
-#inspector-treepanel-toolbutton:-moz-locale-dir(rtl) {
- border-radius: 0 @toolbarbuttonCornerRadius@ @toolbarbuttonCornerRadius@ 0;
-}
-
-/* Highlight toolbar - Option menu */
-
-#inspector-option-toolbarbutton:-moz-focusring {
- outline: 1px dotted hsla(210,30%,85%,0.4);
- outline-offset: -2px;
-}
-
html|*#gcli-tooltip-frame,
html|*#gcli-output-frame {
padding: 0;
@@ -4003,33 +3726,13 @@ html|*#gcli-output-frame {
text-shadow: 0 0 6px hsl(208,100%,60%);
}
-#developer-toolbar-webconsole {
- -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-#developer-toolbar-inspector {
- -moz-image-region: rect(16px, 16px, 32px, 0);
-}
-
-#developer-toolbar-styleeditor {
- -moz-image-region: rect(32px, 16px, 48px, 0);
-}
-
-#developer-toolbar-debugger {
- -moz-image-region: rect(48px, 16px, 64px, 0);
-}
-
-#developer-toolbar-other-tools {
+#developer-toolbar-toolbox-button {
-moz-image-region: rect(64px, 16px, 80px, 0);
}
-#developer-toolbar-other-tools > .toolbarbutton-menu-dropmarker {
- display: none;
-}
-
/* Error counter */
-#developer-toolbar-webconsole[error-count]:before {
+#developer-toolbar-toolbox-button[error-count]:before {
color: #FDF3DE;
min-width: 16px;
text-shadow: none;
diff --git a/browser/themes/pinstripe/devtools/command-responsivemode.png b/browser/themes/pinstripe/devtools/command-responsivemode.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbfa599048c1065c7250a5cd74b9684724f3ded3
GIT binary patch
literal 1083
zcmV-B1jPG^P){UzO0owih;|zVdoglM>cwC%#$YhU7`2<(IQxCw_q6}zaJu(MZ+h|J_xtPTd++so
zJ)EP$j~+kQsO_iXh4I1^PauOVU#LN7^a3-A^a_`}z>Ffl2!DBj8D(s0Nm}ydo%?w`
z1C|$%K~_Ed?*r@^4a|ZIqePKEM~O04@0yv_{;d@_;0)&V(-Q&D#&MBA{H!e9*c-hF?ynud0
z0rdcTU;pKdDbv%?b`mDedI7r69h@D(B~J%9eDWKJJx`wn%xb=20i!Uu@Rh0)MK3Jg
zkQtZtRyrom^7F(u58YBg_5l5e0_p(w9cURlCe9HBIDK#iaBpMI&bMJF4xjuAxL?)t
zI6L$7S-`8GUbBEvv@?5ATWCxN$HduD
z0DbP@Gk8<;UO*MV
z{`b&ug}m`JIagxh>?nXfcW?@DZ)U!gvss|$^vO?vdmnTCoPEwbeHJit_XP`}fQ6s*
z|Bw~zD#>lUIEaa}@lO2&J}<=SzFt5OV8^v5`1Q#@JXdh|GQo)vT=H~Q3l5+B2%_Xa
zcK9q{M%_6J7%R5Vjhp>;8m|8*%qyH>Z2T;BUc;Gvs`S81x~~_o4PbX62Oj{t?sEq{
zM7gj^=oZ}kd&DhYAq+Tt7LZZhYXPI6G7Hzfj@$;vy|(jM`|RLx-1jHzzFxpq;8uWq
z3-N*De65-H~
zDBvR?yAS6m_-vn9aD<8xR($B+hXcl>Z_8WH5KZ3k-u@FY|OgvDx-7;DMJ4%mXj$_lD)+ftT{%L2m!>
zc~~AEczJ;#!)Q4Kc;KZ1AAwn9A%uB&DPJ%gD=F{-gWy{-)$wJ0<8cj~F%N5+`=kEaG
WYW7HKLO22d0000s
literal 0
HcmV?d00001
diff --git a/browser/themes/pinstripe/devtools/command-tilt.png b/browser/themes/pinstripe/devtools/command-tilt.png
new file mode 100644
index 0000000000000000000000000000000000000000..f816bba59cedb2fb2069b4d0a4ff09225e99cdb7
GIT binary patch
literal 1668
zcmV-~27CF5P)7@lZbk!4AxRxGAezZD@!&{M4i(X$6bSLi4nr{%1$IzT
z(FkL7Fbiey)=J}aIhSL(1+|&&`_R75uN{6fP5sdypXuB8d7k&(-^0$kuR8rN{?Hjd
z^0j{hvj2PD>%{%P?Q|k?B!nI@h8PDhV+W1(BCGuY@c+7mC9#;;3^el$Xq*GEyWxZr
zv5`0mG_y0be~{NF77%H~J)oI=plNw=V1dvj3<#sqF>(vrgV%!H(#zy;WZta~BOJ`4CU`2JUH^7V?G^q$LFO|MsN9>+XX`
z&QB_;>{?ZwGJqL7Xz;*`3{yY>?b18Cd&4TKYTn}Ip}_+$GE4y~I$&8>@3Z8pTE$Xc
z9vVFGB7>~3Jay8XBe&E}UzFC(Oewx(^>O}Q*^b<3t2lXxMVx#Mz>FO1z>FOFQVhUS*g#}(Dy$S?(*?d^Y_PsN<4
zLl!hDThr;k8z}1rFk=Ue?s15&^&T=z0ZRH-C_B3QTG~3gTFG;xMb()|-xe=`89Qin
zk85V2}Z<+PVi1w`?n
zn@Ksp!BI>BIXrlIXiNb$Ja~C%Vgb{47N~g$UaQ@ulV%!9M^Dx#bO}Msumx=90evW-
zF$J9B0i6S@RdV6yE5!mVw&kmN2!0XPIJ8Gnp^k`{VGG#AgI54FrhpS%_y=IM$2@p>
zXkr28(Rpef&^00pUELGYEtQ5d@7XAd?4l27z!Sc4}$A@X*Rj
zhqod1Vb{
zflf$?S;R`(h0zn)4;it5lIx|j=xH5Bb2@QM3-R^Zi%21k(o;PY8ED|v-TQ8;?%sVg
z-zFYtA--Pw6Bmg)^k$ky8Fy$BSO4*bfeGQp>%P8W8h-qxY4`~>ix8OLY!IGlZWEi6
z=n|KwaEO(^G!4zTW)$@4Mq~#I&^&1LqqoM5uU6F0p`WqUbny^Cx(g9Z^M~}4I0qhh
zkr4|J^JxbU8Pm@lUYqyRK10J|;vjKA*`^ABN6hzYJZz?4gvr0@>-YMT
z%4#oqZH=cg;%WBAPRzf`aPmu*`5V?K8s4QhzHG{$!i?Qec|70`68cgT`*HLaw#2tW;;_g;Vl&@dI>liuG .toolbarbutton-text {
+ display: none;
+}
+
.devtools-toolbarbutton:not([checked=true]):hover:active {
border-color: hsla(210,8%,5%,.6);
background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
@@ -203,6 +207,60 @@
position: relative;
}
+/* In-tools sidebar */
+
+.devtools-sidebar-tabs {
+ -moz-appearance: none;
+ margin: 0;
+}
+
+.devtools-sidebar-tabs > tabpanels {
+ padding: 0;
+}
+
+.devtools-sidebar-tabs > tabs {
+ -moz-appearance: none;
+ position: static;
+ box-shadow: 0 1px 0 0 hsla(210, 16%, 76%, .2) inset;
+ background-image: url(background-noise-toolbar.png), linear-gradient(to bottom, hsl(210,11%,36%), hsl(210,11%,18%));
+ color: hsl(210,30%,85%);
+ margin-bottom: 0;
+ padding: 0;
+}
+
+.devtools-sidebar-tabs > tabs > .tabs-right,
+.devtools-sidebar-tabs > tabs > .tabs-left {
+ display: none;
+}
+
+.devtools-sidebar-tabs > tabs > tab {
+ -moz-appearance: none;
+ padding: 0;
+ min-width: 78px;
+ min-height: 22px;
+ text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
+ text-align: center;
+ color: inherit;
+ -moz-box-flex: 1;
+ border-width: 0;
+ -moz-border-end-width: 1px;
+ border-color: hsla(210,8%,5%,.6);
+ border-style: solid;
+}
+
+.devtools-sidebar-tabs > tabs > tab:-moz-focusring {
+ position: static;
+}
+
+.devtools-sidebar-tabs > tabs > tab:last-of-type {
+ -moz-border-end-width: 0;
+}
+
+.devtools-sidebar-tabs > tabs > tab[selected=true] {
+ background-image: url(background-noise-toolbar.png), linear-gradient(to bottom, hsl(201,45%,34%), hsl(205,44%,22%));
+ color: white !important;
+}
+
/* Theme */
.devtools-theme-background {
diff --git a/browser/themes/pinstripe/devtools/dock-bottom.png b/browser/themes/pinstripe/devtools/dock-bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..83842f236ef5ede55a268e67077532fc1764746f
GIT binary patch
literal 487
zcmVdbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#RU^m#7D5O5DNKh
zIOvAfv{}Bpy}3APx_hQ+E}SZkWA*&<`f+)6eGl{!f$e6~t!l(Liq(<<1g?8r1-8-x
zYak{7r)TG5uj2=R%rNc4gZ=u`oaHojd>f8ks77z^u{G13$|4$*j7bGs-Kr9=kg|q0LGK>
zJ!#C#^DL;Ww?9D5ENB?E+8#=&7+4reskqhl&@coLT5IghS{Xqd*vZ(+Lj?5D1oFGv
d7ytene*n2yf``D{mBs)7002ovPDHLkV1mh##`^#O
literal 0
HcmV?d00001
diff --git a/browser/themes/pinstripe/devtools/dock-side.png b/browser/themes/pinstripe/devtools/dock-side.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a940bc1e4e50a63d1522fc5604cb2cf44b05e82
GIT binary patch
literal 536
zcmV+z0_XjSP)dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#RSoj`_MNAq&5H*Pw
z3NaSm5~HhonXzzJ)=Nxb;lR(pFz4{i;f!dl`O7l?qz1YG%z?BC4ESSq&?uk@+}IDb
zmoEP>v9Y$YoX=&4Baui)s&b{;oSmCr0WJcAWGp5G}8!KIdEm%}dK31KIqEP)dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#Rc7@u?RTxEB5kmh%P)N(7
zT`i)>qChBuC?O1glu}BRT7)w?m6JZ7^WK|x@7KZt6L)^g?{Ln6^PP_o5q2_c>!Lii
zyS#bd-dMmeN|lt`l7tX4lU@8dJw1~ZTfxg0`;K&Xo;;DNPjID(6VZPrn#PsmdUAYh
zB6F$#%FV3;C3UsYhK6LEy?HzKJCj{p*M;VT{nd~Po|5K)))u{`Wq*Zfnzf=b(G)p<
z_DnjRZjb#~%9_zwGAcA?Umv(JH}vrCYXIw;3_Ji$PoKX!To;X+j^hMGJRVPVcXu66
z)hEnSgTp0QR>3a@gTYw<;{dj%Y#BzN*_Sd1fVh-0l1e4*sSnc&Ev;>zZ{5DLTo%++
zC=~LyAp?LCLKKO}Q$*lWN=PY-wr%I%O^gg{oM$x7lx0~40DT()({(-KoVy?*A(bL2
zRnas}8$hn6y1E{K-O=9G7&1$aMj{cL^NkQS>B_}rt1(kRTqhsUw?BddbV4M?U%x!GkWjq>saY$!;
z?aSA1`kHMU05Kv$G9L3nC5AsaHMKHu?dk-88~_UlSYl;mHGl8^13J~!S!k$_>rx?j
zOoz(>2iWMk0_4cV$KdSTd=9{S0P-rFDnc035UZ`-}m+HPRBWCQb}w1SN@Zm
k|31GNV>|suz9Tk(KRCWA;;1x%9RL6T07*qoM6N<$g8X4xGynhq
literal 0
HcmV?d00001
diff --git a/browser/themes/pinstripe/devtools/inspector.css b/browser/themes/pinstripe/devtools/inspector.css
new file mode 100644
index 000000000000..0c105cfe4b35
--- /dev/null
+++ b/browser/themes/pinstripe/devtools/inspector.css
@@ -0,0 +1,229 @@
+%include ../shared.inc
+%filter substitution
+
+#inspector-inspect-toolbutton {
+ list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
+ -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#inspector-inspect-toolbutton[checked=true] {
+ -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#inspector-toolbar {
+ padding-top: 4px;
+ padding-bottom: 4px;
+}
+
+#inspector-toolbar:-moz-locale-dir(ltr) {
+ padding-left: 2px;
+ padding-right: 16px; /* use -moz-padding-end when/if bug 631729 gets fixed */
+}
+
+#inspector-toolbar:-moz-locale-dir(rtl) {
+ padding-left: 4px;
+ padding-right: 18px; /* use -moz-padding-end when/if bug 631729 gets fixed */
+}
+
+#inspector-breadcrumbs {
+ -moz-margin-end: 3px;
+ /* A fake 1px-shadow is included in the border-images of the
+ inspector-breadcrumbs-buttons, to match toolbar-buttons style.
+ This negative margin compensate the extra row of pixels created
+ by the shadow.*/
+ margin-bottom: -1px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up,
+#inspector-breadcrumbs > .scrollbutton-down {
+ -moz-appearance: none;
+ border: 1px solid hsla(210,8%,5%,.45);
+ background: -moz-linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
+ box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
+ margin: 0 0 1px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
+ border-color: hsla(210,8%,5%,.6);
+ background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
+ box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
+ -moz-appearance: none;
+ list-style-image: url("chrome://browser/skin/devtools/breadcrumbs-scrollbutton.png");
+ -moz-image-region: rect(0px 7px 16px 0px);
+ margin: 0 5px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
+ opacity: 0.5;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
+ -moz-image-region: rect(0px 14px 16px 7px);
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
+ transform: scaleX(-1);
+}
+
+.inspector-breadcrumbs-button {
+ -moz-appearance: none;
+ border-style: solid;
+ border-width: 1px 13px 2px 13px;
+ color: hsl(210,30%,85%);
+ width: 85px; /* Can't use max-width. See bug 723132 */
+ /* The content of the button can be larger than the button */
+ overflow: hidden;
+ min-height: 25px;
+
+ margin: 0 -11px 0 0;
+ padding: 0 9px;
+}
+
+.inspector-breadcrumbs-button:-moz-focusring > label {
+ border-bottom: 1px dotted hsla(210,30%,85%,0.4);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
+ color: hsl(208,100%,60%);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
+ color: hsl(205,100%,70%);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
+ color: hsl(20, 100%, 70%);
+}
+
+.inspector-breadcrumbs-id,
+.inspector-breadcrumbs-classes {
+ color: #8d99a6;
+}
+
+.inspector-breadcrumbs-pseudo-classes {
+ color: hsl(20, 100%, 85%);
+}
+
+/* Highlighter toolbar - breadcrumbs - LTR */
+
+.inspector-breadcrumbs-button {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:not([checked]):hover:active {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked] {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:hover:active {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked] {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 1 13 2 13 fill stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
+ border-left-width: 0;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
+ border-right-width: 0;
+}
+
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked] {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+/* Highlighter toolbar - breadcrumbs - RTL */
+
+.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 1 13 2 13 fill stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
+ border-right-width: 0;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+ border-left-width: 0;
+}
+
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 1 13 2 13 fill stretch;
+}
diff --git a/browser/themes/pinstripe/devtools/layout-background.png b/browser/themes/pinstripe/devtools/layout-background.png
deleted file mode 100644
index 6991cc0f2ab221e7488be16c3f9e4aa4d6228e73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 981
zcmV;`11kK9P)y@%BDT)H`J*U$N?>)QSj&)sG*Oe^Gn5Kznx7)F88^#!>X+mpFmSrr<
zf^&}3>BKM$EXzU&fxhpNQW8QS%QA!zeEIT)BuS7_6mhv+`1qQA#n6BUM!)gy8AviMp=o
z`~HSOUDv$4ydZ>l`<0Z;^Ncjc;JrsFMb~xA^Gs0`SZjHGeWk8zq?Fv>-}CzVijV94L{Y@U!vj$ip?>-8)BB(N2q8Ee4h+M9bMD4g2!YGxf>H`=Ek#iTfh0+YH`&3?T$$*L4iTK;QQ_&Z??H
zDaC%jrz}f`VW21qwr%74_wRIFhf<0pNl4R_JkN2?p+5cj*ZZH~g%ED1Ow+`&EO_s^
zySpQbB8)Kr9FIqwbN`!}rs>U1t@RC!d7jy}4XrhC9N+5C&(BzENz)W#3~8Dogur``
zbB;XEk>~T7IF6a;nd9+zi=U=x$n%`@`Hc4-V+>VQF^(f`+cJ(L)>^#x0DSxQ?M+$R
zw)B0E5Q4kAJC4WW4GVy2n#i(@%jH5{*J!PA&hg>H2SNz!b~}oqK>hmZkM~g&aXOvo
z`=0Cdddn^EJ^THhWmy=8;TBWZ>lLLGLWtYqaUA&%hHv{do)ciN00000NkvXXu0mjf
DG;`Ue
diff --git a/browser/themes/pinstripe/devtools/layout-buttons.png b/browser/themes/pinstripe/devtools/layout-buttons.png
deleted file mode 100644
index 8705bc51475de5e6759371cc30a32e67187f455a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 447
zcmV;w0YLtVP)*HF4|i4HQFuB3#bx}l_*jrJ4(_VH;~JMbe0AA!TePMr
zwT0zI8wYo`Z_M+90}k#LUQLlHcH=q!3+nHE99;8p{A-sk40-+udd!$_2aFUpL$t6H
z&lU#iZ2~n}bOr}^%1NzR4W{_mYd^=#M@B*}`rG@=qc?_t@=!J7QxKW?Jmn%J!
z1)c+HGWDLAG2afjQ&`u})6}A#Ew>LKqsI)hIJi+?G+eqkVo`WRWcedKy;BYI?SP)b
zGyOc5dfpas@+f5Vm|+%&Jn9EjwP?UX90-;VwYd>>_jbzzQyp4VTTtU~R^6f=nc73l{
p$6eJAU$BJOT9O3rs{a4K;U}VSGM> #header > #togglebutton {
- background-position: -16px 0;
-}
diff --git a/browser/themes/pinstripe/devtools/toolbox.css b/browser/themes/pinstripe/devtools/toolbox.css
new file mode 100644
index 000000000000..17faa15b3e18
--- /dev/null
+++ b/browser/themes/pinstripe/devtools/toolbox.css
@@ -0,0 +1,94 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+#toolbox-tabs {
+ margin: 0;
+}
+
+#toolbox-dock-bottom {
+ list-style-image: url("chrome://browser/skin/devtools/dock-bottom.png");
+}
+
+#toolbox-dock-side {
+ list-style-image: url("chrome://browser/skin/devtools/dock-side.png");
+}
+
+#toolbox-dock-window {
+ list-style-image: url("chrome://browser/skin/devtools/dock-window.png");
+}
+
+#command-button-responsive {
+ list-style-image: url(chrome://browser/skin/devtools/command-responsivemode.png);
+ -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+#command-button-responsive:hover {
+ -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+#command-button-responsive:hover:active {
+ -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+#command-button-responsive[checked=true] {
+ -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+#command-button-tilt {
+ list-style-image: url(chrome://browser/skin/devtools/command-tilt.png);
+ -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+#command-button-tilt:hover {
+ -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+#command-button-tilt:hover:active {
+ -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+#command-button-tilt[checked=true] {
+ -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+#command-button-scratchpad {
+ list-style-image: url(chrome://browser/skin/devtools/command-scratchpad.png);
+ -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+#command-button-scratchpad:hover {
+ -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+#command-button-scratchpad:hover:active {
+ -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+
+/* Tabs */
+
+.devtools-tabbar {
+ -moz-appearance: none;
+ background-image: url(background-noise-toolbar.png), linear-gradient(to bottom, hsl(210,11%,36%), hsl(210,11%,18%));
+ color: hsl(210,30%,85%);
+ padding: 4px 3px 3px;
+ box-shadow: 0 -3px 0 0 rgb(20,20,20) inset, 0 -4px 0 0 rgba(0,0,0,0.8) inset;
+}
+
+.devtools-tab {
+ -moz-appearance: none;
+ min-width: 78px;
+ min-height: 22px;
+ text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
+ border-radius: @toolbarbuttonCornerRadius@ @toolbarbuttonCornerRadius@ 0 0;
+ color: inherit;
+ border-style: solid;
+ border-color: transparent;
+ border-width: 1px 1px 0;
+ margin: 0 5px;
+ padding: 0 10px 1px;
+}
+
+.devtools-tab[selected=true] {
+ border-color: hsla(210,8%,5%,.6);
+ background-color: rgb(20,20,20);
+ text-shadow: none;
+ color: white;
+}
diff --git a/browser/themes/pinstripe/devtools/treepanel-button.png b/browser/themes/pinstripe/devtools/treepanel-button.png
deleted file mode 100644
index 2a8802216bf178bc05813fc592df30d91cd49415..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 805
zcmV+=1KRwFP)5$VXf7@J4|UBGmWoNkFo+B=7IV;tniNex>IV$MLwpTQ?d3;XfCB6w1LF^KBG>F_-H+(p2QOJ&
z=qI(xQRtVtI}78ax~0>Nl`T>!E)#AoiVyU?eDUP^NF>}Y)8d&gNiBBy>KiD0o`@X+
zKN@h;xZ3NDl3s619>&;gX6pGB`uZ^*7F{f;GZYN!hRMn@1&xHm8XO%J4nbWvOz@*T
z@kMnecO^Mh8sUTIEo&lI=TSuM#9t*0SwF(qy|hy #highlighter-nodeinfobar > #highlighter-nodeinfobar-inspectbutton {
+.highlighter-nodeinfobar-inspectbutton:active:hover,
+.highlighter-nodeinfobar-container:not([locked]) > .highlighter-nodeinfobar > .highlighter-nodeinfobar-inspectbutton {
-moz-image-region: rect(0px 32px 16px 16px);
}
-#highlighter-nodeinfobar-menu {
+.highlighter-nodeinfobar-menu {
-moz-border-start-width: 1px;
box-shadow: -1px 0 0 hsla(210,16%,76%,.15), 1px 0 0 hsla(210,16%,76%,.15) inset;
-moz-margin-start: 6px;
}
-#highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
+.highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
box-shadow: 1px 0 0 hsla(210,16%,76%,.15), -1px 0 0 hsla(210,16%,76%,.15) inset;
}
-#highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
+.highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
-moz-appearance: none !important;
list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
-moz-box-align: center;
@@ -2779,7 +2755,7 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
background-repeat: no-repeat;
}
-#highlighter-nodeinfobar-arrow-top {
+.highlighter-nodeinfobar-arrow-top {
margin-bottom: -8px;
margin-top: 8px;
border-right-color: hsla(210, 19%, 63%, .5);
@@ -2787,7 +2763,7 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
background-image: -moz-linear-gradient(bottom left, transparent 50%, hsl(209, 18%, 30%) 50%);
}
-#highlighter-nodeinfobar-arrow-bottom {
+.highlighter-nodeinfobar-arrow-bottom {
margin-top: -8px;
margin-bottom: 8px;
border-left-color: hsla(210, 19%, 63%, .5);
@@ -2795,12 +2771,12 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
background-image: -moz-linear-gradient(top right, transparent 50%, hsl(210, 24%, 16%) 50%);
}
-#highlighter-nodeinfobar-container[position="top"] > #highlighter-nodeinfobar,
-#highlighter-nodeinfobar-container[position="overlap"] > #highlighter-nodeinfobar {
+.highlighter-nodeinfobar-container[position="top"] > .highlighter-nodeinfobar,
+.highlighter-nodeinfobar-container[position="overlap"] > .highlighter-nodeinfobar {
box-shadow: 0 1px 0 hsla(0, 0%, 100%, .1) inset;
}
-#highlighter-nodeinfobar-container[hide-arrow] > #highlighter-nodeinfobar {
+.highlighter-nodeinfobar-container[hide-arrow] > .highlighter-nodeinfobar {
margin: 7px 0;
}
@@ -2830,261 +2806,6 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
font-size: 120%;
}
-/* Highlighter toolbar - breadcrumbs */
-
-#inspector-breadcrumbs {
- -moz-margin-end: 3px;
- /* A fake 1px-shadow is included in the border-images of the
- inspector-breadcrumbs-buttons, to match toolbar-buttons style.
- This negative margin compensate the extra row of pixels created
- by the shadow.*/
- margin: -1px 0;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up,
-#inspector-breadcrumbs > .scrollbutton-down {
- -moz-appearance: none;
- border: 1px solid hsla(210,8%,5%,.45);
- background: -moz-linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
- box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
- margin: 1px 0 1px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up {
- -moz-border-start-width: 0;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
-#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
- border-color: hsla(210,8%,5%,.6);
- background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
- box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
-}
-
-#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
- -moz-appearance: none;
- list-style-image: url("chrome://browser/skin/devtools/breadcrumbs-scrollbutton.png");
- -moz-image-region: rect(0px 7px 16px 0px);
- margin: 0 5px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
- opacity: 0.5;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
- -moz-image-region: rect(0px 14px 16px 7px);
-}
-
-#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
-#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
- transform: scaleX(-1);
-}
-
-.inspector-breadcrumbs-button {
- -moz-appearance: none;
- background-color: transparent;
- border-style: solid;
- border-width: 2px 13px;
- outline: none;
- color: hsl(210,30%,85%);
- width: 85px; /* Can't use max-width. See bug 723132 */
- /* The content of the button can be larger than the button */
- overflow: hidden;
- min-height: 25px;
- margin: 0 -11px 0 0;
- padding: 0 9px;
-}
-
-.inspector-breadcrumbs-button:-moz-focusring > .button-box {
- border-width: 0;
-}
-
-.inspector-breadcrumbs-button:-moz-focusring > label {
- border-bottom: 1px dotted hsla(210,30%,85%,0.4);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
- color: hsl(200,100%,60%);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
- color: hsl(200,100%,70%);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
- color: hsl(20, 100%, 70%);
-}
-
-.inspector-breadcrumbs-id,
-.inspector-breadcrumbs-classes {
- color: #8d99a6;
-}
-
-.inspector-breadcrumbs-pseudo-classes {
- color: hsl(20, 100%, 85%);
-}
-
-/* Highlighter toolbar - breadcrumbs - LTR */
-
-.inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
- border-left-width: 0;
-}
-
-.inspector-breadcrumbs-button {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]),
-.inspector-breadcrumbs-button:not([checked]):hover:active {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked] {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked][siblings-menu-open],
-.inspector-breadcrumbs-button[checked]:hover:active {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]),
-.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked] {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked],
-.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 2 13 2 13 fill stretch;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
- border-right-width: 0;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]),
-.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked] {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked],
-.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 2 13 2 13 fill stretch;
-}
-
-/* Highlighter toolbar - breadcrumbs - RTL */
-
-.inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
- border-right-width: 0;
-}
-
-.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]):-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked][siblings-menu-open]:-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]):-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked]:-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 2 13 2 13 fill stretch;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
- border-left-width: 0;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]):-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked]:-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
- -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 2 13 2 13 fill stretch;
-}
-
-/* Highlighter toolbar - HTML Tree */
-
-#inspector-treepanel-toolbutton {
- list-style-image: url("chrome://browser/skin/devtools/treepanel-button.png");
- -moz-margin-end: 0;
- -moz-image-region: rect(0px 18px 16px 0px);
-}
-
-#inspector-treepanel-toolbutton[checked] {
- -moz-image-region: rect(0px 36px 16px 18px);
-}
-
-#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(rtl),
-#inspector-treepanel-toolbutton:-moz-locale-dir(ltr) {
- border-radius: 3px 0 0 3px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(ltr),
-#inspector-treepanel-toolbutton:-moz-locale-dir(rtl) {
- border-radius: 0 3px 3px 0;
-}
-
-/* Highlight toolbar - Option menu */
-
-#inspector-option-toolbarbutton:-moz-focusring {
- outline: 1px dotted hsla(210,30%,85%,0.4);
- outline-offset: -2px;
-}
-
html|*#gcli-tooltip-frame,
html|*#gcli-output-frame {
padding: 0;
@@ -3268,33 +2989,13 @@ html|*#gcli-output-frame {
background: rgba(0,0,0,.4);
}
-#developer-toolbar-webconsole {
- -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-#developer-toolbar-inspector {
- -moz-image-region: rect(16px, 16px, 32px, 0);
-}
-
-#developer-toolbar-styleeditor {
- -moz-image-region: rect(32px, 16px, 48px, 0);
-}
-
-#developer-toolbar-debugger {
- -moz-image-region: rect(48px, 16px, 64px, 0);
-}
-
-#developer-toolbar-other-tools {
+#developer-toolbar-toolbox-button {
-moz-image-region: rect(64px, 16px, 80px, 0);
}
-#developer-toolbar-other-tools > .toolbarbutton-menu-dropmarker {
- display: none;
-}
-
/* Error counter */
-#developer-toolbar-webconsole[error-count]:before {
+#developer-toolbar-toolbox-button[error-count]:before {
color: #FDF3DE;
min-width: 16px;
text-shadow: none;
diff --git a/browser/themes/winstripe/devtools/command-responsivemode.png b/browser/themes/winstripe/devtools/command-responsivemode.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbfa599048c1065c7250a5cd74b9684724f3ded3
GIT binary patch
literal 1083
zcmV-B1jPG^P){UzO0owih;|zVdoglM>cwC%#$YhU7`2<(IQxCw_q6}zaJu(MZ+h|J_xtPTd++so
zJ)EP$j~+kQsO_iXh4I1^PauOVU#LN7^a3-A^a_`}z>Ffl2!DBj8D(s0Nm}ydo%?w`
z1C|$%K~_Ed?*r@^4a|ZIqePKEM~O04@0yv_{;d@_;0)&V(-Q&D#&MBA{H!e9*c-hF?ynud0
z0rdcTU;pKdDbv%?b`mDedI7r69h@D(B~J%9eDWKJJx`wn%xb=20i!Uu@Rh0)MK3Jg
zkQtZtRyrom^7F(u58YBg_5l5e0_p(w9cURlCe9HBIDK#iaBpMI&bMJF4xjuAxL?)t
zI6L$7S-`8GUbBEvv@?5ATWCxN$HduD
z0DbP@Gk8<;UO*MV
z{`b&ug}m`JIagxh>?nXfcW?@DZ)U!gvss|$^vO?vdmnTCoPEwbeHJit_XP`}fQ6s*
z|Bw~zD#>lUIEaa}@lO2&J}<=SzFt5OV8^v5`1Q#@JXdh|GQo)vT=H~Q3l5+B2%_Xa
zcK9q{M%_6J7%R5Vjhp>;8m|8*%qyH>Z2T;BUc;Gvs`S81x~~_o4PbX62Oj{t?sEq{
zM7gj^=oZ}kd&DhYAq+Tt7LZZhYXPI6G7Hzfj@$;vy|(jM`|RLx-1jHzzFxpq;8uWq
z3-N*De65-H~
zDBvR?yAS6m_-vn9aD<8xR($B+hXcl>Z_8WH5KZ3k-u@FY|OgvDx-7;DMJ4%mXj$_lD)+ftT{%L2m!>
zc~~AEczJ;#!)Q4Kc;KZ1AAwn9A%uB&DPJ%gD=F{-gWy{-)$wJ0<8cj~F%N5+`=kEaG
WYW7HKLO22d0000s
literal 0
HcmV?d00001
diff --git a/browser/themes/winstripe/devtools/command-tilt.png b/browser/themes/winstripe/devtools/command-tilt.png
new file mode 100644
index 0000000000000000000000000000000000000000..f816bba59cedb2fb2069b4d0a4ff09225e99cdb7
GIT binary patch
literal 1668
zcmV-~27CF5P)7@lZbk!4AxRxGAezZD@!&{M4i(X$6bSLi4nr{%1$IzT
z(FkL7Fbiey)=J}aIhSL(1+|&&`_R75uN{6fP5sdypXuB8d7k&(-^0$kuR8rN{?Hjd
z^0j{hvj2PD>%{%P?Q|k?B!nI@h8PDhV+W1(BCGuY@c+7mC9#;;3^el$Xq*GEyWxZr
zv5`0mG_y0be~{NF77%H~J)oI=plNw=V1dvj3<#sqF>(vrgV%!H(#zy;WZta~BOJ`4CU`2JUH^7V?G^q$LFO|MsN9>+XX`
z&QB_;>{?ZwGJqL7Xz;*`3{yY>?b18Cd&4TKYTn}Ip}_+$GE4y~I$&8>@3Z8pTE$Xc
z9vVFGB7>~3Jay8XBe&E}UzFC(Oewx(^>O}Q*^b<3t2lXxMVx#Mz>FO1z>FOFQVhUS*g#}(Dy$S?(*?d^Y_PsN<4
zLl!hDThr;k8z}1rFk=Ue?s15&^&T=z0ZRH-C_B3QTG~3gTFG;xMb()|-xe=`89Qin
zk85V2}Z<+PVi1w`?n
zn@Ksp!BI>BIXrlIXiNb$Ja~C%Vgb{47N~g$UaQ@ulV%!9M^Dx#bO}Msumx=90evW-
zF$J9B0i6S@RdV6yE5!mVw&kmN2!0XPIJ8Gnp^k`{VGG#AgI54FrhpS%_y=IM$2@p>
zXkr28(Rpef&^00pUELGYEtQ5d@7XAd?4l27z!Sc4}$A@X*Rj
zhqod1Vb{
zflf$?S;R`(h0zn)4;it5lIx|j=xH5Bb2@QM3-R^Zi%21k(o;PY8ED|v-TQ8;?%sVg
z-zFYtA--Pw6Bmg)^k$ky8Fy$BSO4*bfeGQp>%P8W8h-qxY4`~>ix8OLY!IGlZWEi6
z=n|KwaEO(^G!4zTW)$@4Mq~#I&^&1LqqoM5uU6F0p`WqUbny^Cx(g9Z^M~}4I0qhh
zkr4|J^JxbU8Pm@lUYqyRK10J|;vjKA*`^ABN6hzYJZz?4gvr0@>-YMT
z%4#oqZH=cg;%WBAPRzf`aPmu*`5V?K8s4QhzHG{$!i?Qec|70`68cgT`*HLaw#2tW;;_g;Vl&@dI>liuG .toolbarbutton-text {
+ display: none;
+}
+
.devtools-toolbarbutton:not([checked=true]):hover:active {
background-color: hsla(210,18%,9%,.1);
background-image: -moz-linear-gradient(hsla(209,13%,54%,.35), hsla(209,13%,54%,.1) 85%, hsla(209,13%,54%,.2));
@@ -209,6 +213,65 @@
position: relative;
}
+/* In-tools sidebar */
+
+.devtools-sidebar-tabs {
+ -moz-appearance: none;
+ margin: 0;
+}
+
+.devtools-sidebar-tabs > tabpanels {
+ -moz-appearance: none;
+ padding: 0;
+ border: 0;
+}
+
+.devtools-sidebar-tabs > tabs {
+ -moz-appearance: none;
+ position: static;
+ box-shadow: 0 1px 0 0 hsla(210, 16%, 76%, .2) inset;
+ background-image: linear-gradient(to bottom, hsl(210,11%,36%), hsl(210,11%,18%));
+ color: hsl(210,30%,85%);
+ margin-bottom: 0;
+ padding: 0;
+}
+
+.devtools-sidebar-tabs > tabs > .tabs-right,
+.devtools-sidebar-tabs > tabs > .tabs-left {
+ display: none;
+}
+
+.devtools-sidebar-tabs > tabs > tab {
+ -moz-appearance: none;
+ padding: 0;
+ margin: 0;
+ min-width: 78px;
+ min-height: 22px;
+ text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
+ text-align: center;
+ color: inherit;
+ -moz-box-flex: 1;
+ border-width: 0;
+ -moz-border-end-width: 1px;
+ border-color: hsla(210,8%,5%,.6);
+ border-style: solid;
+ background: transparent;
+ border-radius: 0;
+}
+
+.devtools-sidebar-tabs > tabs > tab:-moz-focusring {
+ position: static;
+}
+
+.devtools-sidebar-tabs > tabs > tab:last-of-type {
+ -moz-border-end-width: 0;
+}
+
+.devtools-sidebar-tabs > tabs > tab[selected=true] {
+ background-image: linear-gradient(to bottom, hsl(201,45%,34%), hsl(205,44%,22%));
+ color: white !important;
+}
+
/* Theme */
.devtools-theme-background {
diff --git a/browser/themes/winstripe/devtools/dock-bottom.png b/browser/themes/winstripe/devtools/dock-bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..83842f236ef5ede55a268e67077532fc1764746f
GIT binary patch
literal 487
zcmVdbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#RU^m#7D5O5DNKh
zIOvAfv{}Bpy}3APx_hQ+E}SZkWA*&<`f+)6eGl{!f$e6~t!l(Liq(<<1g?8r1-8-x
zYak{7r)TG5uj2=R%rNc4gZ=u`oaHojd>f8ks77z^u{G13$|4$*j7bGs-Kr9=kg|q0LGK>
zJ!#C#^DL;Ww?9D5ENB?E+8#=&7+4reskqhl&@coLT5IghS{Xqd*vZ(+Lj?5D1oFGv
d7ytene*n2yf``D{mBs)7002ovPDHLkV1mh##`^#O
literal 0
HcmV?d00001
diff --git a/browser/themes/winstripe/devtools/dock-side.png b/browser/themes/winstripe/devtools/dock-side.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a940bc1e4e50a63d1522fc5604cb2cf44b05e82
GIT binary patch
literal 536
zcmV+z0_XjSP)dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#RSoj`_MNAq&5H*Pw
z3NaSm5~HhonXzzJ)=Nxb;lR(pFz4{i;f!dl`O7l?qz1YG%z?BC4ESSq&?uk@+}IDb
zmoEP>v9Y$YoX=&4Baui)s&b{;oSmCr0WJcAWGp5G}8!KIdEm%}dK31KIqEP)dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#Rc7@u?RTxEB5kmh%P)N(7
zT`i)>qChBuC?O1glu}BRT7)w?m6JZ7^WK|x@7KZt6L)^g?{Ln6^PP_o5q2_c>!Lii
zyS#bd-dMmeN|lt`l7tX4lU@8dJw1~ZTfxg0`;K&Xo;;DNPjID(6VZPrn#PsmdUAYh
zB6F$#%FV3;C3UsYhK6LEy?HzKJCj{p*M;VT{nd~Po|5K)))u{`Wq*Zfnzf=b(G)p<
z_DnjRZjb#~%9_zwGAcA?Umv(JH}vrCYXIw;3_Ji$PoKX!To;X+j^hMGJRVPVcXu66
z)hEnSgTp0QR>3a@gTYw<;{dj%Y#BzN*_Sd1fVh-0l1e4*sSnc&Ev;>zZ{5DLTo%++
zC=~LyAp?LCLKKO}Q$*lWN=PY-wr%I%O^gg{oM$x7lx0~40DT()({(-KoVy?*A(bL2
zRnas}8$hn6y1E{K-O=9G7&1$aMj{cL^NkQS>B_}rt1(kRTqhsUw?BddbV4M?U%x!GkWjq>saY$!;
z?aSA1`kHMU05Kv$G9L3nC5AsaHMKHu?dk-88~_UlSYl;mHGl8^13J~!S!k$_>rx?j
zOoz(>2iWMk0_4cV$KdSTd=9{S0P-rFDnc035UZ`-}m+HPRBWCQb}w1SN@Zm
k|31GNV>|suz9Tk(KRCWA;;1x%9RL6T07*qoM6N<$g8X4xGynhq
literal 0
HcmV?d00001
diff --git a/browser/themes/winstripe/devtools/inspector.css b/browser/themes/winstripe/devtools/inspector.css
new file mode 100644
index 000000000000..1b47e9f610f4
--- /dev/null
+++ b/browser/themes/winstripe/devtools/inspector.css
@@ -0,0 +1,218 @@
+#inspector-inspect-toolbutton {
+ list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
+ -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#inspector-inspect-toolbutton[checked=true] {
+ -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+/* Highlighter toolbar - breadcrumbs */
+
+#inspector-breadcrumbs {
+ -moz-margin-end: 3px;
+ /* A fake 1px-shadow is included in the border-images of the
+ inspector-breadcrumbs-buttons, to match toolbar-buttons style.
+ This negative margin compensate the extra row of pixels created
+ by the shadow.*/
+ margin: -1px 0;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up,
+#inspector-breadcrumbs > .scrollbutton-down {
+ -moz-appearance: none;
+ border: 1px solid hsla(210,8%,5%,.45);
+ background: -moz-linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
+ box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
+ margin: 1px 0 1px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
+ border-color: hsla(210,8%,5%,.6);
+ background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
+ box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
+ -moz-appearance: none;
+ list-style-image: url("chrome://browser/skin/devtools/breadcrumbs-scrollbutton.png");
+ -moz-image-region: rect(0px 7px 16px 0px);
+ margin: 0 5px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
+ opacity: 0.5;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
+ -moz-image-region: rect(0px 14px 16px 7px);
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
+ transform: scaleX(-1);
+}
+
+.inspector-breadcrumbs-button {
+ -moz-appearance: none;
+ background-color: transparent;
+ border-style: solid;
+ border-width: 2px 13px;
+ outline: none;
+ color: hsl(210,30%,85%);
+ width: 85px; /* Can't use max-width. See bug 723132 */
+ /* The content of the button can be larger than the button */
+ overflow: hidden;
+ min-height: 25px;
+ margin: 0 -11px 0 0;
+ padding: 0 9px;
+}
+
+.inspector-breadcrumbs-button:-moz-focusring > .button-box {
+ border-width: 0;
+}
+
+.inspector-breadcrumbs-button:-moz-focusring > label {
+ border-bottom: 1px dotted hsla(210,30%,85%,0.4);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
+ color: hsl(200,100%,60%);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
+ color: hsl(200,100%,70%);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
+ color: hsl(20, 100%, 70%);
+}
+
+.inspector-breadcrumbs-id,
+.inspector-breadcrumbs-classes {
+ color: #8d99a6;
+}
+
+.inspector-breadcrumbs-pseudo-classes {
+ color: hsl(20, 100%, 85%);
+}
+
+/* Highlighter toolbar - breadcrumbs - LTR */
+
+.inspector-breadcrumbs-button {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:not([checked]):hover:active {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked] {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:hover:active {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked] {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 2 13 2 13 fill stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
+ border-left-width: 0;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
+ border-right-width: 0;
+}
+
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked] {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+/* Highlighter toolbar - breadcrumbs - RTL */
+
+.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 2 13 2 13 fill stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
+ border-right-width: 0;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+ border-left-width: 0;
+}
+
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+ -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 2 13 2 13 fill stretch;
+}
diff --git a/browser/themes/winstripe/devtools/layout-background.png b/browser/themes/winstripe/devtools/layout-background.png
deleted file mode 100644
index 6991cc0f2ab221e7488be16c3f9e4aa4d6228e73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 981
zcmV;`11kK9P)y@%BDT)H`J*U$N?>)QSj&)sG*Oe^Gn5Kznx7)F88^#!>X+mpFmSrr<
zf^&}3>BKM$EXzU&fxhpNQW8QS%QA!zeEIT)BuS7_6mhv+`1qQA#n6BUM!)gy8AviMp=o
z`~HSOUDv$4ydZ>l`<0Z;^Ncjc;JrsFMb~xA^Gs0`SZjHGeWk8zq?Fv>-}CzVijV94L{Y@U!vj$ip?>-8)BB(N2q8Ee4h+M9bMD4g2!YGxf>H`=Ek#iTfh0+YH`&3?T$$*L4iTK;QQ_&Z??H
zDaC%jrz}f`VW21qwr%74_wRIFhf<0pNl4R_JkN2?p+5cj*ZZH~g%ED1Ow+`&EO_s^
zySpQbB8)Kr9FIqwbN`!}rs>U1t@RC!d7jy}4XrhC9N+5C&(BzENz)W#3~8Dogur``
zbB;XEk>~T7IF6a;nd9+zi=U=x$n%`@`Hc4-V+>VQF^(f`+cJ(L)>^#x0DSxQ?M+$R
zw)B0E5Q4kAJC4WW4GVy2n#i(@%jH5{*J!PA&hg>H2SNz!b~}oqK>hmZkM~g&aXOvo
z`=0Cdddn^EJ^THhWmy=8;TBWZ>lLLGLWtYqaUA&%hHv{do)ciN00000NkvXXu0mjf
DG;`Ue
diff --git a/browser/themes/winstripe/devtools/layout-buttons.png b/browser/themes/winstripe/devtools/layout-buttons.png
deleted file mode 100644
index 8705bc51475de5e6759371cc30a32e67187f455a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 447
zcmV;w0YLtVP)*HF4|i4HQFuB3#bx}l_*jrJ4(_VH;~JMbe0AA!TePMr
zwT0zI8wYo`Z_M+90}k#LUQLlHcH=q!3+nHE99;8p{A-sk40-+udd!$_2aFUpL$t6H
z&lU#iZ2~n}bOr}^%1NzR4W{_mYd^=#M@B*}`rG@=qc?_t@=!J7QxKW?Jmn%J!
z1)c+HGWDLAG2afjQ&`u})6}A#Ew>LKqsI)hIJi+?G+eqkVo`WRWcedKy;BYI?SP)b
zGyOc5dfpas@+f5Vm|+%&Jn9EjwP?UX90-;VwYd>>_jbzzQyp4VTTtU~R^6f=nc73l{
p$6eJAU$BJOT9O3rs{a4K;U}VSGM> #header > #togglebutton {
- background-position: -16px 0;
-}
diff --git a/browser/themes/winstripe/devtools/toolbox.css b/browser/themes/winstripe/devtools/toolbox.css
new file mode 100644
index 000000000000..6bba0e7549ed
--- /dev/null
+++ b/browser/themes/winstripe/devtools/toolbox.css
@@ -0,0 +1,98 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+#toolbox-tabs {
+ margin: 0;
+}
+
+#toolbox-dock-bottom {
+ list-style-image: url("chrome://browser/skin/devtools/dock-bottom.png");
+}
+
+#toolbox-dock-side {
+ list-style-image: url("chrome://browser/skin/devtools/dock-side.png");
+}
+
+#toolbox-dock-window {
+ list-style-image: url("chrome://browser/skin/devtools/dock-window.png");
+}
+
+#command-button-responsive {
+ list-style-image: url(chrome://browser/skin/devtools/command-responsivemode.png);
+ -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+#command-button-responsive:hover {
+ -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+#command-button-responsive:hover:active {
+ -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+#command-button-responsive[checked=true] {
+ -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+#command-button-tilt {
+ list-style-image: url(chrome://browser/skin/devtools/command-tilt.png);
+ -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+#command-button-tilt:hover {
+ -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+#command-button-tilt:hover:active {
+ -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+#command-button-tilt[checked=true] {
+ -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+#command-button-scratchpad {
+ list-style-image: url(chrome://browser/skin/devtools/command-scratchpad.png);
+ -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+#command-button-scratchpad:hover {
+ -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+#command-button-scratchpad:hover:active {
+ -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+
+/* Tabs */
+
+.devtools-tabbar {
+ -moz-appearance: none;
+ background-image: linear-gradient(to bottom, hsl(209,18%,34%), hsl(210,24%,16%));
+ color: hsl(210,30%,85%);
+ padding: 4px 3px 3px;
+ box-shadow: 0 -3px 0 0 rgb(20,20,20) inset, 0 -4px 0 0 rgba(0,0,0,0.8) inset;
+}
+
+.devtools-tab {
+ -moz-appearance: none;
+ min-width: 78px;
+ min-height: 22px;
+ text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
+ border-radius: 3px 3px 0 0;
+ color: inherit;
+ border-style: solid;
+ border-color: transparent;
+ border-width: 1px 1px 0;
+ margin: 0 5px;
+ padding: 0 10px 1px;
+}
+
+.devtools-tab[selected=true] {
+ border-color: hsla(210,8%,5%,.6);
+ background-color: rgb(20,20,20);
+ text-shadow: none;
+ color: white;
+}
+
+.devtools-tab > .radio-label-box {
+ -moz-margin-start: 0px
+}
diff --git a/browser/themes/winstripe/devtools/treepanel-button.png b/browser/themes/winstripe/devtools/treepanel-button.png
deleted file mode 100644
index 2a8802216bf178bc05813fc592df30d91cd49415..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 805
zcmV+=1KRwFP)5$VXf7@J4|UBGmWoNkFo+B=7IV;tniNex>IV$MLwpTQ?d3;XfCB6w1LF^KBG>F_-H+(p2QOJ&
z=qI(xQRtVtI}78ax~0>Nl`T>!E)#AoiVyU?eDUP^NF>}Y)8d&gNiBBy>KiD0o`@X+
zKN@h;xZ3NDl3s619>&;gX6pGB`uZ^*7F{f;GZYN!hRMn@1&xHm8XO%J4nbWvOz@*T
z@kMnecO^Mh8sUTIEo&lI=TSuM#9t*0SwF(qy|hy