--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -518,16 +518,20 @@ toolbar:not(#TabsToolbar) > #personal-bo
#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icon-labels {
visibility: collapse;
}
#urlbar[pageproxystate="invalid"] > #identity-box {
pointer-events: none;
}
+#urlbar[pageproxystate="invalid"] > #identity-box > #notification-popup-box {
+ pointer-events: auto;
+}
+
#identity-icon-labels {
max-width: 18em;
}
@media (max-width: 700px) {
#urlbar-container {
min-width: 45ch;
}
#identity-icon-labels {
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -709,69 +709,74 @@
enablehistory="true"
maxrows="10"
newlines="stripsurroundingwhitespace"
ontextentered="this.handleCommand(param);"
ontextreverted="return this.handleRevert();"
pageproxystate="invalid"
onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
onblur="setTimeout(() => { document.getElementById('identity-box').style.MozUserFocus = ''; }, 0);">
- <box id="notification-popup-box" hidden="true" align="center">
- <image id="default-notification-icon" class="notification-anchor-icon" role="button"
- aria-label="&urlbar.defaultNotificationAnchor.label;"/>
- <image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button"
- aria-label="&urlbar.geolocationNotificationAnchor.label;"/>
- <image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button"
- aria-label="&urlbar.addonsNotificationAnchor.label;"/>
- <image id="indexedDB-notification-icon" class="notification-anchor-icon indexedDB-icon" role="button"
- aria-label="&urlbar.indexedDBNotificationAnchor.label;"/>
- <image id="login-fill-notification-icon" class="notification-anchor-icon login-icon" role="button"
- aria-label="&urlbar.loginFillNotificationAnchor.label;"/>
- <image id="password-notification-icon" class="notification-anchor-icon login-icon" role="button"
- aria-label="&urlbar.passwordNotificationAnchor.label;"/>
- <image id="plugins-notification-icon" class="notification-anchor-icon plugin-icon" role="button"
- aria-label="&urlbar.pluginsNotificationAnchor.label;"/>
- <image id="web-notifications-notification-icon" class="notification-anchor-icon desktop-notification-icon" role="button"
- aria-label="&urlbar.webNotsNotificationAnchor3.label;"/>
- <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon camera-icon" role="button"
- aria-label="&urlbar.webRTCShareDevicesNotificationAnchor.label;"/>
- <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon camera-icon in-use" role="button"
- aria-label="&urlbar.webRTCSharingDevicesNotificationAnchor.label;"/>
- <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon microphone-icon" role="button"
- aria-label="&urlbar.webRTCShareMicrophoneNotificationAnchor.label;"/>
- <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon microphone-icon in-use" role="button"
- aria-label="&urlbar.webRTCSharingMicrophoneNotificationAnchor.label;"/>
- <image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon screen-icon" role="button"
- aria-label="&urlbar.webRTCShareScreenNotificationAnchor.label;"/>
- <image id="webRTC-sharingScreen-notification-icon" class="notification-anchor-icon screen-icon in-use" role="button"
- aria-label="&urlbar.webRTCSharingScreenNotificationAnchor.label;"/>
- <image id="pointerLock-notification-icon" class="notification-anchor-icon pointerLock-icon" role="button"
- aria-label="&urlbar.pointerLockNotificationAnchor.label;"/>
- <image id="servicesInstall-notification-icon" class="notification-anchor-icon service-icon" role="button"
- aria-label="&urlbar.servicesNotificationAnchor.label;"/>
- <image id="translate-notification-icon" class="notification-anchor-icon translation-icon" role="button"
- aria-label="&urlbar.translateNotificationAnchor.label;"/>
- <image id="translated-notification-icon" class="notification-anchor-icon translation-icon in-use" role="button"
- aria-label="&urlbar.translatedNotificationAnchor.label;"/>
- <image id="eme-notification-icon" class="notification-anchor-icon drm-icon" role="button"
- aria-label="&urlbar.emeNotificationAnchor.label;"/>
- </box>
<!-- Use onclick instead of normal popup= syntax since the popup
code fires onmousedown, and hence eats our favicon drag events.
We only add the identity-box button to the tab order when the location bar
has focus, otherwise pressing F6 focuses it instead of the location bar -->
<box id="identity-box" role="button"
align="center"
aria-label="&urlbar.viewSiteInfo.label;"
onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
ondragstart="gIdentityHandler.onDragStart(event);">
<image id="identity-icon"
consumeanchor="identity-box"
onclick="PageProxyClickHandler(event);"/>
+ <box id="notification-popup-box"
+ hidden="true"
+ tooltiptext=""
+ onmouseover="document.getElementById('identity-icon').classList.add('no-hover');"
+ onmouseout="document.getElementById('identity-icon').classList.remove('no-hover');"
+ align="center">
+ <image id="default-notification-icon" class="notification-anchor-icon" role="button"
+ aria-label="&urlbar.defaultNotificationAnchor.label;"/>
+ <image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button"
+ aria-label="&urlbar.geolocationNotificationAnchor.label;"/>
+ <image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button"
+ aria-label="&urlbar.addonsNotificationAnchor.label;"/>
+ <image id="indexedDB-notification-icon" class="notification-anchor-icon indexedDB-icon" role="button"
+ aria-label="&urlbar.indexedDBNotificationAnchor.label;"/>
+ <image id="login-fill-notification-icon" class="notification-anchor-icon login-icon" role="button"
+ aria-label="&urlbar.loginFillNotificationAnchor.label;"/>
+ <image id="password-notification-icon" class="notification-anchor-icon login-icon" role="button"
+ aria-label="&urlbar.passwordNotificationAnchor.label;"/>
+ <image id="plugins-notification-icon" class="notification-anchor-icon plugin-icon" role="button"
+ aria-label="&urlbar.pluginsNotificationAnchor.label;"/>
+ <image id="web-notifications-notification-icon" class="notification-anchor-icon desktop-notification-icon" role="button"
+ aria-label="&urlbar.webNotsNotificationAnchor3.label;"/>
+ <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon camera-icon" role="button"
+ aria-label="&urlbar.webRTCShareDevicesNotificationAnchor.label;"/>
+ <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon camera-icon in-use" role="button"
+ aria-label="&urlbar.webRTCSharingDevicesNotificationAnchor.label;"/>
+ <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon microphone-icon" role="button"
+ aria-label="&urlbar.webRTCShareMicrophoneNotificationAnchor.label;"/>
+ <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon microphone-icon in-use" role="button"
+ aria-label="&urlbar.webRTCSharingMicrophoneNotificationAnchor.label;"/>
+ <image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon screen-icon" role="button"
+ aria-label="&urlbar.webRTCShareScreenNotificationAnchor.label;"/>
+ <image id="webRTC-sharingScreen-notification-icon" class="notification-anchor-icon screen-icon in-use" role="button"
+ aria-label="&urlbar.webRTCSharingScreenNotificationAnchor.label;"/>
+ <image id="pointerLock-notification-icon" class="notification-anchor-icon pointerLock-icon" role="button"
+ aria-label="&urlbar.pointerLockNotificationAnchor.label;"/>
+ <image id="servicesInstall-notification-icon" class="notification-anchor-icon service-icon" role="button"
+ aria-label="&urlbar.servicesNotificationAnchor.label;"/>
+ <image id="translate-notification-icon" class="notification-anchor-icon translation-icon" role="button"
+ aria-label="&urlbar.translateNotificationAnchor.label;"/>
+ <image id="translated-notification-icon" class="notification-anchor-icon translation-icon in-use" role="button"
+ aria-label="&urlbar.translatedNotificationAnchor.label;"/>
+ <image id="eme-notification-icon" class="notification-anchor-icon drm-icon" role="button"
+ aria-label="&urlbar.emeNotificationAnchor.label;"/>
+ </box>
<image id="tracking-protection-icon"/>
<image id="connection-icon"/>
<hbox id="identity-icon-labels">
<label id="identity-icon-label" class="plain" flex="1"/>
<label id="identity-icon-country-label" class="plain"/>
</hbox>
</box>
<box id="urlbar-display-box" align="center">
--- a/browser/base/content/test/popupNotifications/browser_popupNotification_2.js
+++ b/browser/base/content/test/popupNotifications/browser_popupNotification_2.js
@@ -233,10 +233,34 @@ var tests = [
dismissNotification(popup);
},
onHidden: function (popup) {
ok(this.notifyObj.dismissalCallbackTriggered, "dismissal callback triggered");
this.notification.remove();
ok(this.notifyObj.removedCallbackTriggered, "removed callback triggered");
window.locationbar.visible = true;
}
+ },
+ // Test that dismissed popupnotifications can be opened on about:blank
+ // (where the rest of the identity block is disabled)
+ { id: "Test#11",
+ run: function() {
+ this.oldSelectedTab = gBrowser.selectedTab;
+ gBrowser.selectedTab = gBrowser.addTab("about:blank");
+
+ this.notifyObj = new BasicNotification(this.id);
+ this.notifyObj.anchorID = "geo-notification-icon";
+ this.notifyObj.addOptions({dismissed: true});
+ this.notification = showNotification(this.notifyObj);
+
+ EventUtils.synthesizeMouse(document.getElementById("geo-notification-icon"), 0, 0, {});
+ },
+ onShown: function(popup) {
+ checkPopup(popup, this.notifyObj);
+ dismissNotification(popup);
+ },
+ onHidden: function(popup) {
+ this.notification.remove();
+ gBrowser.removeTab(gBrowser.selectedTab);
+ gBrowser.selectedTab = this.oldSelectedTab;
+ }
}
];
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -859,16 +859,24 @@ menuitem:not([type]):not(.menuitem-toolt
-moz-appearance: none;
-moz-box-align: stretch;
}
.urlbar-input-box {
margin-inline-start: 0;
}
+.urlbar-input-box,
+#urlbar-display-box {
+ padding-inline-start: 4px;
+ border-inline-start: 1px solid var(--urlbar-separator-color);
+ border-image: linear-gradient(transparent 15%, var(--urlbar-separator-color) 15%, var(--urlbar-separator-color) 85%, transparent 85%);
+ border-image-slice: 1;
+}
+
.urlbar-history-dropmarker {
-moz-appearance: toolbarbutton-dropdown;
transition: opacity 0.15s ease;
}
#urlbar-wrapper[switchingtabs] > #urlbar > .urlbar-textbox-container > .urlbar-history-dropmarker {
transition: none;
}
@@ -953,18 +961,16 @@ menuitem:not([type]):not(.menuitem-toolt
#urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox {
margin-inline-start: 0;
}
#urlbar-display-box {
margin-top: -1px;
margin-bottom: -1px;
- border-inline-end: 1px solid #AAA;
- margin-inline-end: 3px;
}
.urlbar-display {
margin-top: 0;
margin-bottom: 0;
margin-inline-start: 0;
color: GrayText;
}
@@ -1006,19 +1012,16 @@ menuitem:not([type]):not(.menuitem-toolt
max-width: 28em;
}
.addon-install-confirmation-name {
font-weight: bold;
}
/* Notification icon box */
-#notification-popup-box {
- border-radius: 2.5px 0 0 2.5px;
-}
.notification-anchor-icon:-moz-focusring {
outline: 1px dotted -moz-DialogText;
}
/* Translation infobar */
%include ../shared/translation/infobar.inc.css
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -1571,20 +1571,16 @@ toolbar .toolbarbutton-1 > .toolbarbutto
@media (-moz-mac-yosemite-theme) {
#urlbar:not([focused="true"]):not(:-moz-window-inactive) > #identity-box {
margin-top: -2px;
margin-bottom: -2px;
padding-top: 4px;
padding-bottom: 4px;
}
- #identity-box {
- --identity-box-hover-background-color: rgb(240,237,237);
- --identity-box-selected-background-color: rgb(220,217,217);
- }
}
#identity-box:-moz-locale-dir(ltr) {
border-top-left-radius: 2px;
border-bottom-left-radius: 2px;
}
#identity-box:-moz-locale-dir(rtl) {
@@ -1599,16 +1595,24 @@ toolbar .toolbarbutton-1 > .toolbarbutto
padding-inline-end: 5px;
}
.urlbar-input-box {
margin-inline-start: 0;
padding: 3px 0 2px;
}
+.urlbar-input-box,
+#urlbar-display-box {
+ padding-inline-start: 4px;
+ border-inline-start: 1px solid var(--urlbar-separator-color);
+ border-image: linear-gradient(transparent 15%, var(--urlbar-separator-color) 15%, var(--urlbar-separator-color) 85%, transparent 85%);
+ border-image-slice: 1;
+}
+
.urlbar-history-dropmarker {
padding: 0 3px;
list-style-image: var(--urlbar-dropmarker-url);
-moz-image-region: var(--urlbar-dropmarker-region);
transition: opacity 0.15s ease;
}
#urlbar-wrapper[switchingtabs] > #urlbar > .urlbar-textbox-container > .urlbar-history-dropmarker {
@@ -1684,21 +1688,16 @@ toolbar .toolbarbutton-1 > .toolbarbutto
#search-container {
min-width: calc(54px + 11ch);
}
#wrapper-urlbar-container[place="palette"] {
max-width: 20em;
}
-#urlbar-display-box {
- border-inline-end: 1px solid #AAA;
- margin-inline-end: 3px;
-}
-
.urlbar-display {
margin-top: 0;
margin-bottom: 0;
color: GrayText;
}
%include ../shared/urlbarSearchSuggestionsNotification.inc.css
@@ -2971,20 +2970,16 @@ menuitem:hover > hbox > .alltabs-endimag
list-style-image: none;
height: 2px;
margin-inline-end: -4em;
background-color: Highlight;
}
%include ../shared/notification-icons.inc.css
-#notification-popup-box {
- border-radius: 2px 0 0 2px;
-}
-
.notification-anchor-icon:-moz-focusring {
box-shadow: 0 0 2px 1px -moz-mac-focusring inset,
0 0 3px 2px -moz-mac-focusring;
}
#social-notification-icon > .toolbarbutton-icon {
height: 16px;
}
--- a/browser/themes/shared/addons/addon-install-anchor.svg
+++ b/browser/themes/shared/addons/addon-install-anchor.svg
@@ -5,23 +5,15 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
width="16" height="16" viewBox="0 0 16 16">
<defs>
<style>
use:not(:target) {
display: none;
}
.style-icon-notification {
- fill: #666;
- }
- .style-icon-notification.hover {
- fill: #808080;
- }
- .style-icon-notification.active {
- fill: #4d4d4d;
+ fill: #999;
}
</style>
- <path id="shape-notifcations-addons" d="M10,15c0.5,0,1-0.4,1-1v-3c0,0,0-0.8,0.8-0.8c0.6,0,0.6,0.8,1.8,0.8c0.6,0,1.5-0.2,1.5-2c0-1.8-0.9-2-1.5-2 c-1.1,0-1.1,0.7-1.8,0.7C11,7.7,11,7,11,7V6c0-0.6-0.5-1-1-1H8c0,0-0.8,0-0.8-0.8C7.2,3.6,8,3.6,8,2.5C8,1.9,7.8,1,6,1 C4.2,1,4,1.9,4,2.5c0,1.1,0.8,1.1,0.8,1.8C4.8,5,4,5,4,5H2C1.5,5,1,5.4,1,6l0,1.5c0,0-0.1,1,1.1,1c0.8,0,0.9-1,1.9-1 C4.5,7.4,5,8,5,9c0,1-0.5,1.6-1,1.6c-1,0-1.1-1.1-1.9-1.1C0.9,9.5,1,10.8,1,10.8V14c0,0.6,0.5,1,1,1l2.6,0c0,0,1.1,0,1.1-1 c0-0.8-1-0.1-1-1.1c0-0.5,0.7-1.2,1.8-1.2s1.8,0.7,1.8,1.2c0,1-1.1,0.3-1.1,1.1c0,1,1.2,1,1.2,1H10z"/>
+ <path id="shape-notifications-addons" d="M10,15c0.5,0,1-0.4,1-1v-3c0,0,0-0.8,0.8-0.8c0.6,0,0.6,0.8,1.8,0.8c0.6,0,1.5-0.2,1.5-2c0-1.8-0.9-2-1.5-2 c-1.1,0-1.1,0.7-1.8,0.7C11,7.7,11,7,11,7V6c0-0.6-0.5-1-1-1H8c0,0-0.8,0-0.8-0.8C7.2,3.6,8,3.6,8,2.5C8,1.9,7.8,1,6,1 C4.2,1,4,1.9,4,2.5c0,1.1,0.8,1.1,0.8,1.8C4.8,5,4,5,4,5H2C1.5,5,1,5.4,1,6l0,1.5c0,0-0.1,1,1.1,1c0.8,0,0.9-1,1.9-1 C4.5,7.4,5,8,5,9c0,1-0.5,1.6-1,1.6c-1,0-1.1-1.1-1.9-1.1C0.9,9.5,1,10.8,1,10.8V14c0,0.6,0.5,1,1,1l2.6,0c0,0,1.1,0,1.1-1 c0-0.8-1-0.1-1-1.1c0-0.5,0.7-1.2,1.8-1.2s1.8,0.7,1.8,1.2c0,1-1.1,0.3-1.1,1.1c0,1,1.2,1,1.2,1H10z"/>
</defs>
- <use id="default" xlink:href="#shape-notifcations-addons" class="style-icon-notification"/>
- <use id="hover" xlink:href="#shape-notifcations-addons" class="style-icon-notification hover"/>
- <use id="active" xlink:href="#shape-notifcations-addons" class="style-icon-notification active"/>
+ <use id="default" xlink:href="#shape-notifications-addons" class="style-icon-notification"/>
</svg>
--- a/browser/themes/shared/devedition.inc.css
+++ b/browser/themes/shared/devedition.inc.css
@@ -56,18 +56,16 @@
--urlbar-dropmarker-2x-region: rect(0px, 11px, 14px, 0px);
--urlbar-dropmarker-hover-2x-region: rect(0, 22px, 14px, 11px);
--urlbar-dropmarker-active-2x-region: rect(0px, 33px, 14px, 22px);
}
:root[devtoolstheme="dark"] #identity-box {
--identity-box-chrome-color: #46afe3;
--identity-box-verified-background-color: transparent;
- --identity-box-hover-background-color: rgba(231,230,230,.2);
- --identity-box-selected-background-color: rgba(211,210,210,.2);
}
:root[devtoolstheme="light"] {
--url-and-searchbar-background-color: #fff;
--chrome-background-color: #E3E4E6;
--chrome-color: #18191a;
--chrome-secondary-background-color: #f5f6f7;
@@ -204,33 +202,16 @@ toolbar[brighttext] #downloads-indicator
}
window:not([chromehidden~="toolbar"]) #urlbar-wrapper {
overflow: -moz-hidden-unscrollable;
clip-path: none;
margin-inline-start: 0;
}
-/* Swap out the white arrow with a dark one for the dark theme */
-:root[devtoolstheme="dark"] #notification-popup-box {
- border-image: url("chrome://browser/skin/devedition/urlbar-arrow.png") 0 8 0 0 fill;
-}
-
-@media (min-resolution: 1.1dppx) {
- :root[devtoolstheme="dark"] #notification-popup-box {
- border-image: url("chrome://browser/skin/devedition/urlbar-arrow@2x.png") 0 16 0 0 fill;
- }
-}
-
-/* The (white) notification box background color should match the theme */
-#notification-popup-box {
- border-radius: 0;
- background-color: var(--url-and-searchbar-background-color);
-}
-
/* Nav bar specific stuff */
#nav-bar {
margin-top: 0 !important;
border-top: none !important;
border-bottom: none !important;
border-radius: 0 !important;
box-shadow: 0 -1px var(--chrome-nav-bar-separator-color) !important;
}
deleted file mode 100644
index c14afc780b4a4941865209e2dc99542c383ce56c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index e6867a49898e503367172f98f5b78c7f9ccd17ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/shared/identity-block/identity-block.inc.css
+++ b/browser/themes/shared/identity-block/identity-block.inc.css
@@ -1,116 +1,84 @@
%if 0
/* 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/. */
%endif
#identity-box {
- --identity-box-hover-background-color: rgb(231,230,230);
- --identity-box-selected-background-color: rgb(211,210,210);
--identity-box-verified-color: hsl(92,100%,30%);
%ifdef MOZ_OFFICIAL_BRANDING
--identity-box-chrome-color: rgb(229,115,0);
%else
%if MOZ_UPDATE_CHANNEL == aurora
--identity-box-chrome-color: rgb(51,30,84);
%else
--identity-box-chrome-color: rgb(0,33,71);
%endif
%endif
- border-inline-end: 1px solid var(--urlbar-separator-color);
- border-image: linear-gradient(transparent 15%,
- var(--urlbar-separator-color) 15%,
- var(--urlbar-separator-color) 85%,
- transparent 85%);
- border-image-slice: 1;
font-size: .9em;
padding: 3px 5px;
- margin-inline-end: 4px;
overflow: hidden;
/* The latter two properties have a transition to handle the delayed hiding of
the forward button when hovered. */
transition: background-color 150ms ease, padding-left, padding-right;
}
-#identity-box:hover,
-#identity-box[open=true] {
- border-image-source: none;
-}
-
-#identity-box:hover {
- background-color: var(--identity-box-hover-background-color);
-}
-
-#identity-box:hover:active,
-#identity-box[open=true] {
- background-color: var(--identity-box-selected-background-color);
-}
-
#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
color: var(--identity-box-verified-color);
}
#urlbar[pageproxystate="valid"] > #identity-box.chromeUI {
color: var(--identity-box-chrome-color);
}
#identity-icon-labels:-moz-locale-dir(ltr) {
padding-left: 2px;
}
#identity-icon-labels:-moz-locale-dir(rtl) {
padding-right: 2px;
}
-#notification-popup-box:not([hidden]) + #identity-box {
- padding-inline-start: 10px;
- border-radius: 0;
-}
-
-@conditionalForwardWithUrlbar@ > #urlbar > #identity-box {
- border-radius: 0;
-}
-
-@conditionalForwardWithUrlbar@ > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box {
+@conditionalForwardWithUrlbar@ > #forward-button[disabled] + #urlbar > #identity-box {
padding-inline-start: calc(var(--backbutton-urlbar-overlap) + 5px);
}
-@conditionalForwardWithUrlbar@:hover:not([switchingtabs]) > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box {
+@conditionalForwardWithUrlbar@:hover:not([switchingtabs]) > #forward-button[disabled] + #urlbar > #identity-box {
/* Forward button hiding is delayed when hovered, so we should use the same
delay for the identity box. We handle both horizontal paddings (for LTR and
RTL), the latter two delays here are for padding-left and padding-right. */
transition-delay: 0s, 100s, 100s;
}
-@conditionalForwardWithUrlbar@:not(:hover) > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box {
+@conditionalForwardWithUrlbar@:not(:hover) > #forward-button[disabled] + #urlbar > #identity-box {
/* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
padding-inline-start: calc(var(--backbutton-urlbar-overlap) + 5.01px);
}
/* MAIN IDENTITY ICON */
#identity-icon {
width: 16px;
height: 16px;
list-style-image: url(chrome://browser/skin/identity-icon.svg#normal);
}
-#identity-box:hover > #identity-icon,
+#identity-box:hover > #identity-icon:not(.no-hover),
#identity-box[open=true] > #identity-icon {
list-style-image: url(chrome://browser/skin/identity-icon.svg#hover);
}
#identity-box.grantedPermissions > #identity-icon {
list-style-image: url(chrome://browser/skin/identity-icon.svg#notice);
}
-#identity-box.grantedPermissions:hover > #identity-icon,
+#identity-box.grantedPermissions:hover > #identity-icon:not(.no-hover),
#identity-box.grantedPermissions[open=true] > #identity-icon {
list-style-image: url(chrome://browser/skin/identity-icon.svg#notice-hover);
}
#urlbar[pageproxystate="valid"] > #identity-box.chromeUI > #identity-icon {
list-style-image: url(chrome://branding/content/identity-icons-brand.svg);
}
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -112,18 +112,16 @@
skin/classic/browser/translating-16.png (../shared/translation/translating-16.png)
skin/classic/browser/translating-16@2x.png (../shared/translation/translating-16@2x.png)
skin/classic/browser/translation-16.png (../shared/translation/translation-16.png)
skin/classic/browser/translation-16@2x.png (../shared/translation/translation-16@2x.png)
skin/classic/browser/undoCloseTab.png (../shared/undoCloseTab.png)
skin/classic/browser/undoCloseTab@2x.png (../shared/undoCloseTab@2x.png)
skin/classic/browser/update-badge.svg (../shared/update-badge.svg)
skin/classic/browser/update-badge-failed.svg (../shared/update-badge-failed.svg)
- skin/classic/browser/urlbar-arrow.png (../shared/urlbar-arrow.png)
- skin/classic/browser/urlbar-arrow@2x.png (../shared/urlbar-arrow@2x.png)
skin/classic/browser/warning.svg (../shared/warning.svg)
skin/classic/browser/cert-error.svg (../shared/incontent-icons/cert-error.svg)
skin/classic/browser/session-restore.svg (../shared/incontent-icons/session-restore.svg)
skin/classic/browser/tab-crashed.svg (../shared/incontent-icons/tab-crashed.svg)
skin/classic/browser/favicon-search-16.svg (../shared/favicon-search-16.svg)
skin/classic/browser/icon-search-64.svg (../shared/incontent-icons/icon-search-64.svg)
skin/classic/browser/welcome-back.svg (../shared/incontent-icons/welcome-back.svg)
skin/classic/browser/reader-tour.png (../shared/reader/reader-tour.png)
@@ -146,16 +144,14 @@
skin/classic/browser/panic-panel/icons@2x.png (../shared/panic-panel/icons@2x.png)
skin/classic/browser/privatebrowsing/aboutPrivateBrowsing.css (../shared/privatebrowsing/aboutPrivateBrowsing.css)
skin/classic/browser/privatebrowsing/check.svg (../shared/privatebrowsing/check.svg)
skin/classic/browser/privatebrowsing/favicon.svg (../shared/privatebrowsing/favicon.svg)
skin/classic/browser/privatebrowsing/private-browsing.svg (../shared/privatebrowsing/private-browsing.svg)
skin/classic/browser/privatebrowsing/tracking-protection-off.svg (../shared/privatebrowsing/tracking-protection-off.svg)
skin/classic/browser/privatebrowsing/tracking-protection.svg (../shared/privatebrowsing/tracking-protection.svg)
skin/classic/browser/devedition/urlbar-history-dropmarker.svg (../shared/devedition/urlbar-history-dropmarker.svg)
- skin/classic/browser/devedition/urlbar-arrow.png (../shared/devedition/urlbar-arrow.png)
- skin/classic/browser/devedition/urlbar-arrow@2x.png (../shared/devedition/urlbar-arrow@2x.png)
skin/classic/browser/urlbar-star.svg (../shared/urlbar-star.svg)
skin/classic/browser/urlbar-tab.svg (../shared/urlbar-tab.svg)
skin/classic/browser/usercontext/personal.svg (../shared/usercontext/personal.svg)
skin/classic/browser/usercontext/work.svg (../shared/usercontext/work.svg)
skin/classic/browser/usercontext/banking.svg (../shared/usercontext/banking.svg)
skin/classic/browser/usercontext/shopping.svg (../shared/usercontext/shopping.svg)
--- a/browser/themes/shared/notification-icons.inc.css
+++ b/browser/themes/shared/notification-icons.inc.css
@@ -1,56 +1,28 @@
%if 0
/* 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/. */
%endif
#notification-popup-box {
- position: relative;
- background-color: #fff;
- background-clip: padding-box;
- padding-left: 3px;
- 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;
-}
-
-@media (min-resolution: 1.1dppx) {
- #notification-popup-box {
- border-image: url("chrome://browser/skin/urlbar-arrow@2x.png") 0 16 0 0 fill;
- }
-}
-
-@conditionalForwardWithUrlbar@ > #forward-button[disabled] + #urlbar > #notification-popup-box {
- padding-left: calc(var(--backbutton-urlbar-overlap) + 3px);
-}
-
-/* This changes the direction of the main notification box on the url bar. */
-#notification-popup-box:-moz-locale-dir(rtl),
-/* This adds a second flip for the notification anchors, as they don't switch direction
- for RTL mode. */
-.notification-anchor-icon:-moz-locale-dir(rtl) {
- transform: scaleX(-1);
-}
-
-/* For the anchor icons in the chat window, we don't have the notification popup box,
- so we need to cancel the RTL transform. */
-.notification-anchor-icon.chat-toolbarbutton:-moz-locale-dir(rtl) {
- transform: none;
+ padding: 5px 0px;
+ margin: -5px 0px;
+ margin-inline-end: -5px;
+ padding-inline-end: 5px;
}
/* This class can be used alone or in combination with the class defining the
type of icon displayed. This rule must be defined before the others in order
for its list-style-image to be overridden. */
.notification-anchor-icon {
width: 16px;
height: 16px;
- margin: 0 2px;
+ margin-inline-start: 2px;
%ifdef MOZ_WIDGET_GTK
list-style-image: url(moz-icon://stock/gtk-dialog-info?size=16);
%else
list-style-image: url(chrome://global/skin/icons/information-16.png);
%endif
}
@media (min-resolution: 1.1dppx) {
@@ -207,24 +179,16 @@
}
/* INSTALL ADDONS */
.install-icon {
list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default);
}
-.install-icon:hover {
- list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#hover);
-}
-
-.install-icon:hover:active {
- list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#active);
-}
-
.popup-notification-icon[popupid="xpinstall-disabled"],
.popup-notification-icon[popupid="addon-install-blocked"],
.popup-notification-icon[popupid="addon-install-origin-blocked"] {
list-style-image: url(chrome://browser/skin/addons/addon-install-blocked.svg);
}
.popup-notification-icon[popupid="addon-progress"] {
list-style-image: url(chrome://browser/skin/addons/addon-install-downloading.svg);
@@ -274,24 +238,16 @@
.plugin-icon.plugin-blocked {
list-style-image: url(chrome://browser/skin/notification-pluginBlocked.png);
}
.plugin-icon {
-moz-image-region: rect(0, 16px, 16px, 0);
}
-.plugin-icon:hover {
- -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.plugin-icon:active {
- -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
%ifdef XP_MACOSX
@media (min-resolution: 1.1dppx) {
.plugin-icon {
list-style-image: url(chrome://browser/skin/notification-pluginNormal@2x.png);
}
.plugin-icon.plugin-hidden {
list-style-image: url(chrome://browser/skin/notification-pluginAlert@2x.png);
@@ -299,24 +255,16 @@
.plugin-icon.plugin-blocked {
list-style-image: url(chrome://browser/skin/notification-pluginBlocked@2x.png);
}
.plugin-icon {
-moz-image-region: rect(0, 32px, 32px, 0);
}
-
- .plugin-icon:hover {
- -moz-image-region: rect(0, 64px, 32px, 32px);
- }
-
- .plugin-icon:active {
- -moz-image-region: rect(0, 96px, 32px, 64px);
- }
}
%endif
#notification-popup-box[hidden] {
/* Override display:none to make the pluginBlockedNotification animation work
when showing the notification repeatedly. */
display: -moz-box;
visibility: collapse;
deleted file mode 100644
index ed83d8aac957701a9ad96594c39401a8dc2de50f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 91d9f8d8b3b7b7d3282f0fceec952822b0fce91f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1260,16 +1260,24 @@ html|*.urlbar-input:-moz-lwtheme::-moz-p
.urlbar-textbox-container {
-moz-box-align: stretch;
}
.urlbar-input-box {
margin-inline-start: 0;
}
+.urlbar-input-box,
+#urlbar-display-box {
+ padding-inline-start: 4px;
+ border-inline-start: 1px solid var(--urlbar-separator-color);
+ border-image: linear-gradient(transparent 15%, var(--urlbar-separator-color) 15%, var(--urlbar-separator-color) 85%, transparent 85%);
+ border-image-slice: 1;
+}
+
#urlbar-icons {
-moz-box-align: center;
}
.urlbar-icon {
padding: 0 3px;
/* 16x16 icon with border-box sizing */
width: 22px;
@@ -1309,21 +1317,16 @@ html|*.urlbar-input:-moz-lwtheme::-moz-p
border: none;
background: transparent;
}
#urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox {
margin-inline-start: 0;
}
-#urlbar-display-box {
- border-inline-end: 1px solid #AAA;
- margin-inline-end: 3px;
-}
-
.urlbar-display {
margin-top: 0;
margin-bottom: 0;
margin-inline-start: 0;
color: GrayText;
}
%include ../shared/urlbarSearchSuggestionsNotification.inc.css
@@ -2177,19 +2180,16 @@ toolbarbutton.bookmark-item[dragover="tr
max-width: 28em;
}
.addon-install-confirmation-name {
font-weight: bold;
}
/* Notification icon box */
-#notification-popup-box {
- border-radius: 2.5px 0 0 2.5px;
-}
.notification-anchor-icon:-moz-focusring {
outline: 1px dotted -moz-DialogText;
}
/* Translation infobar */
%include ../shared/translation/infobar.inc.css
--- a/toolkit/modules/PopupNotifications.jsm
+++ b/toolkit/modules/PopupNotifications.jsm
@@ -950,16 +950,18 @@ PopupNotifications.prototype = {
if (type == "keypress" &&
!(event.charCode == Ci.nsIDOMKeyEvent.DOM_VK_SPACE ||
event.keyCode == Ci.nsIDOMKeyEvent.DOM_VK_RETURN))
return;
if (this._currentNotifications.length == 0)
return;
+ event.stopPropagation();
+
// Get the anchor that is the immediate child of the icon box
let anchor = event.target;
while (anchor && anchor.parentNode != this.iconBox)
anchor = anchor.parentNode;
if (!anchor) {
return;
}
