diff --git a/browser/devtools/inspector/breadcrumbs.js b/browser/devtools/inspector/breadcrumbs.js index 60af2dee53c3..dec6f5a09c5e 100644 --- a/browser/devtools/inspector/breadcrumbs.js +++ b/browser/devtools/inspector/breadcrumbs.js @@ -12,6 +12,9 @@ const ENSURE_SELECTION_VISIBLE_DELAY = 50; // ms Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource:///modules/devtools/DOMHelpers.jsm"); Cu.import("resource://gre/modules/Services.jsm"); +Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +const ELLIPSIS = Services.prefs.getComplexValue("intl.ellipsis", Ci.nsIPrefLocalizedString).data; +const MAX_LABEL_LENGTH = 40; let promise = require("sdk/core/promise"); @@ -72,6 +75,17 @@ HTMLBreadcrumbs.prototype = { _init: function BC__init() { this.container = this.chromeDoc.getElementById("inspector-breadcrumbs"); + + // These separators are used for CSS purposes only, and are positioned + // off screen, but displayed with -moz-element. + this.separators = this.chromeDoc.createElement("box"); + this.separators.className = "breadcrumb-separator-container"; + this.separators.innerHTML = + "" + + "" + + ""; + this.container.parentNode.appendChild(this.separators); + this.container.addEventListener("mousedown", this, true); this.container.addEventListener("keypress", this, true); @@ -184,16 +198,15 @@ HTMLBreadcrumbs.prototype = { let pseudosLabel = this.chromeDoc.createElement("label"); pseudosLabel.className = "breadcrumbs-widget-item-pseudo-classes plain"; - tagLabel.textContent = aNode.tagName.toLowerCase(); - idLabel.textContent = aNode.id ? ("#" + aNode.id) : ""; + let tagText = aNode.tagName.toLowerCase(); + let idText = aNode.id ? ("#" + aNode.id) : ""; + let classesText = ""; if (aNode.className) { - let classesText = ""; let classList = aNode.className.split(/\s+/); for (let i = 0; i < classList.length; i++) { classesText += "." + classList[i]; } - classesLabel.textContent = classesText; } // XXX: Until we have pseudoclass lock in the node. @@ -201,6 +214,26 @@ HTMLBreadcrumbs.prototype = { } + // Figure out which element (if any) needs ellipsing. + // Substring for that element, then clear out any extras + // (except for pseudo elements). + let maxTagLength = MAX_LABEL_LENGTH; + let maxIdLength = MAX_LABEL_LENGTH - tagText.length; + let maxClassLength = MAX_LABEL_LENGTH - tagText.length - idText.length; + + if (tagText.length > maxTagLength) { + tagText = tagText.substr(0, maxTagLength) + ELLIPSIS; + idText = classesText = ""; + } else if (idText.length > maxIdLength) { + idText = idText.substr(0, maxIdLength) + ELLIPSIS; + classesText = ""; + } else if (classesText.length > maxClassLength) { + classesText = classesText.substr(0, maxClassLength) + ELLIPSIS; + } + + tagLabel.textContent = tagText; + idLabel.textContent = idText; + classesLabel.textContent = classesText; pseudosLabel.textContent = aNode.pseudoClassLocks.join(""); fragment.appendChild(tagLabel); @@ -360,6 +393,10 @@ HTMLBreadcrumbs.prototype = { this.container.removeEventListener("mousedown", this, true); this.container.removeEventListener("keypress", this, true); this.container = null; + + this.separators.remove(); + this.separators = null; + this.nodeHierarchy = null; }, diff --git a/browser/devtools/shared/widgets/BreadcrumbsWidget.jsm b/browser/devtools/shared/widgets/BreadcrumbsWidget.jsm index 74bc464d9632..578494492459 100644 --- a/browser/devtools/shared/widgets/BreadcrumbsWidget.jsm +++ b/browser/devtools/shared/widgets/BreadcrumbsWidget.jsm @@ -46,6 +46,17 @@ this.BreadcrumbsWidget = function BreadcrumbsWidget(aNode) { this._list.addEventListener("underflow", this._onUnderflow.bind(this), false); this._list.addEventListener("overflow", this._onOverflow.bind(this), false); + + // These separators are used for CSS purposes only, and are positioned + // off screen, but displayed with -moz-element. + this._separators = this.document.createElement("box"); + this._separators.className = "breadcrumb-separator-container"; + this._separators.innerHTML = + "" + + "" + + ""; + this._parent.appendChild(this._separators); + // This widget emits events that can be handled in a MenuContainer. EventEmitter.decorate(this); diff --git a/browser/themes/linux/devtools/breadcrumbs-scrollbutton.png b/browser/themes/linux/devtools/breadcrumbs-scrollbutton.png deleted file mode 100644 index 722438060a89..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs-scrollbutton.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-end-pressed.png b/browser/themes/linux/devtools/breadcrumbs/ltr-end-pressed.png deleted file mode 100644 index 1b0fcf98659e..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-end-pressed.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-end-selected-pressed.png b/browser/themes/linux/devtools/breadcrumbs/ltr-end-selected-pressed.png deleted file mode 100644 index c7c2f39ab2c4..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-end-selected-pressed.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-end-selected.png b/browser/themes/linux/devtools/breadcrumbs/ltr-end-selected.png deleted file mode 100644 index c7c2f39ab2c4..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-end-selected.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-end.png b/browser/themes/linux/devtools/breadcrumbs/ltr-end.png deleted file mode 100644 index 2a65f402ad84..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-end.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-middle-pressed.png b/browser/themes/linux/devtools/breadcrumbs/ltr-middle-pressed.png deleted file mode 100644 index 1d2611ddaf0b..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-middle-pressed.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-middle-selected-pressed.png b/browser/themes/linux/devtools/breadcrumbs/ltr-middle-selected-pressed.png deleted file mode 100644 index d2b7f8dae062..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-middle-selected-pressed.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-middle-selected.png b/browser/themes/linux/devtools/breadcrumbs/ltr-middle-selected.png deleted file mode 100644 index 2311685f8642..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-middle-selected.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-middle.png b/browser/themes/linux/devtools/breadcrumbs/ltr-middle.png deleted file mode 100644 index a99e9fabe969..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-middle.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-start-pressed.png b/browser/themes/linux/devtools/breadcrumbs/ltr-start-pressed.png deleted file mode 100644 index 30c2c29463bd..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-start-pressed.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-start-selected-pressed.png b/browser/themes/linux/devtools/breadcrumbs/ltr-start-selected-pressed.png deleted file mode 100644 index a5bc6124e552..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-start-selected-pressed.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-start-selected.png b/browser/themes/linux/devtools/breadcrumbs/ltr-start-selected.png deleted file mode 100644 index a08fb902db8b..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-start-selected.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/ltr-start.png b/browser/themes/linux/devtools/breadcrumbs/ltr-start.png deleted file mode 100644 index b8a43b58cd7a..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/ltr-start.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-end-pressed.png b/browser/themes/linux/devtools/breadcrumbs/rtl-end-pressed.png deleted file mode 100644 index 4c57d76f18b5..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-end-pressed.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-end-selected-pressed.png b/browser/themes/linux/devtools/breadcrumbs/rtl-end-selected-pressed.png deleted file mode 100644 index cd2f0a5e837f..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-end-selected-pressed.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-end-selected.png b/browser/themes/linux/devtools/breadcrumbs/rtl-end-selected.png deleted file mode 100644 index cd2f0a5e837f..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-end-selected.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-end.png b/browser/themes/linux/devtools/breadcrumbs/rtl-end.png deleted file mode 100644 index ea9bc32556ae..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-end.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-middle-pressed.png b/browser/themes/linux/devtools/breadcrumbs/rtl-middle-pressed.png deleted file mode 100644 index d6a8a4385689..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-middle-pressed.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-middle-selected-pressed.png b/browser/themes/linux/devtools/breadcrumbs/rtl-middle-selected-pressed.png deleted file mode 100644 index 61bbcb13419b..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-middle-selected-pressed.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-middle-selected.png b/browser/themes/linux/devtools/breadcrumbs/rtl-middle-selected.png deleted file mode 100644 index 066c34528030..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-middle-selected.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-middle.png b/browser/themes/linux/devtools/breadcrumbs/rtl-middle.png deleted file mode 100644 index cb87d62b24b9..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-middle.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-start-pressed.png b/browser/themes/linux/devtools/breadcrumbs/rtl-start-pressed.png deleted file mode 100644 index 155f6380bf22..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-start-pressed.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-start-selected-pressed.png b/browser/themes/linux/devtools/breadcrumbs/rtl-start-selected-pressed.png deleted file mode 100644 index dab1153284f5..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-start-selected-pressed.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-start-selected.png b/browser/themes/linux/devtools/breadcrumbs/rtl-start-selected.png deleted file mode 100644 index a520e8088c78..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-start-selected.png and /dev/null differ diff --git a/browser/themes/linux/devtools/breadcrumbs/rtl-start.png b/browser/themes/linux/devtools/breadcrumbs/rtl-start.png deleted file mode 100644 index 86912e0668d7..000000000000 Binary files a/browser/themes/linux/devtools/breadcrumbs/rtl-start.png and /dev/null differ diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index 484c9005c9e0..5f7d99a41b9a 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -178,31 +178,9 @@ browser.jar: skin/classic/browser/devtools/editor-error.png (devtools/editor-error.png) skin/classic/browser/devtools/editor-breakpoint.png (devtools/editor-breakpoint.png) skin/classic/browser/devtools/editor-debug-location.png (devtools/editor-debug-location.png) - skin/classic/browser/devtools/breadcrumbs-scrollbutton.png (devtools/breadcrumbs-scrollbutton.png) - skin/classic/browser/devtools/breadcrumbs/ltr-end-pressed.png (devtools/breadcrumbs/ltr-end-pressed.png) - skin/classic/browser/devtools/breadcrumbs/ltr-end-selected-pressed.png (devtools/breadcrumbs/ltr-end-selected-pressed.png) - skin/classic/browser/devtools/breadcrumbs/ltr-end-selected.png (devtools/breadcrumbs/ltr-end-selected.png) - skin/classic/browser/devtools/breadcrumbs/ltr-end.png (devtools/breadcrumbs/ltr-end.png) - skin/classic/browser/devtools/breadcrumbs/ltr-middle-pressed.png (devtools/breadcrumbs/ltr-middle-pressed.png) - skin/classic/browser/devtools/breadcrumbs/ltr-middle-selected-pressed.png (devtools/breadcrumbs/ltr-middle-selected-pressed.png) - skin/classic/browser/devtools/breadcrumbs/ltr-middle-selected.png (devtools/breadcrumbs/ltr-middle-selected.png) - skin/classic/browser/devtools/breadcrumbs/ltr-middle.png (devtools/breadcrumbs/ltr-middle.png) - skin/classic/browser/devtools/breadcrumbs/ltr-start-pressed.png (devtools/breadcrumbs/ltr-start-pressed.png) - skin/classic/browser/devtools/breadcrumbs/ltr-start-selected-pressed.png (devtools/breadcrumbs/ltr-start-selected-pressed.png) - skin/classic/browser/devtools/breadcrumbs/ltr-start.png (devtools/breadcrumbs/ltr-start.png) - skin/classic/browser/devtools/breadcrumbs/ltr-start-selected.png (devtools/breadcrumbs/ltr-start-selected.png) - skin/classic/browser/devtools/breadcrumbs/rtl-end-pressed.png (devtools/breadcrumbs/rtl-end-pressed.png) - skin/classic/browser/devtools/breadcrumbs/rtl-end-selected-pressed.png (devtools/breadcrumbs/rtl-end-selected-pressed.png) - skin/classic/browser/devtools/breadcrumbs/rtl-end-selected.png (devtools/breadcrumbs/rtl-end-selected.png) - skin/classic/browser/devtools/breadcrumbs/rtl-end.png (devtools/breadcrumbs/rtl-end.png) - skin/classic/browser/devtools/breadcrumbs/rtl-middle-pressed.png (devtools/breadcrumbs/rtl-middle-pressed.png) - skin/classic/browser/devtools/breadcrumbs/rtl-middle-selected-pressed.png (devtools/breadcrumbs/rtl-middle-selected-pressed.png) - skin/classic/browser/devtools/breadcrumbs/rtl-middle-selected.png (devtools/breadcrumbs/rtl-middle-selected.png) - skin/classic/browser/devtools/breadcrumbs/rtl-middle.png (devtools/breadcrumbs/rtl-middle.png) - skin/classic/browser/devtools/breadcrumbs/rtl-start-pressed.png (devtools/breadcrumbs/rtl-start-pressed.png) - skin/classic/browser/devtools/breadcrumbs/rtl-start-selected-pressed.png (devtools/breadcrumbs/rtl-start-selected-pressed.png) - skin/classic/browser/devtools/breadcrumbs/rtl-start.png (devtools/breadcrumbs/rtl-start.png) - skin/classic/browser/devtools/breadcrumbs/rtl-start-selected.png (devtools/breadcrumbs/rtl-start-selected.png) + skin/classic/browser/devtools/breadcrumbs-divider@2x.png (../shared/devtools/images/breadcrumbs-divider@2x.png) + skin/classic/browser/devtools/breadcrumbs-scrollbutton.png (../shared/devtools/images/breadcrumbs-scrollbutton.png) + skin/classic/browser/devtools/breadcrumbs-scrollbutton@2x.png (../shared/devtools/images/breadcrumbs-scrollbutton@2x.png) skin/classic/browser/devtools/splitview.css (devtools/splitview.css) skin/classic/browser/devtools/styleeditor.css (devtools/styleeditor.css) * skin/classic/browser/devtools/shadereditor.css (devtools/shadereditor.css) diff --git a/browser/themes/osx/devtools/breadcrumbs-scrollbutton.png b/browser/themes/osx/devtools/breadcrumbs-scrollbutton.png deleted file mode 100644 index 722438060a89..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs-scrollbutton.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-end-pressed.png b/browser/themes/osx/devtools/breadcrumbs/ltr-end-pressed.png deleted file mode 100644 index 1b0fcf98659e..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-end-pressed.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-end-selected-pressed.png b/browser/themes/osx/devtools/breadcrumbs/ltr-end-selected-pressed.png deleted file mode 100644 index c7c2f39ab2c4..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-end-selected-pressed.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-end-selected.png b/browser/themes/osx/devtools/breadcrumbs/ltr-end-selected.png deleted file mode 100644 index c7c2f39ab2c4..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-end-selected.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-end.png b/browser/themes/osx/devtools/breadcrumbs/ltr-end.png deleted file mode 100644 index 2a65f402ad84..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-end.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-middle-pressed.png b/browser/themes/osx/devtools/breadcrumbs/ltr-middle-pressed.png deleted file mode 100644 index 1d2611ddaf0b..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-middle-pressed.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-middle-selected-pressed.png b/browser/themes/osx/devtools/breadcrumbs/ltr-middle-selected-pressed.png deleted file mode 100644 index d2b7f8dae062..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-middle-selected-pressed.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-middle-selected.png b/browser/themes/osx/devtools/breadcrumbs/ltr-middle-selected.png deleted file mode 100644 index 2311685f8642..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-middle-selected.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-middle.png b/browser/themes/osx/devtools/breadcrumbs/ltr-middle.png deleted file mode 100644 index a99e9fabe969..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-middle.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-start-pressed.png b/browser/themes/osx/devtools/breadcrumbs/ltr-start-pressed.png deleted file mode 100644 index 30c2c29463bd..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-start-pressed.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-start-selected-pressed.png b/browser/themes/osx/devtools/breadcrumbs/ltr-start-selected-pressed.png deleted file mode 100644 index a5bc6124e552..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-start-selected-pressed.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-start-selected.png b/browser/themes/osx/devtools/breadcrumbs/ltr-start-selected.png deleted file mode 100644 index a08fb902db8b..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-start-selected.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/ltr-start.png b/browser/themes/osx/devtools/breadcrumbs/ltr-start.png deleted file mode 100644 index b8a43b58cd7a..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/ltr-start.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-end-pressed.png b/browser/themes/osx/devtools/breadcrumbs/rtl-end-pressed.png deleted file mode 100644 index 4c57d76f18b5..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-end-pressed.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-end-selected-pressed.png b/browser/themes/osx/devtools/breadcrumbs/rtl-end-selected-pressed.png deleted file mode 100644 index cd2f0a5e837f..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-end-selected-pressed.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-end-selected.png b/browser/themes/osx/devtools/breadcrumbs/rtl-end-selected.png deleted file mode 100644 index cd2f0a5e837f..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-end-selected.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-end.png b/browser/themes/osx/devtools/breadcrumbs/rtl-end.png deleted file mode 100644 index ea9bc32556ae..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-end.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-middle-pressed.png b/browser/themes/osx/devtools/breadcrumbs/rtl-middle-pressed.png deleted file mode 100644 index d6a8a4385689..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-middle-pressed.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-middle-selected-pressed.png b/browser/themes/osx/devtools/breadcrumbs/rtl-middle-selected-pressed.png deleted file mode 100644 index 61bbcb13419b..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-middle-selected-pressed.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-middle-selected.png b/browser/themes/osx/devtools/breadcrumbs/rtl-middle-selected.png deleted file mode 100644 index 066c34528030..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-middle-selected.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-middle.png b/browser/themes/osx/devtools/breadcrumbs/rtl-middle.png deleted file mode 100644 index cb87d62b24b9..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-middle.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-start-pressed.png b/browser/themes/osx/devtools/breadcrumbs/rtl-start-pressed.png deleted file mode 100644 index 155f6380bf22..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-start-pressed.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-start-selected-pressed.png b/browser/themes/osx/devtools/breadcrumbs/rtl-start-selected-pressed.png deleted file mode 100644 index dab1153284f5..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-start-selected-pressed.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-start-selected.png b/browser/themes/osx/devtools/breadcrumbs/rtl-start-selected.png deleted file mode 100644 index a520e8088c78..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-start-selected.png and /dev/null differ diff --git a/browser/themes/osx/devtools/breadcrumbs/rtl-start.png b/browser/themes/osx/devtools/breadcrumbs/rtl-start.png deleted file mode 100644 index 86912e0668d7..000000000000 Binary files a/browser/themes/osx/devtools/breadcrumbs/rtl-start.png and /dev/null differ diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index e81d1ece497a..99f36d2bce9f 100644 --- a/browser/themes/osx/jar.mn +++ b/browser/themes/osx/jar.mn @@ -285,31 +285,9 @@ browser.jar: * skin/classic/browser/devtools/webconsole.css (devtools/webconsole.css) skin/classic/browser/devtools/webconsole_networkpanel.css (devtools/webconsole_networkpanel.css) skin/classic/browser/devtools/webconsole.png (devtools/webconsole.png) - skin/classic/browser/devtools/breadcrumbs-scrollbutton.png (devtools/breadcrumbs-scrollbutton.png) - skin/classic/browser/devtools/breadcrumbs/ltr-end-pressed.png (devtools/breadcrumbs/ltr-end-pressed.png) - skin/classic/browser/devtools/breadcrumbs/ltr-end-selected-pressed.png (devtools/breadcrumbs/ltr-end-selected-pressed.png) - skin/classic/browser/devtools/breadcrumbs/ltr-end-selected.png (devtools/breadcrumbs/ltr-end-selected.png) - skin/classic/browser/devtools/breadcrumbs/ltr-end.png (devtools/breadcrumbs/ltr-end.png) - skin/classic/browser/devtools/breadcrumbs/ltr-middle-pressed.png (devtools/breadcrumbs/ltr-middle-pressed.png) - skin/classic/browser/devtools/breadcrumbs/ltr-middle-selected-pressed.png (devtools/breadcrumbs/ltr-middle-selected-pressed.png) - skin/classic/browser/devtools/breadcrumbs/ltr-middle-selected.png (devtools/breadcrumbs/ltr-middle-selected.png) - skin/classic/browser/devtools/breadcrumbs/ltr-middle.png (devtools/breadcrumbs/ltr-middle.png) - skin/classic/browser/devtools/breadcrumbs/ltr-start-pressed.png (devtools/breadcrumbs/ltr-start-pressed.png) - skin/classic/browser/devtools/breadcrumbs/ltr-start-selected-pressed.png (devtools/breadcrumbs/ltr-start-selected-pressed.png) - skin/classic/browser/devtools/breadcrumbs/ltr-start.png (devtools/breadcrumbs/ltr-start.png) - skin/classic/browser/devtools/breadcrumbs/ltr-start-selected.png (devtools/breadcrumbs/ltr-start-selected.png) - skin/classic/browser/devtools/breadcrumbs/rtl-end-pressed.png (devtools/breadcrumbs/rtl-end-pressed.png) - skin/classic/browser/devtools/breadcrumbs/rtl-end-selected-pressed.png (devtools/breadcrumbs/rtl-end-selected-pressed.png) - skin/classic/browser/devtools/breadcrumbs/rtl-end-selected.png (devtools/breadcrumbs/rtl-end-selected.png) - skin/classic/browser/devtools/breadcrumbs/rtl-end.png (devtools/breadcrumbs/rtl-end.png) - skin/classic/browser/devtools/breadcrumbs/rtl-middle-pressed.png (devtools/breadcrumbs/rtl-middle-pressed.png) - skin/classic/browser/devtools/breadcrumbs/rtl-middle-selected-pressed.png (devtools/breadcrumbs/rtl-middle-selected-pressed.png) - skin/classic/browser/devtools/breadcrumbs/rtl-middle-selected.png (devtools/breadcrumbs/rtl-middle-selected.png) - skin/classic/browser/devtools/breadcrumbs/rtl-middle.png (devtools/breadcrumbs/rtl-middle.png) - skin/classic/browser/devtools/breadcrumbs/rtl-start-pressed.png (devtools/breadcrumbs/rtl-start-pressed.png) - skin/classic/browser/devtools/breadcrumbs/rtl-start-selected-pressed.png (devtools/breadcrumbs/rtl-start-selected-pressed.png) - skin/classic/browser/devtools/breadcrumbs/rtl-start.png (devtools/breadcrumbs/rtl-start.png) - skin/classic/browser/devtools/breadcrumbs/rtl-start-selected.png (devtools/breadcrumbs/rtl-start-selected.png) + skin/classic/browser/devtools/breadcrumbs-divider@2x.png (../shared/devtools/images/breadcrumbs-divider@2x.png) + skin/classic/browser/devtools/breadcrumbs-scrollbutton.png (../shared/devtools/images/breadcrumbs-scrollbutton.png) + skin/classic/browser/devtools/breadcrumbs-scrollbutton@2x.png (../shared/devtools/images/breadcrumbs-scrollbutton@2x.png) skin/classic/browser/devtools/splitview.css (devtools/splitview.css) skin/classic/browser/devtools/styleeditor.css (devtools/styleeditor.css) * skin/classic/browser/devtools/shadereditor.css (devtools/shadereditor.css) diff --git a/browser/themes/shared/devtools/debugger.inc.css b/browser/themes/shared/devtools/debugger.inc.css index be9a3146e150..ed66585f7911 100644 --- a/browser/themes/shared/devtools/debugger.inc.css +++ b/browser/themes/shared/devtools/debugger.inc.css @@ -103,10 +103,6 @@ /* Breadcrumbs stack frames view */ -.breadcrumbs-widget-item { - max-width: none; -} - .dbg-stackframe-details { -moz-padding-start: 4px; } diff --git a/browser/themes/shared/devtools/images/breadcrumbs-divider@2x.png b/browser/themes/shared/devtools/images/breadcrumbs-divider@2x.png new file mode 100644 index 000000000000..9ce5dd74eb33 Binary files /dev/null and b/browser/themes/shared/devtools/images/breadcrumbs-divider@2x.png differ diff --git a/browser/themes/shared/devtools/images/breadcrumbs-scrollbutton.png b/browser/themes/shared/devtools/images/breadcrumbs-scrollbutton.png new file mode 100644 index 000000000000..5f28c8b22468 Binary files /dev/null and b/browser/themes/shared/devtools/images/breadcrumbs-scrollbutton.png differ diff --git a/browser/themes/shared/devtools/images/breadcrumbs-scrollbutton@2x.png b/browser/themes/shared/devtools/images/breadcrumbs-scrollbutton@2x.png new file mode 100644 index 000000000000..22c3c8667a06 Binary files /dev/null and b/browser/themes/shared/devtools/images/breadcrumbs-scrollbutton@2x.png differ diff --git a/browser/themes/shared/devtools/widgets.inc.css b/browser/themes/shared/devtools/widgets.inc.css index 676c4913d2fe..878d9769eb8b 100644 --- a/browser/themes/shared/devtools/widgets.inc.css +++ b/browser/themes/shared/devtools/widgets.inc.css @@ -20,6 +20,8 @@ .breadcrumbs-widget-container { -moz-margin-end: 3px; + max-height: 25px; /* Set max-height for proper sizing on linux */ + height: 25px; /* Set height to prevent starting small waiting for content */ /* A fake 1px-shadow is included in the border-images of the breadcrumbs-widget-items, to match toolbar-buttons style. This negative margin compensates the extra row of pixels created @@ -27,77 +29,41 @@ margin-bottom: -1px; } -/* Preloading hack, LTR */ - -.breadcrumbs-widget-container:-moz-locale-dir(ltr)::after { - content: ''; - display: block; - background-image: - url(breadcrumbs/ltr-start.png), - url(breadcrumbs/ltr-start-selected.png), - url(breadcrumbs/ltr-start-pressed.png), - url(breadcrumbs/ltr-start-selected-pressed.png), - url(breadcrumbs/ltr-middle.png), - url(breadcrumbs/ltr-middle-selected.png), - url(breadcrumbs/ltr-middle-pressed.png), - url(breadcrumbs/ltr-middle-selected-pressed.png), - url(breadcrumbs/ltr-end.png), - url(breadcrumbs/ltr-end-selected.png), - url(breadcrumbs/ltr-end-pressed.png), - url(breadcrumbs/ltr-end-selected-pressed.png); -} - -/* Preloading hack, RTL */ - -.breadcrumbs-widget-container:-moz-locale-dir(rtl)::after { - content: ''; - display: block; - background-image: - url(breadcrumbs/rtl-start.png), - url(breadcrumbs/rtl-start-selected.png), - url(breadcrumbs/rtl-start-pressed.png), - url(breadcrumbs/rtl-start-selected-pressed.png), - url(breadcrumbs/rtl-middle.png), - url(breadcrumbs/rtl-middle-selected.png), - url(breadcrumbs/rtl-middle-pressed.png), - url(breadcrumbs/rtl-middle-selected-pressed.png), - url(breadcrumbs/rtl-end.png), - url(breadcrumbs/rtl-end-selected.png), - url(breadcrumbs/rtl-end-pressed.png), - url(breadcrumbs/rtl-end-selected-pressed.png); -} - .scrollbutton-up, .scrollbutton-down { -moz-appearance: none; - background: 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); - border: 1px solid hsla(210,8%,5%,.45); - margin: 0 0 1px; -} - -.scrollbutton-up:not([disabled]):active:hover, -.scrollbutton-down:not([disabled]):active:hover { - background: 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); - border-color: hsla(210,8%,5%,.6); + background: transparent; + box-shadow: none; + border: none; + list-style-image: none; + margin: 0; + padding: 0; } .scrollbutton-up > .toolbarbutton-icon, .scrollbutton-down > .toolbarbutton-icon { -moz-appearance: none; - list-style-image: url("breadcrumbs-scrollbutton.png"); - -moz-image-region: rect(0px,7px,16px,0px); - margin: 0 5px; + width: 7px; + height: 16px; + background-size: 14px 16px; + background-position: 0 center; + background-repeat: no-repeat; + background-image: url("breadcrumbs-scrollbutton.png"); + list-style-image: none; + margin: 0 8px; + padding: 0; +} + +@media (min-resolution: 2dppx) { + .scrollbutton-up > .toolbarbutton-icon, + .scrollbutton-down > .toolbarbutton-icon { + background-image: url("breadcrumbs-scrollbutton@2x.png"); + } } .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon, .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon { - -moz-image-region: rect(0px,14px,16px,7px); + background-position: -7px center; } .scrollbutton-up[disabled] > .toolbarbutton-icon, @@ -105,165 +71,150 @@ opacity: 0.5; } + +/* Draw shadows to indicate there is more content 'behind' scrollbuttons. */ +.scrollbutton-up:-moz-locale-dir(ltr), +.scrollbutton-down:-moz-locale-dir(rtl) { + border-right: solid 1px rgba(255, 255, 255, .1); + border-left: solid 1px transparent; + box-shadow: 3px 0px 3px -3px #181d20; +} + +.scrollbutton-down:-moz-locale-dir(ltr), +.scrollbutton-up:-moz-locale-dir(rtl) { + border-right: solid 1px transparent; + border-left: solid 1px rgba(255, 255, 255, .1); + box-shadow: -3px 0px 3px -3px #181d20; +} + +.scrollbutton-up[disabled], +.scrollbutton-down[disabled] { + box-shadow: none; + border-color: transparent; +} + .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl), .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) { transform: scaleX(-1); } +/* The breadcrumb separator elements are used as background images with + * -moz-element, so we position them offscreen since we don't care about + * seeing the original elements. + */ +.breadcrumb-separator-container { + position: fixed; + top: -1000px; + left: -1000px; +} + +#breadcrumb-separator-before, +#breadcrumb-separator-after, +#breadcrumb-separator-normal { + width: 12px; + height: 25px; + overflow: hidden; +} + +#breadcrumb-separator-before, +#breadcrumb-separator-after:after { + background: #1d4f73; +} + +#breadcrumb-separator-after, +#breadcrumb-separator-before:after { + background: #343c45; +} + +/* This chevron arrow cannot be replicated easily in CSS, so we are using + * a background image for it (still keeping it in a separate element so + * we can handle RTL support with a CSS transform). + */ +#breadcrumb-separator-normal { + background: url(breadcrumbs-divider@2x.png) no-repeat center right; + background-size: 12px 24px; +} + +/* Fake a triangle by rotating a rectangle inside the elements */ +#breadcrumb-separator-before:after, +#breadcrumb-separator-after:after { + content: ""; + display: block; + width: 25px; + height: 25px; + transform: translateX(-18px) rotate(45deg); + -moz-box-sizing: border-box; +} + .breadcrumbs-widget-item { background-color: transparent; -moz-appearance: none; - overflow: hidden; - min-width: 85px; - max-width: 250px; min-height: 25px; - border-style: solid; - border-width: 1px 13px 2px 13px; - margin: 0 -11px 0 0; - padding: 0 9px; + min-width: 65px; + margin: 0; + padding: 0 8px 0 20px; + border: none; outline: none; color: hsl(210,30%,85%); } -.breadcrumbs-widget-item:-moz-focusring > label { - border-bottom: 1px dotted hsla(210,30%,85%,0.4); +.breadcrumbs-widget-item:not([checked]) { + background: -moz-element(#breadcrumb-separator-normal) no-repeat center left; } -.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-tag { - color: hsl(208,100%,60%); +.breadcrumbs-widget-item[checked] + .breadcrumbs-widget-item { + background: -moz-element(#breadcrumb-separator-after) no-repeat 0 0; } -.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-id { - color: hsl(205,100%,70%); +.breadcrumbs-widget-item[checked] { + background: -moz-element(#breadcrumb-separator-before) no-repeat 0 0; + background-color: #1d4f73; } +.breadcrumbs-widget-item:first-child { + background-image: none; +} + +/* RTL support: move the images that were on the left to the right, + * and move images that were on the right to the left. + */ +.breadcrumbs-widget-item:-moz-locale-dir(rtl) { + padding: 0 20px 0 8px; +} + +.breadcrumbs-widget-item:-moz-locale-dir(rtl), +.breadcrumbs-widget-item[checked] + .breadcrumbs-widget-item:-moz-locale-dir(rtl) { + background-position: center right; +} + +#breadcrumb-separator-before:-moz-locale-dir(rtl), +#breadcrumb-separator-after:-moz-locale-dir(rtl), +#breadcrumb-separator-normal:-moz-locale-dir(rtl) { + transform: scaleX(-1); +} + +#breadcrumb-separator-before:-moz-locale-dir(rtl):after, +#breadcrumb-separator-after:-moz-locale-dir(rtl):after { + transform: translateX(-5px) rotate(45deg); +} + +.breadcrumbs-widget-item:not([checked]):hover label { + color: white; +} + +.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-tag, +.breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-id, .breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-pseudo-classes { - color: hsl(20,100%,70%); + color: #f5f7fa; } .breadcrumbs-widget-item-id, .breadcrumbs-widget-item-classes { - color: #8d99a6; + color: #b6babf; } .breadcrumbs-widget-item-pseudo-classes { - color: hsl(20,100%,85%); -} - -/* Breadcrumbs LTR */ - -.breadcrumbs-widget-item:-moz-locale-dir(ltr) { - border-image: url("breadcrumbs/ltr-middle.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item:not([checked]):hover:active:-moz-locale-dir(ltr) { - border-image: url("breadcrumbs/ltr-middle-pressed.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item[checked]:-moz-locale-dir(ltr) { - border-image: url("breadcrumbs/ltr-middle-selected.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item[checked]:hover:active:-moz-locale-dir(ltr) { - border-image: url("breadcrumbs/ltr-middle-selected-pressed.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item:first-of-type:-moz-locale-dir(ltr) { - border-image: url("breadcrumbs/ltr-start.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item:first-of-type:not([checked]):hover:active:-moz-locale-dir(ltr) { - border-image: url("breadcrumbs/ltr-start-pressed.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item:first-of-type[checked]:-moz-locale-dir(ltr) { - border-image: url("breadcrumbs/ltr-start-selected.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item:first-of-type[checked]:hover:active:-moz-locale-dir(ltr) { - border-image: url("breadcrumbs/ltr-start-selected-pressed.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item:last-of-type:-moz-locale-dir(ltr) { - border-image: url("breadcrumbs/ltr-end.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item:last-of-type:not([checked]):hover:active:-moz-locale-dir(ltr) { - border-image: url("breadcrumbs/ltr-end-pressed.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item:last-of-type[checked]:-moz-locale-dir(ltr) { - border-image: url("breadcrumbs/ltr-end-selected.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item:last-of-type[checked]:hover:active:-moz-locale-dir(ltr) { - border-image: url("breadcrumbs/ltr-end-selected-pressed.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-container[overflows] > .breadcrumbs-widget-item:first-of-type:-moz-locale-dir(ltr) { - border-left-width: 0; -} - -.breadcrumbs-widget-container[overflows] > .breadcrumbs-widget-item:last-of-type:-moz-locale-dir(ltr) { - border-right-width: 0; -} - -/* Breadcrumbs RTL */ - -.breadcrumbs-widget-item:-moz-locale-dir(rtl) { - border-image: url("breadcrumbs/rtl-middle.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item:not([checked]):hover:active:-moz-locale-dir(rtl) { - border-image: url("breadcrumbs/rtl-middle-pressed.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item[checked]:-moz-locale-dir(rtl) { - border-image: url("breadcrumbs/rtl-middle-selected.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item[checked]:hover:active:-moz-locale-dir(rtl) { - border-image: url("breadcrumbs/rtl-middle-selected-pressed.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item:first-of-type:-moz-locale-dir(rtl) { - border-image: url("breadcrumbs/rtl-start.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) { - border-image: url("breadcrumbs/rtl-start-pressed.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item:first-of-type[checked]:-moz-locale-dir(rtl) { - border-image: url("breadcrumbs/rtl-start-selected.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) { - border-image: url("breadcrumbs/rtl-start-selected-pressed.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item:last-of-type:-moz-locale-dir(rtl) { - border-image: url("breadcrumbs/rtl-end.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) { - border-image: url("breadcrumbs/rtl-end-pressed.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item:last-of-type[checked]:-moz-locale-dir(rtl) { - border-image: url("breadcrumbs/rtl-end-selected.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-item:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) { - border-image: url("breadcrumbs/rtl-end-selected-pressed.png") 1 13 2 13 fill stretch; -} - -.breadcrumbs-widget-container[overflows] > .breadcrumbs-widget-item:first-of-type:-moz-locale-dir(rtl) { - border-right-width: 0; -} - -.breadcrumbs-widget-container[overflows] > .breadcrumbs-widget-item:last-of-type:-moz-locale-dir(rtl) { - border-left-width: 0; + color: #d99b28; } /* SimpleListWidget */ diff --git a/browser/themes/windows/devtools/breadcrumbs-scrollbutton.png b/browser/themes/windows/devtools/breadcrumbs-scrollbutton.png deleted file mode 100644 index 722438060a89..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs-scrollbutton.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-end-pressed.png b/browser/themes/windows/devtools/breadcrumbs/ltr-end-pressed.png deleted file mode 100644 index 80c1f3a26da4..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-end-pressed.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-end-selected-pressed.png b/browser/themes/windows/devtools/breadcrumbs/ltr-end-selected-pressed.png deleted file mode 100644 index 87808778c6e4..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-end-selected-pressed.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-end-selected.png b/browser/themes/windows/devtools/breadcrumbs/ltr-end-selected.png deleted file mode 100644 index dbb728411333..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-end-selected.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-end.png b/browser/themes/windows/devtools/breadcrumbs/ltr-end.png deleted file mode 100644 index ee96024f1a81..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-end.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-middle-pressed.png b/browser/themes/windows/devtools/breadcrumbs/ltr-middle-pressed.png deleted file mode 100644 index 57abb3ffbe78..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-middle-pressed.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-middle-selected-pressed.png b/browser/themes/windows/devtools/breadcrumbs/ltr-middle-selected-pressed.png deleted file mode 100644 index 3898ba3ac10b..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-middle-selected-pressed.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-middle-selected.png b/browser/themes/windows/devtools/breadcrumbs/ltr-middle-selected.png deleted file mode 100644 index c0d13e3efd4f..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-middle-selected.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-middle.png b/browser/themes/windows/devtools/breadcrumbs/ltr-middle.png deleted file mode 100644 index eb65fffd55e0..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-middle.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-start-pressed.png b/browser/themes/windows/devtools/breadcrumbs/ltr-start-pressed.png deleted file mode 100644 index c1a946525817..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-start-pressed.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-start-selected-pressed.png b/browser/themes/windows/devtools/breadcrumbs/ltr-start-selected-pressed.png deleted file mode 100644 index 77d63d1b1196..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-start-selected-pressed.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-start-selected.png b/browser/themes/windows/devtools/breadcrumbs/ltr-start-selected.png deleted file mode 100644 index 6529b71abd92..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-start-selected.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/ltr-start.png b/browser/themes/windows/devtools/breadcrumbs/ltr-start.png deleted file mode 100644 index a4ca858603ef..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/ltr-start.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-end-pressed.png b/browser/themes/windows/devtools/breadcrumbs/rtl-end-pressed.png deleted file mode 100644 index 1077cfb7b7d6..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-end-pressed.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-end-selected-pressed.png b/browser/themes/windows/devtools/breadcrumbs/rtl-end-selected-pressed.png deleted file mode 100644 index ab1040ba8cde..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-end-selected-pressed.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-end-selected.png b/browser/themes/windows/devtools/breadcrumbs/rtl-end-selected.png deleted file mode 100644 index 8b0905d0f094..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-end-selected.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-end.png b/browser/themes/windows/devtools/breadcrumbs/rtl-end.png deleted file mode 100644 index 88cc61b0bcf0..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-end.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-middle-pressed.png b/browser/themes/windows/devtools/breadcrumbs/rtl-middle-pressed.png deleted file mode 100644 index f4a3a5beef55..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-middle-pressed.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-middle-selected-pressed.png b/browser/themes/windows/devtools/breadcrumbs/rtl-middle-selected-pressed.png deleted file mode 100644 index d66acb42eb2e..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-middle-selected-pressed.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-middle-selected.png b/browser/themes/windows/devtools/breadcrumbs/rtl-middle-selected.png deleted file mode 100644 index 9b77579e94d3..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-middle-selected.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-middle.png b/browser/themes/windows/devtools/breadcrumbs/rtl-middle.png deleted file mode 100644 index 63b620154179..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-middle.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-start-pressed.png b/browser/themes/windows/devtools/breadcrumbs/rtl-start-pressed.png deleted file mode 100644 index bfff8e95d8f1..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-start-pressed.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-start-selected-pressed.png b/browser/themes/windows/devtools/breadcrumbs/rtl-start-selected-pressed.png deleted file mode 100644 index 2ce094819032..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-start-selected-pressed.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-start-selected.png b/browser/themes/windows/devtools/breadcrumbs/rtl-start-selected.png deleted file mode 100644 index e7c848ac3cbc..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-start-selected.png and /dev/null differ diff --git a/browser/themes/windows/devtools/breadcrumbs/rtl-start.png b/browser/themes/windows/devtools/breadcrumbs/rtl-start.png deleted file mode 100644 index b8f67974c6ba..000000000000 Binary files a/browser/themes/windows/devtools/breadcrumbs/rtl-start.png and /dev/null differ diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index dfbd4e95a84d..86b163ca5ee9 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -207,31 +207,9 @@ browser.jar: * skin/classic/browser/devtools/webconsole.css (devtools/webconsole.css) skin/classic/browser/devtools/webconsole_networkpanel.css (devtools/webconsole_networkpanel.css) skin/classic/browser/devtools/webconsole.png (devtools/webconsole.png) - skin/classic/browser/devtools/breadcrumbs-scrollbutton.png (devtools/breadcrumbs-scrollbutton.png) - skin/classic/browser/devtools/breadcrumbs/ltr-end-pressed.png (devtools/breadcrumbs/ltr-end-pressed.png) - skin/classic/browser/devtools/breadcrumbs/ltr-end-selected-pressed.png (devtools/breadcrumbs/ltr-end-selected-pressed.png) - skin/classic/browser/devtools/breadcrumbs/ltr-end-selected.png (devtools/breadcrumbs/ltr-end-selected.png) - skin/classic/browser/devtools/breadcrumbs/ltr-end.png (devtools/breadcrumbs/ltr-end.png) - skin/classic/browser/devtools/breadcrumbs/ltr-middle-pressed.png (devtools/breadcrumbs/ltr-middle-pressed.png) - skin/classic/browser/devtools/breadcrumbs/ltr-middle-selected-pressed.png (devtools/breadcrumbs/ltr-middle-selected-pressed.png) - skin/classic/browser/devtools/breadcrumbs/ltr-middle-selected.png (devtools/breadcrumbs/ltr-middle-selected.png) - skin/classic/browser/devtools/breadcrumbs/ltr-middle.png (devtools/breadcrumbs/ltr-middle.png) - skin/classic/browser/devtools/breadcrumbs/ltr-start-pressed.png (devtools/breadcrumbs/ltr-start-pressed.png) - skin/classic/browser/devtools/breadcrumbs/ltr-start-selected-pressed.png (devtools/breadcrumbs/ltr-start-selected-pressed.png) - skin/classic/browser/devtools/breadcrumbs/ltr-start.png (devtools/breadcrumbs/ltr-start.png) - skin/classic/browser/devtools/breadcrumbs/ltr-start-selected.png (devtools/breadcrumbs/ltr-start-selected.png) - skin/classic/browser/devtools/breadcrumbs/rtl-end-pressed.png (devtools/breadcrumbs/rtl-end-pressed.png) - skin/classic/browser/devtools/breadcrumbs/rtl-end-selected-pressed.png (devtools/breadcrumbs/rtl-end-selected-pressed.png) - skin/classic/browser/devtools/breadcrumbs/rtl-end-selected.png (devtools/breadcrumbs/rtl-end-selected.png) - skin/classic/browser/devtools/breadcrumbs/rtl-end.png (devtools/breadcrumbs/rtl-end.png) - skin/classic/browser/devtools/breadcrumbs/rtl-middle-pressed.png (devtools/breadcrumbs/rtl-middle-pressed.png) - skin/classic/browser/devtools/breadcrumbs/rtl-middle-selected-pressed.png (devtools/breadcrumbs/rtl-middle-selected-pressed.png) - skin/classic/browser/devtools/breadcrumbs/rtl-middle-selected.png (devtools/breadcrumbs/rtl-middle-selected.png) - skin/classic/browser/devtools/breadcrumbs/rtl-middle.png (devtools/breadcrumbs/rtl-middle.png) - skin/classic/browser/devtools/breadcrumbs/rtl-start-pressed.png (devtools/breadcrumbs/rtl-start-pressed.png) - skin/classic/browser/devtools/breadcrumbs/rtl-start-selected-pressed.png (devtools/breadcrumbs/rtl-start-selected-pressed.png) - skin/classic/browser/devtools/breadcrumbs/rtl-start.png (devtools/breadcrumbs/rtl-start.png) - skin/classic/browser/devtools/breadcrumbs/rtl-start-selected.png (devtools/breadcrumbs/rtl-start-selected.png) + skin/classic/browser/devtools/breadcrumbs-divider@2x.png (../shared/devtools/images/breadcrumbs-divider@2x.png) + skin/classic/browser/devtools/breadcrumbs-scrollbutton.png (../shared/devtools/images/breadcrumbs-scrollbutton.png) + skin/classic/browser/devtools/breadcrumbs-scrollbutton@2x.png (../shared/devtools/images/breadcrumbs-scrollbutton@2x.png) skin/classic/browser/devtools/splitview.css (devtools/splitview.css) skin/classic/browser/devtools/styleeditor.css (devtools/styleeditor.css) * skin/classic/browser/devtools/shadereditor.css (devtools/shadereditor.css) @@ -533,31 +511,9 @@ browser.jar: * skin/classic/aero/browser/devtools/webconsole.css (devtools/webconsole.css) skin/classic/aero/browser/devtools/webconsole_networkpanel.css (devtools/webconsole_networkpanel.css) skin/classic/aero/browser/devtools/webconsole.png (devtools/webconsole.png) - skin/classic/aero/browser/devtools/breadcrumbs-scrollbutton.png (devtools/breadcrumbs-scrollbutton.png) - skin/classic/aero/browser/devtools/breadcrumbs/ltr-end-pressed.png (devtools/breadcrumbs/ltr-end-pressed.png) - skin/classic/aero/browser/devtools/breadcrumbs/ltr-end-selected-pressed.png (devtools/breadcrumbs/ltr-end-selected-pressed.png) - skin/classic/aero/browser/devtools/breadcrumbs/ltr-end-selected.png (devtools/breadcrumbs/ltr-end-selected.png) - skin/classic/aero/browser/devtools/breadcrumbs/ltr-end.png (devtools/breadcrumbs/ltr-end.png) - skin/classic/aero/browser/devtools/breadcrumbs/ltr-middle-pressed.png (devtools/breadcrumbs/ltr-middle-pressed.png) - skin/classic/aero/browser/devtools/breadcrumbs/ltr-middle-selected-pressed.png (devtools/breadcrumbs/ltr-middle-selected-pressed.png) - skin/classic/aero/browser/devtools/breadcrumbs/ltr-middle-selected.png (devtools/breadcrumbs/ltr-middle-selected.png) - skin/classic/aero/browser/devtools/breadcrumbs/ltr-middle.png (devtools/breadcrumbs/ltr-middle.png) - skin/classic/aero/browser/devtools/breadcrumbs/ltr-start-pressed.png (devtools/breadcrumbs/ltr-start-pressed.png) - skin/classic/aero/browser/devtools/breadcrumbs/ltr-start-selected-pressed.png (devtools/breadcrumbs/ltr-start-selected-pressed.png) - skin/classic/aero/browser/devtools/breadcrumbs/ltr-start.png (devtools/breadcrumbs/ltr-start.png) - skin/classic/aero/browser/devtools/breadcrumbs/ltr-start-selected.png (devtools/breadcrumbs/ltr-start-selected.png) - skin/classic/aero/browser/devtools/breadcrumbs/rtl-end-pressed.png (devtools/breadcrumbs/rtl-end-pressed.png) - skin/classic/aero/browser/devtools/breadcrumbs/rtl-end-selected-pressed.png (devtools/breadcrumbs/rtl-end-selected-pressed.png) - skin/classic/aero/browser/devtools/breadcrumbs/rtl-end-selected.png (devtools/breadcrumbs/rtl-end-selected.png) - skin/classic/aero/browser/devtools/breadcrumbs/rtl-end.png (devtools/breadcrumbs/rtl-end.png) - skin/classic/aero/browser/devtools/breadcrumbs/rtl-middle-pressed.png (devtools/breadcrumbs/rtl-middle-pressed.png) - skin/classic/aero/browser/devtools/breadcrumbs/rtl-middle-selected-pressed.png (devtools/breadcrumbs/rtl-middle-selected-pressed.png) - skin/classic/aero/browser/devtools/breadcrumbs/rtl-middle-selected.png (devtools/breadcrumbs/rtl-middle-selected.png) - skin/classic/aero/browser/devtools/breadcrumbs/rtl-middle.png (devtools/breadcrumbs/rtl-middle.png) - skin/classic/aero/browser/devtools/breadcrumbs/rtl-start-pressed.png (devtools/breadcrumbs/rtl-start-pressed.png) - skin/classic/aero/browser/devtools/breadcrumbs/rtl-start-selected-pressed.png (devtools/breadcrumbs/rtl-start-selected-pressed.png) - skin/classic/aero/browser/devtools/breadcrumbs/rtl-start.png (devtools/breadcrumbs/rtl-start.png) - skin/classic/aero/browser/devtools/breadcrumbs/rtl-start-selected.png (devtools/breadcrumbs/rtl-start-selected.png) + skin/classic/aero/browser/devtools/breadcrumbs-divider@2x.png (../shared/devtools/images/breadcrumbs-divider@2x.png) + skin/classic/aero/browser/devtools/breadcrumbs-scrollbutton.png (../shared/devtools/images/breadcrumbs-scrollbutton.png) + skin/classic/aero/browser/devtools/breadcrumbs-scrollbutton@2x.png (../shared/devtools/images/breadcrumbs-scrollbutton@2x.png) skin/classic/aero/browser/devtools/splitview.css (devtools/splitview.css) skin/classic/aero/browser/devtools/styleeditor.css (devtools/styleeditor.css) * skin/classic/aero/browser/devtools/shadereditor.css (devtools/shadereditor.css)