diff options
author | Pale Moon <git-repo@palemoon.org> | 2020-04-17 10:53:39 +0200 |
---|---|---|
committer | Pale Moon <git-repo@palemoon.org> | 2020-04-17 10:53:39 +0200 |
commit | e5e4c1d782bd70e4515f0f06b1597408250c8860 (patch) | |
tree | 28d228610e538c221f7838f0b3b4bab1fe56d500 | |
parent | 7a7efaed46f9e5bd3494e00af06353ab9c5770aa (diff) | |
parent | f580793765405acd9100a715eff5ebc54ef9b766 (diff) | |
download | palemoon-e5e4c1d782bd70e4515f0f06b1597408250c8860.tar.gz |
Merge branch 'master' into Tidy-js
# Conflicts:
# palemoon/base/content/browser-gestureSupport.js
104 files changed, 3607 insertions, 1668 deletions
@@ -10,7 +10,7 @@ The shared Unified XUL Platform source code is referenced here as a git submodul ## Resources - * [Build Pale Moon for Windows](https://forum.palemoon.org/viewtopic.php?f=19&t=13556) - * [Build Pale Moon for Linux](https://developer.palemoon.org/Developer_Guide:Build_Instructions/Pale_Moon/Linux) + * [Build Pale Moon for Windows](https://developer.palemoon.org/build/windows/) + * [Build Pale Moon for Linux](https://developer.palemoon.org/build/linux/) * [Pale Moon home page](http://www.palemoon.org/) * [Code of Conduct, Contributing, and UXP Coding style](https://github.com/MoonchildProductions/UXP/tree/master/docs) diff --git a/palemoon/app/Makefile.in b/palemoon/app/Makefile.in index d008010ec..34efe931e 100644 --- a/palemoon/app/Makefile.in +++ b/palemoon/app/Makefile.in @@ -88,6 +88,9 @@ tools repackage:: $(PROGRAM) sed -e 's/%MAC_APP_NAME%/$(MAC_APP_NAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > '$(dist_dest)/Contents/Resources/$(AB).lproj/InfoPlist.strings' rsync -a --exclude-from='$(srcdir)/macbuild/Contents/MacOS-files.in' $(DIST)/bin/ '$(dist_dest)/Contents/Resources' rsync -a --include-from='$(srcdir)/macbuild/Contents/MacOS-files.in' --exclude '*' $(DIST)/bin/ '$(dist_dest)/Contents/MacOS' + # MacOS-files-copy.in is a list of files that should be copies rather + # than symlinks and placed in .app/Contents/MacOS. + rsync -aL --include-from='$(srcdir)/macbuild/Contents/MacOS-files-copy.in' --exclude '*' $(DIST)/bin/ '$(dist_dest)/Contents/MacOS' $(RM) '$(dist_dest)/Contents/MacOS/$(PROGRAM)' rsync -aL $(PROGRAM) '$(dist_dest)/Contents/MacOS' cp -RL $(DIST)/branding/firefox.icns '$(dist_dest)/Contents/Resources/firefox.icns' diff --git a/palemoon/app/macbuild/Contents/MacOS-files-copy.in b/palemoon/app/macbuild/Contents/MacOS-files-copy.in new file mode 100644 index 000000000..628fea3fa --- /dev/null +++ b/palemoon/app/macbuild/Contents/MacOS-files-copy.in @@ -0,0 +1,11 @@ +# Specifies files that should be copied (via deep copy, resolving symlinks) +# from dist/bin to the .app/Contents/MacOS directory. Linking is preferred to +# reduce disk I/O during builds, so just include dylibs which need to be in the +# same directory as returned by dladdr(3). +# +# Some of these dylibs load other dylibs which are assumed to be siblings in +# the same directory obtained from dladdr(3). With macOS 10.15, dladdr returns +# absolute resolved paths which breaks this assumption if symlinks are used +# because the symlink targets are in different directories. Hence the need for +# them to be copied to the same directory. +/*.dylib diff --git a/palemoon/app/macbuild/Contents/MacOS-files.in b/palemoon/app/macbuild/Contents/MacOS-files.in index 561366def..6f5289502 100644 --- a/palemoon/app/macbuild/Contents/MacOS-files.in +++ b/palemoon/app/macbuild/Contents/MacOS-files.in @@ -1,5 +1,4 @@ /*.app/*** -/*.dylib /certutil /firefox-bin /gtest/*** diff --git a/palemoon/app/profile/palemoon.js b/palemoon/app/profile/palemoon.js index fa02689ea..74100ed3e 100644 --- a/palemoon/app/profile/palemoon.js +++ b/palemoon/app/profile/palemoon.js @@ -329,6 +329,10 @@ pref("browser.identity.display_punycode", 1); // Address bar RSS icon control, show by default pref("browser.urlbar.rss", true); +// If changed to true, copying the entire URL from the location bar will put +// the human readable (percent-decoded) URL on the clipboard. +pref("browser.urlbar.decodeURLsOnCopy", false); + pref("browser.altClickSave", true); // Enable logging downloads operations to the Error Console. @@ -870,7 +874,7 @@ pref("browser.sessionstore.restore_pinned_tabs_on_demand", false); // 0 = pull fully from cache // 1 = perform a soft refresh when restoring a tab (check network) // 2 = perform a hard refresh when restoring a tab (bypass cache completely) -pref("browser.sessionstore.cache_behavior", 1); +pref("browser.sessionstore.cache_behavior", 0); // Pale Moon: Allow exact positioning of windows to previous locations, even // if they would be outside of the screen bounds pref("browser.sessionstore.exactPos", false); @@ -948,6 +952,9 @@ pref("security.alternate_certificate_error_page", "certerror"); // Whether to start the private browsing mode at application startup pref("browser.privatebrowsing.autostart", false); +// Whether to immediately open the bookmark edit panel for new bookmarks +pref("browser.bookmarks.editDialog.showForNewBookmarks", false); + // Don't try to alter this pref, it'll be reset the next time you use the // bookmarking dialog pref("browser.bookmarks.editDialog.firstEditField", "namePicker"); diff --git a/palemoon/base/content/browser-gestureSupport.js b/palemoon/base/content/browser-gestureSupport.js index 9dd994c32..062bc2078 100644 --- a/palemoon/base/content/browser-gestureSupport.js +++ b/palemoon/base/content/browser-gestureSupport.js @@ -25,22 +25,18 @@ var gGestureSupport = { * True to add/init listeners and false to remove/uninit */ init: function(aAddListener) { - // Bug 863514 - Make gesture support work in electrolysis - if (gMultiProcessBrowser) { - return; - } - - const gestureEvents = ["SwipeGestureStart", + const gestureEvents = ["SwipeGestureMayStart", "SwipeGestureStart", "SwipeGestureUpdate", "SwipeGestureEnd", "SwipeGesture", "MagnifyGestureStart", "MagnifyGestureUpdate", "MagnifyGesture", "RotateGestureStart", "RotateGestureUpdate", "RotateGesture", "TapGesture", "PressTapGesture"]; - let addRemove = aAddListener ? - window.addEventListener : - window.removeEventListener; + let addRemove = aAddListener ? window.addEventListener : + window.removeEventListener; - gestureEvents.forEach(function(event) addRemove("Moz" + event, this, true), this); + for (let event of gestureEvents) { + addRemove("Moz" + event, this, true); + } }, /** @@ -58,14 +54,18 @@ var gGestureSupport = { } // Create a preference object with some defaults - let def = function(aThreshold, aLatched) { - return { threshold: aThreshold, latched: !!aLatched }; - } + let def = (aThreshold, aLatched) => + ({ threshold: aThreshold, latched: !!aLatched }); switch (aEvent.type) { + case "MozSwipeGestureMayStart": + if (this._shouldDoSwipeGesture(aEvent)) { + aEvent.preventDefault(); + } + break; case "MozSwipeGestureStart": aEvent.preventDefault(); - this._setupSwipeGesture(aEvent); + this._setupSwipeGesture(); break; case "MozSwipeGestureUpdate": aEvent.preventDefault(); @@ -126,9 +126,8 @@ var gGestureSupport = { */ _setupGesture: function(aEvent, aGesture, aPref, aInc, aDec) { // Try to load user-set values from preferences - for (let [pref, def] in Iterator(aPref)) { + for (let [pref, def] in Iterator(aPref)) aPref[pref] = this._getPref(aGesture + "." + pref, def); - } // Keep track of the total deltas and latching behavior let offset = 0; @@ -171,37 +170,50 @@ var gGestureSupport = { * @return true if the swipe event may navigate the history, false othwerwise. */ _swipeNavigatesHistory: function(aEvent) { - return this._getCommand(aEvent, ["swipe", "left"]) == "Browser:BackOrBackDuplicate" && - this._getCommand(aEvent, ["swipe", "right"]) == "Browser:ForwardOrForwardDuplicate"; + return this._getCommand(aEvent, ["swipe", "left"]) + == "Browser:BackOrBackDuplicate" && + this._getCommand(aEvent, ["swipe", "right"]) + == "Browser:ForwardOrForwardDuplicate"; }, /** - * Sets up the history swipe animations for a swipe gesture event, if enabled. + * Checks whether we want to start a swipe for aEvent and sets + * aEvent.allowedDirections to the right values. * * @param aEvent - * The swipe gesture start event. + * The swipe gesture "MayStart" event. + * @return true if we're willing to start a swipe for this event, false + * otherwise. */ - _setupSwipeGesture: function(aEvent) { - if (!this._swipeNavigatesHistory(aEvent)) { - return; - } + _shouldDoSwipeGesture: function(aEvent) { + if (!this._swipeNavigatesHistory(aEvent)) + return false; let canGoBack = gHistorySwipeAnimation.canGoBack(); let canGoForward = gHistorySwipeAnimation.canGoForward(); let isLTR = gHistorySwipeAnimation.isLTR; - if (canGoBack) { - aEvent.allowedDirections |= isLTR ? - aEvent.DIRECTION_LEFT : - aEvent.DIRECTION_RIGHT; - } - if (canGoForward) { - aEvent.allowedDirections |= isLTR ? - aEvent.DIRECTION_RIGHT : - aEvent.DIRECTION_LEFT; - } + if (canGoBack) + aEvent.allowedDirections |= isLTR ? aEvent.DIRECTION_LEFT : + aEvent.DIRECTION_RIGHT; + if (canGoForward) + aEvent.allowedDirections |= isLTR ? aEvent.DIRECTION_RIGHT : + aEvent.DIRECTION_LEFT; - gHistorySwipeAnimation.startAnimation(); + return true; + }, + + /** + * Sets up swipe gestures. This includes setting up swipe animations for the + * gesture, if enabled. + * + * @param aEvent + * The swipe gesture start event. + * @return true if swipe gestures could successfully be set up, false + * othwerwise. + */ + _setupSwipeGesture: function() { + gHistorySwipeAnimation.startAnimation(false); this._doUpdate = function(aEvent) { gHistorySwipeAnimation.updateAnimation(aEvent.delta); @@ -210,8 +222,8 @@ var gGestureSupport = { this._doEnd = function(aEvent) { gHistorySwipeAnimation.swipeEndEventReceived(); - this._doUpdate = function(aEvent) { }; - this._doEnd = function(aEvent) { }; + this._doUpdate = function(aEvent) {}; + this._doEnd = function(aEvent) {}; } }, @@ -229,9 +241,8 @@ var gGestureSupport = { while (--num >= 0) { // Only select array elements where the current bit is set yield aArray.reduce(function(aPrev, aCurr, aIndex) { - if (num & 1 << aIndex) { + if (num & 1 << aIndex) aPrev.push(aCurr); - } return aPrev; }, []); } @@ -268,9 +279,8 @@ var gGestureSupport = { // command for both don't exist) let keyCombos = []; ["shift", "alt", "ctrl", "meta"].forEach(function(key) { - if (aEvent[key + "Key"]) { + if (aEvent[key + "Key"]) keyCombos.push(key); - } }); // Try each combination of key presses in decreasing order for commands @@ -281,12 +291,10 @@ var gGestureSupport = { let command; try { command = this._getPref(aGesture.concat(subCombo).join(".")); - } catch(e) { - } + } catch (e) {} - if (command) { + if (command) return command; - } } return null; }, @@ -310,7 +318,8 @@ var gGestureSupport = { node.dispatchEvent(cmdEvent); } - } else { + } + else { goDoCommand(aCommand); } }, @@ -322,7 +331,7 @@ var gGestureSupport = { * @param aEvent * The continual motion update event to handle */ - _doUpdate: function(aEvent) { }, + _doUpdate: function(aEvent) {}, /** * Handle gesture end events. This function will be set by _setupSwipe. @@ -330,7 +339,7 @@ var gGestureSupport = { * @param aEvent * The gesture end event to handle */ - _doEnd: function(aEvent) { }, + _doEnd: function(aEvent) {}, /** * Convert the swipe gesture into a browser action based on the direction. @@ -371,11 +380,13 @@ var gGestureSupport = { * @param aDir * The direction for the swipe event */ - _coordinateSwipeEventWithAnimation: function(aEvent, aDir) { + _coordinateSwipeEventWithAnimation: + function(aEvent, aDir) { if ((gHistorySwipeAnimation.isAnimationRunning()) && (aDir == "RIGHT" || aDir == "LEFT")) { gHistorySwipeAnimation.processSwipeEvent(aEvent, aDir); - } else { + } + else { this.processSwipeEvent(aEvent, aDir); } }, @@ -395,13 +406,11 @@ var gGestureSupport = { try { // Determine what type of data to load based on default value's type let type = typeof aDef; - let getFunc = "get" + (type == "boolean" ? - "Bool" : - type == "number" ? - "Int" : - "Char") + "Pref"; + let getFunc = "get" + (type == "boolean" ? "Bool" : + type == "number" ? "Int" : "Char") + "Pref"; return gPrefService[getFunc](branch + aPref); - } catch(e) { + } + catch (e) { return aDef; } }, @@ -413,18 +422,15 @@ var gGestureSupport = { * The MozRotateGestureUpdate event triggering this call */ rotate: function(aEvent) { - if (!(content.document instanceof ImageDocument)) { + if (!(content.document instanceof ImageDocument)) return; - } let contentElement = content.document.body.firstElementChild; - if (!contentElement) { + if (!contentElement) return; - } // If we're currently snapping, cancel that snap - if (contentElement.classList.contains("completeRotation")) { + if (contentElement.classList.contains("completeRotation")) this._clearCompleteRotation(); - } this.rotation = Math.round(this.rotation + aEvent.delta); contentElement.style.transform = "rotate(" + this.rotation + "deg)"; @@ -435,41 +441,37 @@ var gGestureSupport = { * Perform a rotation end for ImageDocuments */ rotateEnd: function() { - if (!(content.document instanceof ImageDocument)) { + if (!(content.document instanceof ImageDocument)) return; - } let contentElement = content.document.body.firstElementChild; - if (!contentElement) { + if (!contentElement) return; - } let transitionRotation = 0; // The reason that 360 is allowed here is because when rotating between // 315 and 360, setting rotate(0deg) will cause it to rotate the wrong // direction around--spinning wildly. - if (this.rotation <= 45) { + if (this.rotation <= 45) transitionRotation = 0; - } else if (this.rotation > 45 && this.rotation <= 135) { + else if (this.rotation > 45 && this.rotation <= 135) transitionRotation = 90; - } else if (this.rotation > 135 && this.rotation <= 225) { + else if (this.rotation > 135 && this.rotation <= 225) transitionRotation = 180; - } else if (this.rotation > 225 && this.rotation <= 315) { + else if (this.rotation > 225 && this.rotation <= 315) transitionRotation = 270; - } else { + else transitionRotation = 360; - } // If we're going fast enough, and we didn't already snap ahead of rotation, // then snap ahead of rotation to simulate momentum if (this._lastRotateDelta > this._rotateMomentumThreshold && - this.rotation > transitionRotation) { + this.rotation > transitionRotation) transitionRotation += 90; - } else if (this._lastRotateDelta < -1 * this._rotateMomentumThreshold && - this.rotation < transitionRotation) { + else if (this._lastRotateDelta < -1 * this._rotateMomentumThreshold && + this.rotation < transitionRotation) transitionRotation -= 90; - } // Only add the completeRotation class if it is is necessary if (transitionRotation != this.rotation) { @@ -497,9 +499,8 @@ var gGestureSupport = { */ set rotation(aVal) { this._currentRotation = aVal % 360; - if (this._currentRotation < 0) { + if (this._currentRotation < 0) this._currentRotation += 360; - } return this._currentRotation; }, @@ -508,14 +509,8 @@ var gGestureSupport = { * image */ restoreRotationState: function() { - // Bug 863514 - Make gesture support work in electrolysis - if (gMultiProcessBrowser) { + if (!(content.document instanceof ImageDocument)) return; - } - - if (!(content.document instanceof ImageDocument)) { - return; - } let contentElement = content.document.body.firstElementChild; let transformValue = content.window.getComputedStyle(contentElement, null) @@ -543,9 +538,8 @@ var gGestureSupport = { content.document instanceof ImageDocument && content.document.body && content.document.body.firstElementChild; - if (!contentElement) { + if (!contentElement) return; - } contentElement.classList.remove("completeRotation"); contentElement.removeEventListener("transitionend", this._clearCompleteRotation); }, @@ -562,12 +556,11 @@ var gHistorySwipeAnimation = { * by the platform/configuration. */ init: function() { - if (!this._isSupported()) { + if (!this._isSupported()) return; - } this.active = false; - this.isLTR = document.documentElement.mozMatchesSelector(":-moz-locale-dir(ltr)"); + this.isLTR = document.documentElement.matches(":-moz-locale-dir(ltr)"); this._trackedSnapshots = []; this._historyIndex = -1; this._boxWidth = -1; @@ -581,6 +574,7 @@ var gHistorySwipeAnimation = { gBrowser.addEventListener("pagehide", this, false); gBrowser.addEventListener("pageshow", this, false); gBrowser.addEventListener("popstate", this, false); + gBrowser.addEventListener("DOMModalDialogClosed", this, false); gBrowser.tabContainer.addEventListener("TabClose", this, false); } }, @@ -592,6 +586,7 @@ var gHistorySwipeAnimation = { gBrowser.removeEventListener("pagehide", this, false); gBrowser.removeEventListener("pageshow", this, false); gBrowser.removeEventListener("popstate", this, false); + gBrowser.removeEventListener("DOMModalDialogClosed", this, false); gBrowser.tabContainer.removeEventListener("TabClose", this, false); this.active = false; @@ -609,7 +604,8 @@ var gHistorySwipeAnimation = { this._canGoBack = this.canGoBack(); this._canGoForward = this.canGoForward(); this._handleFastSwiping(); - } else { + } + else { this._historyIndex = gBrowser.webNavigation.sessionHistory.index; this._canGoBack = this.canGoBack(); this._canGoForward = this.canGoForward(); @@ -628,6 +624,7 @@ var gHistorySwipeAnimation = { */ stopAnimation: function() { gHistorySwipeAnimation._removeBoxes(); + this._historyIndex = gBrowser.webNavigation.sessionHistory.index; }, /** @@ -638,22 +635,18 @@ var gHistorySwipeAnimation = { * swipe gesture. */ updateAnimation: function(aVal) { - if (!this.isAnimationRunning()) { + if (!this.isAnimationRunning()) return; - } if ((aVal >= 0 && this.isLTR) || (aVal <= 0 && !this.isLTR)) { - if (aVal > 1) { - // Cap value to avoid sliding the page further than allowed. - aVal = 1; - } + if (aVal > 1) + aVal = 1; // Cap value to avoid sliding the page further than allowed. - if (this._canGoBack) { + if (this._canGoBack) this._prevBox.collapsed = false; - } else { + else this._prevBox.collapsed = true; - } // The current page is pushed to the right (LTR) or left (RTL), // the intention is to go back. @@ -662,12 +655,10 @@ var gHistorySwipeAnimation = { // The forward page should be pushed offscreen all the way to the right. this._positionBox(this._nextBox, 1); - } else { - if (aVal < -1) { - // Cap value to avoid sliding the page further than allowed. - aVal = -1; - } - + } + else { + if (aVal < -1) + aVal = -1; // Cap value to avoid sliding the page further than allowed. // The intention is to go forward. If there is a page to go forward to, // it should slide in from the right (LTR) or left (RTL). // Otherwise, the current page should slide to the left (LTR) or @@ -675,10 +666,12 @@ var gHistorySwipeAnimation = { // For the backdrop to be visible in that case, the previous page needs // to be hidden (if it exists). if (this._canGoForward) { + this._nextBox.collapsed = false; let offset = this.isLTR ? 1 : -1; this._positionBox(this._curBox, 0); - this._positionBox(this._nextBox, offset + aVal); // aVal is negative - } else { + this._positionBox(this._nextBox, offset + aVal); // aval is negative + } + else { this._prevBox.collapsed = true; this._positionBox(this._curBox, aVal); } @@ -692,25 +685,34 @@ var gHistorySwipeAnimation = { * An event to process. */ handleEvent: function(aEvent) { + let browser = gBrowser.selectedBrowser; switch (aEvent.type) { case "TabClose": - let browser = gBrowser.getBrowserForTab(aEvent.target); - this._removeTrackedSnapshot(-1, browser); + let browserForTab = gBrowser.getBrowserForTab(aEvent.target); + this._removeTrackedSnapshot(-1, browserForTab); + break; + case "DOMModalDialogClosed": + this.stopAnimation(); break; case "pageshow": + if (aEvent.target == browser.contentDocument) { + this.stopAnimation(); + } + break; case "popstate": - if (this.isAnimationRunning()) { - if (aEvent.target != gBrowser.selectedBrowser.contentDocument) - break; + if (aEvent.target == browser.contentDocument.defaultView) { this.stopAnimation(); } - this._historyIndex = gBrowser.webNavigation.sessionHistory.index; break; case "pagehide": - if (aEvent.target == gBrowser.selectedBrowser.contentDocument) { - // Take a snapshot of a page whenever it's about to be navigated away - // from. - this._takeSnapshot(); + if (aEvent.target == browser.contentDocument) { + // Take and compress a snapshot of a page whenever it's about to be + // navigated away from. We already have a snapshot of the page if an + // animation is running, so we're left with compressing it. + if (!this.isAnimationRunning()) { + this._takeSnapshot(); + } + this._compressSnapshotAtCurrentIndex(); } break; } @@ -734,13 +736,12 @@ var gHistorySwipeAnimation = { * The direction for the swipe event */ processSwipeEvent: function(aEvent, aDir) { - if (aDir == "RIGHT") { + if (aDir == "RIGHT") this._historyIndex += this.isLTR ? 1 : -1; - } else if (aDir == "LEFT") { + else if (aDir == "LEFT") this._historyIndex += this.isLTR ? -1 : 1; - } else { + else return; - } this._lastSwipeDir = aDir; }, @@ -750,9 +751,8 @@ var gHistorySwipeAnimation = { * @return true if there is a previous page in history, false otherwise. */ canGoBack: function() { - if (this.isAnimationRunning()) { + if (this.isAnimationRunning()) return this._doesIndexExistInHistory(this._historyIndex - 1); - } return gBrowser.webNavigation.canGoBack; }, @@ -762,9 +762,8 @@ var gHistorySwipeAnimation = { * @return true if there is a next page in history, false otherwise. */ canGoForward: function() { - if (this.isAnimationRunning()) { + if (this.isAnimationRunning()) return this._doesIndexExistInHistory(this._historyIndex + 1); - } return gBrowser.webNavigation.canGoForward; }, @@ -774,11 +773,10 @@ var gHistorySwipeAnimation = { * any. This will also result in the animation overlay to be torn down. */ swipeEndEventReceived: function() { - if (this._lastSwipeDir != "") { + if (this._lastSwipeDir != "") this._navigateToHistoryIndex(); - } else { + else this.stopAnimation(); - } }, /** @@ -791,7 +789,8 @@ var gHistorySwipeAnimation = { _doesIndexExistInHistory: function(aIndex) { try { gBrowser.webNavigation.sessionHistory.getEntryAtIndex(aIndex, false); - } catch(ex) { + } + catch(ex) { return false; } return true; @@ -802,9 +801,10 @@ var gHistorySwipeAnimation = { * |this|. */ _navigateToHistoryIndex: function() { - if (this._doesIndexExistInHistory(this._historyIndex)) { + if (this._doesIndexExistInHistory(this._historyIndex)) gBrowser.webNavigation.gotoIndex(this._historyIndex); - } + else + this.stopAnimation(); }, /** @@ -860,9 +860,8 @@ var gHistorySwipeAnimation = { this._curBox = null; this._prevBox = null; this._nextBox = null; - if (this._container) { + if (this._container) this._container.parentNode.removeChild(this._container); - } this._container = null; this._boxWidth = -1; }, @@ -893,28 +892,48 @@ var gHistorySwipeAnimation = { */ _positionBox: function(aBox, aPosition) { aBox.style.transform = "translateX(" + this._boxWidth * aPosition + "px)"; + let transform = ""; + + aBox.style.transform = transform; }, /** - * Takes a snapshot of the page the browser is currently on. + * Verifies that we're ready to take snapshots based on the global pref and + * the current index in history. + * + * @return true if we're ready to take snapshots, false otherwise. */ - _takeSnapshot: function() { + _readyToTakeSnapshots: function() { if ((this._maxSnapshots < 1) || (gBrowser.webNavigation.sessionHistory.index < 0)) { + return false; + } + return true; + }, + + /** + * Takes a snapshot of the page the browser is currently on. + */ + _takeSnapshot: function() { + if (!this._readyToTakeSnapshots()) { return; } + let canvas = null; + let browser = gBrowser.selectedBrowser; let r = browser.getBoundingClientRect(); - let canvas = document.createElementNS("http://www.w3.org/1999/xhtml", - "canvas"); + canvas = document.createElementNS("http://www.w3.org/1999/xhtml", + "canvas"); canvas.mozOpaque = true; - canvas.width = r.width; - canvas.height = r.height; + let scale = window.devicePixelRatio; + canvas.width = r.width * scale; + canvas.height = r.height * scale; let ctx = canvas.getContext("2d"); - let zoom = browser.markupDocumentViewer.fullZoom; + let zoom = browser.markupDocumentViewer.fullZoom * scale; ctx.scale(zoom, zoom); - ctx.drawWindow(browser.contentWindow, 0, 0, r.width, r.height, "white", + ctx.drawWindow(browser.contentWindow, + 0, 0, canvas.width / zoom, canvas.height / zoom, "white", ctx.DRAWWINDOW_DO_NOT_FLUSH | ctx.DRAWWINDOW_DRAW_VIEW | ctx.DRAWWINDOW_ASYNC_DECODE_IMAGES | ctx.DRAWWINDOW_USE_WIDGET_LAYERS); @@ -939,25 +958,48 @@ var gHistorySwipeAnimation = { * @param aCanvas * The snapshot to add to the list and compress. */ - _assignSnapshotToCurrentBrowser: function(aCanvas) { + _assignSnapshotToCurrentBrowser: + function(aCanvas) { let browser = gBrowser.selectedBrowser; let currIndex = browser.webNavigation.sessionHistory.index; this._removeTrackedSnapshot(currIndex, browser); this._addSnapshotRefToArray(currIndex, browser); - if (!("snapshots" in browser)) { + if (!("snapshots" in browser)) browser.snapshots = []; - } let snapshots = browser.snapshots; // Temporarily store the canvas as the compressed snapshot. // This avoids a blank page if the user swipes quickly // between pages before the compression could complete. - snapshots[currIndex] = aCanvas; + snapshots[currIndex] = { + image: aCanvas, + scale: window.devicePixelRatio + }; + }, + + /** + * Compresses the HTMLCanvasElement that's stored at the current history + * index in the snapshot array and stores the compressed image in its place. + */ + _compressSnapshotAtCurrentIndex: + function() { + if (!this._readyToTakeSnapshots()) { + // We didn't take a snapshot earlier because we weren't ready to, so + // there's nothing to compress. + return; + } + + let browser = gBrowser.selectedBrowser; + let snapshots = browser.snapshots; + let currIndex = browser.webNavigation.sessionHistory.index; // Kick off snapshot compression. - aCanvas.toBlob(function(aBlob) { - snapshots[currIndex] = aBlob; + let canvas = snapshots[currIndex].image; + canvas.toBlob(function(aBlob) { + if (snapshots[currIndex]) { + snapshots[currIndex].image = aBlob; + } }, "image/png" ); }, @@ -982,13 +1024,10 @@ var gHistorySwipeAnimation = { (aIndex < 0 || aIndex == arr[i].index)) { delete aBrowser.snapshots[arr[i].index]; arr.splice(i, 1); - if (requiresExactIndexMatch) { - // Found and removed the only element. - return; - } - // Make sure to revisit the index that we just removed an - // element at. - i--; + if (requiresExactIndexMatch) + return; // Found and removed the only element. + i--; // Make sure to revisit the index that we just removed an + // element at. } } }, @@ -1002,7 +1041,8 @@ var gHistorySwipeAnimation = { * @param aBrowser * The browser the new snapshot was taken in. */ - _addSnapshotRefToArray: function(aIndex, aBrowser) { + _addSnapshotRefToArray: + function(aIndex, aBrowser) { let id = { index: aIndex, browser: aBrowser }; let arr = this._trackedSnapshots; @@ -1010,6 +1050,7 @@ var gHistorySwipeAnimation = { while (arr.length > this._maxSnapshots) { let lastElem = arr[arr.length - 1]; + delete lastElem.browser.snapshots[lastElem.index].image; delete lastElem.browser.snapshots[lastElem.index]; arr.splice(-1, 1); } @@ -1026,22 +1067,50 @@ var gHistorySwipeAnimation = { * @return A new Image object representing the converted blob. */ _convertToImg: function(aBlob) { - if (!aBlob) { + if (!aBlob) return null; - } // Return aBlob if it's still a canvas and not a compressed blob yet. - if (aBlob instanceof HTMLCanvasElement) { + if (aBlob instanceof HTMLCanvasElement) return aBlob; - } let img = new Image(); - let url = URL.createObjectURL(aBlob); - img.onload = function() { - URL.revokeObjectURL(url); - }; - img.src = url; - return img; + let url = ""; + try { + url = URL.createObjectURL(aBlob); + img.onload = function() { + URL.revokeObjectURL(url); + }; + } + finally { + img.src = url; + return img; + } + }, + + /** + * Scales the background of a given box element (which uses a given snapshot + * as background) based on a given scale factor. + * @param aSnapshot + * The snapshot that is used as background of aBox. + * @param aScale + * The scale factor to use. + * @param aBox + * The box element that uses aSnapshot as background. + */ + _scaleSnapshot: function(aSnapshot, aScale, aBox) { + if (aSnapshot && aScale != 1 && aBox) { + if (aSnapshot instanceof HTMLCanvasElement) { + aBox.style.backgroundSize = + aSnapshot.width / aScale + "px " + aSnapshot.height / aScale + "px"; + } else { + // snapshot is instanceof HTMLImageElement + aSnapshot.addEventListener("load", function() { + aBox.style.backgroundSize = + aSnapshot.width / aScale + "px " + aSnapshot.height / aScale + "px"; + }); + } + } }, /** @@ -1053,15 +1122,20 @@ var gHistorySwipeAnimation = { * The snapshot to set the current page to. If this parameter is null, * the previously stored snapshot for this index (if any) will be used. */ - _installCurrentPageSnapshot: function(aCanvas) { + _installCurrentPageSnapshot: + function(aCanvas) { let currSnapshot = aCanvas; + let scale = window.devicePixelRatio; if (!currSnapshot) { - let snapshots = gBrowser.selectedBrowser.snapshots || { }; + let snapshots = gBrowser.selectedBrowser.snapshots || {}; let currIndex = this._historyIndex; if (currIndex in snapshots) { - currSnapshot = this._convertToImg(snapshots[currIndex]); + currSnapshot = this._convertToImg(snapshots[currIndex].image); + scale = snapshots[currIndex].scale; } } + this._scaleSnapshot(currSnapshot, scale, this._curBox ? this._curBox : + null); document.mozSetImageElement("historySwipeAnimationCurrentPageSnapshot", currSnapshot); }, @@ -1070,13 +1144,16 @@ var gHistorySwipeAnimation = { * Sets the snapshots of the previous and next pages to the snapshots * previously stored for their respective indeces. */ - _installPrevAndNextSnapshots: function() { + _installPrevAndNextSnapshots: + function() { let snapshots = gBrowser.selectedBrowser.snapshots || []; let currIndex = this._historyIndex; let prevIndex = currIndex - 1; let prevSnapshot = null; if (prevIndex in snapshots) { - prevSnapshot = this._convertToImg(snapshots[prevIndex]); + prevSnapshot = this._convertToImg(snapshots[prevIndex].image); + this._scaleSnapshot(prevSnapshot, snapshots[prevIndex].scale, + this._prevBox); } document.mozSetImageElement("historySwipeAnimationPreviousPageSnapshot", prevSnapshot); @@ -1084,7 +1161,9 @@ var gHistorySwipeAnimation = { let nextIndex = currIndex + 1; let nextSnapshot = null; if (nextIndex in snapshots) { - nextSnapshot = this._convertToImg(snapshots[nextIndex]); + nextSnapshot = this._convertToImg(snapshots[nextIndex].image); + this._scaleSnapshot(nextSnapshot, snapshots[nextIndex].scale, + this._nextBox); } document.mozSetImageElement("historySwipeAnimationNextPageSnapshot", nextSnapshot); diff --git a/palemoon/base/content/browser-places.js b/palemoon/base/content/browser-places.js index e8feee219..3269b3ffb 100644 --- a/palemoon/base/content/browser-places.js +++ b/palemoon/base/content/browser-places.js @@ -14,6 +14,10 @@ var StarUI = { return document.getElementById(aID); }, + get showForNewBookmarks() { + return Services.prefs.getBoolPref("browser.bookmarks.editDialog.showForNewBookmarks", false); + }, + // Edit-bookmark panel get panel() { delete this.panel; @@ -1298,7 +1302,8 @@ var BookmarkingUI = { } // Ignore clicks on the star if we are updating its state. if (!this._pendingStmt) { - PlacesCommandHook.bookmarkCurrentPage(this._itemIds.length > 0); + PlacesCommandHook.bookmarkCurrentPage(this._itemIds.length > 0 || + StarUI.showForNewBookmarks); } }, diff --git a/palemoon/base/content/browser.css b/palemoon/base/content/browser.css index a2970aefc..91c6478d2 100644 --- a/palemoon/base/content/browser.css +++ b/palemoon/base/content/browser.css @@ -106,7 +106,7 @@ toolbar[printpreview="true"] { -moz-box-ordinal-group: 10; } -%ifdef CAN_DRAW_IN_TITLEBAR +%ifdef MOZ_CAN_DRAW_IN_TITLEBAR #main-window[inFullscreen] > #titlebar, #main-window[inFullscreen] .titlebar-placeholder, #main-window:not([tabsintitlebar]) .titlebar-placeholder { @@ -222,7 +222,7 @@ splitmenu { } %ifdef MENUBAR_CAN_AUTOHIDE -%ifndef CAN_DRAW_IN_TITLEBAR +%ifndef MOZ_CAN_DRAW_IN_TITLEBAR #appmenu-toolbar-button > .toolbarbutton-text { display: -moz-box; } @@ -321,7 +321,7 @@ panel[noactions] > richlistbox > richlistitem[type~="action"] > .ac-url-box > .a } #identity-box.verifiedIdentity > #identity-icon-labels > #identity-icon-label { - -moz-margin-end: 0.25em !important; + margin-inline-end: 0.25em !important; } #wrapper-search-container > #search-container > #searchbar > .searchbar-textbox > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input { diff --git a/palemoon/base/content/browser.js b/palemoon/base/content/browser.js index e86e5b44d..a23354e5a 100644 --- a/palemoon/base/content/browser.js +++ b/palemoon/base/content/browser.js @@ -4783,7 +4783,7 @@ var TabsOnTop = { var TabsInTitlebar = { init: function() { -#ifdef CAN_DRAW_IN_TITLEBAR +#ifdef MOZ_CAN_DRAW_IN_TITLEBAR this._readPref(); Services.prefs.addObserver(this._prefName, this, false); @@ -4796,7 +4796,7 @@ var TabsInTitlebar = { }, allowedBy: function(condition, allow) { -#ifdef CAN_DRAW_IN_TITLEBAR +#ifdef MOZ_CAN_DRAW_IN_TITLEBAR if (allow) { if (condition in this._disallowed) { delete this._disallowed[condition]; @@ -4815,7 +4815,7 @@ var TabsInTitlebar = { return document.documentElement.getAttribute("tabsintitlebar") == "true"; }, -#ifdef CAN_DRAW_IN_TITLEBAR +#ifdef MOZ_CAN_DRAW_IN_TITLEBAR observe: function(subject, topic, data) { if (topic == "nsPref:changed") this._readPref(); @@ -4890,7 +4890,7 @@ var TabsInTitlebar = { #endif uninit: function() { -#ifdef CAN_DRAW_IN_TITLEBAR +#ifdef MOZ_CAN_DRAW_IN_TITLEBAR this._initialized = false; Services.prefs.removeObserver(this._prefName, this); #endif @@ -4904,7 +4904,7 @@ function updateAppButtonDisplay() { window.menubar.visible && document.getElementById("toolbar-menubar").getAttribute("autohide") == "true"; -#ifdef CAN_DRAW_IN_TITLEBAR +#ifdef MOZ_CAN_DRAW_IN_TITLEBAR document.getElementById("titlebar").hidden = !displayAppButton; if (displayAppButton) { @@ -4921,7 +4921,7 @@ function updateAppButtonDisplay() { } #endif -#ifdef CAN_DRAW_IN_TITLEBAR +#ifdef MOZ_CAN_DRAW_IN_TITLEBAR function onTitlebarMaxClick() { if (window.windowState == window.STATE_MAXIMIZED) { window.restore(); @@ -7089,7 +7089,7 @@ var gPrivateBrowsingUI = { document.getElementById("Tools:Sanitize").setAttribute("disabled", "true"); if (window.location.href == getBrowserURL()) { -#ifdef XP_MACOSX +#if defined(XP_MACOSX) && defined(MOZ_CAN_DRAW_IN_TITLEBAR) if (!PrivateBrowsingUtils.permanentPrivateBrowsing) { document.documentElement.setAttribute("drawintitlebar", true); } diff --git a/palemoon/base/content/browser.xul b/palemoon/base/content/browser.xul index 0a249afa9..34c7c185d 100644 --- a/palemoon/base/content/browser.xul +++ b/palemoon/base/content/browser.xul @@ -324,7 +324,7 @@ </popupset> -#ifdef CAN_DRAW_IN_TITLEBAR +#ifdef MOZ_CAN_DRAW_IN_TITLEBAR <vbox id="titlebar"> <hbox id="titlebar-content"> #ifdef MENUBAR_CAN_AUTOHIDE @@ -374,7 +374,7 @@ #include browser-menubar.inc </toolbaritem> -#ifdef CAN_DRAW_IN_TITLEBAR +#ifdef MOZ_CAN_DRAW_IN_TITLEBAR <hbox class="titlebar-placeholder" type="appmenu-button" ordinal="0"/> <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/> #endif @@ -771,7 +771,7 @@ </toolbar> #ifdef MENUBAR_CAN_AUTOHIDE -#ifndef CAN_DRAW_IN_TITLEBAR +#ifndef MOZ_CAN_DRAW_IN_TITLEBAR #define APPMENU_ON_TABBAR #endif #endif @@ -838,7 +838,7 @@ label="&closeTab.label;" tooltiptext="&closeTab.label;"/> -#ifdef CAN_DRAW_IN_TITLEBAR +#ifdef MOZ_CAN_DRAW_IN_TITLEBAR <hbox class="titlebar-placeholder" type="appmenu-button" ordinal="0"/> <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/> #endif diff --git a/palemoon/base/content/urlbarBindings.xml b/palemoon/base/content/urlbarBindings.xml index 71a74a036..ae9b8d58f 100644 --- a/palemoon/base/content/urlbarBindings.xml +++ b/palemoon/base/content/urlbarBindings.xml @@ -521,19 +521,17 @@ uri = uriFixup.createExposableURI(uri); } catch (ex) {} - // If the entire URL is selected, just use the actual loaded URI. - if (inputVal == selectedVal) { - // ... but only if isn't a javascript: or data: URI, since those - // are hard to read when encoded - if (!uri.schemeIs("javascript") && !uri.schemeIs("data")) { - selectedVal = uri.spec; - } - - return selectedVal; + // If the entire URL is selected, just use the actual loaded URI, + // unless we want a decoded URI, or it's a data: or javascript: URI, + // since those are hard to read when encoded. + if (inputVal == selectedVal && + !uri.schemeIs("javascript") && !uri.schemeIs("data") && + !Services.prefs.getBoolPref("browser.urlbar.decodeURLsOnCopy")) { + return uri.spec; } - // Just the beginning of the URL is selected, check for a trimmed - // value + // Just the beginning of the URL is selected, or we want a decoded + // url. First check for a trimmed value. let spec = uri.spec; let trimmedSpec = this.trimValue(spec); if (spec != trimmedSpec) { diff --git a/palemoon/base/moz.build b/palemoon/base/moz.build index e81e45c23..b0a696b3f 100644 --- a/palemoon/base/moz.build +++ b/palemoon/base/moz.build @@ -11,9 +11,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'): DEFINES['HAVE_SHELL_SERVICE'] = 1 DEFINES['CONTEXT_COPY_IMAGE_CONTENTS'] = 1 -if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'): - DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1 - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'): DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1 diff --git a/palemoon/branding/official/pref/palemoon-branding.js b/palemoon/branding/official/pref/palemoon-branding.js index 3c396a9f6..f8b96cd0c 100644 --- a/palemoon/branding/official/pref/palemoon-branding.js +++ b/palemoon/branding/official/pref/palemoon-branding.js @@ -17,6 +17,9 @@ pref("general.useragent.updates.interval", 86400); // Once per day pref("general.useragent.updates.retry", 7200); // Retry getting update every 2 hours if failed
pref("general.useragent.updates.url", "https://dua.palemoon.org/?app=palemoon&version=%APP_VERSION%&channel=%CHANNEL%");
+// Geolocation
+pref("geo.wifi.uri", "https://pro.ip-api.com/json/?fields=lat,lon,status,message&key=K3TirHYiysBjnmD");
+
// ========================= updates ========================
#if defined(XP_WIN) || defined(XP_LINUX)
// Updates enabled
diff --git a/palemoon/branding/shared/pref/uaoverrides.inc b/palemoon/branding/shared/pref/uaoverrides.inc index 5a0ef27c5..50b55afd7 100644 --- a/palemoon/branding/shared/pref/uaoverrides.inc +++ b/palemoon/branding/shared/pref/uaoverrides.inc @@ -11,76 +11,69 @@ #define GK_SLICE Gecko/20100101
#define FX_SLICE Firefox/@GK_VERSION@
-#ifdef XP_UNIX
-#ifndef XP_MACOSX
-#define OS_SLICE X11; Linux x86_64;
-#else
-#define OS_SLICE Macintosh; Intel Mac OS X 10.11;
-#endif
-#else
-#define OS_SLICE Windows NT 6.1; WOW64;
-#endif
+// %OS_SLICE% macro is resolved at runtime, see MoonchildProductions/UXP/issues/1473
// Special-case AMO
// We send the native UA slice now, since they no longer offer any compatible extensions for us.
// This will result in an "only with Firefox" message which suits us fine, because it's the truth.
-pref("@GUAO_PREF@.addons.mozilla.org","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
-
-// Required for domains that have proven unresponsive to requests from users
-pref("@GUAO_PREF@.live.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
-pref("@GUAO_PREF@.msn.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
-pref("@GUAO_PREF@.bing.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
-pref("@GUAO_PREF@.outlook.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
-pref("@GUAO_PREF@.web.de","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
-pref("@GUAO_PREF@.aol.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
-pref("@GUAO_PREF@.calendar.yahoo.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
-pref("@GUAO_PREF@.google.com","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@");
-pref("@GUAO_PREF@.googlevideos.com","Mozilla/5.0 (@OS_SLICE@ rv:38.9) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/38.9 @PM_SLICE@");
-pref("@GUAO_PREF@.gstatic.com","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@");
-pref("@GUAO_PREF@.yahoo.com","Mozilla/5.0 (@OS_SLICE@ rv:99.9) @GK_SLICE@ Firefox/99.9 (Pale Moon)");
-pref("@GUAO_PREF@.youtube.com","Mozilla/5.0 (@OS_SLICE@ rv:60.0) @GK_SLICE@ Firefox/60.0 @PM_SLICE@");
-pref("@GUAO_PREF@.gaming.youtube.com","Mozilla/5.0 (@OS_SLICE@ rv:42.0) @GK_SLICE@ Firefox/42.0");
-pref("@GUAO_PREF@.dropbox.com","Mozilla/5.0 (@OS_SLICE@ rv:99.9) @GK_SLICE@ Firefox/99.9 (Pale Moon)");
+pref("@GUAO_PREF@.addons.mozilla.org","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
+
+// Required for domains that are unresponsive to requests from users (or likely to be)
+pref("@GUAO_PREF@.live.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
+pref("@GUAO_PREF@.msn.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
+pref("@GUAO_PREF@.bing.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
+pref("@GUAO_PREF@.outlook.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
+pref("@GUAO_PREF@.web.de","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
+pref("@GUAO_PREF@.aol.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
+pref("@GUAO_PREF@.calendar.yahoo.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
+pref("@GUAO_PREF@.google.com","Mozilla/5.0 (%OS_SLICE% rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@");
+pref("@GUAO_PREF@.googlevideos.com","Mozilla/5.0 (%OS_SLICE% rv:38.9) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/38.9 @PM_SLICE@");
+pref("@GUAO_PREF@.gstatic.com","Mozilla/5.0 (%OS_SLICE% rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@");
+pref("@GUAO_PREF@.yahoo.com","Mozilla/5.0 (%OS_SLICE% rv:99.9) @GK_SLICE@ Firefox/99.9 (Pale Moon)");
+pref("@GUAO_PREF@.youtube.com","Mozilla/5.0 (%OS_SLICE% rv:60.0) @GK_SLICE@ Firefox/60.0 @PM_SLICE@");
+pref("@GUAO_PREF@.gaming.youtube.com","Mozilla/5.0 (%OS_SLICE% rv:42.0) @GK_SLICE@ Firefox/42.0");
+pref("@GUAO_PREF@.dropbox.com","Mozilla/5.0 (%OS_SLICE% rv:99.9) @GK_SLICE@ Firefox/99.9 (Pale Moon)");
+pref("@GUAO_PREF@.patientaccess.com","Mozilla/5.0 (%OS_SLICE% rv:60.0) @GK_SLICE@ Firefox/60.0 @PM_SLICE@");
pref("@GUAO_PREF@.players.brightcove.net","Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko");
// The never-ending Facebook debacle...
-pref("@GUAO_PREF@.facebook.com","Mozilla/5.0 (@OS_SLICE@ rv:99.9) @GK_SLICE@ Firefox/99.9 (Pale Moon)");
-pref("@GUAO_PREF@.fbcdn.net","Mozilla/5.0 (@OS_SLICE@ rv:99.9) @GK_SLICE@ Firefox/99.9 (Pale Moon)");
+pref("@GUAO_PREF@.facebook.com","Mozilla/5.0 (%OS_SLICE% rv:99.9) @GK_SLICE@ Firefox/99.9 (Pale Moon)");
+pref("@GUAO_PREF@.fbcdn.net","Mozilla/5.0 (%OS_SLICE% rv:99.9) @GK_SLICE@ Firefox/99.9 (Pale Moon)");
// UA-Sniffing domains below are pending responses from their operators - temp workaround
-pref("@GUAO_PREF@.chase.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
+pref("@GUAO_PREF@.chase.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
// For Amazon Prime videos
-pref("@GUAO_PREF@.www.amazon.com","Mozilla/5.0 (@OS_SLICE@ rv:45.9) @GK_SLICE@ Firefox/45.9 (Pale Moon)");
+pref("@GUAO_PREF@.www.amazon.com","Mozilla/5.0 (%OS_SLICE% rv:45.9) @GK_SLICE@ Firefox/45.9 (Pale Moon)");
// Soundcloud uses Firefox-exclusive combinations of code. Never pass Firefox slice.
-pref("@GUAO_PREF@.soundcloud.com","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
+pref("@GUAO_PREF@.soundcloud.com","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
// Daily motion only likes strict Firefox UAs
-pref("@GUAO_PREF@.dailymotion.com","Mozilla/5.0 (@OS_SLICE@ rv:52.0) @GK_SLICE@ Firefox/52.0");
+pref("@GUAO_PREF@.dailymotion.com","Mozilla/5.0 (%OS_SLICE% rv:52.0) @GK_SLICE@ Firefox/52.0");
// The following requires native mode. Or it blocks.. "too old firefox", breakage, etc.
-pref("@GUAO_PREF@.deviantart.com","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
-pref("@GUAO_PREF@.deviantart.net","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
-pref("@GUAO_PREF@.altibox.dk","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
-pref("@GUAO_PREF@.altibox.no","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
-pref("@GUAO_PREF@.firefox.com","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
-pref("@GUAO_PREF@.mozilla.org","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
-pref("@GUAO_PREF@.mozilla.com","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
-pref("@GUAO_PREF@.github.com","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
+pref("@GUAO_PREF@.deviantart.com","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
+pref("@GUAO_PREF@.deviantart.net","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
+pref("@GUAO_PREF@.altibox.dk","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
+pref("@GUAO_PREF@.altibox.no","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
+pref("@GUAO_PREF@.firefox.com","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
+pref("@GUAO_PREF@.mozilla.org","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
+pref("@GUAO_PREF@.mozilla.com","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
+pref("@GUAO_PREF@.github.com","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
// UA-Sniffing domains below have indicated no interest in supporting Pale Moon (BOO!)
-pref("@GUAO_PREF@.humblebundle.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
-pref("@GUAO_PREF@.privat24.ua","Mozilla/5.0 (@OS_SLICE@ rv:38.0) @GK_SLICE@ Firefox/38.0");
-pref("@GUAO_PREF@.citi.com","Mozilla/5.0 (@OS_SLICE@ rv:57.0) @GK_SLICE@ Firefox/57.0 (Pale Moon)");
-pref("@GUAO_PREF@.netflix.com","Mozilla/5.0 (@OS_SLICE@ rv:45.9) @GK_SLICE@ Firefox/45.9");
-pref("@GUAO_PREF@.netflximg.net","Mozilla/5.0 (@OS_SLICE@ rv:45.9) @GK_SLICE@ Firefox/45.9");
+pref("@GUAO_PREF@.humblebundle.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
+pref("@GUAO_PREF@.privat24.ua","Mozilla/5.0 (%OS_SLICE% rv:38.0) @GK_SLICE@ Firefox/38.0");
+pref("@GUAO_PREF@.citi.com","Mozilla/5.0 (%OS_SLICE% rv:57.0) @GK_SLICE@ Firefox/57.0 (Pale Moon)");
+pref("@GUAO_PREF@.netflix.com","Mozilla/5.0 (%OS_SLICE% rv:45.9) @GK_SLICE@ Firefox/45.9");
+pref("@GUAO_PREF@.netflximg.net","Mozilla/5.0 (%OS_SLICE% rv:45.9) @GK_SLICE@ Firefox/45.9");
// UA-sniffing domains that are "app/vendor-specific" and do not like Pale Moon
pref("@GUAO_PREF@.web.whatsapp.com","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.77 Safari/537.36");
// The following domains do not like the Goanna slice
-pref("@GUAO_PREF@.hitbox.tv","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
-pref("@GUAO_PREF@.yuku.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ @PM_SLICE@");
+pref("@GUAO_PREF@.hitbox.tv","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
+pref("@GUAO_PREF@.yuku.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ @PM_SLICE@");
// ============================================================================
diff --git a/palemoon/branding/unstable/pref/palemoon-branding.js b/palemoon/branding/unstable/pref/palemoon-branding.js index d005020b9..c4d1e599e 100644 --- a/palemoon/branding/unstable/pref/palemoon-branding.js +++ b/palemoon/branding/unstable/pref/palemoon-branding.js @@ -17,6 +17,9 @@ pref("general.useragent.updates.interval", 86400); // Once per day pref("general.useragent.updates.retry", 7200); // Retry getting update every 2 hours if failed
pref("general.useragent.updates.url", "https://dua.palemoon.org/?app=palemoon&version=%APP_VERSION%&channel=%CHANNEL%");
+// Geolocation
+pref("geo.wifi.uri", "https://pro.ip-api.com/json/?fields=lat,lon,status,message&key=K3TirHYiysBjnmD");
+
// ========================= updates ========================
#if defined(XP_WIN) || defined(XP_LINUX)
// Enable auto-updates for this channel
diff --git a/palemoon/components/abouthome/aboutHome.css b/palemoon/components/abouthome/aboutHome.css index 2b062e8e7..b41eab32a 100644 --- a/palemoon/components/abouthome/aboutHome.css +++ b/palemoon/components/abouthome/aboutHome.css @@ -63,7 +63,7 @@ a { display: -moz-box; -moz-box-align: center; padding-top: 2px; - -moz-padding-end: 8px; + padding-inline-end: 8px; } #searchLogoContainer[hidden] { @@ -99,12 +99,12 @@ a { } #searchSubmit { - -moz-margin-start: -1px; + margin-inline-start: -1px; background: linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.1)) padding-box; padding: 0 9px; border: 1px solid; border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.17) hsla(210,54%,20%,.2); - -moz-border-start: 1px solid transparent; + border-inline-start: 1px solid transparent; border-radius: 0 2.5px 2.5px 0; box-shadow: 0 0 2px hsla(0,0%,100%,.5) inset, 0 1px 0 hsla(0,0%,100%,.2); @@ -279,7 +279,7 @@ body[narrow] #restorePreviousSession { display: inline-block; /* display on same line as text label */ vertical-align: middle; margin-bottom: 0; - -moz-margin-end: 8px; + margin-inline-end: 8px; } #restorePreviousSession:-moz-dir(rtl)::before { diff --git a/palemoon/components/nsBrowserGlue.js b/palemoon/components/nsBrowserGlue.js index 081c26065..098dac6c2 100644 --- a/palemoon/components/nsBrowserGlue.js +++ b/palemoon/components/nsBrowserGlue.js @@ -238,9 +238,9 @@ BrowserGlue.prototype = { this._onPlacesShutdown(); break; case "idle": - if ((this._idleService.idleTime > BOOKMARKS_BACKUP_IDLE_TIME * 1000) && - this._shouldBackupBookmarks()) + if (this._idleService.idleTime > BOOKMARKS_BACKUP_IDLE_TIME * 1000) { this._backupBookmarks(); + } break; case "distribution-customization-complete": Services.obs.removeObserver(this, "distribution-customization-complete"); @@ -941,8 +941,7 @@ BrowserGlue.prototype = { Services.prefs.getBoolPref("browser.bookmarks.restore_default_bookmarks"); if (restoreDefaultBookmarks) { // Ensure that we already have a bookmarks backup for today. - if (this._shouldBackupBookmarks()) - yield this._backupBookmarks(); + yield this._backupBookmarks(); importBookmarks = true; } } catch(ex) {} @@ -1088,22 +1087,19 @@ BrowserGlue.prototype = { } let waitingForBackupToComplete = true; - if (this._shouldBackupBookmarks()) { - waitingForBackupToComplete = false; - this._backupBookmarks().then( - function onSuccess() { - waitingForBackupToComplete = true; - }, - function onFailure() { - Cu.reportError("Unable to backup bookmarks."); - waitingForBackupToComplete = true; - } - ); - } + this._backupBookmarks().then( + function onSuccess() { + waitingForBackupToComplete = false; + }, + function onFailure() { + Cu.reportError("Unable to backup bookmarks."); + waitingForBackupToComplete = false; + } + ); // Backup bookmarks to bookmarks.html to support apps that depend // on the legacy format. - let waitingForHTMLExportToComplete = true; + let waitingForHTMLExportToComplete = false; // If this fails to get the preference value, we don't export. if (Services.prefs.getBoolPref("browser.bookmarks.autoExportHTML")) { // Exceptionally, since this is a non-default setting and HTML format is @@ -1112,51 +1108,44 @@ BrowserGlue.prototype = { // spin the event loop on shutdown until we include a watchdog to prevent // potential hangs (bug 518683). The asynchronous shutdown operations // will then be handled by a shutdown service (bug 435058). - waitingForHTMLExportToComplete = false; + waitingForHTMLExportToComplete = true; BookmarkHTMLUtils.exportToFile(BookmarkHTMLUtils.defaultPath).then( function onSuccess() { - waitingForHTMLExportToComplete = true; + waitingForHTMLExportToComplete = false; }, function onFailure() { Cu.reportError("Unable to auto export html."); - waitingForHTMLExportToComplete = true; + waitingForHTMLExportToComplete = false; } ); } + // The events loop should spin at least once because waitingForBackupToComplete + // is true before checking whether backup should be made. let thread = Services.tm.currentThread; - while (!waitingForBackupToComplete || !waitingForHTMLExportToComplete) { + while (waitingForBackupToComplete || waitingForHTMLExportToComplete) { thread.processNextEvent(true); } }, /** - * Determine whether to backup bookmarks or not. - * @return true if bookmarks should be backed up, false if not. - */ - _shouldBackupBookmarks: function() { - let lastBackupFile = PlacesBackups.getMostRecent(); - - // Should backup bookmarks if there are no backups or the maximum interval between - // backups elapsed. - return (!lastBackupFile || - new Date() - PlacesBackups.getDateForFile(lastBackupFile) > BOOKMARKS_BACKUP_INTERVAL); - }, - - /** * Backup bookmarks. */ _backupBookmarks: function() { return Task.spawn(function() { - // Backup bookmarks if there are no backups or the maximum interval between - // backups elapsed. - let maxBackups = BOOKMARKS_BACKUP_MAX_BACKUPS; - try { - maxBackups = Services.prefs.getIntPref("browser.bookmarks.max_backups"); - } - catch(ex) { /* Use default. */ } + let lastBackupFile = yield PlacesBackups.getMostRecentBackup(); + // Should backup bookmarks if there are no backups or the maximum + // interval between backups elapsed. + if (!lastBackupFile || + new Date() - PlacesBackups.getDateForFile(lastBackupFile) > BOOKMARKS_BACKUP_INTERVAL) { + let maxBackups = BOOKMARKS_BACKUP_MAX_BACKUPS; + try { + maxBackups = Services.prefs.getIntPref("browser.bookmarks.max_backups"); + } + catch(ex) { /* Use default. */ } - yield PlacesBackups.create(maxBackups); // Don't force creation. + yield PlacesBackups.create(maxBackups); // Don't force creation. + } }); }, @@ -1198,7 +1187,7 @@ BrowserGlue.prototype = { }, _migrateUI: function() { - const UI_VERSION = 22; + const UI_VERSION = 23; const BROWSER_DOCURL = "chrome://browser/content/browser.xul#"; let currentUIVersion = 0; try { @@ -1453,9 +1442,9 @@ BrowserGlue.prototype = { } } - if (currentUIVersion < 22) { + if (currentUIVersion < 23) { if (Services.prefs.prefHasUserValue("layers.acceleration.disabled")) { - let HWADisabled = Service.prefs.getBoolPref("layers.acceleration.disabled"); + let HWADisabled = Services.prefs.getBoolPref("layers.acceleration.disabled"); Services.prefs.setBoolPref("layers.acceleration.enabled", !HWADisabled); Services.prefs.setBoolPref("gfx.direct2d.disabled", HWADisabled); } diff --git a/palemoon/components/preferences/advanced.js b/palemoon/components/preferences/advanced.js index 7bcf2130e..59c12890a 100644 --- a/palemoon/components/preferences/advanced.js +++ b/palemoon/components/preferences/advanced.js @@ -159,8 +159,8 @@ var gAdvancedPane = { { #ifdef XP_WIN var fromPref = document.getElementById("layers.acceleration.enabled"); - var toPref = document.getElementById("gfx.direct2d.disabled"); - toPref.value = !fromPref.value; + var toPref = document.getElementById("gfx.direct2d.enabled"); + toPref.value = fromPref.value; #endif this.updateHWADisplay(); }, diff --git a/palemoon/components/preferences/advanced.xul b/palemoon/components/preferences/advanced.xul index 693efc543..82db77605 100644 --- a/palemoon/components/preferences/advanced.xul +++ b/palemoon/components/preferences/advanced.xul @@ -35,7 +35,7 @@ onchange="gAdvancedPane.updateHardwareAcceleration()"/> <preference id="layers.acceleration.force" name="layers.acceleration.force" type="bool"/> #ifdef XP_WIN - <preference id="gfx.direct2d.disabled" name="gfx.direct2d.disabled" type="bool" inverted="true"/> + <preference id="gfx.direct2d.enabled" name="gfx.direct2d.disabled" type="bool" inverted="true"/> #endif <preference id="layout.spellcheckDefault" name="layout.spellcheckDefault" type="int"/> diff --git a/palemoon/components/preferences/security.xul b/palemoon/components/preferences/security.xul index 9aa3f7a8a..350eb0d79 100644 --- a/palemoon/components/preferences/security.xul +++ b/palemoon/components/preferences/security.xul @@ -46,10 +46,7 @@ <preference id="network.stricttransportsecurity.enabled" name="network.stricttransportsecurity.enabled" type="bool"/> - <preference id="security.cert_pinning.hpkp.enabled" - name="security.cert_pinning.hpkp.enabled" - type="bool"/> - + <!-- Opportunistic Encryption --> <preference id="network.http.upgrade-insecure-requests" @@ -147,10 +144,6 @@ label="&enableHSTS.label;" accesskey="&enableHSTS.accesskey;" preference="network.stricttransportsecurity.enabled" /> - <checkbox id="enableHPKP" - label="&enableHPKP.label;" - accesskey="&enableHPKP.accesskey;" - preference="security.cert_pinning.hpkp.enabled"/> </vbox> </groupbox> diff --git a/palemoon/components/sessionstore/SessionStore.jsm b/palemoon/components/sessionstore/SessionStore.jsm index dae7789f7..23fdac3f8 100644 --- a/palemoon/components/sessionstore/SessionStore.jsm +++ b/palemoon/components/sessionstore/SessionStore.jsm @@ -3236,19 +3236,24 @@ var SessionStoreInternal = { // instead of gotoIndex. See bug 597315. browser.webNavigation.sessionHistory.getEntryAtIndex(activeIndex, true); browser.webNavigation.sessionHistory.reloadCurrentEntry(); - // If the user prefers it, bypass cache and always load from the network. - let flags = Ci.nsIWebNavigation.LOAD_FLAGS_NONE; - switch (this._cacheBehavior) { - case 2: // hard refresh - flags = Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_PROXY | - Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE; - browser.webNavigation.reload(flags); - break; - case 1: // soft refresh - browser.webNavigation.reload(flags); - break; - default: // 0 or other: use cache, so do nothing. - break; + // If the user prefers it, bypass cache and always load from the network, + // but only if restoring on demand, to prevent request flooding (since + // reloading will override the max tabs to restore concurrently mechanism). + // See Issue #1772 + if (restoreOnDemand) { + let flags = Ci.nsIWebNavigation.LOAD_FLAGS_NONE; + switch (this._cacheBehavior) { + case 2: // hard refresh + flags = Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_PROXY | + Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE; + browser.webNavigation.reload(flags); + break; + case 1: // soft refresh + browser.webNavigation.reload(flags); + break; + default: // 0 or other: use cache, so do nothing. + break; + } } } catch (ex) { diff --git a/palemoon/config/version.txt b/palemoon/config/version.txt index e9b856e98..136e68166 100644 --- a/palemoon/config/version.txt +++ b/palemoon/config/version.txt @@ -1 +1 @@ -29.0.0a2
\ No newline at end of file +29.0.0a3
\ No newline at end of file diff --git a/palemoon/confvars.sh b/palemoon/confvars.sh index f2ca94662..55b0411ec 100644 --- a/palemoon/confvars.sh +++ b/palemoon/confvars.sh @@ -79,6 +79,11 @@ MOZ_JSDOWNLOADS=1 # conformant implementations. MOZ_WEBGL_CONFORMANT=1 +# Platform Feature: Enable drawing in the titlebar on Windows +if test "$OS_ARCH" = "WINNT"; then + MOZ_CAN_DRAW_IN_TITLEBAR=1 +fi + # Set the chrome packing format # Possible values are omni, jar, and flat # Currently, only omni and flat are supported diff --git a/palemoon/locales/en-US/chrome/browser/preferences/security.dtd b/palemoon/locales/en-US/chrome/browser/preferences/security.dtd index 930736d56..c18ed600a 100644 --- a/palemoon/locales/en-US/chrome/browser/preferences/security.dtd +++ b/palemoon/locales/en-US/chrome/browser/preferences/security.dtd @@ -37,8 +37,6 @@ <!ENTITY SecProto.label "Security Protocols"> <!ENTITY enableHSTS.label "Enable Strict Transport Security (HSTS)"> <!ENTITY enableHSTS.accesskey "S"> -<!ENTITY enableHPKP.label "Enable Certificate Key Pinning (HPKP)"> -<!ENTITY enableHPKP.accesskey "C"> <!ENTITY OpEnc.label "Opportunistic Encryption (OE)"> <!ENTITY enableUIROpEnc.label "Enable Upgrade Insecure Requests"> diff --git a/palemoon/themes/linux/aboutCertError.css b/palemoon/themes/linux/aboutCertError.css index dbb353025..100bb3d3b 100644 --- a/palemoon/themes/linux/aboutCertError.css +++ b/palemoon/themes/linux/aboutCertError.css @@ -33,7 +33,7 @@ h2 { border-radius: 10px; box-shadow: 0px 0px 8px red; padding: 3em; - -moz-padding-start: 30px; + padding-inline-start: 30px; background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat -moz-Field; background-origin: content-box; } @@ -43,16 +43,16 @@ h2 { } #errorTitle { - -moz-margin-start: 80px; + margin-inline-start: 80px; } #errorLongContent { - -moz-margin-start: 80px; + margin-inline-start: 80px; } .expander > button { - -moz-padding-start: 20px; - -moz-margin-start: -20px; + padding-inline-start: 20px; + margin-inline-start: -20px; background: url("chrome://browser/skin/aboutCertError_sectionExpanded.png") left center no-repeat; border: none; font: inherit; diff --git a/palemoon/themes/linux/aboutPrivateBrowsing.css b/palemoon/themes/linux/aboutPrivateBrowsing.css index 2bb39d295..a6fd54920 100644 --- a/palemoon/themes/linux/aboutPrivateBrowsing.css +++ b/palemoon/themes/linux/aboutPrivateBrowsing.css @@ -21,7 +21,7 @@ body.normal > #errorPageContainer { } #startPrivateBrowsingDesc > button { - -moz-margin-start: 0; + margin-inline-start: 0; } #footerDesc > p { @@ -30,7 +30,7 @@ body.normal > #errorPageContainer { #moreInfo { font-size: 110%; /* to match the value set in chrome://global/skin/netError.css */ - -moz-padding-start: 25px; + padding-inline-start: 25px; background: url("moz-icon://stock/gtk-dialog-info?size=menu") no-repeat top left; } diff --git a/palemoon/themes/linux/aboutSessionRestore.css b/palemoon/themes/linux/aboutSessionRestore.css index a32b9757a..a58c104ce 100644 --- a/palemoon/themes/linux/aboutSessionRestore.css +++ b/palemoon/themes/linux/aboutSessionRestore.css @@ -82,9 +82,9 @@ treechildren::-moz-tree-row(alternate, selected) { } #buttons { - -moz-margin-start: 80px; /* same as #errorLongContent in netError.css */ + margin-inline-start: 80px; /* same as #errorLongContent in netError.css */ } #buttons > button { margin-top: 2em; - -moz-margin-start: 5px; + margin-inline-start: 5px; } diff --git a/palemoon/themes/linux/aboutSyncTabs.css b/palemoon/themes/linux/aboutSyncTabs.css index 4f21a9d40..1fcd8304f 100644 --- a/palemoon/themes/linux/aboutSyncTabs.css +++ b/palemoon/themes/linux/aboutSyncTabs.css @@ -22,18 +22,18 @@ margin-top: 4px; width: 45em; height: 32px; - -moz-margin-start: 2em; - -moz-margin-end: 2em; + margin-inline-start: 2em; + margin-inline-end: 2em; } #tabsListHeading { font-size: 140%; font-weight: bold; - -moz-margin-start: 40px; + margin-inline-start: 40px; } richlistitem { - -moz-margin-end: 2em; + margin-inline-end: 2em; } richlistitem[selected="true"], @@ -46,7 +46,7 @@ richlistitem[type="tab"] { border: #999999 1px solid !important; padding: 2px 5px; margin-bottom: 4px; - -moz-margin-start: 4em; + margin-inline-start: 4em; border-radius: 6px; background-color: menu; width: 44em; @@ -64,7 +64,7 @@ richlistitem[type="tab"][selected="true"] { richlistitem[type="client"] { min-height: 2em; color: #000000; - -moz-margin-start: 2em; + margin-inline-start: 2em; margin-top: 2px; margin-bottom: 3px; width: 42em; @@ -96,6 +96,6 @@ richlistitem.desktop[type="client"] { } .tabIcon { - -moz-padding-start: 2px; + padding-inline-start: 2px; padding-top: 2px; } diff --git a/palemoon/themes/linux/autocomplete.css b/palemoon/themes/linux/autocomplete.css index ab926851d..e23e6b001 100644 --- a/palemoon/themes/linux/autocomplete.css +++ b/palemoon/themes/linux/autocomplete.css @@ -83,7 +83,7 @@ panel[type="private-autocomplete-richlistbox"], } .private-autocomplete-treebody::-moz-tree-cell-text { - -moz-padding-start: 8px; + padding-inline-start: 8px; } treechildren.private-autocomplete-treebody::-moz-tree-row(selected) { @@ -143,15 +143,15 @@ treechildren.private-autocomplete-treebody::-moz-tree-cell-text(selected) { width: 16px; height: 16px; margin-bottom: -2px; - -moz-margin-start: 3px; - -moz-margin-end: 6px; + margin-inline-start: 3px; + margin-inline-end: 6px; } .ac-type-icon { width: 16px; height: 16px; - -moz-margin-start: 6px; - -moz-margin-end: 4px; + margin-inline-start: 6px; + margin-inline-end: 4px; } .ac-extra > .ac-result-type-tag { diff --git a/palemoon/themes/linux/browser.css b/palemoon/themes/linux/browser.css index d7344a234..805c22d67 100644 --- a/palemoon/themes/linux/browser.css +++ b/palemoon/themes/linux/browser.css @@ -92,8 +92,8 @@ toolbarbutton.bookmark-item:hover:active, toolbarbutton.bookmark-item[open="true"] { padding-top: 3px; padding-bottom: 1px; - -moz-padding-start: 4px; - -moz-padding-end: 2px; + padding-inline-start: 4px; + padding-inline-end: 2px; } .bookmark-item > .toolbarbutton-icon { @@ -137,7 +137,7 @@ menuitem.bookmark-item { } .bookmark-item > .menu-iconic-left > .menu-iconic-icon { - -moz-padding-start: 0px; + padding-inline-start: 0px; } /* Bookmark drag and drop styles */ @@ -157,7 +157,7 @@ menuitem.bookmark-item { .menupopup-drop-indicator { list-style-image: none; height: 2px; - -moz-margin-end: -4em; + margin-inline-end: -4em; background-color: Highlight; } @@ -559,7 +559,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { } .toolbarbutton-1 > .toolbarbutton-icon { - -moz-margin-end: 0; + margin-inline-end: 0; } toolbar[mode="full"] .toolbarbutton-1:not([type="menu-button"]), @@ -897,7 +897,7 @@ toolbar[iconsize="small"] #webrtc-status-button { /* Fullscreen window controls */ #window-controls { -moz-box-align: start; - -moz-margin-start: 10px; + margin-inline-start: 10px; } #minimize-button { @@ -923,7 +923,7 @@ toolbar[iconsize="small"] #webrtc-status-button { } .urlbar-input-box { - -moz-margin-start: 0; + margin-inline-start: 0; min-width: 4em; } @@ -948,25 +948,25 @@ toolbar[iconsize="small"] #webrtc-status-button { #urlbar-search-splitter { -moz-appearance: none; width: 8px; - -moz-margin-start: -4px; + margin-inline-start: -4px; } #urlbar-search-splitter + #urlbar-container > #urlbar , #urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox { - -moz-margin-start: 0; + margin-inline-start: 0; } #urlbar-display-box { margin-top: -1px; margin-bottom: -1px; - -moz-border-end: 1px solid #AAA; - -moz-margin-end: 3px; + border-inline-end: 1px solid #AAA; + margin-inline-end: 3px; } #urlbar-display { margin-top: 0; margin-bottom: 0; - -moz-margin-start: 0; + margin-inline-start: 0; color: GrayText; } @@ -976,8 +976,8 @@ toolbar[iconsize="small"] #webrtc-status-button { height: 16px; margin-top: 2px; margin-bottom: 2px; - -moz-margin-start: 4px; - -moz-margin-end: 3px; + margin-inline-start: 4px; + margin-inline-end: 3px; list-style-image: url(chrome://browser/skin/identity-icons-generic.png); -moz-image-region: rect(0, 16px, 16px, 0); } @@ -1013,7 +1013,7 @@ toolbar[iconsize="small"] #webrtc-status-button { #identity-box { padding: 1px; margin: -1px; - -moz-margin-end: 0; + margin-inline-end: 0; font-size: .9em; } @@ -1033,13 +1033,13 @@ toolbar[iconsize="small"] #webrtc-status-button { } #identity-icon-labels { - -moz-padding-start: 2px; - -moz-padding-end: 5px; + padding-inline-start: 2px; + padding-inline-end: 5px; } #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { color: rgb(95,127,67); - -moz-margin-end: 4px; + margin-inline-end: 4px; background-image: linear-gradient(rgba(226,246,208,1), rgba(203,235,177,1)); background-position: right; @@ -1048,7 +1048,7 @@ toolbar[iconsize="small"] #webrtc-status-button { #urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain { color: rgb(51,87,137); - -moz-margin-end: 4px; + margin-inline-end: 4px; background-image: linear-gradient(rgba(220,231,245,1), rgba(207,221,242,1)); background-position: right; @@ -1109,13 +1109,13 @@ toolbar[iconsize="small"] #webrtc-status-button { /* Identity popup body text */ .identity-popup-description { white-space: pre-wrap; - -moz-padding-start: 15px; + padding-inline-start: 15px; margin: 2px 0 4px; } .identity-popup-label { white-space: pre-wrap; - -moz-padding-start: 15px; + padding-inline-start: 15px; margin: 0; } @@ -1141,7 +1141,7 @@ toolbar[iconsize="small"] #webrtc-status-button { #identity-popup-content-box.verifiedIdentity > #identity-popup-encryption , #identity-popup-content-box.verifiedDomain > #identity-popup-encryption { margin-top: 10px; - -moz-margin-start: -18px; + margin-inline-start: -18px; } #identity-popup-content-box.verifiedIdentity > #identity-popup-encryption > vbox > #identity-popup-encryption-icon , @@ -1162,7 +1162,7 @@ toolbar[iconsize="small"] #webrtc-status-button { .popup-notification-icon { width: 64px; height: 64px; - -moz-margin-end: 10px; + margin-inline-end: 10px; } .popup-notification-icon[popupid="geolocation"] { @@ -1200,8 +1200,8 @@ toolbar[iconsize="small"] #webrtc-status-button { .popup-progress-label, .popup-progress-meter { - -moz-margin-start: 0; - -moz-margin-end: 0; + margin-inline-start: 0; + margin-inline-end: 0; } .popup-progress-cancel { @@ -1210,7 +1210,7 @@ toolbar[iconsize="small"] #webrtc-status-button { border: none; padding: 0; margin: 0; - -moz-margin-start: 5px; + margin-inline-start: 5px; min-height: 0; min-width: 0; list-style-image: url("moz-icon://stock/gtk-cancel?size=menu"); @@ -1252,13 +1252,13 @@ toolbar[iconsize="small"] #webrtc-status-button { border-width: 0 8px 0 0; border-style: solid; border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 fill; - -moz-margin-end: -8px; + margin-inline-end: -8px; margin-top: -1px; margin-bottom: -1px; } #notification-popup-box:not([hidden]) + #identity-box { - -moz-padding-start: 10px; + padding-inline-start: 10px; border-radius: 0; } @@ -1710,7 +1710,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- .tab-icon-image { width: 16px; height: 16px; - -moz-margin-end: 3px; + margin-inline-end: 3px; list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); } @@ -1725,8 +1725,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- .tab-throbber[pinned], .tab-icon-image[pinned], .tabs-newtab-button > .toolbarbutton-icon { - -moz-margin-start: 2px; - -moz-margin-end: 2px; + margin-inline-start: 2px; + margin-inline-end: 2px; } #context_reloadTab { @@ -1766,12 +1766,12 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- padding: 0; margin-top: -1px; margin-bottom: -1px; - -moz-margin-end: -1px; + margin-inline-end: -1px; } /* Tab sound indicator */ .tab-icon-sound { - -moz-margin-start: 4px; + margin-inline-start: 4px; width: 16px; height: 16px; padding: 0; @@ -1876,13 +1876,13 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- } .tabbrowser-arrowscrollbox > .scrollbutton-up { - -moz-border-start: 0; - -moz-border-end: 2px solid transparent; + border-inline-start: 0; + border-inline-end: 2px solid transparent; } .tabbrowser-arrowscrollbox > .scrollbutton-down { - -moz-border-start: 2px solid transparent; - -moz-border-end: 0; + border-inline-start: 2px solid transparent; + border-inline-end: 0; transition: 1s box-shadow ease-out; border-radius: 4px; } @@ -1952,7 +1952,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- #sidebar-throbber[loading="true"] { list-style-image: url("chrome://global/skin/icons/loading_16.png"); - -moz-margin-end: 4px; + margin-inline-end: 4px; } toolbarbutton.chevron { @@ -2040,8 +2040,8 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon { } #allTabs-filter { - -moz-margin-start: 36px; - -moz-margin-end: 0; + margin-inline-start: 36px; + margin-inline-end: 0; } .allTabs-preview-label { @@ -2051,7 +2051,7 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon { /* Application button menu */ .splitmenu-menuitem { - -moz-margin-end: 1px; + margin-inline-end: 1px; } #appmenu-toolbar-button:not(:hover):not([open]):not(:-moz-lwtheme) { @@ -2064,7 +2064,7 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon { margin-bottom: -2px !important; } #appmenuSecondaryPane { - -moz-border-start: 1px solid ThreeDShadow; + border-inline-start: 1px solid ThreeDShadow; } #appmenuSecondaryPane-spacer { min-height: 1em; @@ -2184,7 +2184,7 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon { text-shadow: none; background-image: linear-gradient(#B4211B, #8A1915); border-radius: 1px; - -moz-margin-end: 2px; + margin-inline-end: 2px; } %endif diff --git a/palemoon/themes/linux/downloads/allDownloadsViewOverlay.css b/palemoon/themes/linux/downloads/allDownloadsViewOverlay.css index 3526e01d6..b41788472 100644 --- a/palemoon/themes/linux/downloads/allDownloadsViewOverlay.css +++ b/palemoon/themes/linux/downloads/allDownloadsViewOverlay.css @@ -14,7 +14,7 @@ } .downloadTypeIcon { - -moz-margin-end: 8px; + margin-inline-end: 8px; /* Prevent flickering when changing states. */ min-height: 32px; min-width: 32px; diff --git a/palemoon/themes/linux/downloads/downloads.css b/palemoon/themes/linux/downloads/downloads.css index 79bb5ee57..368abd677 100644 --- a/palemoon/themes/linux/downloads/downloads.css +++ b/palemoon/themes/linux/downloads/downloads.css @@ -51,7 +51,7 @@ #downloadsSummary, richlistitem[type="download"] { height: 6em; - -moz-padding-end: 0; + padding-inline-end: 0; color: inherit; } @@ -96,7 +96,7 @@ richlistitem[type="download"]:last-child { } .downloadTypeIcon { - -moz-margin-end: 8px; + margin-inline-end: 8px; /* Prevent flickering when changing states. */ min-height: 32px; min-width: 32px; @@ -358,7 +358,7 @@ toolbar[brighttext] #downloads-indicator-counter { background-image: linear-gradient(#505050, #575757); border: 1px solid; border-color: hsla(0,0%,0%,.6) hsla(0,0%,0%,.4) hsla(0,0%,0%,.4); - -moz-border-start: none; + border-inline-start: none; border-radius: 0 2px 2px 0; } diff --git a/palemoon/themes/linux/engineManager.css b/palemoon/themes/linux/engineManager.css index 18817cd4f..c6d42cce2 100644 --- a/palemoon/themes/linux/engineManager.css +++ b/palemoon/themes/linux/engineManager.css @@ -5,8 +5,8 @@ %endif #engineList treechildren::-moz-tree-image(engineName) { - -moz-margin-end: 4px; - -moz-margin-start: 1px; + margin-inline-end: 4px; + margin-inline-start: 1px; width: 16px; height: 16px; } diff --git a/palemoon/themes/linux/feeds/subscribe-ui.css b/palemoon/themes/linux/feeds/subscribe-ui.css index b3c0b37a2..51eb7a117 100644 --- a/palemoon/themes/linux/feeds/subscribe-ui.css +++ b/palemoon/themes/linux/feeds/subscribe-ui.css @@ -7,17 +7,17 @@ } .handlersMenuPopup > menuitem { - -moz-padding-start: 23px; + padding-inline-start: 23px; } .handlersMenuPopup > menuitem.menuitem-iconic { - -moz-padding-start: 2px; + padding-inline-start: 2px; } .handlersMenuPopup > .menuitem-iconic > .menu-iconic-left { display: -moz-box; min-width: 16px; - -moz-padding-end: 2px; + padding-inline-end: 2px; } .chooseApplicationMenuItem { diff --git a/palemoon/themes/linux/feeds/subscribe.css b/palemoon/themes/linux/feeds/subscribe.css index dd1e24eef..ac5de5865 100644 --- a/palemoon/themes/linux/feeds/subscribe.css +++ b/palemoon/themes/linux/feeds/subscribe.css @@ -10,7 +10,7 @@ html { #feedBody { border: 1px solid THreeDShadow; padding: 3em; - -moz-padding-start: 30px; + padding-inline-start: 30px; margin: 2em auto; background: -moz-Field; } @@ -25,9 +25,9 @@ html { #feedHeader { margin-top: 4.9em; margin-bottom: 1em; - -moz-margin-start: 1.4em; - -moz-margin-end: 1em; - -moz-padding-start: 2.9em; + margin-inline-start: 1.4em; + margin-inline-end: 1em; + padding-inline-start: 2.9em; font-size: 110%; color: InfoText; } @@ -54,12 +54,12 @@ html { #feedHeader[firstrun="true"] #feedIntroText { padding-top: 0.1em; - -moz-padding-start: 0.6em; + padding-inline-start: 0.6em; display: block; } #feedHeader[firstrun="true"] > #feedSubscribeLine { - -moz-padding-start: 1.8em; + padding-inline-start: 1.8em; } #feedSubscribeLine { @@ -99,8 +99,8 @@ h2 { #feedTitleLink { float: right; - -moz-margin-start: .6em; - -moz-margin-end: 0; + margin-inline-start: .6em; + margin-inline-end: 0; margin-top: 0; margin-bottom: 0; } @@ -110,15 +110,15 @@ a[href] img { } #feedTitleContainer { - -moz-margin-start: 0; - -moz-margin-end: .6em; + margin-inline-start: 0; + margin-inline-end: .6em; margin-top: 0; margin-bottom: 0; } #feedTitleImage { - -moz-margin-start: .6em; - -moz-margin-end: 0; + margin-inline-start: .6em; + margin-inline-end: 0; margin-top: 0; margin-bottom: 0; max-width: 300px; diff --git a/palemoon/themes/linux/pageInfo.css b/palemoon/themes/linux/pageInfo.css index 49ae4938a..805c2fa45 100644 --- a/palemoon/themes/linux/pageInfo.css +++ b/palemoon/themes/linux/pageInfo.css @@ -75,7 +75,7 @@ textbox { } textbox.header { - -moz-margin-start: 0; + margin-inline-start: 0; } .iframe { @@ -94,7 +94,7 @@ textbox[disabled] { /* General Tab */ #generalPanel > #titletext { - -moz-margin-start: 5px; + margin-inline-start: 5px; } groupbox.collapsable caption .caption-icon { @@ -102,8 +102,8 @@ groupbox.collapsable caption .caption-icon { height: 9px; background-repeat: no-repeat; background-position: center; - -moz-margin-start: 1px; - -moz-margin-end: 3px; + margin-inline-start: 1px; + margin-inline-end: 3px; background-image: url("chrome://global/skin/tree/twisty-open.png"); } @@ -121,13 +121,13 @@ groupbox tree { } groupbox.treebox .groupbox-body { - -moz-margin-start: 5px; - -moz-margin-end: 1px; + margin-inline-start: 5px; + margin-inline-end: 1px; padding-top: 0; } #securityBox description { - -moz-margin-start: 10px; + margin-inline-start: 10px; } #general-security-identity { @@ -182,8 +182,8 @@ treechildren::-moz-tree-cell-text(broken) { #feedListbox richlistitem { padding-top: 6px; padding-bottom: 6px; - -moz-padding-start: 7px; - -moz-padding-end: 7px; + padding-inline-start: 7px; + padding-inline-end: 7px; min-height: 25px; border-bottom: 1px dotted #C0C0C0; color: -moz-FieldText; @@ -229,8 +229,8 @@ treechildren::-moz-tree-cell-text(broken) { .permission { padding-top: 6px; padding-bottom: 6px; - -moz-padding-start: 7px; - -moz-padding-end: 7px; + padding-inline-start: 7px; + padding-inline-end: 7px; min-height: 25px; border-bottom: 1px dotted #C0C0C0; } diff --git a/palemoon/themes/linux/permissions/aboutPermissions.css b/palemoon/themes/linux/permissions/aboutPermissions.css index 386e167e6..17634e8fa 100644 --- a/palemoon/themes/linux/permissions/aboutPermissions.css +++ b/palemoon/themes/linux/permissions/aboutPermissions.css @@ -40,7 +40,7 @@ .site-favicon { height: 16px; width: 16px; - -moz-margin-end: 4px; + margin-inline-end: 4px; list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); } @@ -57,7 +57,7 @@ #site-description { font-size: 125%; - -moz-margin-start: 6px; /* to match button margin */ + margin-inline-start: 6px; /* to match button margin */ } #site-label { @@ -69,7 +69,7 @@ #defaults-description { font-size: 125%; font-weight: bold; - -moz-margin-start: 6px; + margin-inline-start: 6px; } .pref-item { @@ -79,7 +79,7 @@ .pref-icon { width: 36px; height: 36px; - -moz-margin-end: 10px; + margin-inline-end: 10px; } .pref-icon[type="password"] { diff --git a/palemoon/themes/linux/places/editBookmarkOverlay.css b/palemoon/themes/linux/places/editBookmarkOverlay.css index f1f6210b4..dba6ba655 100644 --- a/palemoon/themes/linux/places/editBookmarkOverlay.css +++ b/palemoon/themes/linux/places/editBookmarkOverlay.css @@ -24,7 +24,7 @@ .expander-down { min-width: 0; padding: 2px 0; - -moz-padding-start: 2px; + padding-inline-start: 2px; } .expander-up > .button-box { diff --git a/palemoon/themes/linux/places/organizer.css b/palemoon/themes/linux/places/organizer.css index cabeebbca..16ead7212 100644 --- a/palemoon/themes/linux/places/organizer.css +++ b/palemoon/themes/linux/places/organizer.css @@ -47,7 +47,7 @@ } #placesMenu > menu { - -moz-padding-start: 4px; + padding-inline-start: 4px; -moz-binding: url("chrome://browser/skin/places/organizer.xml#toolbarbutton-dropdown"); -moz-appearance: toolbarbutton; color: -moz-DialogText; @@ -74,7 +74,7 @@ } #infoBoxExpanderLabel { - -moz-padding-start: 2px; + padding-inline-start: 2px; } #searchModifiers { diff --git a/palemoon/themes/linux/preferences/applications.css b/palemoon/themes/linux/preferences/applications.css index c9d1b8c8a..8b63dfdab 100644 --- a/palemoon/themes/linux/preferences/applications.css +++ b/palemoon/themes/linux/preferences/applications.css @@ -11,18 +11,18 @@ .actionsMenu { margin-top: -1px; margin-bottom: -1px; - -moz-margin-start: -1px; - -moz-margin-end: 0; + margin-inline-start: -1px; + margin-inline-end: 0; } .typeIcon, .actionIcon { - -moz-margin-start: 3px; - -moz-margin-end: 3px; + margin-inline-start: 3px; + margin-inline-end: 3px; } richlistitem label { - -moz-margin-start: 1px; + margin-inline-start: 1px; margin-top: 2px; } @@ -51,16 +51,16 @@ menuitem[appHandlerIcon="plugin"] { } .actionsMenu .menulist-icon { - -moz-margin-end: 1px; + margin-inline-end: 1px; height: 16px; width: 16px; } .actionsMenu > menupopup > menuitem > .menu-iconic-left { - -moz-padding-start: 0; - -moz-padding-end: 4px !important; + padding-inline-start: 0; + padding-inline-end: 4px !important; } .actionsMenu > menupopup > menuitem { - -moz-padding-start: 3px; + padding-inline-start: 3px; } diff --git a/palemoon/themes/linux/sanitizeDialog.css b/palemoon/themes/linux/sanitizeDialog.css index 96cf3bcea..28d4e7eb3 100644 --- a/palemoon/themes/linux/sanitizeDialog.css +++ b/palemoon/themes/linux/sanitizeDialog.css @@ -3,12 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #sanitizeDurationChoice { - -moz-margin-end: 0; + margin-inline-end: 0; } /* Align the duration label with the warning box and item list */ #sanitizeDurationLabel { - -moz-margin-start: 3px; + margin-inline-start: 3px; } @@ -56,15 +56,15 @@ padding: 0; margin-top: 6px; margin-bottom: 6px; - -moz-margin-start: -6px; - -moz-margin-end: 0; + margin-inline-start: -6px; + margin-inline-end: 0; } .expander-up, .expander-down { min-width: 0; padding: 2px 0; - -moz-padding-start: 2px; + padding-inline-start: 2px; } .expander-up { @@ -86,8 +86,8 @@ /* Make the item list the same width as the warning box */ #itemList { - -moz-margin-start: 0; - -moz-margin-end: 0; + margin-inline-start: 0; + margin-inline-end: 0; } /* Without this a useless scrollbar appears in the listbox when its rows @@ -100,8 +100,8 @@ /* Align the last dialog button with the end of the warning box */ .prefWindow-dlgbuttons { - -moz-margin-end: 0; + margin-inline-end: 0; } .dialog-button[dlgtype="accept"] { - -moz-margin-end: 0; + margin-inline-end: 0; } diff --git a/palemoon/themes/linux/searchbar.css b/palemoon/themes/linux/searchbar.css index cb6ecffcc..0352e27a7 100644 --- a/palemoon/themes/linux/searchbar.css +++ b/palemoon/themes/linux/searchbar.css @@ -26,7 +26,7 @@ height: 16px; width: 16px; list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); - -moz-margin-start: 2px; + margin-inline-start: 2px; } .searchbar-engine-button { @@ -41,7 +41,7 @@ .searchbar-engine-button > .button-box { -moz-appearance: none; padding: 2px 0; - -moz-padding-end: 2px; + padding-inline-end: 2px; border: 0; } diff --git a/palemoon/themes/linux/statusbar/overlay.css b/palemoon/themes/linux/statusbar/overlay.css index 2351aac4c..d326bac3f 100644 --- a/palemoon/themes/linux/statusbar/overlay.css +++ b/palemoon/themes/linux/statusbar/overlay.css @@ -57,7 +57,7 @@ toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label { margin: 0px 2px !important; margin-top: -1px !important; - -moz-margin-start: 4px !important; + margin-inline-start: 4px !important; } /* @@ -81,7 +81,7 @@ splitter.status4evar-status-splitter #notification-popup-box { - -moz-margin-start: -1px; + margin-inline-start: -1px; } #urlbar .urlbar-over-link-box diff --git a/palemoon/themes/linux/syncCommon.css b/palemoon/themes/linux/syncCommon.css index 9a84cebee..9ad7214aa 100644 --- a/palemoon/themes/linux/syncCommon.css +++ b/palemoon/themes/linux/syncCommon.css @@ -8,7 +8,7 @@ } .statusIcon { - -moz-margin-start: 4px; + margin-inline-start: 4px; max-height: 16px; max-width: 16px; } diff --git a/palemoon/themes/linux/syncSetup.css b/palemoon/themes/linux/syncSetup.css index 4c6518a1b..f84fd08ad 100644 --- a/palemoon/themes/linux/syncSetup.css +++ b/palemoon/themes/linux/syncSetup.css @@ -99,7 +99,7 @@ description > .text-link:focus { } .inputColumn { - -moz-margin-end: 2px + margin-inline-end: 2px } .pin { diff --git a/palemoon/themes/osx/Search-glass.png b/palemoon/themes/osx/Search-glass.png Binary files differdeleted file mode 100644 index 9eb0e259f..000000000 --- a/palemoon/themes/osx/Search-glass.png +++ /dev/null diff --git a/palemoon/themes/osx/Search.png b/palemoon/themes/osx/Search.png Binary files differnew file mode 100644 index 000000000..0b71db3b4 --- /dev/null +++ b/palemoon/themes/osx/Search.png diff --git a/palemoon/themes/osx/Toolbar-glass.png b/palemoon/themes/osx/Toolbar-glass.png Binary files differdeleted file mode 100644 index 23cc4bfaf..000000000 --- a/palemoon/themes/osx/Toolbar-glass.png +++ /dev/null diff --git a/palemoon/themes/osx/Toolbar-inverted.png b/palemoon/themes/osx/Toolbar-inverted.png Binary files differindex 2c3253fe8..54d83bf5f 100644 --- a/palemoon/themes/osx/Toolbar-inverted.png +++ b/palemoon/themes/osx/Toolbar-inverted.png diff --git a/palemoon/themes/osx/Toolbar-inverted.svg b/palemoon/themes/osx/Toolbar-inverted.svg new file mode 100644 index 000000000..ce59313e6 --- /dev/null +++ b/palemoon/themes/osx/Toolbar-inverted.svg @@ -0,0 +1,302 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + enable-background="new 0 0 378 38" + viewBox="0 0 378 38" + height="38" + width="378" + y="0px" + x="0px" + id="strataToolbarSVG" + version="1.1"> + <metadata + id="metadata146"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs144"> + <filter + id="filter1070" + style="color-interpolation-filters:sRGB;"> + <feFlood + id="feFlood1060" + result="flood" + flood-color="rgb(0,0,0)" + flood-opacity="0.498039" /> + <feComposite + id="feComposite1062" + result="composite1" + operator="in" + in2="SourceGraphic" + in="flood" /> + <feGaussianBlur + id="feGaussianBlur1064" + result="blur" + stdDeviation="0.5" + in="composite1" /> + <feOffset + id="feOffset1066" + result="offset" + dy="0" + dx="0" /> + <feComposite + id="feComposite1068" + result="fbSourceGraphic" + operator="over" + in2="offset" + in="SourceGraphic" /> + <feColorMatrix + id="feColorMatrix1072" + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + in="fbSourceGraphic" + result="fbSourceGraphicAlpha" /> + <feFlood + in="fbSourceGraphic" + result="flood" + flood-color="rgb(0,0,0)" + flood-opacity="0.498039" + id="feFlood1074" /> + <feComposite + result="composite1" + operator="in" + in="flood" + id="feComposite1076" + in2="fbSourceGraphic" /> + <feGaussianBlur + result="blur" + stdDeviation="0.5" + in="composite1" + id="feGaussianBlur1078" /> + <feOffset + result="offset" + dy="0" + dx="0" + id="feOffset1080" /> + <feComposite + result="fbSourceGraphic" + operator="over" + in="fbSourceGraphic" + id="feComposite1082" + in2="offset" /> + <feColorMatrix + id="feColorMatrix1084" + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + in="fbSourceGraphic" + result="fbSourceGraphicAlpha" /> + <feFlood + in="fbSourceGraphic" + result="flood" + flood-color="rgb(0,0,0)" + flood-opacity="0.498039" + id="feFlood1086" /> + <feComposite + result="composite1" + operator="in" + in="flood" + id="feComposite1088" + in2="fbSourceGraphic" /> + <feGaussianBlur + result="blur" + stdDeviation="0.5" + in="composite1" + id="feGaussianBlur1090" /> + <feOffset + result="offset" + dy="0" + dx="0" + id="feOffset1092" /> + <feComposite + result="fbSourceGraphic" + operator="over" + in="fbSourceGraphic" + id="feComposite1094" + in2="offset" /> + <feColorMatrix + id="feColorMatrix1096" + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + in="fbSourceGraphic" + result="fbSourceGraphicAlpha" /> + <feFlood + in="fbSourceGraphic" + result="flood" + flood-color="rgb(0,0,0)" + flood-opacity="0.498039" + id="feFlood1098" /> + <feComposite + result="composite1" + operator="in" + in="flood" + id="feComposite1100" + in2="fbSourceGraphic" /> + <feGaussianBlur + result="blur" + stdDeviation="0.5" + in="composite1" + id="feGaussianBlur1102" /> + <feOffset + result="offset" + dy="0" + dx="0" + id="feOffset1104" /> + <feComposite + result="fbSourceGraphic" + operator="over" + in="fbSourceGraphic" + id="feComposite1106" + in2="offset" /> + <feColorMatrix + id="feColorMatrix1108" + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + in="fbSourceGraphic" + result="fbSourceGraphicAlpha" /> + <feFlood + in="fbSourceGraphic" + result="flood" + flood-color="rgb(0,0,0)" + flood-opacity="0.498039" + id="feFlood1110" /> + <feComposite + result="composite1" + operator="in" + in="flood" + id="feComposite1112" + in2="fbSourceGraphic" /> + <feGaussianBlur + result="blur" + stdDeviation="0.5" + in="composite1" + id="feGaussianBlur1114" /> + <feOffset + result="offset" + dy="0" + dx="0" + id="feOffset1116" /> + <feComposite + result="composite2" + operator="over" + in="fbSourceGraphic" + id="feComposite1118" + in2="offset" /> + </filter> + </defs> + <g + style="fill:#ffffff;filter:url(#filter1070)" + id="toolbar"> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 14.7,10.7 C 14.464283,10.935746 14.000125,11 14.000125,11 H 9 l 2.132,2.085573 c 0.519423,0.508112 0.595,1.2729 0.198,1.6979 l -0.793,0.9549 c -0.396,0.424 -1.091,0.318 -1.587,-0.212 L 3.595,9.690773 3,8.946873 l 0.595,-0.743 5.256,-5.7295 c 0.496,-0.531 1.19,-0.637 1.587,-0.212 l 0.794,0.9549 c 0.396,0.425 0.297,1.1669 -0.198,1.6979 L 9,7 h 4.999875 c 0,0 0.464437,0.064342 0.700125,0.3 0.235717,0.2356875 0.299875,0.7 0.299875,0.7 l 2.5e-4,2 c 0,0 -0.06444,0.464283 -0.300125,0.7 z" + id="back" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="back-large" + d="m 16.441631,29.733331 c -0.275,0.275034 -0.816512,0.349996 -0.816512,0.349996 H 8.999927 l 2.487308,2.516543 c 0.595913,0.602917 0.694159,1.485034 0.230997,1.980862 l -0.925157,1.114039 C 10.33108,36.189432 9.5202547,36.065767 8.9415947,35.44744 L 2.6941594,28.639311 2,27.771437 2.6941594,26.904612 8.8260957,20.220265 c 0.57866,-0.619493 1.3883193,-0.743159 1.8514803,-0.24733 l 0.926324,1.114038 c 0.461995,0.495828 0.346497,1.361369 -0.230997,1.980863 l -2.37283,2.348836 h 6.6249 c 0,0 0.541837,0.07506 0.816804,0.349997 0.275,0.274966 0.34985,0.816658 0.34985,0.816658 l 1.46e-4,2.333346 c 0,0 -0.07518,0.541658 -0.350142,0.816658 z" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="forward" + d="m 21.30025,10.7 c 0.235717,0.235746 0.699875,0.3 0.699875,0.3 h 5.000125 l -2.132,2.085573 c -0.519423,0.508112 -0.595,1.2729 -0.198,1.6979 l 0.793,0.9549 c 0.396,0.424 1.091,0.318 1.587,-0.212 l 5.355,-5.8356 0.595,-0.7439 -0.595,-0.743 -5.256,-5.7295 c -0.496,-0.531 -1.19,-0.637 -1.587,-0.212 l -0.794,0.9549 c -0.396,0.425 -0.297,1.1669 0.198,1.6979 L 27.00025,7 h -4.999875 c 0,0 -0.464437,0.064342 -0.700125,0.3 C 21.064533,7.5356875 21.000375,8 21.000375,8 l -2.5e-4,2 c 0,0 0.06444,0.464283 0.300125,0.7 z" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 51.5,4.64955 47.233834,8.949625 51.5,13.248616 49.366916,15.398166 45,11.201008 40.733834,15.5 38.60075,13.35045 42.866916,8.9485416 38.5,4.64955 40.633084,2.5 45,6.800075 49.266166,2.5 Z" + id="stop" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 69,9 H 62 L 64.8,6.2 C 64.1,5.7 63.4,5.5 62.5,5.5 c -2.2,0 -4,1.8 -4,4 0,2.2 1.8,4 4,4 1.399,0 2.7,-0.7 3.399,-1.9 l 2.301,1 C 67.099,14.6 65,16 62.5,16 58.899,16 56,13.1 56,9.5 56,5.9 58.899,3 62.5,3 64,3 65.399,3.5 66.6,4.4 L 69,2 Z" + id="reload" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 76,9 h -3 l 8,-7 8,7 h -3 v 6.5 H 82 V 12 h -2 v 3.5 h -4 z" + id="home" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 91.5,9 h 4.453 V 2 h 6.093 V 9 H 106.5 L 99,16 Z" + id="download" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 117,2 c -3.866,0 -7,3.134 -7,7 0,3.866 3.134,7 7,7 3.866,0 7,-3.134 7,-7 0,-3.866 -3.134,-7 -7,-7 z m 0,2 c 2.761,0 5,2.238 5,5 0,2.762 -2.239,5 -5,5 -2.762,0 -5,-2.238 -5,-5 0,-2.762 2.239,-5 5,-5 z m -0.7,1.2 C 116.0643,5.4357023 116,6 116,6 v 4 l 4,2 -2,-3 V 6 C 118,6 117.9357,5.4357023 117.7,5.2 117.4643,4.9642977 117,5 117,5 c 0,0 -0.4643,-0.035702 -0.7,0.2 z" + id="history" /> + <g + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="bookmarks"> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 131,2 v 14 h 7.44922 0.55078 1.94922 c 0.99175,-0.258441 1.76717,-1.038297 2,-2 V 12 6 4 c -0.23283,-0.9617034 -1.00825,-1.7415586 -2,-2 h -1.63672 -0.86328 z m 6.11523,2.4160156 1.05469,1.7714844 c 0,0 0.29209,0.4878333 0.51953,0.6425781 0.21313,0.1449479 0.73828,0.2285157 0.73828,0.2285157 h 2.15625 l -1.49804,2.4335937 c 0,0 -0.21789,0.4778906 -0.32617,0.7167965 -0.16271,0.357558 0.005,0.982547 0.0586,1.566407 0.0848,0.918442 0.15039,1.80664 0.15039,1.80664 l -1.75,-0.894531 c 0,0 -0.71714,-0.337318 -1.10156,-0.337891 -0.45203,0 -1.29883,0.392579 -1.29883,0.392579 l -1.75391,0.841796 c 0,0 0.12894,-0.80101 0.26758,-1.68164 0.0917,-0.579219 0.34458,-1.238485 0.14063,-1.636719 -0.11058,-0.216562 -0.33204,-0.6484375 -0.33204,-0.6484375 l -1.7246,-2.5019531 h 2.14257 c 0,0 0.69711,-0.049193 0.98243,-0.2285156 0.21656,-0.1352084 0.48242,-0.5957032 0.48242,-0.5957032 z" + id="bookmarks-star" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 129,2 c -0.99175,0.2584414 -1.76717,1.0382967 -2,2 v 2 6 2 c 0.23283,0.961703 1.00825,1.741559 2,2 h 2.5 V 12 6 2 Z" + id="bookmarks-overlay" /> + <path + style="stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 131.49914,2 V 16" + id="bookmarks-divider" /> + </g> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 160,14 h -2 l 1,2 h -12 l 1,-2 h -2 c -0.601,0 -1,-0.4 -1,-1 V 8 c 0,-0.6 0.70113,-0.635443 1,-1 0.38098,-0.4647208 0.61902,-1.0352792 1,-1.5 0.29887,-0.364557 0.399,-1 1,-1 V 3 c 0,-0.6 0.399,-1 1,-1 h 8 c 0.6,0 1,0.4 1,1 v 1.5 c 0.6,0 0.70113,0.635443 1,1 0.38098,0.4647208 0.61902,1.0352792 1,1.5 0.29887,0.364557 1,0.4 1,1 v 5 c 0,0.6 -0.4,1 -1,1 z M 148.5,9 h -0.5 -0.5 c -0.3,0 -0.5,0.2 -0.5,0.5 0,0.3 0.2,0.5 0.5,0.5 h 1 C 148.8,10 149,9.8 149,9.5 149,9.2 148.8,9 148.5,9 Z M 157,4 c 0,-0.6 -0.4,-1 -1,-1 h -6 c -0.601,0 -1,0.4 -1,1 v 3 c 0,0.6 0.399,1 1,1 h 6 c 0.6,0 1,-0.4 1,-1 z m -0.9,9 h -6.2 l -0.899,2 h 8 z" + id="print" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="newtab" + d="m 170.93359,2 -4.01562,0.00195 c 0,0.00178 -0.87681,0.216686 -0.87695,1.4980469 v 2.8164062 c 0,0 -0.0732,0.3643751 -0.19922,0.484375 C 165.69982,6.9357812 165.29102,7 165.29102,7 c 0,0 -0.53242,-0.057 -0.7754,0 -0.36297,0.086 -0.73599,0.236 -1,0.5 -0.26399,0.264 -0.41502,0.637 -0.5,1 -0.038,0.162 0,0.5 0,0.5 v 5.537109 c 0,0 0.24003,0.710891 0.5,0.962891 0.27398,0.267 1.03516,0.5 1.03516,0.5 h 13.0957 c 0,0 0.60287,-0.276 0.83985,-0.5 0.21699,-0.205 0.49023,-0.742188 0.49023,-0.742188 V 9 c 0.026,-0.322 0.038,-0.338 0,-0.5 -0.086,-0.363 -0.22624,-0.736 -0.49023,-1 -0.26398,-0.264 -0.63802,-0.415 -1,-0.5 -0.22799,-0.054 -0.69922,0 -0.69922,0 0,0 -0.44657,-0.056219 -0.60156,-0.1992188 -0.12799,-0.1189999 -0.19922,-0.484375 -0.19922,-0.484375 L 175.98828,3.5 C 175.98843,2.1047456 174.9707,2 174.9707,2 Z m -0.79101,5 h 1.71484 V 9.1425781 H 174 v 1.7148439 h -2.14258 V 13 h -1.71484 V 10.857422 H 168 V 9.1425781 h 2.14258 z" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="newwindow" + d="M 182.4375,2 C 181.52354,2.2781435 181.28553,2.8114358 181,3.6875 V 14.125 c 0.21642,1.330001 0.75257,1.636052 2.0625,1.875 H 195 c 1.30474,-0.204204 1.70477,-0.57308 2,-1.875 V 4 C 196.8019,2.7723315 196.4998,2.3703399 195.3125,2 Z M 190,3 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 2 v 1 h -2 z m -11,3 h 12 v 8 h -12 z m 5.14258,1 V 9.1425781 H 186 v 1.7148439 h 2.14258 V 13 h 1.71484 V 10.857422 H 192 V 9.1425781 h -2.14258 V 7 Z" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 212.70159,16 c -0.79707,0 -1.49513,-0.2 -2.2922,-1.3 -0.79807,-1.1 -1.69515,-2.5 -1.69515,-2.5 0,0 -0.69706,-0.9 -1.09709,-1.6 -0.49805,-0.7 -1.0971,-0.5 -1.0971,-0.5 0,0 -2.89125,-4.7 -3.3903,-5.4 -0.59805,-1 0.59906,-2.7 0.59906,-2.7 l 4.38738,7 c 0,0 1.39612,1.9 1.89417,2.3 0.49904,0.4 1.39612,-0.4 2.79224,0.9 1.89417,1.8 1.29611,3.8 -0.10101,3.8 z m -0.29802,-2.9 c -0.89708,-1 -1.69415,-0.9 -1.89417,-0.6 -0.20002,0.3 0,1.2 0.39804,1.7 0.39803,0.5 0.79806,0.7 1.39612,0.7 0.59905,0.1 1.09709,-0.7 0.10001,-1.8 z m -3.78934,-4.7 -1.1961,-1.8 2.89125,-4.6 c 0,0 1.19611,1.7 0.59906,2.7 -0.29903,0.4 -1.39613,2.3 -2.29421,3.7 z m -4.5854,2.899 c 0.29903,-0.3 0.99709,-1.1 1.39613,-1.7 l 0.79806,1.2 c -0.39803,0.6 -0.89707,1.4 -0.89707,1.4 0,0 -0.89608,1.4 -1.69415,2.5 -0.69806,1.1 -1.39612,1.3 -2.2932,1.3 -1.39613,0 -2.09419,-2 -0.10001,-3.8 1.39412,-1.199 2.2912,-0.499 2.79024,-0.9 z m -2.39321,1.801 c -0.89708,1 -0.39803,1.8 0.19902,1.8 0.59905,0 0.99709,-0.2 1.39612,-0.7 0.39804,-0.5 0.59806,-1.5 0.39804,-1.7 -0.29803,-0.3 -1.0961,-0.4 -1.99318,0.6 z" + id="cut" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 231,16 h -6 c -0.601,0 -1,-0.4 -1,-1 V 12 9.4 7 c 0,-0.6 0.399,-1 1,-1 0,0 3.2,0 5,0 l 2,2 c 0,2.2 0,7 0,7 0,0.6 -0.4,1 -1,1 z m -2,-9 v 2 h 2 z M 223,5.9 V 7 8.9 12 h -4 c -0.601,0 -1,-0.4 -1,-1 V 3 c 0,-0.6 0.399,-1 1,-1 0,0 3.2,0 5,0 l 2,2 c 0,0.4 0,0.8 0,1.3 h -2.5 C 223.2,5.4 223,5.6 223,5.9 Z M 223,3 v 2 h 2 z" + id="copy" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 246.8507,16 h -7.7014 C 238.26914,16 237.5,15.3 237.5,14.5 v -9 c 0,-0.8 0.77014,-1.5 1.6493,-1.5 h 1.6503 c 0,0 0,-2 2.2004,-2 2.2004,0 2.2004,2 2.2004,2 h 1.6493 c 0.88016,0 1.6503,0.7 1.6503,1.5 v 9 c 0.001,0.799 -0.76914,1.5 -1.6493,1.5 z M 245.97054,5 244.76032,4.5 c 0,0 0,-1.5 -1.76032,-1.5 -1.76032,0 -1.76032,1.5 -1.76032,1.5 l -1.21122,0.5 -0.5501,1 h 2.7505 3.52164 0.88016 z m 0.11002,1.7 h -5.17094 l -3.3016,1.7 3.08056,4.9 7.26232,-3.8 z" + id="paste" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 265,12 V 6 l 3,3 z m -7,1 h 6 l -3,3 z m 0,-1 V 6 h 6 v 6 z m 5,-4 h -4 v 3 h 4 z m -2,-6 3,3 h -6 z m -4,4 v 6 l -3,-3 z" + id="fullscreen" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 274,8 h 10 v 2 h -10 z" + id="minus" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 302,10 h -4 v 4 h -2 v -4 h -4 V 8 h 4 V 4 h 2 v 4 h 4 z" + id="plus" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 321.96164,9.3589991 c -0.0996,0.5880529 -0.19907,1.1749739 -0.39904,1.6649929 -0.39904,1.272996 -2.49721,3.230982 -2.49721,3.230982 l 1.23012,1.745023 -4.92726,6e-6 V 9.849 c 0,0 0.89889,1.46799 1.39795,2.05599 1.19912,-0.588025 1.99814,-1.762997 2.09818,-2.9380158 0.10109,-0.8810027 -0.19905,-1.6639894 -0.59902,-2.2510039 -0.18813,-0.3229439 -0.42109,-0.5799624 -0.68685,-0.7931908 -0.30005,-0.23897 -1.01208,-0.5779774 -1.01208,-0.5779774 l 0.0174,-3.3306603 c 1.03186,0.2680556 1.4999,0.3864246 2.85781,1.3686643 1.67715,1.2509803 2.78224,3.5019854 2.52022,5.9759989 z m -6.99262,-1.9580198 c 0,0 -1.09884,-1.4681946 -1.59912,-1.9580122 -1.39809,0.6859994 -2.19718,1.957993 -2.19714,3.3290059 0.39151,1.955025 1.15486,2.878079 2.87049,3.728027 V 16 c -1.14823,-0.14515 -2.89657,-1.144129 -3.76062,-2.017966 -1.64214,-1.695027 -2.56324,-3.735 -2.20626,-6.1889776 0.1,-0.6850241 0.30006,-1.3699914 0.49903,-1.9580159 0.40011,-1.0769929 1.10011,-1.957978 2.09921,-2.6429982 0.0997,-0.098323 0.199,-0.098023 0.29929,-0.1955973 -0.39905,-0.3919885 -1.2861,-0.9964444 -1.2861,-0.9964444 l 5.35545,-1.3e-6 z" + id="sync" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 339.29905,15.9 h -1.49989 c -0.39997,0 -0.79995,-0.3 -0.79995,-0.8 0,0 0.29998,-3.6 -3.19977,-7.2 -2.49982,-3 -6.9995,-3.2 -6.9995,-3.2 C 326.29998,4.7 326,4.4 326,4 V 2.6 c 0,-0.4 0.29998,-0.7 0.79994,-0.7 0,0 6.29955,0.4 9.59932,4.5 3.29976,3.1 3.60074,8.8 3.60074,8.8 -10e-4,0.4 -0.20099,0.7 -0.70095,0.7 z m -12.49911,-9 c 0,0 3.69974,0.5 5.79959,2.4 2.09985,2 2.49982,5.9 2.49982,5.9 0,0.4 -0.1,0.8 -0.49996,0.8 h -1.4999 c -0.39997,0 -0.59995,-0.3 -0.59995,-0.8 0,0 0.1,-2.4 -1.80088,-4.2 C 329.19877,9.7 326.79994,9.6 326.79994,9.6 326.29998,9.6 326,9.3 326,8.9 V 7.6 c 0,-0.4 0.29998,-0.7 0.79994,-0.7 z m 1.19992,5 c 1.09992,0 1.99985,0.9 1.99985,2 0,1.1 -0.89993,2 -1.99985,2 C 326.89894,15.9 326,15 326,13.9 c 0,-1.1 0.89994,-2 1.99986,-2 z" + id="rss" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 344.5,5 c 0,0 0.0643,-0.4642977 0.3,-0.7 0.2357,-0.2357023 0.7,-0.3 0.7,-0.3 h 7.5 c 0,0 0.4643,0.064298 0.7,0.3 0.2357,0.2357023 0.3,0.7 0.3,0.7 v 2 l 4.0245,-3 -0.049,10 L 354,11 v 2 c 0,0 -0.0643,0.464298 -0.3,0.7 -0.2357,0.235702 -0.7,0.3 -0.7,0.3 h -7.5 c 0,0 -0.4643,-0.0643 -0.7,-0.3 -0.2357,-0.235702 -0.3,-0.7 -0.3,-0.7 z" + id="webrtc" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="bookmark-none" + d="m 369.20312,1 -1.9082,3.2734375 c 0,0 -0.46184,0.8030625 -0.83984,1.0390625 -0.498,0.313 -1.71875,0.3984375 -1.71875,0.3984375 H 361 l 3.00781,4.3652345 c 0,0 0.38708,0.754812 0.58008,1.132812 0.356,0.6951 -0.0841,1.844469 -0.24414,2.855469 -0.242,1.5371 -0.4668,2.935547 -0.4668,2.935547 l 3.06055,-1.466797 c 0,0 1.47663,-0.685547 2.26562,-0.685547 0.671,10e-4 1.92579,0.587891 1.92579,0.587891 l 3.05273,1.5625 c 0,0 -0.11177,-1.549244 -0.25976,-3.152344 -0.093,-1.0191 -0.38752,-2.112228 -0.10352,-2.736328 0.189,-0.417 0.56836,-1.2519531 0.56836,-1.2519531 L 377,5.6113281 h -3.76172 c 0,0 -0.91706,-0.1454375 -1.28906,-0.3984375 -0.397,-0.2701 -0.90625,-1.1210937 -0.90625,-1.1210937 z m -0.0762,3 1.15039,1.9316406 c 0,0 0.31633,0.5323647 0.56446,0.7011719 0.23249,0.1581201 0.80664,0.25 0.80664,0.25 H 374 l -1.63281,2.6542969 c 0,0 -0.23929,0.5206326 -0.35742,0.7812496 -0.17749,0.39005 0.008,1.074021 0.0664,1.710938 C 372.16866,13.031203 372.23828,14 372.23828,14 l -1.9082,-0.978516 c 0,0 -0.78376,-0.366562 -1.20313,-0.367187 -0.4931,0 -1.41601,0.429687 -1.41601,0.429687 L 365.79883,14 c 0,0 0.13977,-0.873327 0.29101,-1.833984 0.1,-0.631855 0.37484,-1.350734 0.15235,-1.785157 -0.12063,-0.236243 -0.36133,-0.708984 -0.36133,-0.708984 L 364,6.9453125 h 2.33594 c 0,0 0.76298,-0.054381 1.07422,-0.25 0.23624,-0.1474953 0.52343,-0.6484375 0.52343,-0.6484375 z" /> + <path + style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="bookmark-added" + d="m 369.202,19 -1.908,3.2732 c 0,0 -0.461,0.8031 -0.839,1.0391 -0.498,0.313 -1.718,0.399 -1.718,0.399 H 361 l 3.008,4.3643 c 0,0 0.387,0.755 0.58,1.133 0.356,0.6951 -0.084,1.8452 -0.244,2.8562 C 364.102,33.6019 363.877,35 363.877,35 l 3.06,-1.4671 c 0,0 1.477,-0.686 2.266,-0.686 0.671,0.001 1.925,0.588 1.925,0.588 l 3.053,1.5641 c 0,0 -0.112,-1.5501 -0.26,-3.1532 -0.093,-1.0191 -0.388,-2.1121 -0.104,-2.7362 0.189,-0.417 0.57,-1.252 0.57,-1.252 L 377,23.6123 h -3.763 c 0,0 -0.917,-0.146 -1.289,-0.399 -0.397,-0.2701 -0.906,-1.1221 -0.906,-1.1221 z" /> + </g> +</svg> diff --git a/palemoon/themes/osx/Toolbar.png b/palemoon/themes/osx/Toolbar.png Binary files differindex 3d1b80ec7..8ec756e03 100644 --- a/palemoon/themes/osx/Toolbar.png +++ b/palemoon/themes/osx/Toolbar.png diff --git a/palemoon/themes/osx/Toolbar.svg b/palemoon/themes/osx/Toolbar.svg new file mode 100644 index 000000000..7a68c0608 --- /dev/null +++ b/palemoon/themes/osx/Toolbar.svg @@ -0,0 +1,1356 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + version="1.1" + id="PaleMoonToolbarSVG" + x="0px" + y="0px" + width="378" + height="38" + viewBox="0 0 378 38" + enable-background="new 0 0 378 38"> + <metadata + id="metadata146"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs144"> + <radialGradient + id="globalGradient" + cy="0.69999999"> + <stop + offset="0.05" + id="stop4" + style="stop-color:#87939b;stop-opacity:1" /> + <stop + offset="1" + id="stop6" + style="stop-color:#45555f;stop-opacity:1" /> + </radialGradient> + <filter + id="insetShadow"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood1875" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite1877" /> + <feGaussianBlur + in="composite1" + stdDeviation="2" + result="blur" + id="feGaussianBlur1879" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset1881" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite1883" /> + </filter> + <filter + style="color-interpolation-filters:sRGB;" + id="filter2164"> + <feFlood + flood-opacity="1" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood2154" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite2156" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.5" + result="blur" + id="feGaussianBlur2158" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset2160" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite2162" /> + </filter> + <radialGradient + gradientUnits="userSpaceOnUse" + r="7.2456884" + fy="12.21416" + fx="95.643087" + cx="95.643087" + gradientTransform="matrix(1.0350983,0,0,0.96609178,0,18)" + id="globalGradient-8" + cy="12.21416"> + <stop + offset="0.05" + id="stop4-5" + style="stop-color:#12d92d;stop-opacity:1" /> + <stop + offset="1" + id="stop6-5" + style="stop-color:#01b222;stop-opacity:1" /> + </radialGradient> + <radialGradient + xlink:href="#linearGradient4635" + id="radialGradient4669" + cx="10.529827" + cy="14.778796" + fx="10.529827" + fy="14.778796" + r="7.1399999" + gradientTransform="matrix(1,0,0,1.1087088,0,-1.2351844)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient4635"> + <stop + style="stop-color:#6198cb;stop-opacity:1" + offset="0" + id="stop4631" /> + <stop + style="stop-color:#3a78b2;stop-opacity:1" + offset="1" + id="stop4633" /> + </linearGradient> + <filter + style="color-interpolation-filters:sRGB" + id="filter4701"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4691" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4693" /> + <feGaussianBlur + in="composite1" + stdDeviation="1" + result="blur" + id="feGaussianBlur4695" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4697" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4699" /> + </filter> + <radialGradient + xlink:href="#linearGradient4635" + id="radialGradient4637" + cx="11.063469" + cy="38.79744" + fx="11.063469" + fy="38.79744" + r="8.7600002" + gradientTransform="matrix(1,0,0,1.0853313,0,-3.029369)" + gradientUnits="userSpaceOnUse" /> + <filter + style="color-interpolation-filters:sRGB" + id="filter4661"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4651" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4653" /> + <feGaussianBlur + in="composite1" + stdDeviation="1" + result="blur" + id="feGaussianBlur4655" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4657" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4659" /> + </filter> + <radialGradient + xlink:href="#linearGradient4635" + id="radialGradient4677" + cx="34.841751" + cy="14.552581" + fx="34.841751" + fy="14.552581" + r="7.1399999" + gradientTransform="matrix(1,0,0,1.1003056,0,-1.1335797)" + gradientUnits="userSpaceOnUse" /> + <filter + style="color-interpolation-filters:sRGB" + id="filter4689"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4679" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4681" /> + <feGaussianBlur + in="composite1" + stdDeviation="1" + result="blur" + id="feGaussianBlur4683" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4685" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4687" /> + </filter> + <radialGradient + xlink:href="#linearGradient4603" + id="radialGradient4605" + cx="58.062626" + cy="12.761739" + fx="58.062626" + fy="12.761739" + r="7.6799994" + gradientTransform="matrix(1,0,0,0.99218759,0,0.09141507)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient4603"> + <stop + style="stop-color:#e72b1d;stop-opacity:1" + offset="0" + id="stop4599" /> + <stop + style="stop-color:#cc4338;stop-opacity:1" + offset="1" + id="stop4601" /> + </linearGradient> + <filter + style="color-interpolation-filters:sRGB" + id="filter4629"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4619" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4621" /> + <feGaussianBlur + in="composite1" + stdDeviation="1" + result="blur" + id="feGaussianBlur4623" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4625" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4627" /> + </filter> + <radialGradient + xlink:href="#linearGradient4523-3" + id="radialGradient4525" + cx="79.305222" + cy="13.939252" + fx="79.305222" + fy="13.939252" + r="7.8000002" + gradientTransform="matrix(1,0,0,1.0769231,0,-0.86932835)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient4523-3"> + <stop + style="stop-color:#4fb55d;stop-opacity:1" + offset="0" + id="stop4519" /> + <stop + style="stop-color:#2d8539;stop-opacity:1" + offset="1" + id="stop4521" /> + </linearGradient> + <filter + style="color-interpolation-filters:sRGB" + id="filter4597"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4587" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4589" /> + <feGaussianBlur + in="composite1" + stdDeviation="1" + result="blur" + id="feGaussianBlur4591" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4593" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4595" /> + </filter> + <radialGradient + xlink:href="#linearGradient4527" + id="radialGradient4529" + cx="103.23091" + cy="12.664675" + fx="103.23091" + fy="12.664675" + r="9.5995998" + gradientTransform="matrix(1,0,0,0.87507716,0,1.3868386)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient4527"> + <stop + style="stop-color:#3f6bbd;stop-opacity:1" + offset="0" + id="stop4523" /> + <stop + style="stop-color:#29467b;stop-opacity:1" + offset="1" + id="stop4525" /> + </linearGradient> + <filter + style="color-interpolation-filters:sRGB" + id="filter4783"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4773" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4775" /> + <feGaussianBlur + in="composite1" + stdDeviation="1" + result="blur" + id="feGaussianBlur4777" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4779" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4781" /> + </filter> + <radialGradient + xlink:href="#linearGradient4707" + id="radialGradient4709" + cx="125.30523" + cy="16.659737" + fx="125.30523" + fy="16.659737" + r="8.3726959" + gradientTransform="matrix(1,0,0,1.0032611,0,-0.03620244)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient4707"> + <stop + style="stop-color:#8c9ba5;stop-opacity:1" + offset="0" + id="stop4703" /> + <stop + style="stop-color:#607480;stop-opacity:1" + offset="1" + id="stop4705" /> + </linearGradient> + <filter + style="color-interpolation-filters:sRGB" + id="filter4721"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4711" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4713" /> + <feGaussianBlur + in="composite1" + stdDeviation="1" + result="blur" + id="feGaussianBlur4715" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4717" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4719" /> + </filter> + <radialGradient + xlink:href="#linearGradient4727" + id="radialGradient4729" + cx="149.26262" + cy="12.784631" + fx="149.26262" + fy="12.784631" + r="8.6400051" + gradientTransform="matrix(1,0,0,0.993055,0,0.07848724)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient4727"> + <stop + style="stop-color:#3eb796;stop-opacity:1" + offset="0" + id="stop4723" /> + <stop + style="stop-color:#31a886;stop-opacity:1" + offset="1" + id="stop4725" /> + </linearGradient> + <filter + style="color-interpolation-filters:sRGB" + id="filter4741"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4731" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4733" /> + <feGaussianBlur + in="composite1" + stdDeviation="1" + result="blur" + id="feGaussianBlur4735" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4737" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4739" /> + </filter> + <radialGradient + xlink:href="#linearGradient5023" + id="radialGradient5017" + cx="466.94476" + cy="12.037849" + fx="466.94476" + fy="12.037849" + r="9.6007004" + gradientTransform="matrix(0.79035186,0,0,0.79508811,-0.14216924,6.9389816e-4)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient5023"> + <stop + id="stop5019" + offset="0" + style="stop-color:#c6cdd2;stop-opacity:1" /> + <stop + id="stop5021" + offset="1" + style="stop-color:#9cabb4;stop-opacity:1" /> + </linearGradient> + <radialGradient + xlink:href="#linearGradient4707" + id="radialGradient4793" + cx="194.44176" + cy="13.746766" + fx="194.44176" + fy="13.746766" + r="9.5999947" + gradientTransform="matrix(1,0,0,0.87500048,0,1.3876528)" + gradientUnits="userSpaceOnUse" /> + <filter + style="color-interpolation-filters:sRGB" + id="filter4805"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4795" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4797" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.5" + result="blur" + id="feGaussianBlur4799" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4801" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4803" /> + </filter> + <radialGradient + xlink:href="#linearGradient4707" + id="radialGradient4833" + cx="239.2" + cy="11.101265" + fx="239.2" + fy="11.101265" + r="9.6000004" + gradientTransform="matrix(1,0,0,0.87500002,0,1.3876579)" + gradientUnits="userSpaceOnUse" /> + <filter + style="color-interpolation-filters:sRGB" + id="filter4853"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4843" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4845" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.5" + result="blur" + id="feGaussianBlur4847" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4849" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4851" /> + </filter> + <radialGradient + xlink:href="#linearGradient4707" + id="radialGradient4841" + cx="242.26164" + cy="12.423289" + fx="242.26164" + fy="12.423289" + r="3.5288758" + gradientTransform="matrix(0.79274531,0,0,0.78327977,-0.14435628,0.11758726)" + gradientUnits="userSpaceOnUse" /> + <radialGradient + xlink:href="#linearGradient4707" + id="radialGradient4858" + cx="242.0894" + cy="12.418613" + fx="242.0894" + fy="12.418613" + r="3.5288758" + gradientTransform="matrix(1,0,0,0.9880597,0,0.14828194)" + gradientUnits="userSpaceOnUse" /> + <radialGradient + xlink:href="#linearGradient5037" + id="radialGradient5031" + cx="466.39926" + cy="31.105829" + fx="466.39926" + fy="31.105829" + r="9.7507105" + gradientTransform="matrix(1,0,0,0.99992718,0,0.00247197)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient5037"> + <stop + id="stop5033" + offset="0" + style="stop-color:#e8e1a1;stop-opacity:1" /> + <stop + id="stop5035" + offset="1" + style="stop-color:#baad3e;stop-opacity:1" /> + </linearGradient> + <filter + style="color-interpolation-filters:sRGB" + id="filter5049"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood5039" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite5041" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.5" + result="blur" + id="feGaussianBlur5043" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset5045" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite5047" /> + </filter> + <radialGradient + xlink:href="#linearGradient4707" + id="radialGradient4813" + cx="217.95329" + cy="16.56296" + fx="217.95329" + fy="16.56296" + r="10.35937" + gradientTransform="matrix(1,0,0,0.8160434,0,2.0506693)" + gradientUnits="userSpaceOnUse" /> + <filter + style="color-interpolation-filters:sRGB" + id="filter4825"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4815" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4817" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.5" + result="blur" + id="feGaussianBlur4819" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4821" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4823" /> + </filter> + <radialGradient + xlink:href="#linearGradient4707" + id="radialGradient4861" + cx="262.79288" + cy="15.840806" + fx="262.79288" + fy="15.840806" + r="8.5577164" + gradientTransform="matrix(1,0,0,0.9969072,0,0.03528241)" + gradientUnits="userSpaceOnUse" /> + <filter + style="color-interpolation-filters:sRGB" + id="filter4873"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4863" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4865" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.5" + result="blur" + id="feGaussianBlur4867" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4869" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4871" /> + </filter> + <radialGradient + xlink:href="#linearGradient4707" + id="radialGradient4881" + cx="286.58698" + cy="14.171478" + fx="286.58698" + fy="14.171478" + r="8.53125" + gradientUnits="userSpaceOnUse" /> + <filter + style="color-interpolation-filters:sRGB" + id="filter4893"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4883" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4885" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.5" + result="blur" + id="feGaussianBlur4887" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4889" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4891" /> + </filter> + <radialGradient + xlink:href="#linearGradient4707" + id="radialGradient4901" + cx="308.97141" + cy="14.457072" + fx="308.97141" + fy="14.457072" + r="6.09375" + gradientTransform="matrix(1,0,0,1.4,0,-4.4901397)" + gradientUnits="userSpaceOnUse" /> + <filter + style="color-interpolation-filters:sRGB" + id="filter4913"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4903" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4905" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.5" + result="blur" + id="feGaussianBlur4907" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4909" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4911" /> + </filter> + <radialGradient + xlink:href="#linearGradient4707" + id="radialGradient4921" + cx="331.15933" + cy="13.119289" + fx="331.15933" + fy="13.119289" + r="8.53125" + gradientUnits="userSpaceOnUse" /> + <filter + style="color-interpolation-filters:sRGB" + id="filter4933"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4923" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4925" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.5" + result="blur" + id="feGaussianBlur4927" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4929" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4931" /> + </filter> + <radialGradient + xlink:href="#linearGradient4707" + id="radialGradient4941" + cx="353.15076" + cy="11.316628" + fx="353.15076" + fy="11.316628" + r="6.09375" + gradientTransform="matrix(0.79035186,0,0,0.15902921,-0.14216924,7.1987363)" + gradientUnits="userSpaceOnUse" /> + <radialGradient + gradientTransform="matrix(0.79035186,0,0,0.79514603,-0.14216924,3.8580698e-5)" + xlink:href="#linearGradient4707" + id="radialGradient4949" + cx="375.97003" + cy="11.407905" + fx="375.97003" + fy="11.407905" + r="6.09375" + gradientUnits="userSpaceOnUse" /> + <radialGradient + xlink:href="#linearGradient4707" + id="radialGradient4957" + cx="400.5007" + cy="13.518586" + fx="400.5007" + fy="13.518586" + r="8.5350475" + gradientTransform="matrix(1,0,0,0.99701325,0,0.03407254)" + gradientUnits="userSpaceOnUse" /> + <filter + style="color-interpolation-filters:sRGB" + id="filter4969"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4959" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4961" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.5" + result="blur" + id="feGaussianBlur4963" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4965" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4967" /> + </filter> + <radialGradient + xlink:href="#linearGradient4975" + id="radialGradient4977" + cx="417.02075" + cy="15.742972" + fx="417.02075" + fy="15.742972" + r="8.53125" + gradientTransform="matrix(1.357667,-0.02466618,0.02411975,1.3275908,-149.53429,5.1574131)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient4975"> + <stop + style="stop-color:#f79729;stop-opacity:1" + offset="0" + id="stop4971" /> + <stop + style="stop-color:#d2831f;stop-opacity:1" + offset="1" + id="stop4973" /> + </linearGradient> + <filter + style="color-interpolation-filters:sRGB" + id="filter4989"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4979" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4981" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.5" + result="blur" + id="feGaussianBlur4983" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4985" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4987" /> + </filter> + <radialGradient + xlink:href="#linearGradient4707" + id="radialGradient4997" + cx="444.33652" + cy="11.316628" + fx="444.33652" + fy="11.316628" + r="8.53125" + gradientTransform="matrix(1,0,0,0.71428563,0,3.2333231)" + gradientUnits="userSpaceOnUse" /> + <filter + style="color-interpolation-filters:sRGB" + id="filter5009"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4999" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite5001" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.5" + result="blur" + id="feGaussianBlur5003" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset5005" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite5007" /> + </filter> + <radialGradient + xlink:href="#linearGradient4747" + id="radialGradient4710" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)" + cx="134.97461" + cy="9" + fx="134.97461" + fy="9" + r="7.9746099" /> + <linearGradient + id="linearGradient4747"> + <stop + style="stop-color:#c5b631;stop-opacity:1" + offset="0" + id="stop4743" /> + <stop + style="stop-color:#baad3e;stop-opacity:1" + offset="1" + id="stop4745" /> + </linearGradient> + <filter + style="color-interpolation-filters:sRGB" + id="filter4729"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4719" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4721" /> + <feGaussianBlur + in="composite1" + stdDeviation="1" + result="blur" + id="feGaussianBlur4723" /> + <feOffset + dx="2.77556e-017" + dy="0" + result="offset" + id="feOffset4725" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4727" /> + </filter> + <radialGradient + xlink:href="#linearGradient5037" + id="radialGradient4712" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)" + cx="132.6468" + cy="9.0947113" + fx="132.6468" + fy="9.0947113" + r="7.9746099" /> + <filter + style="color-interpolation-filters:sRGB" + id="filter4774"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4764" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4766" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.5" + result="blur" + id="feGaussianBlur4768" /> + <feOffset + dx="2.77556e-017" + dy="0" + result="offset" + id="feOffset4770" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4772" /> + </filter> + <radialGradient + xlink:href="#linearGradient4747" + id="radialGradient4714" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)" + cx="134.97461" + cy="9" + fx="134.97461" + fy="9" + r="7.9746099" /> + <radialGradient + xlink:href="#linearGradient4707" + id="radialGradient4750" + cx="166.37157" + cy="11.485105" + fx="166.37157" + fy="11.485105" + r="0.31640625" + gradientTransform="matrix(0.99998863,-0.00473886,0.08838422,18.426509,-1.0132111,-199.35688)" + gradientUnits="userSpaceOnUse" /> + <radialGradient + xlink:href="#linearGradient4832" + id="radialGradient4709-1" + cx="125.30523" + cy="16.659737" + fx="125.30523" + fy="16.659737" + r="8.3726959" + gradientTransform="matrix(1,0,0,1.0032611,0.11563445,22.233158)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient4832"> + <stop + id="stop5029" + offset="0" + style="stop-color:#22e23d;stop-opacity:1" /> + <stop + id="stop4830" + offset="1" + style="stop-color:#38a748;stop-opacity:1" /> + </linearGradient> + <filter + style="color-interpolation-filters:sRGB" + id="filter4844"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4834" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="out" + result="composite1" + id="feComposite4836" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.5" + result="blur" + id="feGaussianBlur4838" /> + <feOffset + dx="2.77556e-017" + dy="0" + result="offset" + id="feOffset4840" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="atop" + result="composite2" + id="feComposite4842" /> + </filter> + </defs> + <g + id="g7757"> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + style="display:inline;fill:url(#radialGradient4669);fill-opacity:1;stroke-width:1;filter:url(#filter4701)" + d="m 17.870749,13.841269 -6.303534,-0.0074 2.264363,2.148431 c 0.615648,0.584128 0.72,1.44 0.24,1.92 l -0.96,1.08 c -0.48,0.48 -1.32,0.36 -1.92,-0.24 0,0 -6.4200001,-6.6 -6.4800001,-6.6 -0.06,0 -0.36,-0.48 -0.48,-0.84 0,-0.359999 0.36,-0.719999 0.48,-0.839999 l 6.3600001,-6.48 c 0.6,-0.6000001 1.44,-0.7200001 1.92,-0.24 l 0.96,1.0799999 c 0.48,0.48 0.36,1.32 -0.24,1.9200001 l -2.144363,2.0610645 6.359451,0.043374 c 0.719983,0.00491 1.227959,0.50779 1.227959,1.2277905 v 2.483369 c 0,0.72 -0.563877,1.284215 -1.283876,1.28337 z" + id="path4" /> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + style="display:inline;fill:url(#radialGradient4637);fill-opacity:1;stroke-width:1;filter:url(#filter4661)" + id="path4154" + d="m 19.187889,37.765372 -7.620674,-0.0365 3.352509,3.266174 c 0.515294,0.50108 0.829738,1.388534 0.443269,1.764345 l -1.759464,1.992905 c -0.356609,0.403923 -1.52102,-0.108922 -2.036314,-0.735274 L 3.9756591,36.471238 c 0,0 -0.7399492,-0.710192 -0.7399492,-1.211274 0,-0.501081 0.7399492,-1.303987 0.7399492,-1.303987 l 7.5915559,-7.545783 c 0.515294,-0.50108 1.613776,-1.093109 1.980397,-0.698138 l 1.815381,1.955768 c 0.386469,0.375811 0.172889,1.300401 -0.471228,1.801482 l -3.32455,3.229041 7.620674,0.02842 c 0.772936,0.0029 1.344153,0.417712 1.344153,1.169335 v 2.560987 c 0,0.751622 -0.571221,1.311987 -1.344153,1.308283 z" /> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + style="display:inline;fill:url(#radialGradient4677);fill-opacity:1;stroke-width:1;filter:url(#filter4689)" + id="path4165" + d="m 26.776124,12.612425 v -2.53895 c 0,-0.7200003 0.480206,-1.3282747 1.2,-1.3111602 l 5.76,0.041051 L 31.66,6.7412646 c -0.602042,-0.5979755 -0.72,-1.4399999 -0.24,-1.92 l 0.96,-1.08 c 0.48,-0.48 1.32,-0.36 1.92,0.24 l 6.36,6.4800004 c 0.12,0.12 0.48,0.48 0.48,0.84 0,0.36 -0.36,0.84 -0.48,0.84 l -6.48,6.48 c -0.6,0.6 -1.44,0.72 -1.92,0.24 l -0.96,-1.08 c -0.48,-0.48 -0.36,-1.32 0.24,-1.92 L 33.736124,13.833888 28.06,13.868005 c -0.719987,0.0043 -1.283876,-0.53558 -1.283876,-1.25558 z" /> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + style="display:inline;fill:url(#radialGradient4605);fill-opacity:1;stroke-width:1;filter:url(#filter4629)" + id="path4176" + d="m 64.708108,6.2881044 -5.061037,5.0305226 5.061037,5.030522 -2.530518,2.515261 -5.061038,-5.030522 -5.061037,5.030522 -2.530519,-2.515261 5.061037,-5.030522 -5.061037,-5.0305226 2.530519,-2.5152612 5.061037,5.0305223 5.061038,-5.0305223 z" /> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + style="display:inline;fill:url(#radialGradient4525);fill-opacity:1;stroke-width:1;filter:url(#filter4597)" + id="path4187" + d="m 87.482777,11.318627 h -8.856816 l 3.13833,-3.0716727 C 81.15648,7.545735 80.363876,6.712205 79.283876,6.712205 c -2.64,0 -5.107543,1.9376803 -5.107543,4.577681 0,2.64 2.411627,5.050109 5.051627,5.050109 1.68,0 3.619039,-1.066107 4.459039,-2.506107 l 2.530518,1.25763 c -1.32,2.4 -3.961599,4.443007 -6.961599,4.443007 -4.32,0 -8.219378,-3.896849 -8.219378,-8.216849 0,-4.3200008 3.927337,-7.633261 8.247337,-7.633261 1.8,0 3.619792,0.8778997 5.059792,1.9578998 l 3.139108,-3.1271021 z" /> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + style="display:inline;fill:url(#radialGradient4529);fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1;filter:url(#filter4783)" + d="M 102.66589,2.5152127 92.543814,11.318627 h 3.795778 v 7.545783 h 5.061038 v -5.030522 h 2.53052 v 5.030522 h 5.06104 v -7.545783 h 3.79577 z" + id="path4209" /> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + style="display:inline;fill:url(#radialGradient4709);fill-opacity:1;stroke-width:1;filter:url(#filter4721)" + id="path4214" + d="m 133.03211,12.576257 -6.32629,6.288153 c -0.24,0.36 -0.82401,0.692435 -1.30401,0.692435 -0.48,0 -0.86651,-0.332435 -1.22651,-0.692435 l -6.3263,-6.288153 c -0.79571,-0.72 -0.93921,-1.286268 0.0208,-1.280462 l 3.77501,0.02283 -0.0107,-7.5841022 c -0.001,-0.7199993 0.50796,-1.1722101 1.22796,-1.1722101 h 5.10754 c 0.72,0 1.22426,0.4800094 1.22796,1.2 l 0.0388,7.5563123 3.80118,-0.05062 c 0.95992,-0.01278 0.71459,0.588252 -0.005,1.308252 z" /> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + style="display:inline;fill:url(#radialGradient4729);fill-opacity:1;stroke-width:1;filter:url(#filter4741)" + id="path4225" + d="m 148.19571,20.103585 c -4.8,0 -8.89163,-3.97895 -8.89163,-8.77895 0,-4.6800005 4.11959,-8.7145303 8.91959,-8.7145303 4.8,0 8.80776,3.9511599 8.80776,8.7511603 0,4.68 -4.03572,8.74232 -8.83572,8.74232 z m 0.0559,-15.04801 c -3.36,0 -6.39142,2.9178996 -6.39142,6.2779 0,3.24 2.9755,6.22232 6.3355,6.22232 3.36,0 6.33551,-2.86232 6.33551,-6.22232 0,-3.3600004 -2.91959,-6.2779 -6.27959,-6.2779 z m -0.63959,7.520682 c -0.48,-0.12 -0.63716,-0.735044 -0.64429,-1.214992 l -0.0559,-3.7667402 c -0.0107,-0.7199217 0.53592,-1.28337 1.25592,-1.28337 0.72,0 1.27834,0.535601 1.28388,1.25558 l 0.0289,3.7518922 c 1.32,1.32 2.53051,3.772891 2.53051,3.772891 0,0 -3.07896,-1.195261 -4.39896,-2.515261 z" /> + <path + style="display:inline;fill:url(#radialGradient5017);fill-opacity:1;stroke-width:0.79274529" + id="path4355" + d="m 369.00476,4.7878231 0.94842,1.9083504 0.47422,0.858758 0.94842,0.190835 2.18136,0.3816699 -1.61231,1.7175156 -0.6639,0.667923 0.0948,0.954175 0.37937,2.290022 -1.89685,-0.954178 -0.85358,-0.477086 -0.85358,0.477086 -1.89685,0.954178 0.37938,-2.290022 0.0948,-0.954175 -0.6639,-0.667923 -1.61232,-1.7175156 2.27622,-0.3816699 0.94842,-0.190835 0.37936,-0.858758 0.94843,-1.9083504 m 0,-3.4350309 c -0.28454,0 -0.56906,0.1908348 -0.75874,0.667922 l -1.89683,3.9121193 -4.07821,0.6679227 c -0.94842,0.190835 -1.13812,0.8587576 -0.47421,1.5266802 l 2.94011,3.1487776 -0.66391,4.389208 c -0.0948,0.572504 0.1897,0.954174 0.66391,0.954174 0.18967,0 0.37936,-0.09542 0.56905,-0.190835 l 3.69885,-2.003768 3.69884,2.003768 c 0.18969,0.09543 0.47421,0.190835 0.56906,0.190835 0.4742,0 0.75873,-0.38167 0.6639,-1.049592 l -0.6639,-4.389207 2.9401,-3.1487781 c 0.66391,-0.6679226 0.37938,-1.3358454 -0.4742,-1.5266803 L 371.66031,5.837416 369.76347,1.9252968 C 369.5738,1.543627 369.28926,1.3527922 369.00474,1.3527922 Z" /> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + style="display:inline;fill:url(#radialGradient4793);fill-opacity:1;stroke-width:1;filter:url(#filter4805)" + id="path4366" + d="m 202.62125,17.648005 -2.53039,-0.04122 1.26526,2.515261 h -15.18311 l 1.26526,-2.515261 -2.51784,0.02249 c -0.71997,0.0064 -1.31817,-0.563397 -1.31184,-1.28337 l 0.0559,-6.3612693 c 0.006,-0.7199727 0.59192,-1.2112687 1.31183,-1.2000001 l 1.19667,0.018731 0.0313,-2.5298907 c 0.009,-0.7199457 0.51397,-1.243001 1.23397,-1.243001 l 0.022,-1.2403691 c 0.0127,-0.7198886 0.6198,-1.2535885 1.33979,-1.2555799 l 10.04733,-0.02779 c 0.72,-0.00199 1.21931,0.5078413 1.22796,1.22779 l 0.0156,1.295949 c 0.72,0 1.2692,0.5785813 1.26831,1.2985809 l -0.003,2.4743108 1.26513,-10e-8 c 0.71992,-0.010711 1.26205,0.5376375 1.26526,1.2576305 v 6.288153 c 0,0.729621 -0.61509,1.257631 -1.26526,1.257631 z m -15.18298,-0.04122 1.26526,-2.515262 h -1.26526 z m 0.6,-6.288153 h -0.6 -0.6 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 h 1.2 c 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.25348,-0.503016 -0.6,-0.6 z M 198.8256,5.0304738 c 0,-0.72 -0.54528,-1.2523398 -1.26526,-1.2576306 h -7.59155 c -0.71998,-0.00529 -1.28117,0.5378043 -1.26526,1.2576306 v 3.7728917 c 0.0159,0.7198264 0.54528,1.2629215 1.26526,1.2576305 h 7.59155 c 0.71999,-0.0053 1.24942,-0.5078188 1.25592,-1.2277899 z m -1.26526,10.0610482 h -7.59155 l -1.26526,3.772892 h 10.12207 z m 2.53052,0 h -1.26526 l 1.26526,2.515262 z" /> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + style="display:inline;fill:url(#radialGradient4833);fill-opacity:1;stroke-width:1;filter:url(#filter4853)" + id="path4388" + d="m 248.17426,18.945466 -16.43876,-0.02779 c -0.96,-0.0016 -1.40468,-0.339789 -1.40858,-1.299781 l -0.0559,-13.7557998 c -0.004,-0.959992 0.47654,-1.3847678 1.43653,-1.3831504 l 16.49468,0.02779 c 0.96,0.00162 1.24473,0.3675784 1.24083,1.3275705 l -0.0559,13.7557997 c -0.004,0.959992 -0.25287,1.356983 -1.21287,1.355361 z M 239.88388,3.8178947 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 2.64346,0 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.36,0.6 0.6,0.6 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 3.72,0 h -1.2 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 h 1.2 c 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 0.65592,4.9945298 c 0.005,-0.7199803 -0.53592,-1.2538267 -1.25592,-1.2555798 l -11.41287,-0.02779 c -0.72,-0.00175 -1.22533,0.5077946 -1.22796,1.2277899 l -0.028,7.6724304 c -0.003,0.719994 0.50796,1.175707 1.22795,1.172209 l 11.44083,-0.05558 c 0.71999,-0.0035 1.19464,-0.507809 1.2,-1.227789 z" /> + <g + aria-label="+" + transform="scale(0.98484984,1.0153832)" + style="font-style:normal;font-weight:normal;font-size:9.51294327px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient4841);fill-opacity:1;stroke:none;stroke-width:0.79274535px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="text4409"> + <path + d="m 194.95358,9.8484986 h -2.03077 v 1.9696994 h -1.01538 V 9.8484986 h -2.03077 V 8.8636487 h 2.03077 V 6.893949 h 1.01538 v 1.9696997 h 2.03077 z" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:8.55116463px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#radialGradient4841);fill-opacity:1;stroke-width:0.79274535px" + id="path7725" /> + </g> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + d="m 467.25784,24.196945 c -0.36562,0 -0.73125,0.24375 -0.975,0.853125 l -2.4375,4.996876 -5.24062,0.853125 c -1.21875,0.24375 -1.4625,1.096875 -0.60938,1.95 l 3.77813,4.021875 -0.85313,5.60625 c -0.12181,0.73125 0.24375,1.21875 0.85313,1.21875 0.24375,0 0.4875,-0.121875 0.73125,-0.24375 l 4.75312,-2.559375 4.75313,2.559375 c 0.24375,0.121875 0.60937,0.24375 0.73125,0.24375 0.60937,0 0.975,-0.4875 0.85312,-1.340625 l -0.85312,-5.60625 3.77812,-4.021875 c 0.85313,-0.853125 0.4875,-1.70625 -0.60937,-1.95 l -5.24063,-0.853125 -2.4375,-4.996876 c -0.24375,-0.4875 -0.60937,-0.73125 -0.975,-0.73125 z" + id="path6182" + style="display:inline;fill:url(#radialGradient5031);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5049)" /> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + d="m 226.66131,15.091518 -0.0388,3.707848 c -0.007,0.673061 -0.5177,1.245488 -1.19079,1.24654 l -17.77799,0.02779 c -0.6731,0.0011 -1.2416,-0.573462 -1.24671,-1.24654 l -0.028,-3.688049 c -0.005,-0.673078 0.6302,-1.305219 1.30331,-1.305219 1.26531,-1.257631 1.03718,-3.269047 1.26531,-5.0305225 0.4278,-2.8226251 0.0953,-6.2244545 3.80878,-6.2479747 l 7.52682,-0.047673 c 3.73297,-0.023644 3.4173,3.4730226 3.84751,6.2956477 0.41438,2.7153765 0,3.7728915 1.26526,5.0305225 0.70548,0 1.26526,0.515815 1.26526,1.25763 z m -7.68106,-4.410561 h -1.82811 V 8.8528316 c 0,-0.8124995 -1.21875,-0.8124995 -1.21875,0 v 1.8281254 h -1.82814 c -0.8125,0 -0.8125,1.218749 0,1.218749 h 1.82814 v 1.828125 c 0,0.812501 1.21875,0.812501 1.21875,0 v -1.828125 h 1.82811 c 0.8125,0 0.8125,-1.218749 0,-1.218749 z" + id="path7318" + style="display:inline;fill:url(#radialGradient4813);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4825)" /> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + d="m 269.02823,19.939154 c -0.975,0 -1.82813,-0.24375 -2.80313,-1.584375 -0.975,-1.340625 -2.07187,-3.046875 -2.07187,-3.046875 0,0 -0.85313,-1.096875 -1.34063,-1.95 -0.60937,-0.853125 -1.34062,-0.609375 -1.34062,-0.609375 0,0 -3.53438,-5.7281239 -4.14375,-6.581249 -0.73125,-1.21875 0.73125,-3.290625 0.73125,-3.290625 l 5.3625,8.531249 c 0,0 1.70625,2.315625 2.31562,2.803125 0.60938,0.4875 1.70625,-0.4875 3.4125,1.096875 2.31563,2.19375 1.58438,4.63125 -0.12181,4.63125 z m -0.36563,-3.534375 c -1.09687,-1.21875 -2.07187,-1.096875 -2.31562,-0.73125 -0.24375,0.365625 0,1.4625 0.4875,2.071875 0.4875,0.609375 0.975,0.853125 1.70625,0.853125 0.73125,0.121875 1.34062,-0.853125 0.1218,-2.19375 z m -4.63125,-5.728124 -1.4625,-2.19375 3.53438,-5.60625 c 0,0 1.4625,2.071875 0.73125,3.290625 -0.36563,0.4875001 -1.70625,2.803125 -2.80313,4.509375 z m -5.60625,3.534374 c 0.36563,-0.365625 1.21875,-1.340625 1.70625,-2.071875 l 0.975,1.4625 c -0.4875,0.73125 -1.09687,1.70625 -1.09687,1.70625 0,0 -1.09688,1.70625 -2.07188,3.046875 -0.85312,1.340625 -1.70625,1.584375 -2.80312,1.584375 -1.70625,0 -2.55938,-2.4375 -0.12181,-4.63125 1.70625,-1.4625 2.80312,-0.609375 3.4125,-1.096875 z m -2.925,2.19375 c -1.09687,1.21875 -0.4875,2.19375 0.24375,2.19375 0.73125,0 1.21875,-0.24375 1.70625,-0.853125 0.4875,-0.609375 0.73125,-1.828125 0.4875,-2.071875 -0.36562,-0.365625 -1.34062,-0.4875 -2.4375,0.73125 z" + id="path7886" + style="display:inline;fill:url(#radialGradient4861);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4873)" /> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + d="m 292.45286,20.11787 -7.56413,0 c -0.73125,0 -1.32549,-0.515308 -1.33058,-1.24654 l -0.028,-4.017519 v -3.16875 -2.9250003 c 0,-0.73125 0.4875,-1.21875 1.21875,-1.21875 l 6.44059,0.00442 2.53052,2.515261 0.0354,8.810334 c 0.003,0.731244 -0.57138,1.24654 -1.30263,1.24654 z M 289.62394,8.7600607 v 2.4375003 h 2.4375 z m -7.3125,-0.6736655 0.0213,0.7169703 v 2.5152615 3.772891 l -5.06403,0.04019 c -0.73123,0.0058 -1.21672,-0.598663 -1.21875,-1.32991 l -0.028,-10.0556901 c -0.002,-0.7312471 0.4875,-1.21875 1.21875,-1.21875 h 6.09375 l 2.79402,2.5031129 v 1.81343 h -2.53052 c -0.67317,-0.017075 -1.31624,0.241688 -1.28654,1.2424914 z m 0.0213,-4.7304016 v 2.4596813 l 2.53052,-0.02779 z" + id="path8454" + style="display:inline;fill:url(#radialGradient4881);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4893)" /> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + d="m 312.76384,20.20124 -10.1808,-0.02779 c -0.75126,-0.0021 -1.21143,-0.547743 -1.21303,-1.272325 l -0.028,-12.6083588 c -0.002,-0.9749978 0.29395,-1.2762443 1.26895,-1.2723257 l 2.49639,0.010033 c 0,0 0.0587,-2.5309032 2.49616,-2.5309032 2.4375,0 2.56487,2.5309032 2.56487,2.5309032 l 2.48359,0.017757 c 0.97497,0.00697 1.35938,0.3251372 1.35283,1.3001156 l -0.0839,12.4971989 c -0.005,0.808245 -0.51762,1.35744 -1.15713,1.355695 z m -1.86968,-13.8508896 -1.34061,-0.609375 c 0,0 0,-1.8281249 -1.95,-1.8281249 -1.95,0 -1.95,1.8281249 -1.95,1.8281249 l -1.34063,0.609375 -0.47079,1.1953846 h 7.59155 z m 0.53952,2.4530151 h -6.32629 l -2.53052,2.5152615 2.53052,5.030522 7.59155,-5.030522 z" + id="path9022" + style="display:inline;fill:url(#radialGradient4901);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4913)" /> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + d="M 335.47361,15.091518 V 7.545735 l 3.79578,3.772892 z m -8.85681,1.257631 h 7.59155 l -3.79578,3.772892 z m 6.32629,-1.257631 h -5.06103 c -0.73124,-0.0041 -1.26114,-0.526392 -1.26526,-1.25763 V 8.8033655 c -0.004,-0.7312386 0.53401,-1.2576305 1.26526,-1.2576305 h 5.06103 c 0.73125,0 1.26526,0.5263804 1.26526,1.2576305 v 5.0305225 c 0,0.609375 -0.53402,1.261705 -1.26526,1.25763 z m 0,-3.772891 c 0,-0.73125 -0.53401,-1.257631 -1.26526,-1.257631 h -2.53052 c -0.73125,0 -1.26525,0.526381 -1.26525,1.257631 v 1.25763 c 0,0.73125 0.534,1.257631 1.26525,1.257631 h 2.53052 c 0.73125,0 1.26526,-0.526381 1.26526,-1.257631 z m -2.53052,-8.8034143 3.79578,3.7728917 h -7.59155 z m -5.06103,5.0305223 v 7.545783 l -3.79578,-3.772891 z" + id="path9590" + style="display:inline;fill:url(#radialGradient4921);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4933)" /> + <path + d="m 274,8 h 10 v 2 h -10 z" + id="path10158" + style="display:inline;fill:url(#radialGradient4941);fill-opacity:1;stroke-width:0.96615839" /> + <path + d="m 302,10 h -4 v 4 h -2 v -4 h -4 V 8 h 4 V 4 h 2 v 4 h 4 z" + id="path10726" + style="display:inline;fill:url(#radialGradient4949);fill-opacity:1;stroke-width:0.96615839" /> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + d="m 406.82037,12.583531 c -0.12181,0.73125 -0.24375,1.4625 -0.4875,2.071875 -0.4875,1.584375 -1.4625,3.046875 -3.04686,4.021874 0.4875,0.4875 1.58436,1.096875 1.58436,1.096875 0,0 -2.4375,0.365625 -4.99686,0.365625 l -0.12181,-0.121875 v 0.121875 c -1.21875,0 -2.4375,-0.365625 -3.65625,-0.73125 0.85311,-0.73125 1.4625,-1.584374 1.95,-2.559374 0.73125,-1.4625 0.73125,-3.65625 0.73125,-3.65625 0,0 1.09686,1.828125 1.70625,2.559375 1.4625,-0.73125 2.4375,-2.19375 2.55936,-3.65625 0.12181,-1.096875 -0.24375,-2.071875 -0.73125,-2.8031253 -0.4875,-0.8531251 -1.21875,-1.3406251 -2.07186,-1.7062501 0.24375,-0.4874999 0.60936,-1.0968749 0.975,-1.584375 0.4875,-0.73125 1.09686,-1.21875 1.58436,-1.4625 2.55939,1.340625 4.3875,4.5093751 4.02189,8.0437504 z m -8.53125,-2.4375 c 0,0 -1.34061,-1.8281254 -1.95,-2.4375004 -1.70625,0.853125 -2.68125,2.4375004 -2.68125,4.1437504 0.12181,1.828125 1.34064,3.290625 2.925,4.021875 -0.36561,0.609375 -0.73125,1.21875 -1.21875,1.70625 -0.4875,0.609375 -1.09686,0.974999 -1.4625,1.340624 -2.80311,-1.706249 -4.50936,-4.874999 -4.02186,-8.287499 0.1218,-0.8531253 0.36561,-1.7062504 0.60936,-2.4375004 0.4875,-1.3406249 1.34064,-2.4375 2.55939,-3.290625 0.1218,-0.121875 0.24375,-0.121875 0.36561,-0.24375 -0.4875,-0.4875 -1.95,-0.975 -1.95,-0.975 0,0 3.04689,-0.975 8.2875,-0.365625 -1.58436,2.315625 -1.4625,6.8250004 -1.4625,6.8250004 z" + id="path11294" + style="display:inline;fill:url(#radialGradient4957);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4969)" /> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + d="m 429.73975,20.187746 -2.55504,0.05558 c -0.48738,0.0106 -0.61242,-0.769541 -0.61242,-1.378916 0,0 0.31966,-4.276424 -3.79578,-8.803414 -3.20233,-3.5225593 -8.85682,-3.7728916 -8.85682,-3.7728916 -0.60938,0 -1.26177,-0.171597 -1.25602,-0.6590635 l 0.028,-2.3732094 c 0.006,-0.4874666 0.61868,-0.7406188 1.22806,-0.7406188 0,0 7.05132,0.3003217 11.38734,5.0305223 3.72704,4.065871 5.06103,11.318675 5.06103,11.318675 0,0.4875 -0.0191,1.310083 -0.62831,1.323336 z M 413.91969,8.8033655 c 0,0 4.48239,0.7421569 7.0114,3.0905195 2.59016,2.40515 3.11068,6.970525 3.11068,6.970525 0,0.4875 -0.7448,1.278471 -1.23236,1.278471 h -1.35283 c -0.4875,0 -1.21059,-0.669096 -1.21059,-1.278471 0,0 0.4472,-2.304652 -1.91012,-4.45401 -1.78736,-1.629677 -4.41618,-1.834143 -4.41618,-1.834143 -0.60938,0 -1.23946,-0.793663 -1.22806,-1.281032 l 0.028,-1.195314 c 0.0114,-0.4873685 0.59073,-1.2965455 1.20011,-1.2965455 z m 1.20944,6.3426395 c 1.34062,0 2.54933,1.124665 2.54933,2.46529 0,1.340626 -1.09688,2.576451 -2.4375,2.576451 -1.34063,0 -2.54933,-1.208035 -2.54933,-2.548661 0,-1.340625 1.09687,-2.49308 2.4375,-2.49308 z" + id="path11862" + style="display:inline;fill:url(#radialGradient4977);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4989)" /> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + d="m 448.08169,13.833888 v 2.515261 c 0,0.975 -0.41214,1.257631 -1.26525,1.257631 h -10.12208 c -0.85314,0 -1.26526,-0.282631 -1.26526,-1.257631 V 6.2881044 c 0,-0.9750001 0.41212,-1.2576306 1.26526,-1.2576306 h 10.12208 c 0.85311,0 1.26525,0.2826305 1.26525,1.2576306 v 2.5152611 l 5.06104,-2.5152611 V 16.349149 Z" + id="path12430" + style="display:inline;fill:url(#radialGradient4997);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5009)" /> + <g + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + style="display:inline" + id="g4779"> + <path + id="bookmarks-star-4" + d="M 165.92886,2.5152127 V 20.122041 h 8.85681 1.26526 2.53052 c 1.26526,0 2.53052,-1.257631 2.53052,-2.515261 V 15.091518 7.545735 5.0304738 c 0,-1.2576306 -1.26526,-2.5152611 -2.53052,-2.5152611 h -2.53052 -1.26526 z m 7.59155,2.5152611 1.26526,2.5152612 c 0,0 0.39827,0.9972133 0.68613,1.1930622 0.26974,0.1834496 1.07417,0.064568 1.07417,0.064568 h 3.30074 l -2.53052,3.1379238 c 0,0 -0.38069,0.332603 -0.51773,0.634968 -0.20593,0.452534 -0.18971,0.518683 -0.12151,1.257631 0.10732,1.162403 0.63924,3.772892 0.63924,3.772892 l -2.53052,-1.257631 c 0,0 -0.77873,-0.42944 -1.26526,-0.430166 -0.5721,0 -1.26526,0.430166 -1.26526,0.430166 l -2.53051,1.257631 c 0,0 0.56012,-2.658345 0.73559,-3.772892 0.11606,-0.733074 0.10061,-0.753616 -0.15752,-1.257631 -0.13995,-0.274086 -0.57807,-0.782455 -0.57807,-0.782455 l -2.53052,-2.9904368 h 3.02161 c 0,0 0.91024,-0.099407 1.27135,-0.3263622 0.27408,-0.1711231 0.76807,-0.9312683 0.76807,-0.9312683 z" + style="fill:url(#radialGradient4710);fill-opacity:1;stroke-width:1.265625;filter:url(#filter4729)" /> + <path + id="bookmarks-overlay-1" + d="m 163.39834,2.5152127 c -1.26526,0 -2.53052,1.2576305 -2.53052,2.5152611 v 2.5152612 7.545783 2.515262 c 0,1.25763 1.26526,2.515261 2.53052,2.515261 h 2.91839 l 0.0559,-4.840061 V 7.6882296 l 0.028,-5.1730169 z" + style="fill:url(#radialGradient4712);fill-opacity:1;stroke:none;stroke-width:1.265625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers stroke fill;filter:url(#filter4774)" /> + <path + id="bookmarks-divider-7" + d="M 165.92886,2.5152127 V 20.122041" + style="opacity:0.66300001;fill:url(#radialGradient4714);fill-opacity:1;stroke:url(#radialGradient4750);stroke-width:1.2614392;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + </g> + <path + transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)" + style="display:inline;fill:url(#radialGradient4709-1);fill-opacity:1;stroke-width:1;filter:url(#filter4844)" + id="path4214-3" + d="m 133.03211,35.213608 -6.32629,6.288153 c -0.24,0.36 -0.8202,0.518975 -1.3002,0.518975 -0.48,0 -0.87032,-0.158975 -1.23032,-0.518975 l -6.3263,-6.288153 c -0.6,-0.72 -0.96335,-1.29465 -0.003,-1.287183 l 3.79916,0.02955 -0.0908,-7.535242 c -0.009,-0.719949 0.67572,-1.307177 1.39571,-1.31116 l 5.02367,-0.02779 c 0.71999,-0.004 1.25401,0.619416 1.22796,1.33895 l 0.035,7.535242 3.80499,-0.02955 c 0.95998,-0.0075 0.71078,0.567183 -0.009,1.287183 z" /> + </g> +</svg> diff --git a/palemoon/themes/osx/aboutCertError.css b/palemoon/themes/osx/aboutCertError.css index dbb353025..100bb3d3b 100644 --- a/palemoon/themes/osx/aboutCertError.css +++ b/palemoon/themes/osx/aboutCertError.css @@ -33,7 +33,7 @@ h2 { border-radius: 10px; box-shadow: 0px 0px 8px red; padding: 3em; - -moz-padding-start: 30px; + padding-inline-start: 30px; background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat -moz-Field; background-origin: content-box; } @@ -43,16 +43,16 @@ h2 { } #errorTitle { - -moz-margin-start: 80px; + margin-inline-start: 80px; } #errorLongContent { - -moz-margin-start: 80px; + margin-inline-start: 80px; } .expander > button { - -moz-padding-start: 20px; - -moz-margin-start: -20px; + padding-inline-start: 20px; + margin-inline-start: -20px; background: url("chrome://browser/skin/aboutCertError_sectionExpanded.png") left center no-repeat; border: none; font: inherit; diff --git a/palemoon/themes/osx/aboutPrivateBrowsing.css b/palemoon/themes/osx/aboutPrivateBrowsing.css index cd6026b8e..35843adce 100644 --- a/palemoon/themes/osx/aboutPrivateBrowsing.css +++ b/palemoon/themes/osx/aboutPrivateBrowsing.css @@ -21,7 +21,7 @@ body.normal > #errorPageContainer { } #startPrivateBrowsingDesc > button { - -moz-margin-start: 0; + margin-inline-start: 0; } #footerDesc > p { @@ -30,7 +30,7 @@ body.normal > #errorPageContainer { #moreInfo { font-size: 110%; /* to match the value set in chrome://global/skin/netError.css */ - -moz-padding-start: 25px; + padding-inline-start: 25px; background: url("chrome://global/skin/icons/information-16.png") no-repeat top left; } diff --git a/palemoon/themes/osx/aboutSyncTabs.css b/palemoon/themes/osx/aboutSyncTabs.css index 4f21a9d40..1fcd8304f 100644 --- a/palemoon/themes/osx/aboutSyncTabs.css +++ b/palemoon/themes/osx/aboutSyncTabs.css @@ -22,18 +22,18 @@ margin-top: 4px; width: 45em; height: 32px; - -moz-margin-start: 2em; - -moz-margin-end: 2em; + margin-inline-start: 2em; + margin-inline-end: 2em; } #tabsListHeading { font-size: 140%; font-weight: bold; - -moz-margin-start: 40px; + margin-inline-start: 40px; } richlistitem { - -moz-margin-end: 2em; + margin-inline-end: 2em; } richlistitem[selected="true"], @@ -46,7 +46,7 @@ richlistitem[type="tab"] { border: #999999 1px solid !important; padding: 2px 5px; margin-bottom: 4px; - -moz-margin-start: 4em; + margin-inline-start: 4em; border-radius: 6px; background-color: menu; width: 44em; @@ -64,7 +64,7 @@ richlistitem[type="tab"][selected="true"] { richlistitem[type="client"] { min-height: 2em; color: #000000; - -moz-margin-start: 2em; + margin-inline-start: 2em; margin-top: 2px; margin-bottom: 3px; width: 42em; @@ -96,6 +96,6 @@ richlistitem.desktop[type="client"] { } .tabIcon { - -moz-padding-start: 2px; + padding-inline-start: 2px; padding-top: 2px; } diff --git a/palemoon/themes/osx/appmenu-dropmarker.png b/palemoon/themes/osx/appmenu-dropmarker.png Binary files differdeleted file mode 100644 index 27deaff72..000000000 --- a/palemoon/themes/osx/appmenu-dropmarker.png +++ /dev/null diff --git a/palemoon/themes/osx/appmenu-icons.png b/palemoon/themes/osx/appmenu-icons.png Binary files differdeleted file mode 100644 index 78f365816..000000000 --- a/palemoon/themes/osx/appmenu-icons.png +++ /dev/null diff --git a/palemoon/themes/osx/autocomplete.css b/palemoon/themes/osx/autocomplete.css index a50dbd823..7f63bef19 100644 --- a/palemoon/themes/osx/autocomplete.css +++ b/palemoon/themes/osx/autocomplete.css @@ -129,15 +129,15 @@ treechildren.private-autocomplete-treebody::-moz-tree-cell-text(selected) { width: 16px; height: 16px; margin-bottom: -1px; - -moz-margin-start: 7px; - -moz-margin-end: 5px; + margin-inline-start: 7px; + margin-inline-end: 5px; } .ac-type-icon { width: 16px; height: 16px; - -moz-margin-start: 6px; - -moz-margin-end: 4px; + margin-inline-start: 6px; + margin-inline-end: 4px; } .ac-url-box > .ac-site-icon, diff --git a/palemoon/themes/osx/browser.css b/palemoon/themes/osx/browser.css index 66f4fd006..2c6d9eddb 100644 --- a/palemoon/themes/osx/browser.css +++ b/palemoon/themes/osx/browser.css @@ -9,22 +9,58 @@ %include shared.inc %filter substitution -%define toolbarHighlight rgba(255,255,255,.5) -%define selectedTabHighlight rgba(255,255,255,.7) %define toolbarShadowColor rgba(10%,10%,10%,.4) %define toolbarShadowOnTab linear-gradient(to top, rgba(10%,10%,10%,.4) 1px, transparent 1px) -%define bgTabTexture linear-gradient(transparent, hsla(0,0%,45%,.1) 1px, hsla(0,0%,32%,.2) 80%, hsla(0,0%,0%,.2)) -%define bgTabTextureHover linear-gradient(hsla(0,0%,100%,.3) 1px, hsla(0,0%,75%,.2) 80%, hsla(0,0%,60%,.2)) %define navbarTextboxCustomBorder border-color: rgba(0,0,0,.32); %define navbarLargeIcons #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar %define forwardTransitionLength 150ms %define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button"],#nav-bar:not([currentset])) > #unified-back-forward-button %define conditionalForwardWithUrlbarWidth 27 +:root { + --toolbox-after-color: ThreeDShadow; + + --toolbar-custom-color: -moz-Dialog; + --toolbar-highlight-top: rgba(255,255,255,.5); + --toolbar-highlight-bottom: transparent; + + --toolbarbutton-background-color: hsla(210,32%,93%,.3); + --toolbarbutton-border-radius: 2.5px; + --toolbarbutton-border-color: hsla(210,54%,20%,.2); + + --toolbarbutton-image: url("chrome://browser/skin/Toolbar.png"); + --toolbarbutton-inverted-image: url("chrome://browser/skin/Toolbar-inverted.png"); + + --tab-background: linear-gradient(transparent, hsla(0,0%,45%,.1) 1px, hsla(0,0%,32%,.2) 80%, hsla(0,0%,0%,.2)); + --tab-background-hover: linear-gradient(hsla(0,0%,100%,.3) 1px, hsla(0,0%,75%,.2) 80%, hsla(0,0%,60%,.2)); + --tab-border-radius: 6px; + --tab-box-shadow: inset 0.5px 1px 1px var(--tab-selected-highlight); + --tab-selected-highlight: rgba(255,255,255,.7); +} + +/* Use SVG for HiDPI 133%+ */ +@media (min-resolution: 1.33dppx) { + :root { + --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg"); + --toolbarbutton-inverted-image: url("chrome://browser/skin/Toolbar-inverted.svg"); + } +} + +:root:-moz-lwtheme-brighttext { + --toolbar-highlight-top: rgba(32,32,32,.8); + --toolbar-highlight-bottom: rgba(32,32,32,0); +} + +:root:-moz-lwtheme-darktext { + --toolbar-highlight-top: rgba(255,255,255,.8); + + --tab-selected-highlight: rgba(255,255,255,.6); +} + #navigator-toolbox { - -moz-appearance: none; - background-color: transparent; - border-top: none; + -moz-appearance: none; + background-color: transparent; + border-top: none; } #main-window { @@ -33,115 +69,127 @@ } #navigator-toolbox::after { - content: ""; - display: -moz-box; - -moz-box-ordinal-group: 101; /* tabs toolbar is 100 */ - height: 1px; - background-color: ThreeDShadow; + content: ""; + display: -moz-box; + -moz-box-ordinal-group: 101; /* tabs toolbar is 100 */ + height: 1px; + background-color: var(--toolbox-after-color); } #navigator-toolbox[tabsontop=false]::after, #main-window[disablechrome] #navigator-toolbox::after { - visibility: collapse; + visibility: collapse; } #navigator-toolbox > toolbar:not(:-moz-lwtheme) { - -moz-appearance: none; - border-style: none; - background-color: -moz-Dialog; + -moz-appearance: none; + border-style: none; + background-color: var(--toolbar-custom-color); } #nav-bar[tabsontop=true]:not(:-moz-lwtheme), #nav-bar[tabsontop=true][collapsed=true]:not([customizing]):not(:-moz-lwtheme) + toolbar, #nav-bar[tabsontop=true][collapsed=true]:not([customizing]):not(:-moz-lwtheme) + #customToolbars + #PersonalToolbar { - background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0)); + background-image: linear-gradient(var(--toolbar-highlight-top), var(--toolbar-highlight-bottom)); } -#nav-bar[tabsontop=true]:-moz-lwtheme, -#nav-bar[tabsontop=true][collapsed=true]:not([customizing]):-moz-lwtheme + toolbar, -#nav-bar[tabsontop=true][collapsed=true]:not([customizing]):-moz-lwtheme + #customToolbars + #PersonalToolbar { - background-image: linear-gradient(rgba(255,255,255,.8), rgba(255,255,255,0)); +/* Blend the topmost toolbar with the titlebar */ +%ifdef MOZ_CAN_DRAW_IN_TITLEBAR +#main-window[tabsontop=false]:not([privatebrowsingmode=temporary]) #nav-bar:not(:-moz-lwtheme), +#main-window[tabsontop=false]:not([privatebrowsingmode=temporary]) #PersonalToolbar[collapsed=true] + ~ #TabsToolbar:not(:-moz-lwtheme), +#main-window[tabsontop=true]:not([privatebrowsingmode=temporary]) #TabsToolbar:not(:-moz-lwtheme) { + -moz-appearance: toolbar; +} + +#main-window[tabsontop=false][privatebrowsingmode=temporary] #nav-bar:not(:-moz-lwtheme), +#main-window[tabsontop=false][privatebrowsingmode=temporary] #PersonalToolbar[collapsed=true] + ~ #TabsToolbar:not(:-moz-lwtheme), +#main-window[tabsontop=true][privatebrowsingmode=temporary] #TabsToolbar:not(:-moz-lwtheme) { + background-color: transparent; } -#nav-bar[tabsontop=true]:-moz-lwtheme-brighttext, -#nav-bar[tabsontop=true][collapsed=true]:not([customizing]):-moz-lwtheme-brighttext + toolbar, -#nav-bar[tabsontop=true][collapsed=true]:not([customizing]):-moz-lwtheme-brighttext + #customToolbars + #PersonalToolbar { - background-image: linear-gradient(rgba(32,32,32,.8), rgba(32,32,32,0)); +#main-window[tabsontop=false][privatebrowsingmode=temporary] #nav-bar:not(:-moz-lwtheme) { + border-bottom: 1px solid rgba(26,26,26,0.2); } +%else +#main-window[tabsontop=false] #nav-bar:not(:-moz-lwtheme), +#main-window[tabsontop=false] #PersonalToolbar[collapsed=true] + ~ #TabsToolbar:not(:-moz-lwtheme), +#main-window[tabsontop=true] #TabsToolbar:not(:-moz-lwtheme) { + -moz-appearance: toolbar; +} +%endif #personal-bookmarks { - min-height: 24px; + min-height: 24px; } #print-preview-toolbar:not(:-moz-lwtheme) { - -moz-appearance: toolbox; + -moz-appearance: toolbox; } #browser-bottombox:not(:-moz-lwtheme) { - background-color: -moz-dialog; + background-color: var(--toolbar-custom-color); } - +%ifdef MOZ_CAN_DRAW_IN_TITLEBAR /* ::::: titlebar ::::: */ #main-window[sizemode="normal"]:not([privatebrowsingmode=temporary]) > #titlebar { - -moz-appearance: -moz-window-titlebar; + -moz-appearance: -moz-window-titlebar; } #main-window[sizemode="maximized"] > #titlebar { - -moz-appearance: -moz-window-titlebar-maximized; + -moz-appearance: -moz-window-titlebar-maximized; } #titlebar-buttonbox { - -moz-appearance: -moz-window-button-box; -} - -#main-window[sizemode="maximized"] #titlebar-buttonbox { - -moz-appearance: -moz-window-button-box-maximized; + -moz-appearance: -moz-window-button-box; } .titlebar-placeholder[type="appmenu-button"] { - margin-left: 4px; + margin-left: 4px; } .titlebar-placeholder[type="caption-buttons"] { - margin-left: 10px; + margin-left: 10px; } /* titlebar command buttons */ #titlebar-min { - -moz-appearance: -moz-window-button-minimize; + -moz-appearance: -moz-window-button-minimize; } #titlebar-max { - -moz-appearance: -moz-window-button-maximize; + -moz-appearance: -moz-window-button-maximize; } #main-window[sizemode="maximized"] #titlebar-max { - -moz-appearance: -moz-window-button-restore; + -moz-appearance: -moz-window-button-restore; } #titlebar-close { - -moz-appearance: -moz-window-button-close; + -moz-appearance: -moz-window-button-close; } /* ensure titlebar on privacy windows is of correct size */ #titlebar { - height: 22px; + height: 22px; } /* ensure extra titlebar doesn't appear on normal (e.g. non-privacy) windows */ #main-window:not([privatebrowsingmode=temporary]):not(:-moz-lwtheme) > #titlebar > #titlebar-content > #titlebar-buttonbox-container, #main-window:not([drawintitlebar=true]):not(:-moz-lwtheme) > #titlebar { - display: none; + display: none; } #titlebar-buttonbox-container { margin-left: 7px; margin-top: 3px; } - +%endif /* ::::: bookmark toolbar ::::: */ #personal-bookmarks { @@ -168,40 +216,48 @@ toolbarbutton.chevron:-moz-locale-dir(rtl) > .toolbarbutton-icon { @media (min-resolution: 2dppx) { toolbarbutton.chevron { - list-style-image: url("chrome://global/skin/icons/chevron@2x.png"); + list-style-image: url("chrome://global/skin/icons/chevron@2x.png"); } toolbarbutton.chevron > .toolbarbutton-icon { - width: 13px; + width: 13px; } } /* ::::: bookmark buttons ::::: */ toolbarbutton.bookmark-item { - color: #222; border: 0; border-radius: 10000px; padding: 1px 8px; margin: 0 0 1px; } +toolbarbutton.bookmark-item:not(:-moz-lwtheme) { + color: #222; +} + +toolbarbutton.bookmark-item:-moz-lwtheme { + color: inherit; + text-shadow: inherit; +} + .bookmark-item > .toolbarbutton-menu-dropmarker { list-style-image: url("chrome://browser/skin/places/folderDropArrow.png"); -moz-image-region: rect(0, 7px, 5px, 0); margin-top: 1px; - -moz-margin-start: 3px; - -moz-margin-end: -2px; + margin-inline-start: 3px; + margin-inline-end: -2px; } @media (min-resolution: 2dppx) { .bookmark-item > .toolbarbutton-menu-dropmarker { - list-style-image: url("chrome://browser/skin/places/folderDropArrow@2x.png"); - -moz-image-region: rect(0, 14px, 10px, 0); + list-style-image: url("chrome://browser/skin/places/folderDropArrow@2x.png"); + -moz-image-region: rect(0, 14px, 10px, 0); } .bookmark-item > .toolbarbutton-menu-dropmarker > .dropmarker-icon { - width: 7px; + width: 7px; } } @@ -215,21 +271,28 @@ toolbarbutton.bookmark-item[open="true"] { background-color: rgba(0, 0, 0, .205); } -toolbarbutton.bookmark-item:hover, -toolbarbutton.bookmark-item[open="true"] { - color: #FFF !important; - text-shadow: 0 1px rgba(0, 0, 0, .4) !important; +toolbarbutton.bookmark-item:-moz-lwtheme-brighttext:hover, +toolbarbutton.bookmark-item[open="true"]:-moz-lwtheme-brighttext { + background-color: rgba(255, 255, 255, .3); } +toolbarbutton.bookmark-item:not(:-moz-lwtheme):hover, +toolbarbutton.bookmark-item[open="true"]:not(:-moz-lwtheme) { + color: #FFF; + text-shadow: 0 1px rgba(0, 0, 0, .4); +} + +.bookmark-item:-moz-lwtheme-brighttext > .toolbarbutton-menu-dropmarker, .bookmark-item:hover > .toolbarbutton-menu-dropmarker, .bookmark-item[open="true"] > .toolbarbutton-menu-dropmarker { -moz-image-region: rect(5px, 7px, 10px, 0); } @media (min-resolution: 2dppx) { + .bookmark-item:-moz-lwtheme-brighttext > .toolbarbutton-menu-dropmarker, .bookmark-item:hover > .toolbarbutton-menu-dropmarker, .bookmark-item[open="true"] > .toolbarbutton-menu-dropmarker { - -moz-image-region: rect(10px, 14px, 20px, 0); + -moz-image-region: rect(10px, 14px, 20px, 0); } } @@ -239,9 +302,14 @@ toolbarbutton.bookmark-item[open="true"] { background-color: rgba(0, 0, 0, .5); } +toolbarbutton.bookmark-item:-moz-lwtheme-brighttext:hover, +toolbarbutton.bookmark-item[open="true"]:-moz-lwtheme-brighttext { + background-color: rgba(255,255,255, .3); +} + toolbarbutton.bookmark-item > menupopup { margin-top: 2px; - -moz-margin-start: 3px; + margin-inline-start: 3px; } .bookmark-item > .toolbarbutton-icon { @@ -252,7 +320,7 @@ toolbarbutton.bookmark-item > menupopup { .bookmark-item > .toolbarbutton-icon[label]:not([label=""]), .bookmark-item > .toolbarbutton-icon[type="menu"] { - -moz-margin-end: 5px; + margin-inline-end: 5px; } .bookmark-item[container] { @@ -294,35 +362,35 @@ toolbarbutton.bookmark-item > menupopup { @media (min-resolution: 2dppx) { .bookmark-item[container] { - list-style-image: url("chrome://global/skin/tree/folder@2x.png"); + list-style-image: url("chrome://global/skin/tree/folder@2x.png"); } .bookmark-item[container][livemark] { - list-style-image: url("chrome://browser/skin/page-livemarks@2x.png"); + list-style-image: url("chrome://browser/skin/page-livemarks@2x.png"); } .bookmark-item[container][livemark] .bookmark-item { - list-style-image: url("chrome://browser/skin/places/livemark-item.png"); + list-style-image: url("chrome://browser/skin/places/livemark-item.png"); } .bookmark-item[container][query] { - list-style-image: url("chrome://browser/skin/places/query@2x.png"); + list-style-image: url("chrome://browser/skin/places/query@2x.png"); } .bookmark-item[query][tagContainer] { - list-style-image: url("chrome://browser/skin/places/tag@2x.png"); + list-style-image: url("chrome://browser/skin/places/tag@2x.png"); } .bookmark-item[query][dayContainer] { - list-style-image: url("chrome://browser/skin/places/history@2x.png"); + list-style-image: url("chrome://browser/skin/places/history@2x.png"); } .bookmark-item[query][hostContainer] { - list-style-image: url("chrome://global/skin/tree/folder@2x.png"); + list-style-image: url("chrome://global/skin/tree/folder@2x.png"); } .bookmark-item[query][hostContainer][open] { - list-style-image: url("chrome://global/skin/tree/folder@2x.png"); + list-style-image: url("chrome://global/skin/tree/folder@2x.png"); } } @@ -346,7 +414,7 @@ toolbarbutton.bookmark-item > menupopup { @media (min-resolution: 2dppx) { .bookmark-item > .toolbarbutton-icon, .bookmark-item > .menu-iconic-left > .menu-iconic-icon { - image-rendering: -moz-crisp-edges; + image-rendering: -moz-crisp-edges; } } @@ -361,16 +429,16 @@ toolbarbutton.bookmark-item > menupopup { @media (min-resolution: 2dppx) { #wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box { - background-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png"); - background-size: 16px; + background-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png"); + background-size: 16px; } .bookmarks-toolbar-customize { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png") !important; + list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png") !important; } .bookmarks-toolbar-customize > .toolbarbutton-icon { - width: 16px; + width: 16px; } } @@ -384,11 +452,11 @@ toolbarbutton.bookmark-item > menupopup { /* ::::: primary toolbar buttons ::::: */ .toolbarbutton-1 { - list-style-image: url("chrome://browser/skin/Toolbar.png"); + list-style-image: var(--toolbarbutton-image); } toolbar[brighttext] .toolbarbutton-1 { - list-style-image: url("chrome://browser/skin/Toolbar-inverted.png"); + list-style-image: var(--toolbarbutton-inverted-image); } .toolbarbutton-1[disabled=true] > .toolbarbutton-icon, @@ -396,136 +464,136 @@ toolbar[brighttext] .toolbarbutton-1 { .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker, .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon, .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled] > .toolbarbutton-icon { - opacity: .4; + opacity: .4; } .toolbarbutton-1 > .toolbarbutton-menu-dropmarker, .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { - list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png"); + list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png"); } toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menu-dropmarker, toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { - list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png"); + list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png"); } .toolbarbutton-1 > .toolbarbutton-icon, .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon { - -moz-margin-end: 0; + margin-inline-end: 0; } toolbar[mode=full] .toolbarbutton-1:not([type=menu-button]) { - -moz-box-orient: vertical; + -moz-box-orient: vertical; } toolbar[mode=full] .toolbarbutton-1, toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button { - min-width: 57px; + min-width: 57px; } #nav-bar { - /* force iconsize="small" on this toolbar */ - counter-reset: smallicons; + /* force iconsize="small" on this toolbar */ + counter-reset: smallicons; } @navbarLargeIcons@ .toolbarbutton-1, @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button { - -moz-appearance: none; - border: none; - padding: 0; - background: none; + -moz-appearance: none; + border: none; + padding: 0; + background: none; } @navbarLargeIcons@ .toolbarbutton-1:not([type=menu-button]), @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button, @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { - padding: 5px 2px; - -moz-box-pack: center; + padding: 5px 2px; + -moz-box-pack: center; } @navbarLargeIcons@ .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button) { - padding-left: 5px; - padding-right: 5px; + padding-left: 5px; + padding-right: 5px; } @navbarLargeIcons@ .toolbarbutton-1 > menupopup { - margin-top: -3px; + margin-top: -3px; } @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button { - -moz-padding-end: 0; + padding-inline-end: 0; } @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { - -moz-padding-start: 0; - -moz-box-align: center; + padding-inline-start: 0; + -moz-box-align: center; } @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-icon, @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-badge-stack, @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon, @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { - padding: 2px 6px; - background: hsla(210,32%,93%,.3) padding-box; - background-image: linear-gradient(hsla(0,0%,100%,.4), hsla(0,0%,100%,.1)); - background-clip: padding-box; - border-radius: 2.5px; - border: 1px solid; - border-color: hsla(210,54%,20%,.2) hsla(210,54%,20%,.2) hsla(210,54%,20%,.2); - box-shadow: 0 1px hsla(0,0%,100%,.05) inset, - 0 1px hsla(210,54%,20%,.05), - 0 0 2px hsla(210,54%,20%,.05); - transition-property: background-image, background-color, border-color, box-shadow; - transition-duration: 150ms; + padding: 2px 6px; + background: var(--toolbarbutton-background-color) padding-box; + background-image: linear-gradient(hsla(0,0%,100%,.4), hsla(0,0%,100%,.1)); + background-clip: padding-box; + border-radius: var(--toolbarbutton-border-radius); + border: 1px solid; + border-color: var(--toolbarbutton-border-color) var(--toolbarbutton-border-color) var(--toolbarbutton-border-color); + box-shadow: 0 1px hsla(0,0%,100%,.05) inset, + 0 1px hsla(210,54%,20%,.05), + 0 0 2px hsla(210,54%,20%,.05); + transition-property: background-image, background-color, border-color, box-shadow; + transition-duration: 150ms; } @navbarLargeIcons@ .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-icon, @navbarLargeIcons@ .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-badge-stack, @navbarLargeIcons@ .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { - padding: 3px 7px; + padding: 3px 7px; } @navbarLargeIcons@ .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button) > .toolbarbutton-icon, @navbarLargeIcons@ .toolbarbutton-1[type=menu] > .toolbarbutton-text /* hack for add-ons that forcefully display the label */ { - -moz-padding-end: 17px; + padding-inline-end: 17px; } @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menu-dropmarker { - -moz-margin-start: -15px; + margin-inline-start: -15px; } @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon { - -moz-border-end: none; + border-inline-end: none; } @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { - padding: 8px 5px 7px; + padding: 8px 5px 7px; } @navbarLargeIcons@ .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before { - content: ""; - display: -moz-box; - width: 1px; - height: 18px; - -moz-margin-end: -1px; - background-image: linear-gradient(hsla(210,54%,20%,.2) 0, hsla(210,54%,20%,.2) 18px); - background-clip: padding-box; - background-position: center; - background-repeat: no-repeat; - background-size: 1px 18px; - box-shadow: 0 0 0 1px hsla(0,0%,100%,.2); + content: ""; + display: -moz-box; + width: 1px; + height: 18px; + margin-inline-end: -1px; + background-image: linear-gradient(var(--toolbarbutton-border-color) 0, var(--toolbarbutton-border-color) 18px); + background-clip: padding-box; + background-position: center; + background-repeat: no-repeat; + background-size: 1px 18px; + box-shadow: 0 0 0 1px hsla(0,0%,100%,.2); } @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon:-moz-locale-dir(ltr), @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-locale-dir(rtl) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 0; } @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon:-moz-locale-dir(rtl), @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-locale-dir(ltr) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; + border-top-left-radius: 0; + border-bottom-left-radius: 0; } @navbarLargeIcons@ .toolbarbutton-1:not([disabled]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon, @@ -533,56 +601,56 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button { @navbarLargeIcons@ .toolbarbutton-1:not([disabled]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon, @navbarLargeIcons@ .toolbarbutton-1:not([disabled]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack, @conditionalForwardWithUrlbar@ > .toolbarbutton-1:-moz-any([disabled],:not([open]):not([disabled]):not(:active)) > .toolbarbutton-icon { - background-image: linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.5)); - border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.3) hsla(210,54%,20%,.35); - box-shadow: 0 1px hsla(0,0%,100%,.3) inset, - 0 1px hsla(210,54%,20%,.03), - 0 0 2px hsla(210,54%,20%,.1); - transition-property: background-image, background-color, border-color, box-shadow; - transition-duration: 150ms; + background-image: linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.5)); + border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.3) hsla(210,54%,20%,.35); + box-shadow: 0 1px hsla(0,0%,100%,.3) inset, + 0 1px hsla(210,54%,20%,.03), + 0 0 2px hsla(210,54%,20%,.1); + transition-property: background-image, background-color, border-color, box-shadow; + transition-duration: 150ms; } @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):not([open]):not(:active):hover > .toolbarbutton-icon, @navbarLargeIcons@ .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon, @conditionalForwardWithUrlbar@ > #forward-button:not([open]):not(:active):not([disabled]):hover > .toolbarbutton-icon { - border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4); - background-color: hsla(210,48%,96%,.75); - box-shadow: 0 0 1px hsla(210,54%,20%,.03), - 0 0 2px hsla(210,54%,20%,.1); + border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4); + background-color: hsla(210,48%,96%,.75); + box-shadow: 0 0 1px hsla(210,54%,20%,.03), + 0 0 2px hsla(210,54%,20%,.1); } @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover:active > .toolbarbutton-icon, @navbarLargeIcons@ .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon, @navbarLargeIcons@ .toolbarbutton-1:not([disabled]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon, @navbarLargeIcons@ .toolbarbutton-1:not([disabled]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-stack { - background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1)); - background-color: hsla(210,54%,20%,.15); - border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4); - box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset, - 0 0 1px hsla(210,54%,20%,.2) inset, - /* allows windows-keyhole-forward-clip-path to be used for non-hover as well as hover: */ - 0 1px 0 hsla(210,54%,20%,0), - 0 0 2px hsla(210,54%,20%,0); - text-shadow: none; - transition: none; + background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1)); + background-color: hsla(210,54%,20%,.15); + border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4); + box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset, + 0 0 1px var(--toolbarbutton-border-color) inset, + /* allows osx-keyhole-forward-clip-path to be used for non-hover as well as hover: */ + 0 1px 0 hsla(210,54%,20%,0), + 0 0 2px hsla(210,54%,20%,0); + text-shadow: none; + transition: none; } @navbarLargeIcons@ .toolbarbutton-1:-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon { - -moz-border-start-color: hsla(210,54%,20%,.35); + border-inline-start-color: hsla(210,54%,20%,.35); } @navbarLargeIcons@ .toolbarbutton-1[checked]:not(:active):hover > .toolbarbutton-icon { - background-color: rgba(90%,90%,90%,.4); - transition: background-color .4s; + background-color: rgba(90%,90%,90%,.4); + transition: background-color .4s; } :-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1, :-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button, .tabbrowser-arrowscrollbox > .scrollbutton-up, .tabbrowser-arrowscrollbox > .scrollbutton-down { - -moz-appearance: none; - border-style: none; - padding: 0 3px; + -moz-appearance: none; + border-style: none; + padding: 0 3px; } #TabsToolbar .toolbarbutton-1:not([disabled]):hover, @@ -590,230 +658,231 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button { #TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover, .tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover, .tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover { - background-image: linear-gradient(rgba(255,255,255,0), rgba(255,255,255,.5)), - linear-gradient(transparent, rgba(0,0,0,.25) 30%), - linear-gradient(transparent, rgba(0,0,0,.25) 30%); - background-position: 1px -1px, 0 -1px, 100% -1px; - background-size: calc(100% - 2px) 100%, 1px 100%, 1px 100%; - background-repeat: no-repeat; + background-image: linear-gradient(var(--toolbar-highlight-bottom), var(--toolbar-highlight-top)), + linear-gradient(transparent, rgba(0,0,0,.25) 30%), + linear-gradient(transparent, rgba(0,0,0,.25) 30%); + background-position: 1px -1px, 0 -1px, 100% -1px; + background-size: calc(100% - 2px) 100%, 1px 100%, 1px 100%; + background-repeat: no-repeat; } #addon-bar .toolbarbutton-1:not([disabled]):hover, #addon-bar .toolbarbutton-1[open], #addon-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover { - background-image: linear-gradient(to top, transparent, rgba(0,0,0,.15)), - linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%), - linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%); - background-position: left, left, right; - background-size: auto, 1px 100%, 1px 100%; - background-repeat: no-repeat; + background-image: linear-gradient(to top, transparent, rgba(0,0,0,.15)), + linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%), + linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%); + background-position: left, left, right; + background-size: auto, 1px 100%, 1px 100%; + background-repeat: no-repeat; } /* unified back/forward button */ #back-button { - -moz-image-region: rect(0, 18px, 18px, 0); + -moz-image-region: rect(0, 18px, 18px, 0); } #forward-button { - -moz-image-region: rect(0, 36px, 18px, 18px); + -moz-image-region: rect(0, 36px, 18px, 18px); } #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon, #forward-button:-moz-locale-dir(rtl), #forward-button:-moz-locale-dir(rtl) > .toolbarbutton-text { - transform: scaleX(-1); + transform: scaleX(-1); } @conditionalForwardWithUrlbar@ { - -moz-box-align: center; + -moz-box-align: center; } @conditionalForwardWithUrlbar@ > #forward-button { - padding: 0; + padding: 0; } @conditionalForwardWithUrlbar@ > #forward-button > menupopup { - margin-top: 1px; + margin-top: 1px; } @conditionalForwardWithUrlbar@ > #forward-button > .toolbarbutton-icon { - /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */ - clip-path: url(chrome://browser/content/browser.xul#windows-keyhole-forward-clip-path); - -moz-margin-start: -6px !important; - border-left-style: none; - border-radius: 0; - padding-left: 7px; - padding-right: 3px; + /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */ + clip-path: url(chrome://browser/content/browser.xul#osx-keyhole-forward-clip-path); + margin-inline-start: -9px !important; + border-left-style: none; + border-radius: 0; + padding-left: 7px; + padding-right: 3px; } @conditionalForwardWithUrlbar@:not([switchingtabs]) > #forward-button { - transition: opacity @forwardTransitionLength@ ease-out; + transition: opacity @forwardTransitionLength@ ease-out; } @conditionalForwardWithUrlbar@:not(:hover) > #forward-button[disabled] { - /* opacity: 0; */ + /* opacity: 0; */ } @conditionalForwardWithUrlbar@ > #back-button { - -moz-image-region: rect(18px, 20px, 38px, 0); - padding-top: 3px; - padding-bottom: 3px; - -moz-padding-start: 5px; - -moz-padding-end: 0; - position: relative; - z-index: 1; - border-radius: 0 10000px 10000px 0; + -moz-image-region: rect(18px, 20px, 38px, 0); + padding-top: 3px; + padding-bottom: 3px; + padding-inline-start: 5px; + padding-inline-end: 0; + position: relative; + z-index: 1; + border-radius: 0 10000px 10000px 0; } @conditionalForwardWithUrlbar@ > #back-button:-moz-locale-dir(rtl) { - border-radius: 10000px 0 0 10000px; + border-radius: 10000px 0 0 10000px; } @conditionalForwardWithUrlbar@ > #back-button > menupopup { - margin-top: -1px; + margin-top: -1px; } @conditionalForwardWithUrlbar@ > #back-button > .toolbarbutton-icon { - border-radius: 10000px; - padding: 5px; - border: none; - background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1)); - box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset, - 0 0 0 1px hsla(0,0%,100%,.3) inset, - 0 0 0 1px hsla(210,54%,20%,.25), - 0 1px 0 hsla(210,54%,20%,.35); - transition-property: background-color, box-shadow; - transition-duration: 250ms; + border-radius: 10000px; + padding: 5px; + border: none; + background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1)); + box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset, + 0 0 0 1px hsla(0,0%,100%,.3) inset, + 0 0 0 1px hsla(210,54%,20%,.25), + 0 1px 0 hsla(210,54%,20%,.35); + transition-property: background-color, box-shadow; + transition-duration: 250ms; } @conditionalForwardWithUrlbar@ > #back-button:not([disabled="true"]):not([open="true"]):not(:active):hover > .toolbarbutton-icon { - background-color: hsla(210,48%,96%,.75); - box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset, - 0 0 0 1px hsla(0,0%,100%,.3) inset, - 0 0 0 1px hsla(210,54%,20%,.3), - 0 1px 0 hsla(210,54%,20%,.4), - 0 0 4px hsla(210,54%,20%,.2); + background-color: hsla(210,48%,96%,.75); + box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset, + 0 0 0 1px hsla(0,0%,100%,.3) inset, + 0 0 0 1px hsla(210,54%,20%,.3), + 0 1px 0 hsla(210,54%,20%,.4), + 0 0 4px var(--toolbarbutton-border-color); } @conditionalForwardWithUrlbar@ > #back-button:not([disabled="true"]):hover:active > .toolbarbutton-icon, @conditionalForwardWithUrlbar@ > #back-button[open="true"] > .toolbarbutton-icon { - background-color: hsla(210,54%,20%,.15); - box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset, - 0 0 1px hsla(210,54%,20%,.2) inset, - 0 0 0 1px hsla(210,54%,20%,.4), - 0 1px 0 hsla(210,54%,20%,.2); - transition: none; + background-color: hsla(210,54%,20%,.15); + box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset, + 0 0 1px var(--toolbarbutton-border-color) inset, + 0 0 0 1px hsla(210,54%,20%,.4), + 0 1px 0 var(--toolbarbutton-border-color); + transition: none; } @conditionalForwardWithUrlbar@ > #back-button[disabled] > .toolbarbutton-icon { - box-shadow: 0 0 0 1px hsla(210,54%,20%,.55), - 0 1px 0 hsla(210,54%,20%,.65); - transition: none; + box-shadow: 0 0 0 1px hsla(210,54%,20%,.55), + 0 1px 0 hsla(210,54%,20%,.65); + transition: none; } .unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr), .unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl) { - list-style-image: url("chrome://browser/skin/menu-back.png") !important; + list-style-image: url("chrome://browser/skin/menu-back.png") !important; } .unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr), .unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl) { - list-style-image: url("chrome://browser/skin/menu-forward.png") !important; + list-style-image: url("chrome://browser/skin/menu-forward.png") !important; } #stop-button { - -moz-image-region: rect(0, 54px, 18px, 36px); + -moz-image-region: rect(0, 54px, 18px, 36px); } #reload-button { - -moz-image-region: rect(0, 72px, 18px, 54px); + -moz-image-region: rect(0, 72px, 18px, 54px); } #home-button.bookmark-item { - list-style-image: url("chrome://browser/skin/Toolbar.png"); + list-style-image: var(--toolbarbutton-image); } + toolbar[brighttext] #home-button.bookmark-item { - list-style-image: url("chrome://browser/skin/Toolbar-inverted.png"); + list-style-image: var(--toolbarbutton-inverted-image); } #home-button { - -moz-image-region: rect(0, 90px, 18px, 72px); + -moz-image-region: rect(0, 90px, 18px, 72px); } #downloads-button { - -moz-image-region: rect(0, 108px, 18px, 90px); + -moz-image-region: rect(0, 108px, 18px, 90px); } #history-button, #history-menu-button { - -moz-image-region: rect(0, 126px, 18px, 108px); + -moz-image-region: rect(0, 126px, 18px, 108px); } #bookmarks-button, #bookmarks-menu-button { - -moz-image-region: rect(0, 144px, 18px, 126px); + -moz-image-region: rect(0, 144px, 18px, 126px); } #bookmarks-menu-button.bookmark-item { - list-style-image: url("chrome://browser/skin/Toolbar.png"); + list-style-image: var(--toolbarbutton-image); } toolbar[brighttext] #bookmarks-menu-button.bookmark-item { - list-style-image: url("chrome://browser/skin/Toolbar-inverted.png"); + list-style-image: var(--toolbarbutton-inverted-image); } #print-button { - -moz-image-region: rect(0, 162px, 18px, 144px); + -moz-image-region: rect(0, 162px, 18px, 144px); } #new-tab-button { - -moz-image-region: rect(0, 180px, 18px, 162px); + -moz-image-region: rect(0, 180px, 18px, 162px); } #new-window-button { - -moz-image-region: rect(0, 198px, 18px, 180px); + -moz-image-region: rect(0, 198px, 18px, 180px); } #cut-button { - -moz-image-region: rect(0, 216px, 18px, 198px); + -moz-image-region: rect(0, 216px, 18px, 198px); } #copy-button { - -moz-image-region: rect(0, 234px, 18px, 216px); + -moz-image-region: rect(0, 234px, 18px, 216px); } #paste-button { - -moz-image-region: rect(0, 252px, 18px, 234px); + -moz-image-region: rect(0, 252px, 18px, 234px); } #fullscreen-button { - -moz-image-region: rect(0, 270px, 18px, 252px); + -moz-image-region: rect(0, 270px, 18px, 252px); } #zoom-out-button { - -moz-image-region: rect(0, 288px, 18px, 270px); + -moz-image-region: rect(0, 288px, 18px, 270px); } #zoom-in-button { - -moz-image-region: rect(0, 306px, 18px, 288px); + -moz-image-region: rect(0, 306px, 18px, 288px); } #sync-button { - -moz-image-region: rect(0, 324px, 18px, 306px); + -moz-image-region: rect(0, 324px, 18px, 306px); } #sync-button[status="active"] { - list-style-image: url("chrome://browser/skin/sync-throbber.png"); - -moz-image-region: rect(0, 18px, 18px, 0); + list-style-image: url("chrome://browser/skin/sync-throbber.png"); + -moz-image-region: rect(0, 18px, 18px, 0); } #feed-button { - -moz-image-region: rect(0, 342px, 18px, 324px); + -moz-image-region: rect(0, 342px, 18px, 324px); } %ifdef MOZ_WEBRTC #webrtc-status-button { - -moz-image-region: rect(0, 360px, 18px, 342px); + -moz-image-region: rect(0, 360px, 18px, 342px); } %endif @@ -821,211 +890,211 @@ toolbar[brighttext] #bookmarks-menu-button.bookmark-item { #urlbar, .searchbar-textbox { - -moz-appearance: none; - margin: 1px 3px; - padding: 0; - background-clip: padding-box; - border: 1px solid ThreeDShadow; - border-radius: 2px; + -moz-appearance: none; + margin: 1px 3px; + padding: 0; + background-clip: padding-box; + border: 1px solid ThreeDShadow; + border-radius: 2px; } #urlbar { - width: 7em; - -moz-padding-end: 2px; + width: 7em; + padding-inline-end: 2px; } @media (-moz-mac-lion-theme) { - #urlbar, - .searchbar-textbox { - @navbarTextboxCustomBorder@ - } + #urlbar, + .searchbar-textbox { + @navbarTextboxCustomBorder@ + } } #urlbar:-moz-lwtheme, .searchbar-textbox:-moz-lwtheme { - background-color: rgba(255,255,255,.8); - @navbarTextboxCustomBorder@ - color: black; + background-color: rgba(255,255,255,.8); + @navbarTextboxCustomBorder@ + color: black; } @conditionalForwardWithUrlbar@ + #urlbar-container { - padding-left: @conditionalForwardWithUrlbarWidth@px; - -moz-margin-start: -@conditionalForwardWithUrlbarWidth@px; - position: relative; - pointer-events: none; + padding-left: @conditionalForwardWithUrlbarWidth@px; + margin-inline-start: -@conditionalForwardWithUrlbarWidth@px; + position: relative; + pointer-events: none; } @conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar { - -moz-border-start: none; - margin-left: 0; - pointer-events: all; + border-inline-start: none; + margin-left: 0; + pointer-events: all; } @conditionalForwardWithUrlbar@:not([switchingtabs]) + #urlbar-container > #urlbar { - transition: margin-left @forwardTransitionLength@ ease-out; + transition: margin-left @forwardTransitionLength@ ease-out; } @conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(ltr) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; + border-top-left-radius: 0; + border-bottom-left-radius: 0; } @conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(rtl) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 0; } @conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container { - clip-path: url("chrome://browser/content/browser.xul#windows-urlbar-back-button-clip-path"); + clip-path: url("chrome://browser/content/browser.xul#windows-urlbar-back-button-clip-path"); } @conditionalForwardWithUrlbar@ + #urlbar-container:-moz-locale-dir(rtl), @conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(rtl) { - /* let windows-urlbar-back-button-mask clip the urlbar's right side for RTL */ - transform: scaleX(-1); + /* let windows-urlbar-back-button-mask clip the urlbar's right side for RTL */ + transform: scaleX(-1); } html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, .searchbar-textbox:-moz-lwtheme > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input::-moz-placeholder { - opacity: 1.0; - color: #777; + opacity: 1.0; + color: #777; } #urlbar:-moz-lwtheme[focused="true"], .searchbar-textbox:-moz-lwtheme[focused="true"] { - background-color: white; + background-color: white; } #urlbar-container { - -moz-box-orient: horizontal; - -moz-box-align: stretch; + -moz-box-orient: horizontal; + -moz-box-align: stretch; } .urlbar-textbox-container { - -moz-box-align: stretch; + -moz-box-align: stretch; } .urlbar-input-box { - -moz-margin-start: 0; - min-width: 4em; + margin-inline-start: 0; + min-width: 4em; } #urlbar-icons { - -moz-box-align: center; + -moz-box-align: center; } .urlbar-icon { - padding: 0 3px; + padding: 0 3px; } .searchbar-engine-button, .search-go-container { - padding: 2px 2px; + padding: 2px 2px; } .urlbar-icon:hover { - background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.3), hsla(200,100%,70%,0)); + background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.3), hsla(200,100%,70%,0)); } .urlbar-icon[open="true"], .urlbar-icon:hover:active { - background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.1), hsla(200,100%,70%,0)); + background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.1), hsla(200,100%,70%,0)); } #urlbar-search-splitter { - min-width: 6px; - -moz-margin-start: -3px; - border: none; - background: transparent; + min-width: 6px; + margin-inline-start: -3px; + border: none; + background: transparent; } #urlbar-search-splitter + #urlbar-container > #urlbar , #urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox { - -moz-margin-start: 0; + margin-inline-start: 0; } #urlbar-display-box { - -moz-border-end: 1px solid #AAA; - -moz-margin-end: 3px; + border-inline-end: 1px solid #AAA; + margin-inline-end: 3px; } #urlbar-display { - margin-top: 0; - margin-bottom: 0; - -moz-margin-start: 0; - color: GrayText; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + color: GrayText; } /* identity box */ #identity-box { - padding: 2px; - font-size: .9em; + padding: 2px; + font-size: .9em; } #identity-box:-moz-locale-dir(ltr) { - border-top-left-radius: 1.5px; - border-bottom-left-radius: 1.5px; + border-top-left-radius: 1.5px; + border-bottom-left-radius: 1.5px; } #identity-box:-moz-locale-dir(rtl) { - border-top-right-radius: 1.5px; - border-bottom-right-radius: 1.5px; + border-top-right-radius: 1.5px; + border-bottom-right-radius: 1.5px; } #notification-popup-box:not([hidden]) + #identity-box { - -moz-padding-start: 10px; - border-radius: 0; + padding-inline-start: 10px; + border-radius: 0; } @conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar > #identity-box { - border-radius: 0; + border-radius: 0; } #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { - color: hsl(92,100%,30%); - -moz-margin-end: 4px; - background-image: -moz-linear-gradient(hsla(92,81%,16%,0), - hsla(92,81%,16%,.08) 25%, - hsla(92,81%,16%,.08) 75%, - hsla(92,81%,16%,0)); - background-position: right; - background-repeat: no-repeat; + color: hsl(92,100%,30%); + margin-inline-end: 4px; + background-image: -moz-linear-gradient(hsla(92,81%,16%,0), + hsla(92,81%,16%,.08) 25%, + hsla(92,81%,16%,.08) 75%, + hsla(92,81%,16%,0)); + background-position: right; + background-repeat: no-repeat; } #urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain { - color: rgb(0,79,168); - -moz-margin-end: 4px; - background-image: -moz-linear-gradient(rgba(0,79,168,0), - rgba(0,79,168,.08) 25%, - rgba(0,79,168,.08) 75%, - rgba(0,79,168,0)); - background-position: right; - background-repeat: no-repeat; + color: rgb(0,79,168); + margin-inline-end: 4px; + background-image: -moz-linear-gradient(rgba(0,79,168,0), + rgba(0,79,168,.08) 25%, + rgba(0,79,168,.08) 75%, + rgba(0,79,168,0)); + background-position: right; + background-repeat: no-repeat; } #identity-box.verifiedIdentity:-moz-locale-dir(rtl) { - background-position: left; + background-position: left; } #identity-box.verifiedIdentity:not(:-moz-lwtheme) { - background-color: #fff; - box-shadow: inset 0 0 2px rgb(0,168,0); + background-color: #fff; + box-shadow: inset 0 0 2px rgb(0,168,0); } #identity-box.verifiedDomain:not(:-moz-lwtheme) { - background-color: rgb(224,234,247); - box-shadow: inset 0 0 2px rgb(0,79,168); + background-color: rgb(224,234,247); + box-shadow: inset 0 0 2px rgb(0,79,168); } #identity-box:-moz-focusring { - outline: 1px dotted #000; - outline-offset: -3px; + outline: 1px dotted #000; + outline-offset: -3px; } #identity-icon-labels { - -moz-padding-start: 2px; - -moz-padding-end: 5px; + padding-inline-start: 2px; + padding-inline-end: 5px; } /* Address bar shading for SSL */ @@ -1062,282 +1131,282 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, /* Location bar dropmarker */ .urlbar-history-dropmarker { - -moz-appearance: none; - padding: 0 3px; - background-color: transparent; - border: none; - width: auto; - list-style-image: url("chrome://browser/skin/urlbar-history-dropmarker.png"); - -moz-image-region: rect(0px, 11px, 14px, 0px); + -moz-appearance: none; + padding: 0 3px; + background-color: transparent; + border: none; + width: auto; + list-style-image: url("chrome://browser/skin/urlbar-history-dropmarker.png"); + -moz-image-region: rect(0px, 11px, 14px, 0px); } .urlbar-history-dropmarker:hover { - background-image: radial-gradient(circle closest-side, hsla(205,100%,70%,.3), hsla(205,100%,70%,0)); - -moz-image-region: rect(0px, 22px, 14px, 11px); + background-image: radial-gradient(circle closest-side, hsla(205,100%,70%,.3), hsla(205,100%,70%,0)); + -moz-image-region: rect(0px, 22px, 14px, 11px); } .urlbar-history-dropmarker:hover:active, .urlbar-history-dropmarker[open="true"] { - background-image: radial-gradient(circle closest-side, hsla(205,100%,70%,.1), hsla(205,100%,70%,0)); - -moz-image-region: rect(0px, 33px, 14px, 22px); + background-image: radial-gradient(circle closest-side, hsla(205,100%,70%,.1), hsla(205,100%,70%,0)); + -moz-image-region: rect(0px, 33px, 14px, 22px); } /* page proxy icon */ #page-proxy-favicon { - width: 16px; - height: 16px; - margin-top: 1px; - margin-bottom: 1px; - -moz-margin-start: 3px; - -moz-margin-end: 2px; - list-style-image: url(chrome://browser/skin/identity-icons-generic.png); - -moz-image-region: rect(0, 16px, 16px, 0); + width: 16px; + height: 16px; + margin-top: 1px; + margin-bottom: 1px; + margin-inline-start: 3px; + margin-inline-end: 2px; + list-style-image: url(chrome://browser/skin/identity-icons-generic.png); + -moz-image-region: rect(0, 16px, 16px, 0); } @conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar > #identity-box > #page-proxy-favicon { - -moz-margin-end: 1px; + margin-inline-end: 1px; } /* Since we already have a padlock, always use the generic icon until the favicon loads .verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https.png); + list-style-image: url(chrome://browser/skin/identity-icons-https.png); } .verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-ev.png); + list-style-image: url(chrome://browser/skin/identity-icons-https-ev.png); } .mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active.png); + list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active.png); } */ #identity-box:hover > #page-proxy-favicon { - -moz-image-region: rect(0, 32px, 16px, 16px); + -moz-image-region: rect(0, 32px, 16px, 16px); } #identity-box:hover:active > #page-proxy-favicon, #identity-box[open=true] > #page-proxy-favicon { - -moz-image-region: rect(0, 48px, 16px, 32px); + -moz-image-region: rect(0, 48px, 16px, 32px); } #page-proxy-favicon[pageproxystate="invalid"] { - opacity: 0.3; + opacity: 0.3; } /* autocomplete */ #treecolAutoCompleteImage { - max-width: 36px; + max-width: 36px; } .ac-result-type-bookmark, .autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/bookmark.png"); - -moz-image-region: rect(0px 48px 16px 32px); - width: 16px; - height: 16px; + list-style-image: url("chrome://browser/skin/places/bookmark.png"); + -moz-image-region: rect(0px 48px 16px 32px); + width: 16px; + height: 16px; } .ac-result-type-keyword, .autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) { - list-style-image: url(chrome://global/skin/icons/search-textbox.png); - margin: 2px; - width: 12px; - height: 12px; + list-style-image: url(chrome://global/skin/icons/search-textbox.png); + margin: 2px; + width: 12px; + height: 12px; } .ac-result-type-tag, .autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/tag.png"); - width: 16px; - height: 16px; + list-style-image: url("chrome://browser/skin/places/tag.png"); + width: 16px; + height: 16px; } .ac-comment { - font-size: 1.06em; + font-size: 1.06em; } .ac-extra > .ac-comment { - font-size: 1em; + font-size: 1em; } .ac-url-text, .ac-action-text { - font-size: 1em; - color: -moz-nativehyperlinktext; + font-size: 1em; + color: -moz-nativehyperlinktext; } @media (-moz-mac-lion-theme) { - .ac-url-text:not([selected="true"]), - .ac-action-text:not([selected="true"]) { - color: #008800; - } + .ac-url-text:not([selected="true"]), + .ac-action-text:not([selected="true"]) { + color: #008800; + } } richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon { - list-style-image: url("chrome://browser/skin/actionicon-tab.png"); - -moz-image-region: rect(0, 16px, 11px, 0); - padding: 0 3px; + list-style-image: url("chrome://browser/skin/actionicon-tab.png"); + -moz-image-region: rect(0, 16px, 11px, 0); + padding: 0 3px; } richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-box > .ac-action-icon { - -moz-image-region: rect(11px, 16px, 22px, 0); + -moz-image-region: rect(11px, 16px, 22px, 0); } .ac-comment[selected="true"], .ac-url-text[selected="true"], .ac-action-text[selected="true"] { - color: inherit !important; + color: inherit !important; } .autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) { - color: GrayText; + color: GrayText; } .autocomplete-treebody::-moz-tree-cell-text(suggesthint, treecolAutoCompleteComment), .autocomplete-treebody::-moz-tree-cell-text(suggestfirst, treecolAutoCompleteComment) { - color: GrayText; - font-size: smaller; + color: GrayText; + font-size: smaller; } .autocomplete-treebody::-moz-tree-cell(suggesthint) { - border-top: 1px solid GrayText; + border-top: 1px solid GrayText; } /* combined go/reload/stop button in location bar */ #go-button, #urlbar > toolbarbutton { - -moz-appearance: none; - padding: 0 2px; - background-origin: border-box; - border: none; - list-style-image: url("chrome://browser/skin/reload-stop-go.png"); + -moz-appearance: none; + padding: 0 2px; + background-origin: border-box; + border: none; + list-style-image: url("chrome://browser/skin/reload-stop-go.png"); } #go-button { - padding: 0 3px; + padding: 0 3px; } #urlbar-reload-button { - -moz-image-region: rect(0, 14px, 14px, 0); + -moz-image-region: rect(0, 14px, 14px, 0); } #urlbar-reload-button:not([disabled]):hover { - background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.2), hsla(200,100%,70%,0)); - -moz-image-region: rect(14px, 14px, 28px, 0); + background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.2), hsla(200,100%,70%,0)); + -moz-image-region: rect(14px, 14px, 28px, 0); } #urlbar-reload-button:not([disabled]):hover:active { - background-image: radial-gradient(circle closest-side, hsla(200,100%,60%,.1), hsla(200,100%,60%,0)); - -moz-image-region: rect(28px, 14px, 42px, 0); + background-image: radial-gradient(circle closest-side, hsla(200,100%,60%,.1), hsla(200,100%,60%,0)); + -moz-image-region: rect(28px, 14px, 42px, 0); } #urlbar-reload-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { - transform: scaleX(-1); + transform: scaleX(-1); } #go-button, #urlbar-go-button { - -moz-image-region: rect(0, 42px, 14px, 28px); + -moz-image-region: rect(0, 42px, 14px, 28px); } #go-button:hover, #urlbar-go-button:hover { - background-image: radial-gradient(circle closest-side, hsla(110,70%,50%,.2), hsla(110,70%,50%,0)); - -moz-image-region: rect(14px, 42px, 28px, 28px); + background-image: radial-gradient(circle closest-side, hsla(110,70%,50%,.2), hsla(110,70%,50%,0)); + -moz-image-region: rect(14px, 42px, 28px, 28px); } #go-button:hover:active, #urlbar-go-button:hover:active { - background-image: radial-gradient(circle closest-side, hsla(110,70%,50%,.1), hsla(110,70%,50%,0)); - -moz-image-region: rect(28px, 42px, 42px, 28px); + background-image: radial-gradient(circle closest-side, hsla(110,70%,50%,.1), hsla(110,70%,50%,0)); + -moz-image-region: rect(28px, 42px, 42px, 28px); } #go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon, #urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { - transform: scaleX(-1); + transform: scaleX(-1); } #urlbar-stop-button { - -moz-image-region: rect(0, 28px, 14px, 14px); + -moz-image-region: rect(0, 28px, 14px, 14px); } #urlbar-stop-button:not([disabled]):hover { - background-image: radial-gradient(circle closest-side, hsla(5,100%,75%,.3), hsla(5,100%,75%,0)); - -moz-image-region: rect(14px, 28px, 28px, 14px); + background-image: radial-gradient(circle closest-side, hsla(5,100%,75%,.3), hsla(5,100%,75%,0)); + -moz-image-region: rect(14px, 28px, 28px, 14px); } #urlbar-stop-button:hover:active { - background-image: radial-gradient(circle closest-side, hsla(5,100%,75%,.1), hsla(5,100%,75%,0)); - -moz-image-region: rect(28px, 28px, 42px, 14px); + background-image: radial-gradient(circle closest-side, hsla(5,100%,75%,.1), hsla(5,100%,75%,0)); + -moz-image-region: rect(28px, 28px, 42px, 14px); } /* popup blocker button */ #page-report-button { - list-style-image: url("chrome://browser/skin/urlbar-popup-blocked.png"); - -moz-image-region: rect(0, 16px, 16px, 0); + list-style-image: url("chrome://browser/skin/urlbar-popup-blocked.png"); + -moz-image-region: rect(0, 16px, 16px, 0); } #page-report-button:hover { - -moz-image-region: rect(0, 32px, 16px, 16px); + -moz-image-region: rect(0, 32px, 16px, 16px); } #page-report-button:hover:active, #page-report-button[open="true"] { - -moz-image-region: rect(0, 48px, 16px, 32px); + -moz-image-region: rect(0, 48px, 16px, 32px); } /* star button */ #star-button { - list-style-image: url("chrome://browser/skin/places/bookmark.png"); - -moz-image-region: rect(0px 16px 16px 0px); + list-style-image: url("chrome://browser/skin/places/bookmark.png"); + -moz-image-region: rect(0px 16px 16px 0px); } #star-button:hover { - background-image: radial-gradient(circle closest-side, hsla(45,100%,73%,.3), hsla(45,100%,73%,0)); - -moz-image-region: rect(0px 32px 16px 16px); + background-image: radial-gradient(circle closest-side, hsla(45,100%,73%,.3), hsla(45,100%,73%,0)); + -moz-image-region: rect(0px 32px 16px 16px); } #star-button:hover:active { - background-image: radial-gradient(circle closest-side, hsla(45,100%,73%,.1), hsla(45,100%,73%,0)); - -moz-image-region: rect(0px 48px 16px 32px); + background-image: radial-gradient(circle closest-side, hsla(45,100%,73%,.1), hsla(45,100%,73%,0)); + -moz-image-region: rect(0px 48px 16px 32px); } #star-button[starred] { - list-style-image: url("chrome://browser/skin/places/editBookmark.png"); + list-style-image: url("chrome://browser/skin/places/editBookmark.png"); } /* bookmarking panel */ #editBookmarkPanelStarIcon { - list-style-image: url("chrome://browser/skin/places/starred48.png"); - width: 48px; - height: 48px; + list-style-image: url("chrome://browser/skin/places/starred48.png"); + width: 48px; + height: 48px; } #editBookmarkPanelStarIcon[unstarred] { - list-style-image: url("chrome://browser/skin/places/unstarred48.png"); + list-style-image: url("chrome://browser/skin/places/unstarred48.png"); } #editBookmarkPanelTitle { - font-size: 130%; + font-size: 130%; } #editBookmarkPanelHeader, #editBookmarkPanelContent { - margin-bottom: .5em; + margin-bottom: .5em; } /* Implements editBookmarkPanel resizing on folderTree un-collapse. */ #editBMPanel_folderTree { - min-width: 27em; + min-width: 27em; } /* BOOKMARKING PANEL */ @@ -1374,7 +1443,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- border-radius: 3px; border: 1px solid rgba(0,0,0,.3) !important; box-shadow: inset 0 1px 1px 1px rgba(0,0,0,.05), - 0 1px rgba(255,255,255,.3); + 0 1px rgba(255,255,255,.3); margin: 0; padding: 3px 6px; } @@ -1414,7 +1483,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- } .editBookmarkPanelBottomButton:last-child { - -moz-margin-start: 8px; + margin-inline-start: 8px; } /* The following elements come from editBookmarkOverlay.xul. Styling that's @@ -1429,8 +1498,8 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- border-radius: 0 0 3px 3px; border: 1px solid #a5a5a5; box-shadow: inset 0 1px rgba(255,255,255,.8), - inset 0 0 1px rgba(255,255, 255,.25), - 0 1px rgba(255,255,255,.3); + inset 0 0 1px rgba(255,255, 255,.25), + 0 1px rgba(255,255,255,.3); margin: 0; padding: 0; height: 20px; @@ -1439,7 +1508,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- #editBMPanel_newFolderButton { -moz-appearance: none; border: 0 solid #a5a5a5; - -moz-border-end-width: 1px; + border-inline-end-width: 1px; padding: 0 9px; margin: 0; min-width: 21px; @@ -1470,8 +1539,8 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- min-height: 22px; padding-top: 2px; padding-bottom: 1px; - -moz-padding-start: 8px; - -moz-padding-end: 4px; + padding-inline-start: 8px; + padding-inline-end: 4px; } #editBMPanel_folderMenuList:-moz-focusring { @@ -1490,7 +1559,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- border: 0; margin: 0; padding: 0; - -moz-padding-end: 4px; + padding-inline-end: 4px; width: 7px; } @@ -1508,7 +1577,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- border-radius: 3px; border: 1px solid rgba(0,0,0,.3); box-shadow: inset 0 1px 1px 1px rgba(0,0,0,.05), - 0 1px rgba(255,255,255,.3); + 0 1px rgba(255,255,255,.3); margin: 0; } @@ -1534,7 +1603,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- #editBookmarkPanel .expander-down { @hudButton@ margin: 0; - -moz-margin-start: 4px; + margin-inline-start: 4px; min-width: 27px; min-height: 22px; } @@ -1569,16 +1638,16 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- @media (min-resolution: 2dppx) { #editBookmarkPanel .expander-up { - list-style-image: url("chrome://browser/skin/panel-expander-open@2x.png"); + list-style-image: url("chrome://browser/skin/panel-expander-open@2x.png"); } #editBookmarkPanel .expander-down { - list-style-image: url("chrome://browser/skin/panel-expander-closed@2x.png"); + list-style-image: url("chrome://browser/skin/panel-expander-closed@2x.png"); } #editBookmarkPanel .expander-up > .button-box > .button-icon, #editBookmarkPanel .expander-down > .button-box > .button-icon { - width: 9px; + width: 9px; } } @@ -1594,40 +1663,40 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- /* ::::: content area ::::: */ #sidebar { - background-color: Window; + background-color: Window; } #sidebar-title { - -moz-padding-start: 0px; + padding-inline-start: 0px; } /* ::::: throbber ::::: */ #navigator-throbber { - width: 16px; - min-height: 16px; - margin: 0 3px; + width: 16px; + min-height: 16px; + margin: 0 3px; } #navigator-throbber[busy="true"] { - list-style-image: url("chrome://global/skin/icons/loading_16.png"); + list-style-image: url("chrome://global/skin/icons/loading_16.png"); } #navigator-throbber, #wrapper-navigator-throbber > #navigator-throbber { - list-style-image: url("chrome://global/skin/icons/notloading_16.png"); + list-style-image: url("chrome://global/skin/icons/notloading_16.png"); } /* Tabstrip */ #TabsToolbar { - min-height: 0; - padding: 0; + min-height: 0; + padding: 0; } #TabsToolbar:not(:-moz-lwtheme), #TabsToolbar[tabsontop=false] { - background-image: linear-gradient(to top, @toolbarShadowColor@ 1px, rgba(0,0,0,.05) 1px, transparent 50%); + background-image: linear-gradient(to top, @toolbarShadowColor@ 1px, rgba(0,0,0,.05) 1px, transparent 50%); } /* When the tab bar is collapsed, show a 1px border in its place. */ @@ -1642,50 +1711,50 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- } @media (-moz-mac-lion-theme) { - #main-window[sizemode=normal] #TabsToolbar { - padding-left: 2px; - padding-right: 2px; - } + #main-window[sizemode=normal] #TabsToolbar { + padding-left: 2px; + padding-right: 2px; + } } /* remove 5 pixel border on left and right of browser screen */ .tabbrowser-tabbox { - margin: 0; + margin: 0; } .tabbrowser-tab, .tabs-newtab-button { - -moz-appearance: none; - background: @toolbarShadowOnTab@, @bgTabTexture@, - linear-gradient(-moz-dialog, -moz-dialog); - background-clip: padding-box; - padding: 3px 1px 4px; - /* Setting a transparent outer border allows us to have a 1px gap - between the tabs and the top edge of the screen, even when the - tabs have a top margin of 0, which is important for Fitts' law - compliance */ - border: 2px solid; - border-bottom: none; - border-radius: 6px 6px 0px 0px; - -moz-border-top-colors: transparent #929292; - -moz-border-left-colors: transparent #929292; - -moz-border-right-colors: transparent #929292; - /* Hide the transparent top border by default */ - margin-top: -1px; - /* Reduce the gap between the tabs */ - -moz-margin-start: -1px; - box-shadow: inset 0.5px 1px 1px rgba(255,255,255,.7); + -moz-appearance: none; + background: @toolbarShadowOnTab@, var(--tab-background), + linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color)); + background-clip: padding-box; + padding: 3px 1px 4px; + /* Setting a transparent outer border allows us to have a 1px gap + between the tabs and the top edge of the screen, even when the + tabs have a top margin of 0, which is important for Fitts' law + compliance */ + border: 1.6px solid; + border-bottom: none; + border-radius: var(--tab-border-radius) var(--tab-border-radius) 0px 0px; + -moz-border-top-colors: transparent #929292; + -moz-border-left-colors: transparent #929292; + -moz-border-right-colors: transparent #929292; + /* Hide the transparent top border by default */ + margin-top: -1px; + /* Reduce the gap between the tabs */ + margin-inline-start: -1px; + box-shadow: var(--tab-box-shadow); } .tabbrowser-tab { - -moz-padding-end: 3px; + padding-inline-end: 3px; } /* Override the default (globally-set) tab width values; increase by 2px to compensate for the transparent outer border of the tabs */ .tabbrowser-tab:not([pinned]) { - max-width: 252px; - min-width: 102px; + max-width: 252px; + min-width: 102px; } /* When the tabs are on top and the window is maximized or in full- @@ -1695,32 +1764,24 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- #main-window[sizemode="maximized"][tabsontop=true] .tabs-newtab-button, #main-window[sizemode="fullscreen"][tabsontop=true] .tabbrowser-tab, #main-window[sizemode="fullscreen"][tabsontop=true] .tabs-newtab-button { - margin-top: 0px; -} - -/* make the tab text colors match those of the Windows client */ -@media (-moz-mac-lion-theme) { - tab { - text-shadow: none; - color: black !important; - } + margin-top: 0px; } .tabbrowser-tab:hover, .tabs-newtab-button:hover { - background-image: @toolbarShadowOnTab@, @bgTabTextureHover@, - linear-gradient(-moz-dialog, -moz-dialog); + background-image: @toolbarShadowOnTab@, var(--tab-background-hover), + linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color)); } .tabbrowser-tab[selected="true"] { - background-image: linear-gradient(@selectedTabHighlight@, @toolbarHighlight@ 50%), - linear-gradient(-moz-dialog, -moz-dialog); + background-image: linear-gradient(var(--tab-selected-highlight), var(--toolbar-highlight-top) 50%), + linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color)); } #main-window[tabsontop=false]:not([disablechrome]) .tabbrowser-tab[selected=true]:not(:-moz-lwtheme) { - background-image: @toolbarShadowOnTab@, - linear-gradient(@selectedTabHighlight@, @toolbarHighlight@ 50%), - linear-gradient(-moz-dialog, -moz-dialog); + background-image: @toolbarShadowOnTab@, + linear-gradient(var(--tab-selected-highlight), var(--toolbar-highlight-top) 50%), + linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color)); } .tabbrowser-tab[visuallyselected=true]:not(:-moz-lwtheme) { @@ -1736,105 +1797,105 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- /* Remove highlight fuzz on dark themes */ .tabbrowser-tab:-moz-lwtheme-brighttext, .tabs-newtab-button:-moz-lwtheme-brighttext { - box-shadow:none; - -moz-border-top-colors: transparent #707070; - -moz-border-left-colors: transparent #707070; - -moz-border-right-colors: transparent #707070; + box-shadow:none; + -moz-border-top-colors: transparent #707070; + -moz-border-left-colors: transparent #707070; + -moz-border-right-colors: transparent #707070; } .tabbrowser-tab[selected="true"]:-moz-lwtheme { - background-image: linear-gradient(rgba(255,255,255,.6), rgba(255,255,255,.8) 50%); + background-image: linear-gradient(var(--tab-selected-highlight), var(--toolbar-highlight-top) 50%); } .tabbrowser-tab[selected="true"]:-moz-lwtheme-brighttext { - background-image: linear-gradient(rgba(128,128,128,.9), rgba(32,32,32,.9) 50%, rgba(32,32,32,.9) 80%, rgba(32,32,32,.8) 100%); - -moz-border-top-colors: transparent #D0D0D0; - -moz-border-left-colors: transparent #D0D0D0; - -moz-border-right-colors: transparent #D0D0D0; + background-image: linear-gradient(rgba(128,128,128,.9), rgba(32,32,32,.9) 50%, rgba(32,32,32,.9) 80%, var(--toolbar-highlight-top) 100%); + -moz-border-top-colors: transparent #D0D0D0; + -moz-border-left-colors: transparent #D0D0D0; + -moz-border-right-colors: transparent #D0D0D0; } .tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]), .tabs-newtab-button:-moz-lwtheme-brighttext { - background-image: linear-gradient(hsla(0,0%,25%,.4), hsla(0,0%,15%,.6) 80%); + background-image: linear-gradient(hsla(0,0%,25%,.4), hsla(0,0%,15%,.6) 80%); } .tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]):hover, .tabs-newtab-button:-moz-lwtheme-brighttext:hover { - background-image: linear-gradient(hsla(0,0%,60%,.4), hsla(0,0%,10%,.8) 80%); + background-image: linear-gradient(hsla(0,0%,60%,.4), hsla(0,0%,10%,.8) 80%); } .tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]), .tabs-newtab-button:-moz-lwtheme-darktext { - background-image: linear-gradient(hsla(0,0%,75%,.4), hsla(0,0%,85%,.6) 80%); + background-image: linear-gradient(hsla(0,0%,75%,.4), hsla(0,0%,85%,.6) 80%); } .tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]):hover, .tabs-newtab-button:-moz-lwtheme-darktext:hover { - background-image: linear-gradient(hsla(0,0%,60%,.4), hsla(0,0%,90%,.8) 80%); + background-image: linear-gradient(hsla(0,0%,60%,.4), hsla(0,0%,90%,.8) 80%); } .tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) { - background-image: radial-gradient(circle farthest-corner at 50% 3px, rgba(255,255,255,1) 3%, rgba(186,221,251,.75) 40%, rgba(127,179,255,.5) 80%, rgba(127,179,255,.25)); + background-image: radial-gradient(circle farthest-corner at 50% 3px, rgba(255,255,255,1) 3%, rgba(186,221,251,.75) 40%, rgba(127,179,255,.5) 80%, rgba(127,179,255,.25)); } .tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover { - background-image: linear-gradient(hsla(0,0%,100%,.4), hsla(0,0%,75%,.4) 80%), - radial-gradient(circle farthest-corner at 50% 3px, rgba(255,255,255,1) 3%, rgba(186,221,251,.75) 40%, rgba(127,179,255,.5) 80%, rgba(127,179,255,.25)); + background-image: linear-gradient(hsla(0,0%,100%,.4), hsla(0,0%,75%,.4) 80%), + radial-gradient(circle farthest-corner at 50% 3px, rgba(255,255,255,1) 3%, rgba(186,221,251,.75) 40%, rgba(127,179,255,.5) 80%, rgba(127,179,255,.25)); } .tab-throbber, .tab-icon-image { - width: 16px; - height: 16px; - list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); - -moz-margin-start: 2px; - -moz-margin-end: 3px; + width: 16px; + height: 16px; + list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); + margin-inline-start: 2px; + margin-inline-end: 3px; } .tab-throbber { - list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png"); + list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png"); } .tab-throbber[progress] { - list-style-image: url("chrome://browser/skin/tabbrowser/loading.png"); + list-style-image: url("chrome://browser/skin/tabbrowser/loading.png"); } .tab-throbber[pinned], .tab-icon-image[pinned] { - -moz-margin-start: 5px; - -moz-margin-end: 5px; + margin-inline-start: 5px; + margin-inline-end: 5px; } /* tabbrowser-tab focus ring */ .tabbrowser-tab:focus > .tab-stack { - outline: 1px dotted; + outline: 1px dotted; } /* Tab DnD indicator */ .tab-drop-indicator { - list-style-image: url(chrome://browser/skin/tabbrowser/tabDragIndicator.png); - margin-bottom: -11px; + list-style-image: url(chrome://browser/skin/tabbrowser/tabDragIndicator.png); + margin-bottom: -11px; } /* Tab close button */ .tab-close-button { - -moz-appearance: none; - border: none; - padding: 0px; + -moz-appearance: none; + border: none; + padding: 0px; } .tab-close-button:-moz-lwtheme-brighttext { - list-style-image: url("chrome://global/skin/icons/close-inverted.png"); + list-style-image: url("chrome://global/skin/icons/close-inverted.png"); } @media (min-resolution: 2dppx) { - .tab-close-button:-moz-lwtheme-brighttext { - list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png"); - } + .tab-close-button:-moz-lwtheme-brighttext { + list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png"); + } } /* Tab sound indicator */ .tab-icon-sound { - -moz-margin-start: 4px; + margin-inline-start: 4px; width: 16px; height: 16px; padding: 0; @@ -1920,280 +1981,280 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- .tabbrowser-arrowscrollbox > .scrollbutton-up, .tabbrowser-arrowscrollbox > .scrollbutton-down { - list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.png"); - margin: 0; - padding-right: 2px; - border-right: 2px solid transparent; - background-origin: border-box; + list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.png"); + margin: 0; + padding-right: 2px; + border-right: 2px solid transparent; + background-origin: border-box; } toolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-up, toolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-down { - list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.png); + list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.png); } .tabbrowser-arrowscrollbox > .scrollbutton-up[disabled], .tabbrowser-arrowscrollbox > .scrollbutton-down[disabled] { - opacity: .4; + opacity: .4; } .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl), .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr) { - transform: scaleX(-1); + transform: scaleX(-1); } .tabbrowser-arrowscrollbox > .scrollbutton-down { - transition: 1s background-color ease-out; + transition: 1s background-color ease-out; } .tabbrowser-arrowscrollbox > .scrollbutton-down[notifybgtab] { - background-color: Highlight; - transition: none; + background-color: Highlight; + transition: none; } .tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]), .tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]) { - border-width: 0 2px 0 0; - border-style: solid; - border-image: url("chrome://browser/skin/tabbrowser/tab-overflow-border.png") 0 2 0 2 fill; + border-width: 0 2px 0 0; + border-style: solid; + border-image: url("chrome://browser/skin/tabbrowser/tab-overflow-border.png") 0 2 0 2 fill; } .tabs-newtab-button > .toolbarbutton-icon { - margin-top: -1px; - margin-bottom: -1px; + margin-top: -1px; + margin-bottom: -1px; } .tabs-newtab-button, #TabsToolbar > #new-tab-button, #TabsToolbar > toolbarpaletteitem > #new-tab-button { - list-style-image: url(chrome://browser/skin/tabbrowser/newtab.png); - -moz-image-region: auto; + list-style-image: url(chrome://browser/skin/tabbrowser/newtab.png); + -moz-image-region: auto; } .tabs-newtab-button:-moz-lwtheme-brighttext, toolbar[brighttext] #TabsToolbar > #new-tab-button, toolbar[brighttext] #TabsToolbar > toolbarpaletteitem > #new-tab-button { - list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted.png); + list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted.png); } .tabs-newtab-button { - width: 28px; + width: 28px; } #TabsToolbar > #new-tab-button { - width: 26px; + width: 26px; } #alltabs-button { - list-style-image: url("chrome://browser/skin/tabbrowser/alltabs.png"); - -moz-image-region: rect(0, 14px, 16px, 0); + list-style-image: url("chrome://browser/skin/tabbrowser/alltabs.png"); + -moz-image-region: rect(0, 14px, 16px, 0); } #alltabs-button[type="menu"] { - list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png"); - -moz-image-region: auto; + list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png"); + -moz-image-region: auto; } toolbar[brighttext] #alltabs-button { - list-style-image: url("chrome://browser/skin/tabbrowser/alltabs-inverted.png"); + list-style-image: url("chrome://browser/skin/tabbrowser/alltabs-inverted.png"); } toolbar[brighttext] #alltabs-button[type="menu"] { - list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png"); + list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png"); } #alltabs-button[type="menu"] > .toolbarbutton-icon { - margin: 0 2px; + margin: 0 2px; } #alltabs-button[type="menu"] > .toolbarbutton-menu-dropmarker { - display: none; + display: none; } /* All tabs menupopup */ .alltabs-item > .menu-iconic-left > .menu-iconic-icon { - list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); + list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); } .alltabs-item[selected="true"] { - font-weight: bold; + font-weight: bold; } .alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon { - list-style-image: url("chrome://global/skin/icons/loading_16.png"); + list-style-image: url("chrome://global/skin/icons/loading_16.png"); } .alltabs-item[tabIsVisible] { - /* box-shadow instead of background-color to work around native styling */ - box-shadow: inset -5px 0 ThreeDShadow; + /* box-shadow instead of background-color to work around native styling */ + box-shadow: inset -5px 0 ThreeDShadow; } /* Tabstrip close button */ .tabs-closebutton { - -moz-appearance: none; - padding: 4px 2px; - margin: 0px; - border: none; + -moz-appearance: none; + padding: 4px 2px; + margin: 0px; + border: none; } toolbar[brighttext] .tabs-closebutton { - list-style-image: url("chrome://global/skin/icons/close-inverted.png"); + list-style-image: url("chrome://global/skin/icons/close-inverted.png"); } @media (min-resolution: 2dppx) { - toolbar[brighttext] .tabs-closebutton { - list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png"); - } + toolbar[brighttext] .tabs-closebutton { + list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png"); + } } .tabs-closebutton > .toolbarbutton-icon { - -moz-margin-end: 0px !important; - -moz-padding-end: 2px !important; - -moz-padding-start: 2px !important; + margin-inline-end: 0px !important; + padding-inline-end: 2px !important; + padding-inline-start: 2px !important; } #sidebar-throbber[loading="true"] { - list-style-image: url("chrome://global/skin/icons/loading_16.png"); - -moz-margin-end: 4px; + list-style-image: url("chrome://global/skin/icons/loading_16.png"); + margin-inline-end: 4px; } /* Pale Moon: Feed icon */ #ub-feed-button, #ub-feed-button > .button-box, #ub-feed-button:hover:active > .button-box { - padding: 0px; - margin: 0px; - border: 0px; - background-color: transparent !important; + padding: 0px; + margin: 0px; + border: 0px; + background-color: transparent !important; } #ub-feed-button { - -moz-appearance: none; - min-width: 0px; - list-style-image: url("chrome://browser/skin/feeds/feed-icons-16.png"); - -moz-image-region: rect(0px 16px 16px 0px); + -moz-appearance: none; + min-width: 0px; + list-style-image: url("chrome://browser/skin/feeds/feed-icons-16.png"); + -moz-image-region: rect(0px 16px 16px 0px); } #ub-feed-button:hover { - -moz-image-region: rect(0px 32px 16px 16px); + -moz-image-region: rect(0px 32px 16px 16px); } #ub-feed-button[open="true"], #ub-feed-button:hover:active { - -moz-image-region: rect(0px 48px 16px 32px); + -moz-image-region: rect(0px 48px 16px 32px); } /* Bookmarks toolbar */ #PlacesToolbarDropIndicator { - list-style-image: url(chrome://browser/skin/places/toolbarDropMarker.png); + list-style-image: url(chrome://browser/skin/places/toolbarDropMarker.png); } toolbarbutton.bookmark-item[dragover="true"][open="true"] { - -moz-appearance: none; - background: Highlight !important; - color: HighlightText !important; + -moz-appearance: none; + background: Highlight !important; + color: HighlightText !important; } /* rules for menupopup drop indicators */ .menupopup-drop-indicator-bar { - position: relative; - /* these two margins must together compensate the indicator's height */ - margin-top: -1px; - margin-bottom: -1px; + position: relative; + /* these two margins must together compensate the indicator's height */ + margin-top: -1px; + margin-bottom: -1px; } .menupopup-drop-indicator { - list-style-image: none; - height: 2px; - -moz-margin-end: -4em; - background-color: Highlight; + list-style-image: none; + height: 2px; + margin-inline-end: -4em; + background-color: Highlight; } /* ::::: Identity Indicator Styling ::::: */ /* Popup Icons */ #identity-popup-icon { - height: 64px; - width: 64px; - padding: 0; - list-style-image: url("chrome://browser/skin/identity.png"); - -moz-image-region: rect(0px, 64px, 64px, 0px); + height: 64px; + width: 64px; + padding: 0; + list-style-image: url("chrome://browser/skin/identity.png"); + -moz-image-region: rect(0px, 64px, 64px, 0px); } #identity-popup.verifiedDomain > #identity-popup-container > #identity-popup-icon { - -moz-image-region: rect(64px, 64px, 128px, 0px); + -moz-image-region: rect(64px, 64px, 128px, 0px); } #identity-popup.verifiedIdentity > #identity-popup-container > #identity-popup-icon { - -moz-image-region: rect(128px, 64px, 192px, 0px); + -moz-image-region: rect(128px, 64px, 192px, 0px); } /* Popup Body Text */ .identity-popup-description { - white-space: pre-wrap; - -moz-padding-start: 15px; - margin: 2px 0 4px; + white-space: pre-wrap; + padding-inline-start: 15px; + margin: 2px 0 4px; } .identity-popup-label { - white-space: pre-wrap; - -moz-padding-start: 15px; - margin: 0; + white-space: pre-wrap; + padding-inline-start: 15px; + margin: 0; } #identity-popup-content-host, #identity-popup-content-box.verifiedIdentity > #identity-popup-content-owner { - font-size: 1.2em; + font-size: 1.2em; } #identity-popup-content-host { - margin-top: 3px; - margin-bottom: 5px; - font-weight: bold; - max-width: 300px; + margin-top: 3px; + margin-bottom: 5px; + font-weight: bold; + max-width: 300px; } #identity-popup-content-owner { - margin-top: 4px; - margin-bottom: 0 !important; - font-weight: bold; - max-width: 300px; + margin-top: 4px; + margin-bottom: 0 !important; + font-weight: bold; + max-width: 300px; } .verifiedDomain > #identity-popup-content-owner { - font-weight: normal; + font-weight: normal; } #identity-popup-content-verifier { - margin: 4px 0 2px; + margin: 4px 0 2px; } #identity-popup-content-box.verifiedIdentity > #identity-popup-encryption , #identity-popup-content-box.verifiedDomain > #identity-popup-encryption { - margin-top: 10px; - -moz-margin-start: -24px; + margin-top: 10px; + margin-inline-start: -24px; } #identity-popup-content-box.verifiedIdentity > #identity-popup-encryption > vbox > #identity-popup-encryption-icon , #identity-popup-content-box.verifiedDomain > #identity-popup-encryption > vbox > #identity-popup-encryption-icon { - list-style-image: url("chrome://browser/skin/Secure24.png"); + list-style-image: url("chrome://browser/skin/Secure24.png"); } #identity-popup-more-info-button { - margin-top: 6px; - margin-bottom: 0; - -moz-margin-end: 0; + margin-top: 6px; + margin-bottom: 0; + margin-inline-end: 0; } .popup-notification-icon { - width: 64px; - height: 64px; - -moz-margin-end: 10px; + width: 64px; + height: 64px; + margin-inline-end: 10px; } .popup-notification-icon[popupid="geolocation"] { - list-style-image: url(chrome://browser/skin/Geolocation-64.png); + list-style-image: url(chrome://browser/skin/Geolocation-64.png); } .popup-notification-icon[popupid="xpinstall-disabled"], @@ -2203,198 +2264,198 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { .popup-notification-icon[popupid="addon-install-origin-blocked"], .popup-notification-icon[popupid="addon-install-failed"], .popup-notification-icon[popupid="addon-install-complete"] { - list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png); - width: 32px; - height: 32px; + list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png); + width: 32px; + height: 32px; } .popup-notification-icon[popupid="click-to-play-plugins"] { - list-style-image: url(chrome://mozapps/skin/plugins/pluginBlocked-64.png); + list-style-image: url(chrome://mozapps/skin/plugins/pluginBlocked-64.png); } .popup-notification-icon[popupid="web-notifications"] { - list-style-image: url(chrome://browser/skin/notification-64.png); + list-style-image: url(chrome://browser/skin/notification-64.png); } .addon-progress-description { - width: 350px; - max-width: 350px; + width: 350px; + max-width: 350px; } .popup-progress-label, .popup-progress-meter { - -moz-margin-start: 0; - -moz-margin-end: 0; + margin-inline-start: 0; + margin-inline-end: 0; } .popup-progress-cancel { - -moz-appearance: none; - background: transparent; - border: none; - padding: 0; - min-height: 16px; - min-width: 16px; - max-height: 16px; - max-width: 16px; - margin: 0 1px 0 1px; - list-style-image: url(chrome://mozapps/skin/downloads/buttons.png); - -moz-image-region: rect(0px, 16px, 16px, 0px); + -moz-appearance: none; + background: transparent; + border: none; + padding: 0; + min-height: 16px; + min-width: 16px; + max-height: 16px; + max-width: 16px; + margin: 0 1px 0 1px; + list-style-image: url(chrome://mozapps/skin/downloads/buttons.png); + -moz-image-region: rect(0px, 16px, 16px, 0px); } .popup-progress-cancel:hover { - -moz-image-region: rect(16px, 32px, 32px, 16px); + -moz-image-region: rect(16px, 32px, 32px, 16px); } .popup-progress-cancel:active { - -moz-image-region: rect(32px, 32px, 48px, 16px); + -moz-image-region: rect(32px, 32px, 48px, 16px); } .popup-notification-icon[popupid="indexedDB-permissions-prompt"], .popup-notification-icon[popupid="indexedDB-quota-prompt"], .popup-notification-icon[popupid*="offline-app-requested"], .popup-notification-icon[popupid="offline-app-usage"] { - list-style-image: url(chrome://global/skin/icons/question-64.png); + list-style-image: url(chrome://global/skin/icons/question-64.png); } .popup-notification-icon[popupid="password"] { - list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png); + list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png); } .popup-notification-icon[popupid="mixed-content-blocked"] { - list-style-image: url(chrome://browser/skin/mixed-content-blocked-64.png); + list-style-image: url(chrome://browser/skin/mixed-content-blocked-64.png); } %ifdef MOZ_WEBRTC .popup-notification-icon[popupid="webRTC-sharingDevices"], .popup-notification-icon[popupid="webRTC-shareDevices"] { - list-style-image: url(chrome://browser/skin/webRTC-shareDevice-64.png); + list-style-image: url(chrome://browser/skin/webRTC-shareDevice-64.png); } %endif .popup-notification-icon[popupid="pointerLock"] { - list-style-image: url(chrome://browser/skin/pointerLock-64.png); + list-style-image: url(chrome://browser/skin/pointerLock-64.png); } /* Notification icon box */ #notification-popup-box { - position: relative; - background-color: #fff; - background-clip: padding-box; - padding-left: 3px; - border-radius: 2.5px 0 0 2.5px; - border-width: 0 8px 0 0; - border-style: solid; - border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 fill; - -moz-margin-end: -8px; + position: relative; + background-color: #fff; + background-clip: padding-box; + padding-left: 3px; + border-radius: var(--toolbarbutton-border-radius) 0 0 var(--toolbarbutton-border-radius); + border-width: 0 8px 0 0; + border-style: solid; + border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 fill; + margin-inline-end: -8px; } @conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box { - padding-left: 5px; + padding-left: 5px; } #notification-popup-box:-moz-locale-dir(rtl), .notification-anchor-icon:-moz-locale-dir(rtl) { - transform: scaleX(-1); + transform: scaleX(-1); } .notification-anchor-icon { - width: 16px; - height: 16px; - margin: 0 2px; + width: 16px; + height: 16px; + margin: 0 2px; } .notification-anchor-icon:-moz-focusring { - outline: 1px dotted -moz-DialogText; - outline-offset: -3px; + outline: 1px dotted -moz-DialogText; + outline-offset: -3px; } .default-notification-icon, #default-notification-icon { - list-style-image: url(chrome://global/skin/icons/information-16.png); + list-style-image: url(chrome://global/skin/icons/information-16.png); } .geo-notification-icon, #geo-notification-icon { - list-style-image: url(chrome://browser/skin/Geolocation-16.png); + list-style-image: url(chrome://browser/skin/Geolocation-16.png); } #addons-notification-icon { - list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png); + list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png); } .indexedDB-notification-icon, #indexedDB-notification-icon { - list-style-image: url(chrome://global/skin/icons/question-16.png); + list-style-image: url(chrome://global/skin/icons/question-16.png); } #password-notification-icon { - list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16.png); + list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16.png); } #plugins-notification-icon { - list-style-image: url(chrome://browser/skin/notification-pluginNormal.png); + list-style-image: url(chrome://browser/skin/notification-pluginNormal.png); } #alert-plugins-notification-icon { - list-style-image: url(chrome://browser/skin/notification-pluginAlert.png); + list-style-image: url(chrome://browser/skin/notification-pluginAlert.png); } #blocked-plugins-notification-icon { - list-style-image: url(chrome://browser/skin/notification-pluginBlocked.png); + list-style-image: url(chrome://browser/skin/notification-pluginBlocked.png); } #plugins-notification-icon, #alert-plugins-notification-icon, #blocked-plugins-notification-icon { - -moz-image-region: rect(0, 16px, 16px, 0); + -moz-image-region: rect(0, 16px, 16px, 0); } #plugins-notification-icon:hover, #alert-plugins-notification-icon:hover, #blocked-plugins-notification-icon:hover { - -moz-image-region: rect(0, 32px, 16px, 16px); + -moz-image-region: rect(0, 32px, 16px, 16px); } #plugins-notification-icon:active, #alert-plugins-notification-icon:active, #blocked-plugins-notification-icon:active { - -moz-image-region: rect(0, 48px, 16px, 32px); + -moz-image-region: rect(0, 48px, 16px, 32px); } #notification-popup-box[hidden] { - /* Override display:none to make the pluginBlockedNotification animation work - when showing the notification repeatedly. */ - display: -moz-box; - visibility: collapse; + /* Override display:none to make the pluginBlockedNotification animation work + when showing the notification repeatedly. */ + display: -moz-box; + visibility: collapse; } #blocked-plugins-notification-icon[showing] { - animation: pluginBlockedNotification 500ms ease 0s 5 alternate both; + animation: pluginBlockedNotification 500ms ease 0s 5 alternate both; } @keyframes pluginBlockedNotification { - from { - opacity: 0; - } - to { - opacity: 1; - } + from { + opacity: 0; + } + to { + opacity: 1; + } } .mixed-content-blocked-notification-icon, #mixed-content-blocked-notification-icon { - list-style-image: url(chrome://browser/skin/mixed-content-blocked-16.png); + list-style-image: url(chrome://browser/skin/mixed-content-blocked-16.png); } %ifdef MOZ_WEBRTC .webRTC-shareDevices-notification-icon, #webRTC-shareDevices-notification-icon { - list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16.png); + list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16.png); } .webRTC-sharingDevices-notification-icon, #webRTC-sharingDevices-notification-icon { - list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16.png); + list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16.png); } %endif @@ -2415,14 +2476,14 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { } #pointerLock-notification-icon { - list-style-image: url(chrome://browser/skin/pointerLock-16.png); + list-style-image: url(chrome://browser/skin/pointerLock-16.png); } #pointerLock-cancel { - margin: 0px; + margin: 0px; } #identity-popup-container { - min-width: 280px; + min-width: 280px; } /* Bookmarks roots menu-items */ @@ -2432,59 +2493,59 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { #subscribeToPageMenupopup, #BMB_subscribeToPageMenuitem:not([disabled]), #BMB_subscribeToPageMenupopup { - list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png"); + list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png"); } #appmenu_bookmarksToolbar, #bookmarksToolbarFolderMenu, #BMB_bookmarksToolbar { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png"); - -moz-image-region: auto; + list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png"); + -moz-image-region: auto; } @media (min-resolution: 2dppx) { #bookmarksToolbarFolderMenu, #BMB_bookmarksToolbar { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png"); - -moz-image-region: auto; + list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png"); + -moz-image-region: auto; } } #appmenu_unsortedBookmarks, #BMB_unsortedBookmarks { - list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); - -moz-image-region: auto; + list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); + -moz-image-region: auto; } /* ::::: Keyboard UI Panel ::::: */ .KUI-panel { - -moz-appearance: none; - background: rgba(27%,27%,27%,.9) url(KUI-background.png) repeat-x; - color: white; - border-style: none; - border-radius: 20px; + -moz-appearance: none; + background: rgba(27%,27%,27%,.9) url(KUI-background.png) repeat-x; + color: white; + border-style: none; + border-radius: 20px; } .KUI-panel[level="top"] { - background-color: rgba(27%,27%,27%,.65); + background-color: rgba(27%,27%,27%,.65); } .KUI-panel-closebutton { - list-style-image: url(KUI-close.png); - -moz-appearance: none; - border: none; - padding: 0; - width: 24px; - height: 24px; + list-style-image: url(KUI-close.png); + -moz-appearance: none; + border: none; + padding: 0; + width: 24px; + height: 24px; } .KUI-panel-closebutton:not(:hover) { - opacity: .6; + opacity: .6; } .KUI-panel-closebutton > .toolbarbutton-icon { - margin: 0; + margin: 0; } /* ::::: Ctrl-Tab and All Tabs Panels ::::: */ @@ -2492,205 +2553,205 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { /* Ctrl-Tab */ #ctrlTab-panel { - padding: 20px 10px 10px; - font-weight: bold; - text-shadow: 0 0 1px rgb(27%,27%,27%), 0 0 2px rgb(27%,27%,27%); + padding: 20px 10px 10px; + font-weight: bold; + text-shadow: 0 0 1px rgb(27%,27%,27%), 0 0 2px rgb(27%,27%,27%); } .ctrlTab-favicon[src] { - background-color: white; - width: 20px; - height: 20px; - padding: 2px; + background-color: white; + width: 20px; + height: 20px; + padding: 2px; } .ctrlTab-preview-inner > .tabPreview-canvas { - box-shadow: 1px 1px 2px rgb(12%,12%,12%); + box-shadow: 1px 1px 2px rgb(12%,12%,12%); } .ctrlTab-preview:not(#ctrlTab-showAll) > * > .ctrlTab-preview-inner > .tabPreview-canvas { - margin-bottom: 2px; + margin-bottom: 2px; } .ctrlTab-preview-inner { - padding-bottom: 10px; + padding-bottom: 10px; } #ctrlTab-showAll:not(:focus) > * > .ctrlTab-preview-inner { - padding: 10px; - background-color: rgba(255,255,255,.2); - border-radius: .5em; + padding: 10px; + background-color: rgba(255,255,255,.2); + border-radius: .5em; } .ctrlTab-preview:focus > * > .ctrlTab-preview-inner { - color: white; - background-color: rgba(0,0,0,.6); - text-shadow: none; - padding: 8px; - border: 2px solid white; - border-radius: .5em; + color: white; + background-color: rgba(0,0,0,.6); + text-shadow: none; + padding: 8px; + border: 2px solid white; + border-radius: .5em; } .ctrlTab-preview:not(#ctrlTab-showAll):focus > * > .ctrlTab-preview-inner { - margin: -10px -10px 0; + margin: -10px -10px 0; } #ctrlTab-showAll { - margin-top: .5em; + margin-top: .5em; } /* All Tabs */ #allTabs-panel { - padding-bottom: 10px; - -moz-appearance: none; - border: none; - background: -moz-dialog; - color: -moz-dialogText; + padding-bottom: 10px; + -moz-appearance: none; + border: none; + background: -moz-dialog; + color: -moz-dialogText; } #allTabs-meta { - margin: 10px; + margin: 10px; } #allTabs-filter { - -moz-margin-start: 24px; - -moz-margin-end: 0; + margin-inline-start: 24px; + margin-inline-end: 0; } #allTabs-tab-close-button > .toolbarbutton-icon { - margin: 0; + margin: 0; } /* Make sure the allTab previews always have regular close buttons */ #allTabs-tab-close-button:-moz-lwtheme-brighttext { - list-style-image: url("chrome://global/skin/icons/close.png"); + list-style-image: url("chrome://global/skin/icons/close.png"); } .allTabs-favicon[src] { - background-color: -moz-dialog; - width: 22px; - height: 22px; - padding-top: 1px; - padding-bottom: 5px; - -moz-padding-start: 1px; - -moz-padding-end: 5px; - margin-top: -2px; - -moz-margin-start: -2px; - border-bottom-right-radius: 4px; + background-color: -moz-dialog; + width: 22px; + height: 22px; + padding-top: 1px; + padding-bottom: 5px; + padding-inline-start: 1px; + padding-inline-end: 5px; + margin-top: -2px; + margin-inline-start: -2px; + border-bottom-right-radius: 4px; } .allTabs-favicon[src]:-moz-locale-dir(rtl) { - border-bottom-right-radius: 0; - border-bottom-left-radius: 4px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 4px; } .allTabs-preview-inner > .tabPreview-canvas { - background-color: rgb(60%,60%,60%); - box-shadow: 0 0 1.5px ThreeDShadow; + background-color: rgb(60%,60%,60%); + box-shadow: 0 0 1.5px ThreeDShadow; } .allTabs-preview:not(:hover):not([closebuttonhover]) > html|canvas { - opacity: .8; + opacity: .8; } .allTabs-preview:focus > * > .allTabs-preview-inner { - outline: 1px dotted -moz-dialogText; + outline: 1px dotted -moz-dialogText; } /* Add-on bar */ #addon-bar { - -moz-appearance: none; - min-height: 20px; - border-top-style: none; - border-bottom-style: none; - padding-top: 1px; - background-image: linear-gradient(rgba(0,0,0,.15) 1px, rgba(255,255,255,.15) 1px); - background-size: 100% 2px; - background-repeat: no-repeat; + -moz-appearance: none; + min-height: 20px; + border-top-style: none; + border-bottom-style: none; + padding-top: 1px; + background-image: linear-gradient(rgba(0,0,0,.15) 1px, rgba(255,255,255,.15) 1px); + background-size: 100% 2px; + background-repeat: no-repeat; } #status-bar { - -moz-appearance: none; - background-color: transparent; - border: none; - min-height: 0; + -moz-appearance: none; + background-color: transparent; + border: none; + min-height: 0; } #addon-bar[customizing] > #status-bar { - opacity: .5; - background-image: repeating-linear-gradient(135deg, - rgba(255,255,255,.3), rgba(255,255,255,.3) 5px, - rgba(0,0,0,.3) 5px, rgba(0,0,0,.3) 10px); + opacity: .5; + background-image: repeating-linear-gradient(135deg, + rgba(255,255,255,.3), rgba(255,255,255,.3) 5px, + rgba(0,0,0,.3) 5px, rgba(0,0,0,.3) 10px); } #status-bar > statusbarpanel { - border-width: 0; - -moz-appearance: none; + border-width: 0; + -moz-appearance: none; } #addonbar-closebutton { - border: none; - padding: 0 5px; - -moz-appearance: none; + border: none; + padding: 0 5px; + -moz-appearance: none; } toolbar[brighttext] #addonbar-closebutton { - list-style-image: url("chrome://global/skin/icons/close-inverted.png"); + list-style-image: url("chrome://global/skin/icons/close-inverted.png"); } @media (min-resolution: 2dppx) { - toolbar[brighttext] #addonbar-closebutton { - list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png"); - } + toolbar[brighttext] #addonbar-closebutton { + list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png"); + } } /* Status panel */ .statuspanel-label { - margin: 0; - padding: 2px 4px; - background: linear-gradient(#fff, #ddd); - border: 1px none #ccc; - border-top-style: solid; - color: #333; - text-shadow: none; + margin: 0; + padding: 2px 4px; + background: linear-gradient(#fff, #ddd); + border: 1px none #ccc; + border-top-style: solid; + color: #333; + text-shadow: none; } .statuspanel-label:-moz-locale-dir(ltr):not([mirror]), .statuspanel-label:-moz-locale-dir(rtl)[mirror] { - border-right-style: solid; - /* disabled for triggering grayscale AA (bug 659213) - border-top-right-radius: .3em; - */ - margin-right: 1em; + border-right-style: solid; + /* disabled for triggering grayscale AA (bug 659213) + border-top-right-radius: .3em; + */ + margin-right: 1em; } .statuspanel-label:-moz-locale-dir(rtl):not([mirror]), .statuspanel-label:-moz-locale-dir(ltr)[mirror] { - border-left-style: solid; - /* disabled for triggering grayscale AA (bug 659213) - border-top-left-radius: .3em; - */ - margin-left: 1em; + border-left-style: solid; + /* disabled for triggering grayscale AA (bug 659213) + border-top-left-radius: .3em; + */ + margin-left: 1em; } #full-screen-warning-message { - background-color: hsl(0,0%,15%); - color: white; - border-radius: 8px; - margin-top: 30px; - padding: 30px 50px; - box-shadow: 0 0 2px white; + background-color: hsl(0,0%,15%); + color: white; + border-radius: 8px; + margin-top: 30px; + padding: 30px 50px; + box-shadow: 0 0 2px white; } .full-screen-description { - font-size: 150%; + font-size: 150%; } #full-screen-domain-text { - font-size: 300%; + font-size: 300%; } %ifdef MOZ_DEVTOOLS @@ -2703,50 +2764,51 @@ toolbar[brighttext] #addonbar-closebutton { /* Error counter */ #developer-toolbar-toolbox-button[error-count]:before { - color: #FDF3DE; - min-width: 16px; - text-shadow: none; - background-image: linear-gradient(#B4211B, #8A1915); - border-radius: 1px; - -moz-margin-end: 5px; + color: #FDF3DE; + min-width: 16px; + text-shadow: none; + background-image: linear-gradient(#B4211B, #8A1915); + border-radius: 1px; + margin-inline-end: 5px; } %endif .toolbarbutton-badge-stack { - margin: 0; - padding: 0; - position: relative; + margin: 0; + padding: 0; + position: relative; } @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-badge-stack { - padding: 2px 5px; + padding: 2px 5px; } .toolbarbutton-1 > .toolbarbutton-badge-stack > .toolbar-icon { - position: absolute; - top: 2px; - right: 2px; + position: absolute; + top: 2px; + right: 2px; } .toolbarbutton-badge-stack > .toolbarbutton-icon[label]:not([label=""]) { - -moz-margin-end: 0; + margin-inline-end: 0; } @navbarLargeIcons@ *|* > .toolbarbutton-badge[badge]:not([badge=""])::after { - top: 1px; - right: 1px; + top: 1px; + right: 1px; } .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after { - left: 0; - right: auto; + left: 0; + right: auto; } @navbarLargeIcons@ *|* > .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after { - left: 1px; - right: auto; + left: 1px; + right: auto; } +%ifdef MOZ_CAN_DRAW_IN_TITLEBAR #main-window[privatebrowsingmode=temporary] { background-image: url("chrome://browser/skin/privatebrowsing-mask.png"); background-position: top right; @@ -2756,8 +2818,8 @@ toolbar[brighttext] #addonbar-closebutton { @media (min-resolution: 2dppx) { #main-window[privatebrowsingmode=temporary] { - background-image: url("chrome://browser/skin/privatebrowsing-mask@2x.png"); - background-size: 38px; + background-image: url("chrome://browser/skin/privatebrowsing-mask@2x.png"); + background-size: 38px; } } @@ -2782,21 +2844,22 @@ toolbar[brighttext] #addonbar-closebutton { } #main-window[privatebrowsingmode=temporary][inFullscreen] #nav-bar[tabsontop=false] { - -moz-padding-end: 50px !important; + padding-inline-end: 50px !important; } @media (-moz-mac-lion-theme) { #main-window[privatebrowsingmode=temporary][inFullscreen] #TabsToolbar[tabsontop=true] { - -moz-padding-end: 50px; + padding-inline-end: 50px; } } @media not all and (-moz-mac-lion-theme) { #main-window[privatebrowsingmode=temporary] { - background-position: top right 10px; + background-position: top right 10px; } #main-window[privatebrowsingmode=temporary][inFullscreen][tabsontop=true] #window-controls { - -moz-padding-end: 50px; + padding-inline-end: 50px; } } +%endif
\ No newline at end of file diff --git a/palemoon/themes/osx/downloads/allDownloadsViewOverlay.css b/palemoon/themes/osx/downloads/allDownloadsViewOverlay.css index eb99f4c1f..0cfc5f81b 100644 --- a/palemoon/themes/osx/downloads/allDownloadsViewOverlay.css +++ b/palemoon/themes/osx/downloads/allDownloadsViewOverlay.css @@ -14,7 +14,7 @@ } .downloadTypeIcon { - -moz-margin-end: 8px; + margin-inline-end: 8px; /* explicitly size the icon, so size doesn't vary on hidpi systems */ height: 32px; width: 32px; diff --git a/palemoon/themes/osx/downloads/download-glow.png b/palemoon/themes/osx/downloads/download-glow.png Binary files differdeleted file mode 100644 index 53182d7a4..000000000 --- a/palemoon/themes/osx/downloads/download-glow.png +++ /dev/null diff --git a/palemoon/themes/osx/downloads/downloads.css b/palemoon/themes/osx/downloads/downloads.css index 267574e2c..2f9733a98 100644 --- a/palemoon/themes/osx/downloads/downloads.css +++ b/palemoon/themes/osx/downloads/downloads.css @@ -57,7 +57,7 @@ #downloadsSummary, richlistitem[type="download"] { height: 7em; - -moz-padding-end: 0; + padding-inline-end: 0; color: inherit; } @@ -104,7 +104,7 @@ richlistitem[type="download"]:first-child { } .downloadTypeIcon { - -moz-margin-end: 8px; + margin-inline-end: 8px; /* Prevent flickering when changing states. */ height: 32px; width: 32px; @@ -251,37 +251,39 @@ richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:acti /*** Main indicator icon ***/ #downloads-indicator-icon { - background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), + background: -moz-image-rect(var(--toolbarbutton-image), 0, 108, 18, 90) center no-repeat; min-width: 18px; min-height: 18px; } toolbar[brighttext] #downloads-indicator-icon { - background: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"), + background: -moz-image-rect(var(--toolbarbutton-inverted-image), 0, 108, 18, 90) center no-repeat; } #downloads-indicator[attention] > #downloads-indicator-anchor > #downloads-indicator-icon { - background-image: url("chrome://browser/skin/downloads/download-glow.png"); + background: -moz-image-rect(var(--toolbarbutton-image), + 19, 108, 36, 90) center no-repeat; } /* In the next few rules, we use :not([counter]) as a shortcut that is equivalent to -moz-any([progress], [paused]). */ #downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter { - background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), + background: -moz-image-rect(var(--toolbarbutton-image), 0, 108, 18, 90) center no-repeat; background-size: 12px; } toolbar[brighttext] #downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter { - background: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"), + background: -moz-image-rect(var(--toolbarbutton-inverted-image), 0, 108, 18, 90) center no-repeat; } #downloads-indicator:not([counter])[attention] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter { - background-image: url("chrome://browser/skin/downloads/download-glow.png"); + background: -moz-image-rect(var(--toolbarbutton-image), + 19, 108, 36, 90) center no-repeat; } /*** Download notifications ***/ @@ -376,7 +378,7 @@ toolbar[brighttext] #downloads-indicator-counter { background-image: linear-gradient(#505050, #575757); border: 1px solid; border-color: hsla(0,0%,0%,.6) hsla(0,0%,0%,.4) hsla(0,0%,0%,.4); - -moz-border-start: none; + border-inline-start: none; border-radius: 0 2px 2px 0; } diff --git a/palemoon/themes/osx/engineManager.css b/palemoon/themes/osx/engineManager.css index 18817cd4f..c6d42cce2 100644 --- a/palemoon/themes/osx/engineManager.css +++ b/palemoon/themes/osx/engineManager.css @@ -5,8 +5,8 @@ %endif #engineList treechildren::-moz-tree-image(engineName) { - -moz-margin-end: 4px; - -moz-margin-start: 1px; + margin-inline-end: 4px; + margin-inline-start: 1px; width: 16px; height: 16px; } diff --git a/palemoon/themes/osx/feeds/subscribe-ui.css b/palemoon/themes/osx/feeds/subscribe-ui.css index 8ca53283b..f21c037e6 100644 --- a/palemoon/themes/osx/feeds/subscribe-ui.css +++ b/palemoon/themes/osx/feeds/subscribe-ui.css @@ -7,17 +7,17 @@ } .handlersMenuPopup > menuitem { - -moz-padding-start: 23px; + padding-inline-start: 23px; } .handlersMenuPopup > menuitem.menuitem-iconic { - -moz-padding-start: 2px; + padding-inline-start: 2px; } .handlersMenuPopup > .menuitem-iconic > .menu-iconic-left { display: -moz-box; min-width: 16px; - -moz-padding-end: 2px; + padding-inline-end: 2px; } .chooseApplicationMenuItem { diff --git a/palemoon/themes/osx/feeds/subscribe.css b/palemoon/themes/osx/feeds/subscribe.css index 780a7f8b2..3a93c6456 100644 --- a/palemoon/themes/osx/feeds/subscribe.css +++ b/palemoon/themes/osx/feeds/subscribe.css @@ -10,7 +10,7 @@ html { #feedBody { border: 1px solid THreeDShadow; padding: 3em; - -moz-padding-start: 30px; + padding-inline-start: 30px; margin: 2em auto; background: -moz-Field; } @@ -25,9 +25,9 @@ html { #feedHeader { margin-top: 4.9em; margin-bottom: 1em; - -moz-margin-start: 1.4em; - -moz-margin-end: 1em; - -moz-padding-start: 2.9em; + margin-inline-start: 1.4em; + margin-inline-end: 1em; + padding-inline-start: 2.9em; font-size: 110%; color: InfoText; } @@ -54,12 +54,12 @@ html { #feedHeader[firstrun="true"] #feedIntroText { padding-top: 0.1em; - -moz-padding-start: 0.6em; + padding-inline-start: 0.6em; display: block; } #feedHeader[firstrun="true"] > #feedSubscribeLine { - -moz-padding-start: 1.8em; + padding-inline-start: 1.8em; } #feedSubscribeLine { @@ -95,8 +95,8 @@ h2 { #feedTitleLink { float: right; - -moz-margin-start: .6em; - -moz-margin-end: 0; + margin-inline-start: .6em; + margin-inline-end: 0; margin-top: 0; margin-bottom: 0; } @@ -106,15 +106,15 @@ a[href] img { } #feedTitleContainer { - -moz-margin-start: 0; - -moz-margin-end: .6em; + margin-inline-start: 0; + margin-inline-end: .6em; margin-top: 0; margin-bottom: 0; } #feedTitleImage { - -moz-margin-start: .6em; - -moz-margin-end: 0; + margin-inline-start: .6em; + margin-inline-end: 0; margin-top: 0; margin-bottom: 0; max-width: 300px; diff --git a/palemoon/themes/osx/jar.mn b/palemoon/themes/osx/jar.mn index 67339c7cc..9b4876354 100644 --- a/palemoon/themes/osx/jar.mn +++ b/palemoon/themes/osx/jar.mn @@ -17,8 +17,6 @@ browser.jar: #endif * skin/classic/browser/autocomplete.css skin/classic/browser/actionicon-tab.png - skin/classic/browser/appmenu-icons.png - skin/classic/browser/appmenu-dropmarker.png * skin/classic/browser/browser.css skin/classic/browser/click-to-play-warning-stripes.png * skin/classic/browser/engineManager.css @@ -60,7 +58,7 @@ browser.jar: skin/classic/browser/privatebrowsing-light.png skin/classic/browser/privatebrowsing-dark.png skin/classic/browser/reload-stop-go.png - skin/classic/browser/Search-glass.png + skin/classic/browser/Search.png skin/classic/browser/searchbar.css skin/classic/browser/searchbar-dropdown-arrow.png skin/classic/browser/Secure24.png @@ -68,6 +66,8 @@ browser.jar: skin/classic/browser/slowStartup-16.png skin/classic/browser/Toolbar.png skin/classic/browser/Toolbar-inverted.png + skin/classic/browser/Toolbar.svg + skin/classic/browser/Toolbar-inverted.svg skin/classic/browser/toolbarbutton-dropdown-arrow.png skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png skin/classic/browser/urlbar-arrow.png @@ -84,7 +84,6 @@ browser.jar: skin/classic/browser/webRTC-sharingDevice-16.png #endif skin/classic/browser/downloads/buttons.png (downloads/buttons.png) - skin/classic/browser/downloads/download-glow.png (downloads/download-glow.png) skin/classic/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png) skin/classic/browser/downloads/download-notification-start.png (downloads/download-notification-start.png) skin/classic/browser/downloads/download-summary.png (downloads/download-summary.png) @@ -119,6 +118,7 @@ browser.jar: skin/classic/browser/places/toolbarDropMarker.png (places/toolbarDropMarker.png) skin/classic/browser/places/editBookmarkOverlay.css (places/editBookmarkOverlay.css) skin/classic/browser/places/libraryToolbar.png (places/libraryToolbar.png) + skin/classic/browser/places/libraryToolbar.svg (places/libraryToolbar.svg) skin/classic/browser/places/starred48.png (places/starred48.png) skin/classic/browser/places/unstarred48.png (places/unstarred48.png) skin/classic/browser/places/unfiledBookmarks.png (places/unfiledBookmarks.png) diff --git a/palemoon/themes/osx/pageInfo.css b/palemoon/themes/osx/pageInfo.css index f205b57bb..f958d9ce2 100644 --- a/palemoon/themes/osx/pageInfo.css +++ b/palemoon/themes/osx/pageInfo.css @@ -6,7 +6,7 @@ /* View buttons */ #viewGroup { - -moz-padding-start: 10px; + padding-inline-start: 10px; } #viewGroup > radio { @@ -31,7 +31,7 @@ #topBar { border-bottom: 2px groove ThreeDFace; - -moz-padding-start: 10px; + padding-inline-start: 10px; background-color: -moz-Field; color: -moz-FieldText; } @@ -98,7 +98,7 @@ textbox { } textbox.header { - -moz-margin-start: 0; + margin-inline-start: 0; } .iframe { @@ -121,8 +121,8 @@ groupbox.collapsable caption .caption-icon { height: 9px; background-repeat: no-repeat; background-position: center; - -moz-margin-start: 2px; - -moz-margin-end: 2px; + margin-inline-start: 2px; + margin-inline-end: 2px; background-image: url("chrome://global/skin/tree/twisty-open.png"); } @@ -142,7 +142,7 @@ groupbox tree { } #securityBox description { - -moz-margin-start: 10px; + margin-inline-start: 10px; } #general-security-identity { @@ -187,8 +187,8 @@ treechildren::-moz-tree-cell-text(broken) { #feedListbox richlistitem { padding-top: 6px; padding-bottom: 6px; - -moz-padding-start: 7px; - -moz-padding-end: 7px; + padding-inline-start: 7px; + padding-inline-end: 7px; min-height: 25px; border-bottom: 1px dotted #C0C0C0; } @@ -225,8 +225,8 @@ treechildren::-moz-tree-cell-text(broken) { .permission { padding-top: 6px; padding-bottom: 6px; - -moz-padding-start: 7px; - -moz-padding-end: 7px; + padding-inline-start: 7px; + padding-inline-end: 7px; min-height: 25px; border-bottom: 1px dotted #C0C0C0; } diff --git a/palemoon/themes/osx/permissions/aboutPermissions.css b/palemoon/themes/osx/permissions/aboutPermissions.css index f9a4a88af..4886da2be 100644 --- a/palemoon/themes/osx/permissions/aboutPermissions.css +++ b/palemoon/themes/osx/permissions/aboutPermissions.css @@ -43,7 +43,7 @@ .site-favicon { height: 16px; width: 16px; - -moz-margin-end: 4px; + margin-inline-end: 4px; list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); } @@ -60,7 +60,7 @@ #site-description { font-size: 125%; - -moz-margin-start: 6px; /* to match button margin */ + margin-inline-start: 6px; /* to match button margin */ } #site-label { @@ -72,7 +72,7 @@ #defaults-description { font-size: 125%; font-weight: bold; - -moz-margin-start: 6px; + margin-inline-start: 6px; } .pref-item { @@ -82,7 +82,7 @@ .pref-icon { width: 36px; height: 36px; - -moz-margin-end: 10px; + margin-inline-end: 10px; } .pref-icon[type="password"] { diff --git a/palemoon/themes/osx/places/libraryToolbar.svg b/palemoon/themes/osx/places/libraryToolbar.svg new file mode 100644 index 000000000..5fcf42ae3 --- /dev/null +++ b/palemoon/themes/osx/places/libraryToolbar.svg @@ -0,0 +1,41 @@ +<!-- 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/. --> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="16" viewBox="0 0 48 16"> + <defs> + <linearGradient id="starGradient" x1="24.5" x2="24.5" y1="1081" y2="1121" gradientTransform="matrix(.318 0 0 .317 30.2 -342)" gradientUnits="userSpaceOnUse"> + <stop offset="0" stop-color="#f9f3ac"/> + <stop offset="1" stop-color="#ffdc46"/> + </linearGradient> + <linearGradient id="fileGradient" x1="5" x2="5" y1=".842" y2="9.16" gradientUnits="userSpaceOnUse"> + <stop offset="0" stop-color="#fff"/> + <stop offset="1" stop-color="#e3f1fc"/> + </linearGradient> + </defs> + <g id="file"> + <use width="100%" height="100%" transform="translate(6 6)" xlink:href="#file-individual"/> + <use width="100%" height="100%" transform="translate(4 4)" xlink:href="#file-individual"/> + <use width="100%" height="100%" transform="translate(2 2)" xlink:href="#file-individual"/> + <g id="file-individual"> + <path fill="url(#fileGradient)" d="M1 0h8v10H1z"/> + <path fill="#9c9c9c" d="M1 0v10h8V0zm1 1h6v8H2z"/> + </g> + </g> + <g id="view"> + <path fill="#a7dd8c" d="M17 2v1h2V2z"/> + <path fill="#eaedf4" d="M20 2v1h7V2zm8 0v1h3V2zm-8 2v1h7V4zm8 0v1h3V4zm-8 2v1h7V6zm8 0v1h3V6zm-8 3v1h7V9zm8 0v1h3V9zm-8 2v1h7v-1zm8 0v1h3v-1zm-8 2v1h7v-1zm8 0v1h3v-1z"/> + <path fill-opacity=".3" d="M17 3v1h2V3zm3 0v1h7V3zm8 0v1h3V3zM17 5v1h2V5zm3 0v1h7V5zm8 0v1h3V5zM17 7v1h2V7zm3 0v1h7V7zm8 0v1h3V7zm-11 3v1h2v-1zm3 0v1h7v-1zm8 0v1h3v-1zm-11 2v1h2v-1zm3 0v1h7v-1zm8 0v1h3v-1zm-11 2v1h2v-1zm3 0v1h7v-1zm8 0v1h3v-1z"/> + <path fill="#c5a2ec" d="M17 4v1h2V4z"/> + <path fill="#ec8e8e" d="M17 6v1h2V6z"/> + <path fill="#8ebbec" d="M17 9v1h2V9z"/> + <path fill="#a7dd8c" d="M17 11v1h2v-1z"/> + <path fill="#fac090" d="M17 13v1h2v-1z"/> + </g> + <g id="bk-restore"> + <g id="star"> + <path fill="url(#starGradient)" d="M34.2 9.73c.213-2.14.213-2.14-.921-3.23-1.66-1.6-1.52-2.14.636-2.41 1.76-.22 1.78-.23 2.61-1.93.488-.992 1.05-1.7 1.34-1.7.293 0 .856.717 1.35 1.72.841 1.71.854 1.72 2.61 1.94 2.15.268 2.28.789.629 2.38-1.13 1.09-1.13 1.09-.921 3.23.251 2.52.023 2.65-2.26 1.32-1.41-.823-1.41-.823-2.81 0-2.28 1.33-2.51 1.2-2.26-1.32z"/> + <path fill="#cd9a34" d="M38 0c-.299 0-.462.127-.608.245a2.635 2.635 0 0 0-.405.427 7.3 7.3 0 0 0-.769 1.26c-.396.805-.589 1.13-.738 1.24-.15.111-.468.179-1.3.283-.535.067-.96.148-1.32.287-.357.139-.715.384-.825.8-.11.417.055.788.274 1.12.219.328.53.662.939 1.06.539.519.706.698.767.911.06.213.04.683-.062 1.7-.06.607-.095 1.08-.07 1.47.012.198.037.381.107.566a.995.995 0 0 0 .411.502c.408.238.81.117 1.19-.035.38-.152.808-.391 1.36-.712.67-.391.938-.508 1.05-.508.114 0 .383.117 1.05.508.55.32.981.56 1.36.712.38.152.78.274 1.19.035a.995.995 0 0 0 .411-.502c.071-.185.096-.367.108-.566.025-.397-.01-.867-.07-1.47-.103-1.02-.124-1.49-.062-1.7.06-.213.228-.392.767-.911.407-.392.717-.723.935-1.05.218-.325.386-.693.276-1.11-.11-.416-.467-.657-.822-.794-.355-.137-.78-.217-1.31-.283-.833-.104-1.15-.169-1.3-.281-.15-.111-.343-.437-.743-1.25a7.138 7.138 0 0 0-.776-1.27 2.608 2.608 0 0 0-.405-.429C38.464.136 38.3.007 38 .007zm0 1.24c.042.044.073.07.126.137.192.245.428.627.648 1.07.4.814.612 1.31 1.09 1.66.473.351.997.391 1.83.495.488.06.849.14 1.04.214.194.075.154.1.135.029-.019-.071.014-.014-.122.188s-.401.5-.78.866c-.539.519-.912.86-1.07 1.41-.158.555-.077 1.1.024 2.12.06.589.083 1.03.067 1.29-.004.072-.012.088-.02.128.008-.01.047-.001-.137-.075-.264-.106-.672-.326-1.21-.64-.67-.39-1.07-.662-1.62-.662-.555 0-.954.272-1.62.663-.535.313-.945.533-1.21.639-.184.073-.145.065-.137.075-.008-.04-.016-.056-.02-.128-.017-.26.01-.704.068-1.29.102-1.02.182-1.56.025-2.12-.158-.555-.533-.896-1.07-1.41-.381-.367-.646-.67-.783-.873-.136-.204-.104-.263-.122-.197-.018.066-.054.04.14-.036.197-.076.556-.158 1.05-.219.839-.105 1.36-.146 1.84-.495.475-.349.685-.84 1.08-1.65.218-.442.453-.82.644-1.06.051-.065.082-.089.124-.133z"/> + </g> + <path fill="#169103" d="M43 6.7c-2.37 0-4.34 1.65-4.85 3.87h2.03c.458-1.13 1.54-1.94 2.82-1.94.692 0 1.23.154 1.77.541l-1.39 2.17H48v-4.65l-1.85 1.08c-.923-.698-2-1.08-3.15-1.08zm-5 4.65V16l1.85-1.08c.923.698 2 1.08 3.15 1.08 2.37 0 4.34-1.65 4.85-3.87h-2.03c-.458 1.13-1.54 1.94-2.82 1.94-.692 0-1.23-.154-1.77-.541l1.39-2.17z"/> + </g> +</svg> diff --git a/palemoon/themes/osx/places/organizer.css b/palemoon/themes/osx/places/organizer.css index 611c0c00c..ffcd6c523 100644 --- a/palemoon/themes/osx/places/organizer.css +++ b/palemoon/themes/osx/places/organizer.css @@ -2,10 +2,24 @@ * 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/. */ +:root { + --toolbarbutton-image: url("chrome://browser/skin/Toolbar.png"); + --library-toolbar-image: url("chrome://browser/skin/places/libraryToolbar.png"); +} + + +/* Use SVG for HiDPI 133%+ */ +@media (min-resolution: 1.33dppx) { + :root { + --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg"); + --library-toolbar-image: url("chrome://browser/skin/places/libraryToolbar.svg"); + } +} + /* Toolbar */ #placesToolbar { padding: 3px; - -moz-padding-end: 6px; + padding-inline-end: 6px; } #placesToolbar > toolbarbutton[disabled] > .toolbarbutton-icon { @@ -14,7 +28,7 @@ #back-button, #forward-button { - list-style-image: url("chrome://browser/skin/Toolbar.png"); + list-style-image: var(--toolbarbutton-image); } #back-button { @@ -34,35 +48,23 @@ #organizeButton, #viewMenu, #maintenanceButton { - list-style-image: url("chrome://browser/skin/places/libraryToolbar.png"); + list-style-image: var(--library-toolbar-image); } /* organize button */ #organizeButton { -moz-image-region: rect(0px, 16px, 16px, 0px); } -#organizeButton:hover, -#organizeButton[open="true"] { - -moz-image-region: rect(16px, 16px, 32px, 0px); -} /* view button */ #viewMenu { -moz-image-region: rect(0px, 32px, 16px, 16px); } -#viewMenu:hover, -#viewMenu[open="true"] { - -moz-image-region: rect(16px, 32px, 32px, 16px); -} /* maintenance button */ #maintenanceButton { -moz-image-region: rect(0px, 48px, 16px, 32px); } -#maintenanceButton:hover, -#maintenanceButton[open="true"] { - -moz-image-region: rect(16px, 48px, 32px, 32px); -} /* Root View */ #placesView { @@ -76,7 +78,7 @@ } #infoBoxExpanderLabel { - -moz-padding-start: 2px; + padding-inline-start: 2px; } #searchFilter { @@ -92,8 +94,8 @@ } #clearDownloadsButton { - -moz-padding-start: 9px; - -moz-padding-end: 9px; + padding-inline-start: 9px; + padding-inline-end: 9px; } /* hover-over/open button highlighting */ diff --git a/palemoon/themes/osx/places/places.css b/palemoon/themes/osx/places/places.css index 424377952..b30c56bd8 100644 --- a/palemoon/themes/osx/places/places.css +++ b/palemoon/themes/osx/places/places.css @@ -142,5 +142,5 @@ treechildren::-moz-tree-cell-text(cutting) { #viewButton > .button-box > .button-menu-dropmarker { height: auto; width: auto; - -moz-margin-end: -3px; + margin-inline-end: -3px; } diff --git a/palemoon/themes/osx/preferences/applications.css b/palemoon/themes/osx/preferences/applications.css index 80699b463..fdf561477 100644 --- a/palemoon/themes/osx/preferences/applications.css +++ b/palemoon/themes/osx/preferences/applications.css @@ -11,18 +11,18 @@ .actionsMenu { margin-top: 0; margin-bottom: 0; - -moz-margin-start: -2px; - -moz-margin-end: 0; + margin-inline-start: -2px; + margin-inline-end: 0; } .typeIcon, .actionIcon { - -moz-margin-start: 3px; - -moz-margin-end: 3px; + margin-inline-start: 3px; + margin-inline-end: 3px; } richlistitem label { - -moz-margin-start: 1px; + margin-inline-start: 1px; margin-top: 2px; } @@ -51,14 +51,14 @@ menuitem[appHandlerIcon="plugin"] { } .actionsMenu .menulist-icon { - -moz-margin-end: 3px; + margin-inline-end: 3px; } .actionsMenu > menupopup > menuitem > .menu-iconic-left { - -moz-padding-start: 0px; - -moz-padding-end: 2px; + padding-inline-start: 0px; + padding-inline-end: 2px; } .actionsMenu > menupopup > menuitem { - -moz-padding-start: 4px; + padding-inline-start: 4px; } diff --git a/palemoon/themes/osx/sanitizeDialog.css b/palemoon/themes/osx/sanitizeDialog.css index 40dc4b251..2fbedeb76 100644 --- a/palemoon/themes/osx/sanitizeDialog.css +++ b/palemoon/themes/osx/sanitizeDialog.css @@ -3,12 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #sanitizeDurationChoice { - -moz-margin-end: 0; + margin-inline-end: 0; } /* Align the duration label with the warning box and item list */ #sanitizeDurationLabel { - -moz-margin-start: 3px; + margin-inline-start: 3px; } @@ -79,15 +79,15 @@ /* Make the item list the same width as the warning box */ #itemList { - -moz-margin-start: 0; - -moz-margin-end: 0; + margin-inline-start: 0; + margin-inline-end: 0; } /* Align the last dialog button with the end of the warning box */ .prefWindow-dlgbuttons { - -moz-margin-end: 0; + margin-inline-end: 0; } .dialog-button[dlgtype="cancel"] { - -moz-margin-end: 0; + margin-inline-end: 0; } diff --git a/palemoon/themes/osx/searchbar.css b/palemoon/themes/osx/searchbar.css index 55fdfc4bd..e21101ba4 100644 --- a/palemoon/themes/osx/searchbar.css +++ b/palemoon/themes/osx/searchbar.css @@ -28,7 +28,7 @@ min-width: 0; margin: 0; padding: 0; - -moz-padding-end: 2px; + padding-inline-end: 2px; -moz-box-align: center; background: none; border: none; @@ -57,9 +57,9 @@ } .search-go-button { - padding: 1px; - list-style-image: url("chrome://browser/skin/Search-glass.png"); - -moz-image-region: rect(0px 16px 16px 0px); + padding: 2px 1px; + opacity: .4; + list-style-image: url("chrome://browser/skin/Search.png"); } .search-go-button:-moz-locale-dir(rtl) { @@ -67,11 +67,11 @@ } .search-go-button:hover { - -moz-image-region: rect(0px 32px 16px 16px); + opacity: .6; } .search-go-button:hover:active { - -moz-image-region: rect(0px, 48px, 16px, 32px); + opacity: .8; } .searchbar-engine-menuitem[selected="true"] > .menu-iconic-text { diff --git a/palemoon/themes/osx/statusbar/overlay.css b/palemoon/themes/osx/statusbar/overlay.css index ab1cc8f93..d54334206 100644 --- a/palemoon/themes/osx/statusbar/overlay.css +++ b/palemoon/themes/osx/statusbar/overlay.css @@ -60,7 +60,7 @@ toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label { margin: 0px 2px !important; - -moz-margin-start: 3px !important; + margin-inline-start: 3px !important; } /* diff --git a/palemoon/themes/osx/syncCommon.css b/palemoon/themes/osx/syncCommon.css index f0beae0d5..838788cd5 100644 --- a/palemoon/themes/osx/syncCommon.css +++ b/palemoon/themes/osx/syncCommon.css @@ -8,7 +8,7 @@ } .statusIcon { - -moz-margin-start: 4px; + margin-inline-start: 4px; max-height: 16px; max-width: 16px; } diff --git a/palemoon/themes/osx/syncSetup.css b/palemoon/themes/osx/syncSetup.css index fff65e963..8898951eb 100644 --- a/palemoon/themes/osx/syncSetup.css +++ b/palemoon/themes/osx/syncSetup.css @@ -99,7 +99,7 @@ description > .text-link:focus { } .inputColumn { - -moz-margin-end: 2px + margin-inline-end: 2px } .pin { diff --git a/palemoon/themes/osx/tabbrowser/newtab-glass.png b/palemoon/themes/osx/tabbrowser/newtab-glass.png Binary files differdeleted file mode 100644 index 15185beb6..000000000 --- a/palemoon/themes/osx/tabbrowser/newtab-glass.png +++ /dev/null diff --git a/palemoon/themes/osx/tabbrowser/tab-arrow-left-glass.png b/palemoon/themes/osx/tabbrowser/tab-arrow-left-glass.png Binary files differdeleted file mode 100644 index aac93a727..000000000 --- a/palemoon/themes/osx/tabbrowser/tab-arrow-left-glass.png +++ /dev/null diff --git a/palemoon/themes/shared/plugin-doorhanger.inc.css b/palemoon/themes/shared/plugin-doorhanger.inc.css index bda08e4f6..798be2c1d 100644 --- a/palemoon/themes/shared/plugin-doorhanger.inc.css +++ b/palemoon/themes/shared/plugin-doorhanger.inc.css @@ -16,7 +16,7 @@ } .center-item-label { - -moz-margin-start: 6px; + margin-inline-start: 6px; margin-bottom: 0; text-overflow: ellipsis; } @@ -26,7 +26,7 @@ background-repeat: no-repeat; width: 16px; height: 15px; - -moz-margin-start: 6px; + margin-inline-start: 6px; } .click-to-play-plugins-notification-button-container { diff --git a/palemoon/themes/windows/aboutCertError.css b/palemoon/themes/windows/aboutCertError.css index dbb353025..100bb3d3b 100644 --- a/palemoon/themes/windows/aboutCertError.css +++ b/palemoon/themes/windows/aboutCertError.css @@ -33,7 +33,7 @@ h2 { border-radius: 10px; box-shadow: 0px 0px 8px red; padding: 3em; - -moz-padding-start: 30px; + padding-inline-start: 30px; background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat -moz-Field; background-origin: content-box; } @@ -43,16 +43,16 @@ h2 { } #errorTitle { - -moz-margin-start: 80px; + margin-inline-start: 80px; } #errorLongContent { - -moz-margin-start: 80px; + margin-inline-start: 80px; } .expander > button { - -moz-padding-start: 20px; - -moz-margin-start: -20px; + padding-inline-start: 20px; + margin-inline-start: -20px; background: url("chrome://browser/skin/aboutCertError_sectionExpanded.png") left center no-repeat; border: none; font: inherit; diff --git a/palemoon/themes/windows/aboutPrivateBrowsing.css b/palemoon/themes/windows/aboutPrivateBrowsing.css index cd6026b8e..35843adce 100644 --- a/palemoon/themes/windows/aboutPrivateBrowsing.css +++ b/palemoon/themes/windows/aboutPrivateBrowsing.css @@ -21,7 +21,7 @@ body.normal > #errorPageContainer { } #startPrivateBrowsingDesc > button { - -moz-margin-start: 0; + margin-inline-start: 0; } #footerDesc > p { @@ -30,7 +30,7 @@ body.normal > #errorPageContainer { #moreInfo { font-size: 110%; /* to match the value set in chrome://global/skin/netError.css */ - -moz-padding-start: 25px; + padding-inline-start: 25px; background: url("chrome://global/skin/icons/information-16.png") no-repeat top left; } diff --git a/palemoon/themes/windows/aboutSyncTabs.css b/palemoon/themes/windows/aboutSyncTabs.css index 4f21a9d40..1fcd8304f 100644 --- a/palemoon/themes/windows/aboutSyncTabs.css +++ b/palemoon/themes/windows/aboutSyncTabs.css @@ -22,18 +22,18 @@ margin-top: 4px; width: 45em; height: 32px; - -moz-margin-start: 2em; - -moz-margin-end: 2em; + margin-inline-start: 2em; + margin-inline-end: 2em; } #tabsListHeading { font-size: 140%; font-weight: bold; - -moz-margin-start: 40px; + margin-inline-start: 40px; } richlistitem { - -moz-margin-end: 2em; + margin-inline-end: 2em; } richlistitem[selected="true"], @@ -46,7 +46,7 @@ richlistitem[type="tab"] { border: #999999 1px solid !important; padding: 2px 5px; margin-bottom: 4px; - -moz-margin-start: 4em; + margin-inline-start: 4em; border-radius: 6px; background-color: menu; width: 44em; @@ -64,7 +64,7 @@ richlistitem[type="tab"][selected="true"] { richlistitem[type="client"] { min-height: 2em; color: #000000; - -moz-margin-start: 2em; + margin-inline-start: 2em; margin-top: 2px; margin-bottom: 3px; width: 42em; @@ -96,6 +96,6 @@ richlistitem.desktop[type="client"] { } .tabIcon { - -moz-padding-start: 2px; + padding-inline-start: 2px; padding-top: 2px; } diff --git a/palemoon/themes/windows/autocomplete.css b/palemoon/themes/windows/autocomplete.css index b3cab44c8..dbdc3f6d4 100644 --- a/palemoon/themes/windows/autocomplete.css +++ b/palemoon/themes/windows/autocomplete.css @@ -74,7 +74,7 @@ panel[type="private-autocomplete-richlistbox"], } .private-autocomplete-treebody::-moz-tree-cell-text { - -moz-padding-start: 8px; + padding-inline-start: 8px; } treechildren.private-autocomplete-treebody::-moz-tree-row(selected) { @@ -163,8 +163,8 @@ treechildren.private-autocomplete-treebody::-moz-tree-cell-text(selected) { .ac-type-icon { width: 16px; height: 16px; - -moz-margin-start: 6px; - -moz-margin-end: 4px; + margin-inline-start: 6px; + margin-inline-end: 4px; margin-bottom: -1px; } diff --git a/palemoon/themes/windows/browser.css b/palemoon/themes/windows/browser.css index cb0456052..7fd567eb4 100644 --- a/palemoon/themes/windows/browser.css +++ b/palemoon/themes/windows/browser.css @@ -31,6 +31,9 @@ %endif :root { + --fullscreen-background-color: #556; + --fullscreen-text-color: #fff; + --toolbox-after-color: ThreeDShadow; --toolbar-custom-color: hsl(210,75%,92%); @@ -285,12 +288,12 @@ height: auto; padding: 0; margin: 0; - -moz-margin-start: .5em; + margin-inline-start: .5em; } .splitmenu-menuitem { - -moz-margin-end: 1px; - -moz-padding-end: 0.5em; + margin-inline-end: 1px; + padding-inline-end: 0.5em; } .splitmenu-menu { @@ -310,7 +313,7 @@ } #appmenuPrimaryPane { - -moz-border-end: 1px solid ThreeDShadow; + border-inline-end: 1px solid ThreeDShadow; } @media (-moz-windows-default-theme) { @@ -322,13 +325,13 @@ #appmenuPrimaryPane { background-color: rgba(255,255,255,0.5); padding: 2px; - -moz-border-end: none; + border-inline-end: none; } #appmenuSecondaryPane { background-color: #f1f5fb; box-shadow: 1px 0 2px rgb(204,214,234) inset; - -moz-padding-start: 3px; - -moz-padding-end: 2px; + padding-inline-start: 3px; + padding-inline-end: 2px; padding-top: 2px; padding-bottom: 2px; font-family: "Segoe UI Semibold", "Segoe UI", sans-serif; @@ -446,7 +449,7 @@ -moz-appearance: none; margin-top: 3px; margin-bottom: 3px; - -moz-margin-start: 30px; + margin-inline-start: 30px; padding: 0; border-top: 1px solid #d6e5f5; border-bottom: none; @@ -454,17 +457,17 @@ @media (min-resolution: 1.25dppx) { .appmenu-menuseparator { - -moz-margin-start: 25px; + margin-inline-start: 25px; } } @media (min-resolution: 1.5dppx) { .appmenu-menuseparator { - -moz-margin-start: 24px; + margin-inline-start: 24px; } } @media (min-resolution: 2dppx) { .appmenu-menuseparator { - -moz-margin-start: 22px; + margin-inline-start: 22px; } } @@ -628,7 +631,7 @@ @media not all and (-moz-windows-classic) { #titlebar-min { - -moz-margin-end: 2px; + margin-inline-end: 2px; } } @@ -643,8 +646,8 @@ toolbarbutton.bookmark-item:hover:active:not([disabled="true"]), toolbarbutton.bookmark-item[open="true"] { padding-top: 3px; padding-bottom: 1px; - -moz-padding-start: 4px; - -moz-padding-end: 2px; + padding-inline-start: 4px; + padding-inline-end: 2px; } .bookmark-item:not(#bookmarks-menu-button) > .toolbarbutton-icon { @@ -684,7 +687,7 @@ menuitem.bookmark-item { } .bookmark-item > .menu-iconic-left > .menu-iconic-icon { - -moz-padding-start: 0px; + padding-inline-start: 0px; } /* ::::: bookmark items ::::: */ @@ -785,7 +788,7 @@ toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { .toolbarbutton-1 > .toolbarbutton-icon, .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon { - -moz-margin-end: 0; + margin-inline-end: 0; } toolbar[mode=full] .toolbarbutton-1:not([type=menu-button]) { @@ -827,11 +830,11 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button { } @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button { - -moz-padding-end: 0; + padding-inline-end: 0; } @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { - -moz-padding-start: 0; + padding-inline-start: 0; -moz-box-align: center; } @@ -866,15 +869,15 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button { @navbarLargeIcons@ .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button) > .toolbarbutton-icon, @navbarLargeIcons@ .toolbarbutton-1[type=menu] > .toolbarbutton-text /* hack for add-ons that forcefully display the label */ { - -moz-padding-end: 17px; + padding-inline-end: 17px; } @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menu-dropmarker { - -moz-margin-start: -15px; + margin-inline-start: -15px; } @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon { - -moz-border-end: none; + border-inline-end: none; } @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { @@ -886,7 +889,7 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button { display: -moz-box; width: 1px; height: 18px; - -moz-margin-end: -1px; + margin-inline-end: -1px; background-image: linear-gradient(var(--toolbarbutton-border-color) 0, var(--toolbarbutton-border-color) 18px); background-clip: padding-box; background-position: center; @@ -942,7 +945,7 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button { } @navbarLargeIcons@ .toolbarbutton-1:-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon { - -moz-border-start-color: hsla(210,54%,20%,.35); + border-inline-start-color: hsla(210,54%,20%,.35); } @navbarLargeIcons@ .toolbarbutton-1[checked]:not(:active):hover > .toolbarbutton-icon { @@ -1020,7 +1023,7 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button { @conditionalForwardWithUrlbar@ > #forward-button > .toolbarbutton-icon { clip-path: url(chrome://browser/content/browser.xul#windows-keyhole-forward-clip-path); - -moz-margin-start: -6px !important; + margin-inline-start: -6px !important; border-left-style: none; border-radius: 0; padding-left: 7px; @@ -1048,8 +1051,8 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button { -moz-image-region: rect(18px, 20px, 38px, 0); padding-top: 3px; padding-bottom: 3px; - -moz-padding-start: 5px; - -moz-padding-end: 0; + padding-inline-start: 5px; + padding-inline-end: 0; position: relative; z-index: 1; border-radius: 0 10000px 10000px 0; @@ -1212,45 +1215,86 @@ toolbar[brighttext] #bookmarks-menu-button.bookmark-item { /* ::::: fullscreen window controls ::::: */ #window-controls { - -moz-margin-start: 4px; + -moz-box-align: start; + /* Make sure the window controls are always last on the toolbar */ + -moz-box-ordinal-group: 100; + margin-inline-start: 4px; } #minimize-button, #restore-button, #close-button { + -moz-appearance: none; + border-style: none; list-style-image: url("chrome://global/skin/icons/windowControls.png"); + margin: 0; padding: 0; } #minimize-button { -moz-image-region: rect(0, 16px, 16px, 0); } + #minimize-button:hover { -moz-image-region: rect(16px, 16px, 32px, 0); } + #minimize-button:hover:active { -moz-image-region: rect(32px, 16px, 48px, 0); } + #restore-button { -moz-image-region: rect(0, 32px, 16px, 16px); } + #restore-button:hover { -moz-image-region: rect(16px, 32px, 32px, 16px); } + #restore-button:hover:active { -moz-image-region: rect(32px, 32px, 48px, 16px); } + #close-button { - -moz-image-region: rect(0, 48px, 16px, 32px); - -moz-appearance: none; - border-style: none; - margin: 2px; + -moz-image-region: rect(0, 49px, 16px, 32px); } + #close-button:hover { - -moz-image-region: rect(16px, 48px, 32px, 32px); + -moz-image-region: rect(16px, 49px, 32px, 32px); } + #close-button:hover:active { - -moz-image-region: rect(32px, 48px, 48px, 32px); + -moz-image-region: rect(32px, 49px, 48px, 32px); +} + +#minimize-button:-moz-locale-dir(rtl), +#restore-button:-moz-locale-dir(rtl), +#close-button:-moz-locale-dir(rtl) { + transform: scaleX(-1); +} + +@media (-moz-os-version: windows-win10) { + #window-controls { + margin-inline-start: 0; + } + + #window-controls > toolbarbutton { + margin: 0; + padding: 2px 4px; + transition: background-color linear 120ms; + } + + #minimize-button, + #restore-button, + #close-button, + #minimize-button:hover, + #restore-button:hover, + #close-button:hover, + #minimize-button:hover:active, + #restore-button:hover:active, + #close-button:hover:active { + -moz-image-region: auto; + } } /* ::::: Location Bar ::::: */ @@ -1267,7 +1311,7 @@ toolbar[brighttext] #bookmarks-menu-button.bookmark-item { #urlbar { width: 7em; - -moz-padding-end: 2px; + padding-inline-end: 2px; } @media (-moz-windows-default-theme) { @@ -1286,13 +1330,13 @@ toolbar[brighttext] #bookmarks-menu-button.bookmark-item { @conditionalForwardWithUrlbar@ + #urlbar-container { padding-left: @conditionalForwardWithUrlbarWidth@px; - -moz-margin-start: -@conditionalForwardWithUrlbarWidth@px; + margin-inline-start: -@conditionalForwardWithUrlbarWidth@px; position: relative; pointer-events: none; } @conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar { - -moz-border-start: none; + border-inline-start: none; margin-left: 0; pointer-events: all; } @@ -1342,7 +1386,7 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, } .urlbar-input-box { - -moz-margin-start: 0; + margin-inline-start: 0; min-width: 4em; } @@ -1370,25 +1414,25 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, #urlbar-search-splitter { min-width: 6px; - -moz-margin-start: -3px; + margin-inline-start: -3px; border: none; background: transparent; } #urlbar-search-splitter + #urlbar-container > #urlbar , #urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox { - -moz-margin-start: 0; + margin-inline-start: 0; } #urlbar-display-box { - -moz-border-end: 1px solid #AAA; - -moz-margin-end: 3px; + border-inline-end: 1px solid #AAA; + margin-inline-end: 3px; } #urlbar-display { margin-top: 0; margin-bottom: 0; - -moz-margin-start: 0; + margin-inline-start: 0; color: GrayText; } @@ -1410,7 +1454,7 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, } #notification-popup-box:not([hidden]) + #identity-box { - -moz-padding-start: 10px; + padding-inline-start: 10px; border-radius: 0; } @@ -1420,7 +1464,7 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { color: hsl(92,100%,20%); - -moz-margin-end: 4px; + margin-inline-end: 4px; background-image: -moz-linear-gradient(hsla(92,81%,16%,0), hsla(92,81%,16%,.08) 25%, hsla(92,81%,16%,.08) 75%, @@ -1432,7 +1476,7 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, #urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain { color: rgb(0,79,168); - -moz-margin-end: 4px; + margin-inline-end: 4px; background-image: -moz-linear-gradient(rgba(0,79,168,0), rgba(0,79,168,.08) 25%, rgba(0,79,168,.08) 75%, @@ -1460,8 +1504,8 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, } #identity-icon-labels { - -moz-padding-start: 2px; - -moz-padding-end: 5px; + padding-inline-start: 2px; + padding-inline-end: 5px; } /* Address bar shading for SSL */ @@ -1540,14 +1584,14 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, height: 16px; margin-top: 1px; margin-bottom: 1px; - -moz-margin-start: 3px; - -moz-margin-end: 2px; + margin-inline-start: 3px; + margin-inline-end: 2px; list-style-image: url(chrome://browser/skin/identity-icons-generic.png); -moz-image-region: rect(0, 16px, 16px, 0); } @conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar > #identity-box > #page-proxy-favicon { - -moz-margin-end: 1px; + margin-inline-end: 1px; } /* Since we already have a padlock, always use the generic icon until the favicon loads @@ -1796,7 +1840,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- } #sidebar-title { - -moz-padding-start: 0px; + padding-inline-start: 0px; } /* ::::: throbber ::::: */ @@ -1874,12 +1918,12 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- /* Hide the transparent top border by default */ margin-top: -1px; /* Reduce the gap between the tabs */ - -moz-margin-start: -1px; + margin-inline-start: -1px; box-shadow: var(--tab-box-shadow); } .tabbrowser-tab { - -moz-padding-end: 3px; + padding-inline-end: 3px; } /* Override the default (globally-set) tab width values; increase @@ -1996,8 +2040,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- width: 16px; height: 16px; list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); - -moz-margin-start: 2px; - -moz-margin-end: 3px; + margin-inline-start: 2px; + margin-inline-end: 3px; } .tab-throbber { @@ -2010,8 +2054,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- .tab-throbber[pinned], .tab-icon-image[pinned] { - -moz-margin-start: 5px; - -moz-margin-end: 5px; + margin-inline-start: 5px; + margin-inline-end: 5px; } /* tabbrowser-tab focus ring */ @@ -2042,7 +2086,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- /* Tab sound indicator */ .tab-icon-sound { - -moz-margin-start: 4px; + margin-inline-start: 4px; width: 16px; height: 16px; padding: 0; @@ -2273,9 +2317,9 @@ toolbar[brighttext] .tabs-closebutton { } .tabs-closebutton > .toolbarbutton-icon { - -moz-margin-end: 0px !important; - -moz-padding-end: 2px !important; - -moz-padding-start: 2px !important; + margin-inline-end: 0px !important; + padding-inline-end: 2px !important; + padding-inline-start: 2px !important; } toolbarbutton.chevron { @@ -2301,7 +2345,7 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon { #sidebar-throbber[loading="true"] { list-style-image: url("chrome://global/skin/icons/loading_16.png"); - -moz-margin-end: 4px; + margin-inline-end: 4px; } /* Pale Moon: Feed icon */ @@ -2353,7 +2397,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { .menupopup-drop-indicator { list-style-image: none; height: 2px; - -moz-margin-end: -4em; + margin-inline-end: -4em; background-color: Highlight; } @@ -2379,13 +2423,13 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { /* Popup Body Text */ .identity-popup-description { white-space: pre-wrap; - -moz-padding-start: 15px; + padding-inline-start: 15px; margin: 2px 0 4px; } .identity-popup-label { white-space: pre-wrap; - -moz-padding-start: 15px; + padding-inline-start: 15px; margin: 0; } @@ -2419,7 +2463,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { #identity-popup-content-box.verifiedIdentity > #identity-popup-encryption , #identity-popup-content-box.verifiedDomain > #identity-popup-encryption { margin-top: 10px; - -moz-margin-start: -24px; + margin-inline-start: -24px; } #identity-popup-content-box.verifiedIdentity > #identity-popup-encryption > vbox > #identity-popup-encryption-icon , @@ -2430,13 +2474,13 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { #identity-popup-more-info-button { margin-top: 6px; margin-bottom: 0; - -moz-margin-end: 0; + margin-inline-end: 0; } .popup-notification-icon { width: 64px; height: 64px; - -moz-margin-end: 10px; + margin-inline-end: 10px; } .popup-notification-icon[popupid="geolocation"] { @@ -2470,8 +2514,8 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { .popup-progress-label, .popup-progress-meter { - -moz-margin-start: 0; - -moz-margin-end: 0; + margin-inline-start: 0; + margin-inline-end: 0; } .popup-progress-cancel { @@ -2530,7 +2574,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { border-width: 0 8px 0 0; border-style: solid; border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 fill; - -moz-margin-end: -8px; + margin-inline-end: -8px; } @conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box { @@ -2792,8 +2836,8 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { } #allTabs-filter { - -moz-margin-start: 24px; - -moz-margin-end: 0; + margin-inline-start: 24px; + margin-inline-end: 0; } #allTabs-tab-close-button > .toolbarbutton-icon { @@ -2811,10 +2855,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { height: 22px; padding-top: 1px; padding-bottom: 5px; - -moz-padding-start: 1px; - -moz-padding-end: 5px; + padding-inline-start: 1px; + padding-inline-end: 5px; margin-top: -2px; - -moz-margin-start: -2px; + margin-inline-start: -2px; border-bottom-right-radius: 4px; } @@ -2940,7 +2984,7 @@ toolbar[brighttext] #addonbar-closebutton { text-shadow: none; background-image: linear-gradient(#B4211B, #8A1915); border-radius: 1px; - -moz-margin-end: 5px; + margin-inline-end: 5px; } %endif @@ -2961,7 +3005,7 @@ toolbar[brighttext] #addonbar-closebutton { } .toolbarbutton-badge-stack > .toolbarbutton-icon[label]:not([label=""]) { - -moz-margin-end: 0; + margin-inline-end: 0; } @navbarLargeIcons@ *|* > .toolbarbutton-badge[badge]:not([badge=""])::after { @@ -3018,7 +3062,7 @@ toolbar[brighttext] #addonbar-closebutton { #appmenu-popup { margin-top: -1px; - -moz-margin-start: 1px; + margin-inline-start: 1px; } .panel-promo-message { @@ -3090,19 +3134,19 @@ toolbar[brighttext] #addonbar-closebutton { .sidebar-splitter { border: 0; - -moz-border-end: 1px solid #A9B7C9; + border-inline-end: 1px solid #A9B7C9; min-width: 0; width: 3px; background-color: transparent; - -moz-margin-start: -3px; + margin-inline-start: -3px; position: relative; } #appcontent ~ .sidebar-splitter { - -moz-border-start: 1px solid #A9B7C9; - -moz-border-end: none; - -moz-margin-start: 0; - -moz-margin-end: -3px; + border-inline-start: 1px solid #A9B7C9; + border-inline-end: none; + margin-inline-start: 0; + margin-inline-end: -3px; } .menu-accel, @@ -3143,7 +3187,8 @@ toolbar[brighttext] #addonbar-closebutton { --window-text-color: black; } - #titlebar-min:not(:-moz-window-inactive):not(:-moz-lwtheme) { + #titlebar-min:not(:-moz-window-inactive):not(:-moz-lwtheme), + #minimize-button:not(:-moz-lwtheme) { list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize); } @@ -3151,29 +3196,35 @@ toolbar[brighttext] #addonbar-closebutton { list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize); } - #main-window[sizemode="maximized"] #titlebar-max:not(:-moz-window-inactive):not(:-moz-lwtheme) { + #main-window[sizemode="maximized"] #titlebar-max:not(:-moz-window-inactive):not(:-moz-lwtheme), + #restore-button:not(:-moz-lwtheme) { list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore); } - #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme) { + #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme), + #close-button:not(:-moz-lwtheme) { list-style-image: url(chrome://browser/skin/caption-buttons.svg#close); } - .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover { + .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover, + #window-controls > toolbarbutton:not(#close-button):not(:-moz-lwtheme):hover { background-color: hsla(0, 0%, 0%, .17); } - .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active { + .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active, + #window-controls > toolbarbutton:not(#close-button):not(:-moz-lwtheme):hover:active { background-color: hsla(0, 0%, 0%, .27); transition: none; } - #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover { + #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover, + #close-button:not(:-moz-lwtheme):hover { list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highlight); background-color: hsla(0, 86%, 49%, 1); } - #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active { + #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active, + #close-button:not(:-moz-lwtheme):hover:active { background-color: hsla(0, 60%, 49%, 0.6); transition: none; } @@ -3188,8 +3239,14 @@ toolbar[brighttext] #addonbar-closebutton { :root:not(:-moz-window-inactive):not(:-moz-lwtheme) { --window-text-color: -moz-win-accentcolortext; } + + #main-window[sizemode=fullscreen]:not(:-moz-lwtheme) { + --fullscreen-background-color: -moz-win-accentcolor; + --fullscreen-text-color: -moz-win-accentcolortext; + } - #titlebar-min { + #titlebar-min, + #minimize-button { list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize); } @@ -3197,26 +3254,31 @@ toolbar[brighttext] #addonbar-closebutton { list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize); } - #main-window[sizemode="maximized"] #titlebar-max { + #main-window[sizemode="maximized"] #titlebar-max, + #restore-button { list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore); } - #titlebar-close { + #titlebar-close, + #close-button { list-style-image: url(chrome://browser/skin/caption-buttons.svg#close); } - .titlebar-button:hover { + .titlebar-button:hover, + #window-controls > toolbarbutton:not(#close-button):hover { background-color: hsla(0, 0%, 0%, .17); } - .titlebar-button:hover:active { + .titlebar-button:hover:active, + #window-controls > toolbarbutton:not(#close-button):hover:active { background-color: hsla(0, 0%, 0%, .27); transition: none; } @media (-moz-windows-accent-color-is-dark) { /* dark accent color */ - #titlebar-min { + #titlebar-min, + #minimize-button { list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-highlight); } @@ -3224,7 +3286,8 @@ toolbar[brighttext] #addonbar-closebutton { list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-highlight); } - #main-window[sizemode="maximized"] #titlebar-max { + #main-window[sizemode="maximized"] #titlebar-max, + #restore-button { list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-highlight); } @@ -3232,20 +3295,24 @@ toolbar[brighttext] #addonbar-closebutton { list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highlight); } - .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover { + .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover, + #window-controls > toolbarbutton:not(#close-button):not(:-moz-lwtheme):hover { background-color: hsla(0, 0%, 100%, .17); } - .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active { + .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active, + #window-controls > toolbarbutton:not(#close-button):not(:-moz-lwtheme):hover:active { background-color: hsla(0, 0%, 100%, .27); transition: none; } - #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover { + #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover, + #close-button:not(:-moz-lwtheme):hover { background-color: hsla(0, 86%, 49%, 1); } - #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active { + #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active, + #close-button:not(:-moz-lwtheme):hover:active { background-color: hsla(0, 60%, 39%, 1); transition: none; } @@ -3301,13 +3368,15 @@ toolbar[brighttext] #addonbar-closebutton { padding-right: 19px; } - #titlebar-close:hover { + #titlebar-close:hover, + #close-button:hover { list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highlight); background-color: hsla(0, 86%, 49%, 1); transition: background-color linear 160ms; } - #titlebar-close:hover:active { + #titlebar-close:hover:active, + #close-button:hover:active { background-color: hsla(0, 86%, 49%, 0.6); transition: none; } @@ -3341,16 +3410,19 @@ toolbar[brighttext] #addonbar-closebutton { /* light persona */ - .titlebar-button:-moz-lwtheme-darktext:hover { + .titlebar-button:-moz-lwtheme-darktext:hover, + #window-controls > toolbarbutton:not(#close-button):-moz-lwtheme-darktext:hover { background-color: hsla(0, 0%, 0%, .17); } - .titlebar-button:-moz-lwtheme-darktext:hover:active { + .titlebar-button:-moz-lwtheme-darktext:hover:active, + #window-controls > toolbarbutton:not(#close-button):-moz-lwtheme-darktext:hover:active { background-color: hsla(0, 0%, 0%, .27); transition: none; } - #titlebar-min:-moz-lwtheme-darktext { + #titlebar-min:-moz-lwtheme-darktext, + #minimize-button:-moz-lwtheme-darktext { list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-outline); } @@ -3358,29 +3430,35 @@ toolbar[brighttext] #addonbar-closebutton { list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-outline); } - #main-window[sizemode="maximized"]:-moz-lwtheme-darktext #titlebar-max:-moz-lwtheme-darktext { + #main-window[sizemode="maximized"]:-moz-lwtheme-darktext #titlebar-max:-moz-lwtheme-darktext, + #restore-button:-moz-lwtheme-darktext { list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-outline); } - #titlebar-close:-moz-lwtheme-darktext { + #titlebar-close:-moz-lwtheme-darktext, + #close-button:-moz-lwtheme-darktext { list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline); } - #titlebar-close:hover:-moz-lwtheme-darktext { + #titlebar-close:hover:-moz-lwtheme-darktext, + #close-button:hover:-moz-lwtheme-darktext { list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline); } /* dark persona */ - .titlebar-button:-moz-lwtheme-brighttext:hover { + .titlebar-button:-moz-lwtheme-brighttext:hover, + #window-controls > toolbarbutton:not(#close-button):-moz-lwtheme-brighttext:hover { background-color: hsla(0, 0%, 100%, .27); } - .titlebar-button:-moz-lwtheme-brighttext:hover:active { + .titlebar-button:-moz-lwtheme-brighttext:hover:active, + #window-controls > toolbarbutton:not(#close-button):-moz-lwtheme-brighttext:hover:active { background-color: hsla(0, 0%, 100%, .37); transition: none; } - #titlebar-min:-moz-lwtheme-brighttext { + #titlebar-min:-moz-lwtheme-brighttext, + #minimize-button:-moz-lwtheme-brighttext { list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-outline-inverted); } @@ -3388,14 +3466,17 @@ toolbar[brighttext] #addonbar-closebutton { list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-outline-inverted); } - #main-window[sizemode="maximized"]:-moz-lwtheme-brighttext #titlebar-max:-moz-lwtheme-brighttext { + #main-window[sizemode="maximized"]:-moz-lwtheme-brighttext #titlebar-max:-moz-lwtheme-brighttext, + #restore-button:-moz-lwtheme-brighttext { list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-outline-inverted); } - #titlebar-close:-moz-lwtheme-brighttext { + #titlebar-close:-moz-lwtheme-brighttext, + #close-button:-moz-lwtheme-brighttext { list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline-inverted); } - #titlebar-close:hover:-moz-lwtheme-brighttext { + #titlebar-close:hover:-moz-lwtheme-brighttext, + #close-button:hover:-moz-lwtheme-brighttext { list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline-inverted); } @@ -3550,8 +3631,9 @@ toolbar[brighttext] #addonbar-closebutton { /* ==== ==== */ #main-window[sizemode=fullscreen]:not(:-moz-lwtheme) { + --window-text-color: var(--fullscreen-text-color); -moz-appearance: none; - background-color: #556; + background-color: var(--fullscreen-background-color); } #toolbar-menubar:not(:-moz-lwtheme), @@ -3756,35 +3838,6 @@ toolbar[brighttext] #addonbar-closebutton { } } -/* ::::: fullscreen window controls ::::: */ - -#window-controls { - -moz-box-align: start; -} - -#minimize-button, -#restore-button, -#close-button { - -moz-appearance: none; - border-style: none; - margin: 0; -} -#close-button { - -moz-image-region: rect(0, 49px, 16px, 32px); -} -#close-button:hover { - -moz-image-region: rect(16px, 49px, 32px, 32px); -} -#close-button:hover:active { - -moz-image-region: rect(32px, 49px, 48px, 32px); -} - -#minimize-button:-moz-locale-dir(rtl), -#restore-button:-moz-locale-dir(rtl), -#close-button:-moz-locale-dir(rtl) { - transform: scaleX(-1); -} - /* ::::: splitmenu highlight style that imitates Windows 7 start menu ::::: */ @media (-moz-os-version: windows-vista) and (-moz-windows-default-theme), (-moz-os-version: windows-win7) and (-moz-windows-default-theme) { @@ -3796,10 +3849,10 @@ toolbar[brighttext] #addonbar-closebutton { border: 1px solid transparent; } .splitmenu-menuitem { - -moz-margin-end: 0; + margin-inline-end: 0; } .splitmenu-menu { - -moz-margin-start: -1px; + margin-inline-start: -1px; } .splitmenu-menuitem:-moz-locale-dir(ltr), .splitmenu-menu:-moz-locale-dir(rtl) { @@ -3813,11 +3866,11 @@ toolbar[brighttext] #addonbar-closebutton { } .splitmenu-menuitem > .menu-text { - -moz-margin-start: 1px !important; - -moz-margin-end: 3px !important; + margin-inline-start: 1px !important; + margin-inline-end: 3px !important; } .splitmenu-menu > .menu-right { - -moz-margin-end: -3px; + margin-inline-end: -3px; } .splitmenu-menuitem[iconic], @@ -3827,11 +3880,11 @@ toolbar[brighttext] #addonbar-closebutton { .splitmenu-menuitem[iconic] > .menu-iconic-left { margin-top: -3px; margin-bottom: -2px; - -moz-margin-start: -1px; + margin-inline-start: -1px; } .splitmenu-menuitem[iconic] > .menu-iconic-text { - -moz-margin-start: 2px !important; - -moz-margin-end: 3px !important; + margin-inline-start: 2px !important; + margin-inline-end: 3px !important; } .splitmenu-menu[iconic] > .menu-right { margin-top: -1px; diff --git a/palemoon/themes/windows/downloads/allDownloadsViewOverlay.css b/palemoon/themes/windows/downloads/allDownloadsViewOverlay.css index bd3b7899d..3b8e43bc8 100644 --- a/palemoon/themes/windows/downloads/allDownloadsViewOverlay.css +++ b/palemoon/themes/windows/downloads/allDownloadsViewOverlay.css @@ -13,8 +13,8 @@ } .downloadTypeIcon { - -moz-margin-start: 8px; - -moz-margin-end: 8px; + margin-inline-start: 8px; + margin-inline-end: 8px; /* explicitly size the icon, so size doesn't vary on hidpi systems */ height: 32px; width: 32px; diff --git a/palemoon/themes/windows/downloads/downloads.css b/palemoon/themes/windows/downloads/downloads.css index f16989655..040f89071 100644 --- a/palemoon/themes/windows/downloads/downloads.css +++ b/palemoon/themes/windows/downloads/downloads.css @@ -88,7 +88,7 @@ #downloadsSummary, richlistitem[type="download"] { height: 7em; - -moz-padding-end: 0; + padding-inline-end: 0; color: inherit; } @@ -143,7 +143,7 @@ richlistitem[type="download"]:first-child { } .downloadTypeIcon { - -moz-margin-end: 8px; + margin-inline-end: 8px; /* Prevent flickering when changing states. */ height: 32px; width: 32px; @@ -465,7 +465,7 @@ toolbar[brighttext] #downloads-indicator-counter { background-image: linear-gradient(#505050, #575757); border: 1px solid; border-color: hsla(0,0%,0%,.6) hsla(0,0%,0%,.4) hsla(0,0%,0%,.4); - -moz-border-start: none; + border-inline-start: none; border-radius: 0 2px 2px 0; } diff --git a/palemoon/themes/windows/engineManager.css b/palemoon/themes/windows/engineManager.css index 18817cd4f..c6d42cce2 100644 --- a/palemoon/themes/windows/engineManager.css +++ b/palemoon/themes/windows/engineManager.css @@ -5,8 +5,8 @@ %endif #engineList treechildren::-moz-tree-image(engineName) { - -moz-margin-end: 4px; - -moz-margin-start: 1px; + margin-inline-end: 4px; + margin-inline-start: 1px; width: 16px; height: 16px; } diff --git a/palemoon/themes/windows/feeds/subscribe-ui.css b/palemoon/themes/windows/feeds/subscribe-ui.css index 8ca53283b..f21c037e6 100644 --- a/palemoon/themes/windows/feeds/subscribe-ui.css +++ b/palemoon/themes/windows/feeds/subscribe-ui.css @@ -7,17 +7,17 @@ } .handlersMenuPopup > menuitem { - -moz-padding-start: 23px; + padding-inline-start: 23px; } .handlersMenuPopup > menuitem.menuitem-iconic { - -moz-padding-start: 2px; + padding-inline-start: 2px; } .handlersMenuPopup > .menuitem-iconic > .menu-iconic-left { display: -moz-box; min-width: 16px; - -moz-padding-end: 2px; + padding-inline-end: 2px; } .chooseApplicationMenuItem { diff --git a/palemoon/themes/windows/feeds/subscribe.css b/palemoon/themes/windows/feeds/subscribe.css index dc9304b8a..d6247569b 100644 --- a/palemoon/themes/windows/feeds/subscribe.css +++ b/palemoon/themes/windows/feeds/subscribe.css @@ -10,7 +10,7 @@ html { #feedBody { border: 1px solid THreeDShadow; padding: 3em; - -moz-padding-start: 30px; + padding-inline-start: 30px; margin: 2em auto; background: -moz-Field; } @@ -25,9 +25,9 @@ html { #feedHeader { margin-top: 4.9em; margin-bottom: 1em; - -moz-margin-start: 1.4em; - -moz-margin-end: 1em; - -moz-padding-start: 2.9em; + margin-inline-start: 1.4em; + margin-inline-end: 1em; + padding-inline-start: 2.9em; font-size: 110%; color: InfoText; } @@ -54,12 +54,12 @@ html { #feedHeader[firstrun="true"] #feedIntroText { padding-top: 0.1em; - -moz-padding-start: 0.6em; + padding-inline-start: 0.6em; display: block; } #feedHeader[firstrun="true"] > #feedSubscribeLine { - -moz-padding-start: 1.8em; + padding-inline-start: 1.8em; } #feedSubscribeLine { @@ -99,8 +99,8 @@ h2 { #feedTitleLink { float: right; - -moz-margin-start: .6em; - -moz-margin-end: 0; + margin-inline-start: .6em; + margin-inline-end: 0; margin-top: 0; margin-bottom: 0; } @@ -110,15 +110,15 @@ a[href] img { } #feedTitleContainer { - -moz-margin-start: 0; - -moz-margin-end: .6em; + margin-inline-start: 0; + margin-inline-end: .6em; margin-top: 0; margin-bottom: 0; } #feedTitleImage { - -moz-margin-start: .6em; - -moz-margin-end: 0; + margin-inline-start: .6em; + margin-inline-end: 0; margin-top: 0; margin-bottom: 0; max-width: 300px; diff --git a/palemoon/themes/windows/jar.mn b/palemoon/themes/windows/jar.mn index 4422bb666..f90de60a1 100644 --- a/palemoon/themes/windows/jar.mn +++ b/palemoon/themes/windows/jar.mn @@ -112,6 +112,7 @@ browser.jar: skin/classic/browser/places/toolbarDropMarker.png (places/toolbarDropMarker.png) skin/classic/browser/places/editBookmarkOverlay.css (places/editBookmarkOverlay.css) skin/classic/browser/places/libraryToolbar.png (places/libraryToolbar.png) + skin/classic/browser/places/libraryToolbar.svg (places/libraryToolbar.svg) skin/classic/browser/places/starred48.png (places/starred48.png) skin/classic/browser/places/unstarred48.png (places/unstarred48.png) skin/classic/browser/places/tag.png (places/tag.png) diff --git a/palemoon/themes/windows/pageInfo.css b/palemoon/themes/windows/pageInfo.css index ec65cc408..3bbfc933b 100644 --- a/palemoon/themes/windows/pageInfo.css +++ b/palemoon/themes/windows/pageInfo.css @@ -6,7 +6,7 @@ /* View buttons */ #viewGroup { - -moz-padding-start: 10px; + padding-inline-start: 10px; } #viewGroup > radio { @@ -31,7 +31,7 @@ #topBar { border-bottom: 2px groove ThreeDFace; - -moz-padding-start: 10px; + padding-inline-start: 10px; background-color: -moz-Field; color: -moz-FieldText; } @@ -98,7 +98,7 @@ textbox { } textbox.header { - -moz-margin-start: 0; + margin-inline-start: 0; } .iframe { @@ -121,8 +121,8 @@ groupbox.collapsable caption .caption-icon { height: 9px; background-repeat: no-repeat; background-position: center; - -moz-margin-start: 2px; - -moz-margin-end: 2px; + margin-inline-start: 2px; + margin-inline-end: 2px; background-image: url("chrome://global/skin/tree/twisty.svg#open"); } @@ -142,7 +142,7 @@ groupbox tree { } #securityBox description { - -moz-margin-start: 10px; + margin-inline-start: 10px; } #general-security-identity { @@ -197,8 +197,8 @@ treechildren::-moz-tree-cell-text(broken) { #feedListbox richlistitem { padding-top: 6px; padding-bottom: 6px; - -moz-padding-start: 7px; - -moz-padding-end: 7px; + padding-inline-start: 7px; + padding-inline-end: 7px; min-height: 25px; border-bottom: 1px dotted #C0C0C0; } @@ -235,8 +235,8 @@ treechildren::-moz-tree-cell-text(broken) { .permission { padding-top: 6px; padding-bottom: 6px; - -moz-padding-start: 7px; - -moz-padding-end: 7px; + padding-inline-start: 7px; + padding-inline-end: 7px; min-height: 25px; border-bottom: 1px dotted #C0C0C0; } diff --git a/palemoon/themes/windows/permissions/aboutPermissions.css b/palemoon/themes/windows/permissions/aboutPermissions.css index 60ee81673..d3ceed756 100644 --- a/palemoon/themes/windows/permissions/aboutPermissions.css +++ b/palemoon/themes/windows/permissions/aboutPermissions.css @@ -43,7 +43,7 @@ .site-favicon { height: 16px; width: 16px; - -moz-margin-end: 4px; + margin-inline-end: 4px; list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); } @@ -60,7 +60,7 @@ #site-description { font-size: 125%; - -moz-margin-start: 6px; /* to match button margin */ + margin-inline-start: 6px; /* to match button margin */ } #site-label { @@ -72,7 +72,7 @@ #defaults-description { font-size: 125%; font-weight: bold; - -moz-margin-start: 6px; + margin-inline-start: 6px; } .pref-item { @@ -82,7 +82,7 @@ .pref-icon { width: 48px; height: 48px; - -moz-margin-end: 10px; + margin-inline-end: 10px; } .pref-icon[type="password"] { diff --git a/palemoon/themes/windows/places/editBookmarkOverlay.css b/palemoon/themes/windows/places/editBookmarkOverlay.css index be3ea83f4..3d67cd3f4 100644 --- a/palemoon/themes/windows/places/editBookmarkOverlay.css +++ b/palemoon/themes/windows/places/editBookmarkOverlay.css @@ -24,7 +24,7 @@ .expander-down { min-width: 0; margin: 0; - -moz-margin-end: 4px; + margin-inline-end: 4px; } .expander-up > .button-box, diff --git a/palemoon/themes/windows/places/libraryToolbar.svg b/palemoon/themes/windows/places/libraryToolbar.svg new file mode 100644 index 000000000..5fcf42ae3 --- /dev/null +++ b/palemoon/themes/windows/places/libraryToolbar.svg @@ -0,0 +1,41 @@ +<!-- 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/. --> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="16" viewBox="0 0 48 16"> + <defs> + <linearGradient id="starGradient" x1="24.5" x2="24.5" y1="1081" y2="1121" gradientTransform="matrix(.318 0 0 .317 30.2 -342)" gradientUnits="userSpaceOnUse"> + <stop offset="0" stop-color="#f9f3ac"/> + <stop offset="1" stop-color="#ffdc46"/> + </linearGradient> + <linearGradient id="fileGradient" x1="5" x2="5" y1=".842" y2="9.16" gradientUnits="userSpaceOnUse"> + <stop offset="0" stop-color="#fff"/> + <stop offset="1" stop-color="#e3f1fc"/> + </linearGradient> + </defs> + <g id="file"> + <use width="100%" height="100%" transform="translate(6 6)" xlink:href="#file-individual"/> + <use width="100%" height="100%" transform="translate(4 4)" xlink:href="#file-individual"/> + <use width="100%" height="100%" transform="translate(2 2)" xlink:href="#file-individual"/> + <g id="file-individual"> + <path fill="url(#fileGradient)" d="M1 0h8v10H1z"/> + <path fill="#9c9c9c" d="M1 0v10h8V0zm1 1h6v8H2z"/> + </g> + </g> + <g id="view"> + <path fill="#a7dd8c" d="M17 2v1h2V2z"/> + <path fill="#eaedf4" d="M20 2v1h7V2zm8 0v1h3V2zm-8 2v1h7V4zm8 0v1h3V4zm-8 2v1h7V6zm8 0v1h3V6zm-8 3v1h7V9zm8 0v1h3V9zm-8 2v1h7v-1zm8 0v1h3v-1zm-8 2v1h7v-1zm8 0v1h3v-1z"/> + <path fill-opacity=".3" d="M17 3v1h2V3zm3 0v1h7V3zm8 0v1h3V3zM17 5v1h2V5zm3 0v1h7V5zm8 0v1h3V5zM17 7v1h2V7zm3 0v1h7V7zm8 0v1h3V7zm-11 3v1h2v-1zm3 0v1h7v-1zm8 0v1h3v-1zm-11 2v1h2v-1zm3 0v1h7v-1zm8 0v1h3v-1zm-11 2v1h2v-1zm3 0v1h7v-1zm8 0v1h3v-1z"/> + <path fill="#c5a2ec" d="M17 4v1h2V4z"/> + <path fill="#ec8e8e" d="M17 6v1h2V6z"/> + <path fill="#8ebbec" d="M17 9v1h2V9z"/> + <path fill="#a7dd8c" d="M17 11v1h2v-1z"/> + <path fill="#fac090" d="M17 13v1h2v-1z"/> + </g> + <g id="bk-restore"> + <g id="star"> + <path fill="url(#starGradient)" d="M34.2 9.73c.213-2.14.213-2.14-.921-3.23-1.66-1.6-1.52-2.14.636-2.41 1.76-.22 1.78-.23 2.61-1.93.488-.992 1.05-1.7 1.34-1.7.293 0 .856.717 1.35 1.72.841 1.71.854 1.72 2.61 1.94 2.15.268 2.28.789.629 2.38-1.13 1.09-1.13 1.09-.921 3.23.251 2.52.023 2.65-2.26 1.32-1.41-.823-1.41-.823-2.81 0-2.28 1.33-2.51 1.2-2.26-1.32z"/> + <path fill="#cd9a34" d="M38 0c-.299 0-.462.127-.608.245a2.635 2.635 0 0 0-.405.427 7.3 7.3 0 0 0-.769 1.26c-.396.805-.589 1.13-.738 1.24-.15.111-.468.179-1.3.283-.535.067-.96.148-1.32.287-.357.139-.715.384-.825.8-.11.417.055.788.274 1.12.219.328.53.662.939 1.06.539.519.706.698.767.911.06.213.04.683-.062 1.7-.06.607-.095 1.08-.07 1.47.012.198.037.381.107.566a.995.995 0 0 0 .411.502c.408.238.81.117 1.19-.035.38-.152.808-.391 1.36-.712.67-.391.938-.508 1.05-.508.114 0 .383.117 1.05.508.55.32.981.56 1.36.712.38.152.78.274 1.19.035a.995.995 0 0 0 .411-.502c.071-.185.096-.367.108-.566.025-.397-.01-.867-.07-1.47-.103-1.02-.124-1.49-.062-1.7.06-.213.228-.392.767-.911.407-.392.717-.723.935-1.05.218-.325.386-.693.276-1.11-.11-.416-.467-.657-.822-.794-.355-.137-.78-.217-1.31-.283-.833-.104-1.15-.169-1.3-.281-.15-.111-.343-.437-.743-1.25a7.138 7.138 0 0 0-.776-1.27 2.608 2.608 0 0 0-.405-.429C38.464.136 38.3.007 38 .007zm0 1.24c.042.044.073.07.126.137.192.245.428.627.648 1.07.4.814.612 1.31 1.09 1.66.473.351.997.391 1.83.495.488.06.849.14 1.04.214.194.075.154.1.135.029-.019-.071.014-.014-.122.188s-.401.5-.78.866c-.539.519-.912.86-1.07 1.41-.158.555-.077 1.1.024 2.12.06.589.083 1.03.067 1.29-.004.072-.012.088-.02.128.008-.01.047-.001-.137-.075-.264-.106-.672-.326-1.21-.64-.67-.39-1.07-.662-1.62-.662-.555 0-.954.272-1.62.663-.535.313-.945.533-1.21.639-.184.073-.145.065-.137.075-.008-.04-.016-.056-.02-.128-.017-.26.01-.704.068-1.29.102-1.02.182-1.56.025-2.12-.158-.555-.533-.896-1.07-1.41-.381-.367-.646-.67-.783-.873-.136-.204-.104-.263-.122-.197-.018.066-.054.04.14-.036.197-.076.556-.158 1.05-.219.839-.105 1.36-.146 1.84-.495.475-.349.685-.84 1.08-1.65.218-.442.453-.82.644-1.06.051-.065.082-.089.124-.133z"/> + </g> + <path fill="#169103" d="M43 6.7c-2.37 0-4.34 1.65-4.85 3.87h2.03c.458-1.13 1.54-1.94 2.82-1.94.692 0 1.23.154 1.77.541l-1.39 2.17H48v-4.65l-1.85 1.08c-.923-.698-2-1.08-3.15-1.08zm-5 4.65V16l1.85-1.08c.923.698 2 1.08 3.15 1.08 2.37 0 4.34-1.65 4.85-3.87h-2.03c-.458 1.13-1.54 1.94-2.82 1.94-.692 0-1.23-.154-1.77-.541l1.39-2.17z"/> + </g> +</svg> diff --git a/palemoon/themes/windows/places/organizer.css b/palemoon/themes/windows/places/organizer.css index 45851d0da..0a947c2ac 100644 --- a/palemoon/themes/windows/places/organizer.css +++ b/palemoon/themes/windows/places/organizer.css @@ -6,19 +6,21 @@ --toolbar-custom-color: hsl(210,75%,92%); --toolbar-highlight-top: rgba(255,255,255,.5); --toolbarbutton-image: url("chrome://browser/skin/Toolbar.png"); + --library-toolbar-image: url("chrome://browser/skin/places/libraryToolbar.png"); } /* Use SVG for HiDPI 133%+ */ @media (min-resolution: 1.33dppx) { :root { --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg"); + --library-toolbar-image: url("chrome://browser/skin/places/libraryToolbar.svg"); } } /* Toolbar */ #placesToolbar { padding: 3px; - -moz-padding-end: 6px; + padding-inline-end: 6px; } #placesToolbar > toolbarbutton[disabled] > .toolbarbutton-icon { @@ -45,14 +47,14 @@ /* Menu */ #placesMenu { - -moz-margin-start: 6px; + margin-inline-start: 6px; -moz-appearance: none; border: none; } #placesMenu > menu { - -moz-padding-start: 4px; - -moz-padding-end: 1px; + padding-inline-start: 4px; + padding-inline-end: 1px; padding-top: 2px; padding-bottom: 2px; -moz-appearance: toolbarbutton; @@ -73,14 +75,14 @@ #placesMenu > menu[open="true"] { border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow; - -moz-padding-start: 5px; - -moz-padding-end: 0px; + padding-inline-start: 5px; + padding-inline-end: 0px; padding-top: 3px; padding-bottom: 1px; } #placesMenu > menu > .menubar-text { - -moz-padding-end: 8px; + padding-inline-end: 8px; background: url(chrome://global/skin/arrow/arrow-dn.gif) right center no-repeat; } @@ -92,35 +94,23 @@ #organizeButton, #viewMenu, #maintenanceButton { - list-style-image: url("chrome://browser/skin/places/libraryToolbar.png"); + list-style-image: var(--library-toolbar-image); } /* organize button */ #organizeButton { -moz-image-region: rect(0px, 16px, 16px, 0px); } -#organizeButton:hover, -#organizeButton[open="true"] { - -moz-image-region: rect(16px, 16px, 32px, 0px); -} /* view button */ #viewMenu { -moz-image-region: rect(0px, 32px, 16px, 16px); } -#viewMenu:hover, -#viewMenu[open="true"] { - -moz-image-region: rect(16px, 32px, 32px, 16px); -} /* maintenance button */ #maintenanceButton { -moz-image-region: rect(0px, 48px, 16px, 32px); } -#maintenanceButton:hover, -#maintenanceButton[open="true"] { - -moz-image-region: rect(16px, 48px, 32px, 32px); -} /* Root View */ #placesView { @@ -134,12 +124,12 @@ } #infoBoxExpanderLabel { - -moz-padding-start: 2px; + padding-inline-start: 2px; } #organizerScopeBar { padding: 2px 0; - -moz-padding-end: 3px; + padding-inline-end: 3px; } #organizerScopeBar > toolbarbutton { @@ -181,8 +171,8 @@ } #clearDownloadsButton { - -moz-padding-start: 9px; - -moz-padding-end: 9px; + padding-inline-start: 9px; + padding-inline-end: 9px; } #placesView { @@ -205,11 +195,11 @@ @media (-moz-windows-default-theme) { #placesView > splitter { border: 0; - -moz-border-end: 1px solid #A9B7C9; + border-inline-end: 1px solid #A9B7C9; min-width: 0; width: 3px; background-color: transparent; - -moz-margin-start: -3px; + margin-inline-start: -3px; position: relative; } } @@ -245,7 +235,7 @@ #searchFilter { -moz-appearance: none; padding: 2px; - -moz-padding-start: 4px; + padding-inline-start: 4px; background-clip: padding-box; border: 1px solid rgba(0,0,0,.32); border-radius: 2px; diff --git a/palemoon/themes/windows/places/places.css b/palemoon/themes/windows/places/places.css index bb160463e..a16b82113 100644 --- a/palemoon/themes/windows/places/places.css +++ b/palemoon/themes/windows/places/places.css @@ -168,5 +168,5 @@ treechildren::-moz-tree-cell-text(cutting) { #viewButton > .button-box > .button-menu-dropmarker { height: auto; width: auto; - -moz-margin-end: -3px; + margin-inline-end: -3px; } diff --git a/palemoon/themes/windows/preferences/applications.css b/palemoon/themes/windows/preferences/applications.css index 80699b463..fdf561477 100644 --- a/palemoon/themes/windows/preferences/applications.css +++ b/palemoon/themes/windows/preferences/applications.css @@ -11,18 +11,18 @@ .actionsMenu { margin-top: 0; margin-bottom: 0; - -moz-margin-start: -2px; - -moz-margin-end: 0; + margin-inline-start: -2px; + margin-inline-end: 0; } .typeIcon, .actionIcon { - -moz-margin-start: 3px; - -moz-margin-end: 3px; + margin-inline-start: 3px; + margin-inline-end: 3px; } richlistitem label { - -moz-margin-start: 1px; + margin-inline-start: 1px; margin-top: 2px; } @@ -51,14 +51,14 @@ menuitem[appHandlerIcon="plugin"] { } .actionsMenu .menulist-icon { - -moz-margin-end: 3px; + margin-inline-end: 3px; } .actionsMenu > menupopup > menuitem > .menu-iconic-left { - -moz-padding-start: 0px; - -moz-padding-end: 2px; + padding-inline-start: 0px; + padding-inline-end: 2px; } .actionsMenu > menupopup > menuitem { - -moz-padding-start: 4px; + padding-inline-start: 4px; } diff --git a/palemoon/themes/windows/sanitizeDialog.css b/palemoon/themes/windows/sanitizeDialog.css index 4312eb8fb..58e1f2983 100644 --- a/palemoon/themes/windows/sanitizeDialog.css +++ b/palemoon/themes/windows/sanitizeDialog.css @@ -3,12 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #sanitizeDurationChoice { - -moz-margin-end: 0; + margin-inline-end: 0; } /* Align the duration label with the warning box and item list */ #sanitizeDurationLabel { - -moz-margin-start: 3px; + margin-inline-start: 3px; } @@ -79,15 +79,15 @@ /* Make the item list the same width as the warning box */ #itemList { - -moz-margin-start: 0; - -moz-margin-end: 0; + margin-inline-start: 0; + margin-inline-end: 0; } /* Align the last dialog button with the end of the warning box */ .prefWindow-dlgbuttons { - -moz-margin-end: 0; + margin-inline-end: 0; } .dialog-button[dlgtype="cancel"] { - -moz-margin-end: 0; + margin-inline-end: 0; } diff --git a/palemoon/themes/windows/searchbar.css b/palemoon/themes/windows/searchbar.css index 86a485530..d660772b9 100644 --- a/palemoon/themes/windows/searchbar.css +++ b/palemoon/themes/windows/searchbar.css @@ -22,7 +22,7 @@ width: 16px; list-style-image: url("chrome://global/skin/icons/folder-item.png"); -moz-image-region: rect(0px, 16px, 16px, 0px); - -moz-margin-start: 2px; + margin-inline-start: 2px; } .searchbar-engine-button { @@ -30,7 +30,7 @@ min-width: 0; margin: 0; padding: 0; - -moz-padding-end: 2px; + padding-inline-end: 2px; -moz-box-align: center; background: none; border: none; diff --git a/palemoon/themes/windows/statusbar/overlay.css b/palemoon/themes/windows/statusbar/overlay.css index 7f9a5982f..d9a36789b 100644 --- a/palemoon/themes/windows/statusbar/overlay.css +++ b/palemoon/themes/windows/statusbar/overlay.css @@ -58,7 +58,7 @@ toolbar[brighttext] #status4evar-download-button #status4evar-download-icon toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label { - -moz-margin-start: 5px !important; + margin-inline-start: 5px !important; } /* @@ -77,7 +77,7 @@ splitter.status4evar-status-splitter #urlbar-progress-alt { - -moz-margin-end: -2px; + margin-inline-end: -2px; } /* diff --git a/palemoon/themes/windows/syncCommon.css b/palemoon/themes/windows/syncCommon.css index f0beae0d5..838788cd5 100644 --- a/palemoon/themes/windows/syncCommon.css +++ b/palemoon/themes/windows/syncCommon.css @@ -8,7 +8,7 @@ } .statusIcon { - -moz-margin-start: 4px; + margin-inline-start: 4px; max-height: 16px; max-width: 16px; } diff --git a/palemoon/themes/windows/syncSetup.css b/palemoon/themes/windows/syncSetup.css index fff65e963..8898951eb 100644 --- a/palemoon/themes/windows/syncSetup.css +++ b/palemoon/themes/windows/syncSetup.css @@ -99,7 +99,7 @@ description > .text-link:focus { } .inputColumn { - -moz-margin-end: 2px + margin-inline-end: 2px } .pin { diff --git a/platform b/platform -Subproject a1e6132772816ebf5cced2e02b23bcf637fea40 +Subproject 963fc807963bf0bf83d5fefa945acbafa2dfc9f |