--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -116,17 +116,16 @@ skip-if = os == "linux" # Bug 924307
[browser_addKeywordSearch.js]
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
[browser_alltabslistener.js]
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
[browser_audioTabIcon.js]
tags = audiochannel
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
[browser_backButtonFitts.js]
-skip-if = os == "mac" # The Fitt's Law back button is not supported on OS X
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
[browser_beforeunload_duplicate_dialogs.js]
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
[browser_blob-channelname.js]
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
[browser_bookmark_popup.js]
skip-if = (os == "linux" && debug) # mouseover not reliable on linux debug builds
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
--- a/browser/extensions/pocket/skin/osx/pocket.css
+++ b/browser/extensions/pocket/skin/osx/pocket.css
@@ -1,13 +1,12 @@
@import url("chrome://pocket-shared/skin/pocket.css");
-#pocket-button[cui-areatype="toolbar"] > .toolbarbutton-icon {
- max-width: 18px;
- margin: 0;
+#nav-bar #pocket-button > .toolbarbutton-icon {
+ padding: calc(var(--toolbarbutton-vertical-inner-padding)) 6px;
}
#pocket-button[cui-areatype="toolbar"][open] {
-moz-image-region: rect(36px, 18px, 54px, 0);
}
@media (min-resolution: 2dppx) {
#panelMenu_pocket,
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -7,28 +7,32 @@
@import url("chrome://global/skin/");
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/1999/xhtml");
@namespace svg url("http://www.w3.org/2000/svg");
%include ../shared/browser.inc
%include linuxShared.inc
-%filter substitution
-
-%define forwardTransitionLength 150ms
-%define conditionalForwardWithUrlbar window:not([chromehidden~="toolbar"]) #urlbar-wrapper
%include ../shared/browser.inc.css
:root {
--backbutton-urlbar-overlap: 6px;
+ --backbutton-border-color: var(--urlbar-border-color-hover);
+ --backbutton-background: rgba(255,255,255,.15);
+
/* icon width + border + horizontal padding (without the overlap from backbutton-urlbar-overlap) */
--forwardbutton-width: 25px;
+ --toolbarbutton-border-radius: 1px;
+
+ --toolbarbutton-vertical-inner-padding: 2px;
+ --toolbarbutton-vertical-text-padding: var(--toolbarbutton-vertical-inner-padding);
+
--toolbarbutton-hover-background: rgba(255,255,255,.5) linear-gradient(rgba(255,255,255,.5), transparent);
--toolbarbutton-hover-bordercolor: rgba(0,0,0,.25);
--toolbarbutton-hover-boxshadow: none;
--toolbarbutton-active-background: rgba(154,154,154,.5) linear-gradient(rgba(255,255,255,.7), rgba(255,255,255,.4));
--toolbarbutton-active-bordercolor: rgba(0,0,0,.3);
--toolbarbutton-active-boxshadow: 0 1px 1px rgba(0,0,0,.1) inset, 0 0 1px rgba(0,0,0,.3) inset;
@@ -188,77 +192,16 @@ toolbarbutton.bookmark-item:not(.subview
list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important;
}
toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-placeholder,
#personal-bookmarks[cui-areatype="menu-panel"] > #bookmarks-toolbar-placeholder {
list-style-image: url("chrome://browser/skin/places/bookmarksToolbar-menuPanel.png") !important;
}
-/* ----- BOOKMARK STAR ANIMATION ----- */
-
-@keyframes animation-bookmarkAdded {
- from { transform: rotate(0deg) translateX(-16px) rotate(0deg) scale(1); opacity: 0; }
- 60% { transform: rotate(180deg) translateX(-16px) rotate(-180deg) scale(2.2); opacity: 1; }
- 80% { opacity: 1; }
- to { transform: rotate(180deg) translateX(-16px) rotate(-180deg) scale(1); opacity: 0; }
-}
-
-@keyframes animation-bookmarkPulse {
- from { transform: scale(1); }
- 50% { transform: scale(1.3); }
- to { transform: scale(1); }
-}
-
-#bookmarked-notification-container {
- min-height: 1px;
- min-width: 1px;
- height: 1px;
- margin-bottom: -1px;
- z-index: 5;
- position: relative;
-}
-
-#bookmarked-notification {
- background-size: 16px;
- background-position: center;
- background-repeat: no-repeat;
- width: 16px;
- height: 16px;
- opacity: 0;
-}
-
-#bookmarked-notification-dropmarker-anchor {
- z-index: -1;
- position: relative;
-}
-
-#bookmarked-notification-dropmarker-icon {
- width: 18px;
- height: 18px;
- visibility: hidden;
-}
-
-#bookmarked-notification-anchor[notification="finish"] > #bookmarked-notification {
- background-image: url("chrome://browser/skin/places/bookmarks-notification-finish.png");
- animation: animation-bookmarkAdded 800ms;
- animation-timing-function: ease, ease, ease;
-}
-
-#bookmarks-menu-button[notification="finish"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
- list-style-image: none !important;
-}
-
-#bookmarked-notification-dropmarker-anchor[notification="finish"] > #bookmarked-notification-dropmarker-icon {
- visibility: visible;
- animation: animation-bookmarkPulse 300ms;
- animation-delay: 600ms;
- animation-timing-function: ease-out;
-}
-
/* Bookmark menus */
menu.bookmark-item,
menuitem.bookmark-item {
min-width: 0;
max-width: 32em;
}
.bookmark-item:not(.subviewbutton) > .menu-iconic-left {
@@ -343,221 +286,32 @@ menuitem.bookmark-item {
opacity: 0.5;
}
.bookmark-item[cutting] > .toolbarbutton-text,
.bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-text {
opacity: 0.7;
}
-/* Primary toolbar buttons */
-
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > .toolbarbutton-icon,
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
- max-width: 16px;
-}
-
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(@primaryToolbarButtons@, .toolbarbutton-legacy-addon) > .toolbarbutton-icon,
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(@primaryToolbarButtons@, .toolbarbutton-legacy-addon) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
-#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
- max-width: 18px;
-}
-
-.findbar-button,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 {
- -moz-appearance: none;
- padding: 0 3px;
-}
-
-.findbar-button > .toolbarbutton-text,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-badge-stack,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon {
- margin-inline-end: 0;
- padding: 2px 6px;
- border: 1px solid transparent;
- border-radius: 2px;
- transition-property: background-color, border-color;
- transition-duration: 150ms;
-}
-
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@, .toolbarbutton-legacy-addon)) > .toolbarbutton-icon,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@, .toolbarbutton-legacy-addon)) > .toolbarbutton-badge-stack,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@, .toolbarbutton-legacy-addon)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
- padding: 3px 7px;
-}
-
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-:-moz-any(#TabsToolbar, #nav-bar) #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
- /* horizontal padding + border + actual icon width */
- max-width: 32px !important /* bug 561154 */;
-}
-
-#nav-bar #PanelUI-menu-button {
- padding-inline-start: 5px;
- padding-inline-end: 5px;
-}
-
-.findbar-button:not(:-moz-any([checked="true"],[disabled="true"])):hover > .toolbarbutton-text,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1[open]:not([disabled=true]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([disabled=true]):not([open]):hover > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([disabled=true]):not([open]):hover > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([disabled=true]):hover > .toolbarbutton-badge-stack,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([disabled=true]):hover > .toolbarbutton-icon {
- background: var(--toolbarbutton-hover-background);
- background-clip: padding-box;
- border-color: var(--toolbarbutton-hover-bordercolor);
- box-shadow: var(--toolbarbutton-hover-boxshadow);
-}
-
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:hover > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
- margin-top: 4px;
- margin-bottom: 4px;
-}
-
-.findbar-button:not([disabled=true]):-moz-any([checked="true"],:hover:active) > .toolbarbutton-text,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):-moz-any(:hover:active, [open="true"]) > .toolbarbutton-icon,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1[open="true"] > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-stack,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon {
- background: var(--toolbarbutton-active-background);
- background-clip: padding-box;
- box-shadow: var(--toolbarbutton-active-boxshadow);
- border-color: var(--toolbarbutton-active-bordercolor);
- transition-duration: 10ms;
-}
-
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1[checked]:not(:active):hover > .toolbarbutton-icon {
- background-color: var(--toolbarbutton-checkedhover-backgroundcolor);
- transition: background-color 150ms;
-}
-
-:-moz-any(#TabsToolbar, #nav-bar) .toolbaritem-combined-buttons {
- margin-left: 2px;
- margin-right: 2px;
-}
-
-:-moz-any(#TabsToolbar, #nav-bar) .toolbaritem-combined-buttons > .toolbarbutton-1 {
- padding-left: 0;
- padding-right: 0;
-}
-
-:-moz-any(#TabsToolbar, #nav-bar) .toolbaritem-combined-buttons:not(:hover) > separator,
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
- content: "";
- display: -moz-box;
- width: 1px;
- height: 18px;
- margin-inline-end: -1px;
- background-image: linear-gradient(currentColor 0, currentColor 100%);
- background-position: center;
- background-repeat: no-repeat;
- background-size: 1px 18px;
- opacity: .2;
-}
-
-:-moz-any(#TabsToolbar, #nav-bar)[brighttext] .toolbaritem-combined-buttons > separator,
-:-moz-any(#TabsToolbar, #nav-bar)[brighttext] .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
- opacity: .3;
-}
-
-:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
- margin-inline-start: -4px;
- margin-top: 3px;
- margin-bottom: 3px;
-}
-
-:-moz-any(#back-button, #forward-button) > .toolbarbutton-icon {
- border-color: var(--urlbar-border-color) !important /* bug 561154 */;
-}
-
-:-moz-any(#back-button, #forward-button):not(:hover):not(:active):not([open=true]) > .toolbarbutton-icon,
-:-moz-any(#back-button, #forward-button)[disabled=true] > .toolbarbutton-icon {
- background-color: rgba(255,255,255,.25) !important /* bug 561154 */;
- background-clip: padding-box;
-}
-
-#back-button {
- padding-top: 2px;
- padding-bottom: 2px;
- padding-inline-start: 4px;
- padding-inline-end: 0;
- position: relative;
- z-index: 1;
- border-radius: 0 10000px 10000px 0;
-}
-
-#back-button:-moz-locale-dir(rtl) {
- border-radius: 10000px 0 0 10000px;
-}
-
-#back-button > menupopup {
- margin-top: -1px;
-}
-
-#back-button > .toolbarbutton-icon {
- border-radius: 10000px;
- padding: 6px;
- max-width: 32px; /* horizontal padding + border + icon width */
-}
-
-#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
- transform: scaleX(-1);
-}
-
-#forward-button {
- -moz-box-align: stretch; /* let the button shape grow vertically with the location bar */
- padding: 0;
-}
-
-#forward-button > .toolbarbutton-icon {
- padding-left: calc(var(--backbutton-urlbar-overlap) + 3px);
- padding-right: 3px;
- border-left-style: none;
- border-radius: 0;
- max-width: calc(var(--forwardbutton-width) + var(--backbutton-urlbar-overlap));
-}
-
-@conditionalForwardWithUrlbar@:not([switchingtabs]) > #forward-button {
- transition: margin-left @forwardTransitionLength@ ease-out;
-}
-
-@conditionalForwardWithUrlbar@ > #forward-button[disabled] {
- margin-left: calc(0px - var(--forwardbutton-width) - var(--backbutton-urlbar-overlap));
-}
-
-@conditionalForwardWithUrlbar@:hover:not([switchingtabs]) > #forward-button[disabled] {
- /* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */
- transition-delay: 100s;
-}
-
-@conditionalForwardWithUrlbar@:not(:hover) > #forward-button[disabled] {
- /* when not hovered anymore, trigger a new transition to hide the forward button immediately */
- margin-left: calc(-0.01px - var(--forwardbutton-width) - var(--backbutton-urlbar-overlap));
-}
+%include ../shared/bookmarked-notification.inc.css
.unified-nav-back[_moz-menuactive] {
list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu") !important;
}
.unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl) {
list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu") !important;
}
.unified-nav-forward[_moz-menuactive] {
list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu") !important;
}
.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl) {
list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu") !important;
}
-/* Menu panel buttons */
-
+%include ../shared/toolbarbuttons.inc.css
%include ../shared/toolbarbutton-icons.inc.css
%include ../shared/menupanel.inc.css
#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-icon,
#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menu-dropmarker,
#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker,
#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
#main-window:not([customizing]) .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled=true] > .toolbarbutton-icon {
@@ -578,16 +332,17 @@ menuitem.bookmark-item {
}
#close-button {
list-style-image: url("chrome://global/skin/icons/Close.gif");
}
/* Location bar */
#main-window {
--urlbar-border-color: ThreeDShadow;
+ --urlbar-border-color-hover: var(--urlbar-border-color);
}
#navigator-toolbox:-moz-lwtheme {
--urlbar-border-color: rgba(0,0,0,.3);
}
#urlbar,
.searchbar-textbox {
@@ -1200,53 +955,16 @@ html|span.ac-emphasize-text-url {
display: none;
}
.share-provider-button > .toolbarbutton-icon {
width: 16px;
min-height: 16px;
max-height: 16px;
}
-/* bookmarks menu-button */
-
-#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker {
- -moz-appearance: none !important;
- -moz-box-align: center;
-}
-
-#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
- margin-top: 3px;
- margin-bottom: 3px;
-}
-
-#bookmarks-menu-button[disabled][cui-areatype="toolbar"] > .toolbarbutton-icon,
-#bookmarks-menu-button[disabled][cui-areatype="toolbar"] > .toolbarbutton-menu-dropmarker,
-#bookmarks-menu-button[disabled][cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker,
-#bookmarks-menu-button[disabled][cui-areatype="toolbar"] > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-button[disabled] > .toolbarbutton-icon {
- opacity: .4;
-}
-
-#BMB_bookmarksPopup[side="top"],
-#BMB_bookmarksPopup[side="bottom"] {
- margin-left: -16px;
- margin-right: -16px;
-}
-
-#BMB_bookmarksPopup[side="left"],
-#BMB_bookmarksPopup[side="right"] {
- margin-top: -16px;
- margin-bottom: -16px;
-}
-
-#nav-bar .toolbarbutton-1 > menupopup[side="top"].cui-widget-panel,
-#nav-bar .toolbarbutton-1 > menupopup[side="bottom"].cui-widget-panel {
- margin-top: -4px;
-}
-
/* Bookmarking panel */
#editBookmarkPanelStarIcon {
list-style-image: url("chrome://browser/skin/places/starred48.png");
width: 48px;
height: 48px;
}
#editBookmarkPanelStarIcon[unstarred] {
--- a/browser/themes/linux/compacttheme.css
+++ b/browser/themes/linux/compacttheme.css
@@ -1,18 +1,14 @@
% 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/.
%include ../shared/compacttheme.inc.css
-:root {
- --forwardbutton-width: 29px;
-}
-
:root:-moz-lwtheme-darktext {
--urlbar-dropmarker-url: url("chrome://browser/skin/compacttheme/urlbar-history-dropmarker.svg");
--urlbar-dropmarker-region: rect(0px, 11px, 14px, 0px);
--urlbar-dropmarker-hover-region: rect(0, 22px, 14px, 11px);
--urlbar-dropmarker-active-region: rect(0px, 33px, 14px, 22px);
--urlbar-dropmarker-2x-url: url("chrome://browser/skin/compacttheme/urlbar-history-dropmarker.svg");
--urlbar-dropmarker-2x-region: rect(0px, 11px, 14px, 0px);
--urlbar-dropmarker-hover-2x-region: rect(0, 22px, 14px, 11px);
@@ -32,50 +28,16 @@
}
#main-menubar {
color: var(--chrome-color);
}
#main-menubar > menu:not([open]) {
color: inherit;
}
-/* Allow buttons with -moz-appearance set to look normal on hover and open states */
-#navigator-toolbox .toolbarbutton-1:-moz-any(:hover, [open="true"]),
-#PlacesToolbar toolbarbutton.bookmark-item:-moz-any(:hover, [open="true"]) {
- color: initial;
-}
-
-/* Square back and forward buttons */
-#back-button > .toolbarbutton-icon,
-#forward-button > .toolbarbutton-icon {
- margin: 0;
- border: 1px solid var(--chrome-nav-bar-controls-border-color);
- padding: 2px 5px;
- background: var(--chrome-nav-buttons-background);
- box-shadow: none !important;
-}
-
-#forward-button > .toolbarbutton-icon {
- border-inline-start: none;
-}
-
-/* Override a box shadow for disabled back button */
-#main-window:not([customizing]) #back-button[disabled] > .toolbarbutton-icon {
- box-shadow: none !important;
-}
-
-#back-button:hover:not([disabled="true"]) > .toolbarbutton-icon,
-#forward-button:hover:not([disabled="true"]) > .toolbarbutton-icon {
- background: var(--chrome-nav-buttons-hover-background) !important;
-}
-
-#back-button > .toolbarbutton-icon {
- border-radius: 2px 0 0 2px !important;
-}
-
.urlbar-history-dropmarker {
-moz-appearance: none;
padding: 0 3px;
list-style-image: var(--urlbar-dropmarker-url);
-moz-image-region: var(--urlbar-dropmarker-region);
}
/* Add the proper background for tab overflow */
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -51,17 +51,16 @@ browser.jar:
* skin/classic/browser/downloads/downloads.css (downloads/downloads.css)
skin/classic/browser/feeds/feedIcon.png (feeds/feedIcon.png)
skin/classic/browser/feeds/feedIcon16.png (feeds/feedIcon16.png)
skin/classic/browser/feeds/subscribe.css (feeds/subscribe.css)
* skin/classic/browser/newtab/newTab.css (newtab/newTab.css)
skin/classic/browser/places/bookmarksMenu.png (places/bookmarksMenu.png)
skin/classic/browser/places/bookmarksToolbar.png (places/bookmarksToolbar.png)
skin/classic/browser/places/bookmarksToolbar-menuPanel.png (places/bookmarksToolbar-menuPanel.png)
- skin/classic/browser/places/bookmarks-notification-finish.png (places/bookmarks-notification-finish.png)
skin/classic/browser/places/bookmarks-menu-arrow.png (places/bookmarks-menu-arrow.png)
skin/classic/browser/places/calendar.png (places/calendar.png)
* skin/classic/browser/places/editBookmarkOverlay.css (places/editBookmarkOverlay.css)
skin/classic/browser/places/livemark-item.png (places/livemark-item.png)
skin/classic/browser/places/starred48.png (places/starred48.png)
skin/classic/browser/places/unstarred48.png (places/unstarred48.png)
skin/classic/browser/places/places.css (places/places.css)
skin/classic/browser/places/organizer.css (places/organizer.css)
deleted file mode 100644
index 8520b49853d015723d89eca6fe051902c646fc1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -1,63 +1,78 @@
/* 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/. */
@import url("chrome://global/skin/");
%include shared.inc
-%filter substitution
-%define forwardTransitionLength 150ms
-%define conditionalForwardWithUrlbar window:not([chromehidden~="toolbar"]) #urlbar-wrapper
%define toolbarButtonPressed :hover:active:not([disabled="true"]):not([cui-areatype="menu-panel"])
%define windowButtonMarginTop 11px
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/1999/xhtml");
@namespace svg url("http://www.w3.org/2000/svg");
%include ../shared/browser.inc.css
:root {
--space-above-tabbar: 9px;
--tabs-toolbar-color: #333;
--backbutton-urlbar-overlap: 6px;
+ --backbutton-border-color: rgba(0,0,0,0.2);
+ --backbutton-background: linear-gradient(rgba(255,255,255,0.9),
+ rgba(255,255,255,0.7)) repeat-x;
+
/* icon width + border + horizontal padding (without the overlap from backbutton-urlbar-overlap) */
--forwardbutton-width: 26px;
+ --toolbarbutton-vertical-inner-padding: 2px;
+ --toolbarbutton-vertical-text-padding: 4px;
+
+ --toolbarbutton-border-radius: 3px;
+
--toolbarbutton-hover-background: hsla(0,0%,100%,.1) linear-gradient(hsla(0,0%,100%,.3), hsla(0,0%,100%,.1)) padding-box;
--toolbarbutton-hover-bordercolor: hsla(0,0%,0%,.2);
--toolbarbutton-hover-boxshadow: 0 1px 0 hsla(0,0%,100%,.5),
0 1px 0 hsla(0,0%,100%,.5) inset;
--toolbarbutton-active-background: hsla(0,0%,0%,.02) linear-gradient(hsla(0,0%,0%,.12), transparent) border-box;
--toolbarbutton-active-bordercolor: hsla(0,0%,0%,.3);
--toolbarbutton-active-boxshadow: 0 1px 0 hsla(0,0%,100%,.5),
0 1px 0 hsla(0,0%,0%,.05) inset,
0 1px 1px hsla(0,0%,0%,.2) inset;
--toolbarbutton-checkedhover-backgroundcolor: hsla(0,0%,0%,.09);
+ --toolbarbutton-disabled-opacity: 0.4;
+
--urlbar-dropmarker-url: url("chrome://browser/skin/urlbar-history-dropmarker.png");
--urlbar-dropmarker-region: rect(0, 11px, 14px, 0);
--urlbar-dropmarker-active-region: rect(0, 22px, 14px, 11px);
--urlbar-dropmarker-2x-url: url("chrome://browser/skin/urlbar-history-dropmarker@2x.png");
--urlbar-dropmarker-2x-region: rect(0, 22px, 28px, 0);
--urlbar-dropmarker-active-2x-region: rect(0, 44px, 28px, 22px);
--panel-separator-color: hsla(210,4%,10%,.14);
--arrowpanel-dimmed: hsla(210,4%,10%,.07);
--arrowpanel-dimmed-further: hsla(210,4%,10%,.12);
--arrowpanel-dimmed-even-further: hsla(210,4%,10%,.17);
--urlbar-separator-color: hsla(0,0%,16%,.2);
}
+toolbar:-moz-lwtheme {
+ --backbutton-background: linear-gradient(rgba(255,255,255,0.5),
+ rgba(255,255,255,0.2) 50%,
+ rgba(255,255,255,0.1) 50%,
+ rgba(255,255,255,0.2)) repeat-x;
+}
+
#urlbar:-moz-lwtheme:not([focused="true"]),
.searchbar-textbox:-moz-lwtheme:not([focused="true"]) {
opacity: .9;
}
#navigator-toolbox::after {
-moz-box-ordinal-group: 101; /* tabs toolbar is 100 */
content: "";
@@ -174,17 +189,16 @@
#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar):not(#addon-bar)[collapsed=true] {
min-height: 0.1px;
max-height: 0;
transition: min-height 170ms ease-out, max-height 170ms ease-out, visibility 170ms linear;
}
#nav-bar {
-moz-appearance: none;
- padding: 4px;
background: url(chrome://browser/skin/Toolbar-background-noise.png),
linear-gradient(hsl(0,0%,93%), hsl(0,0%,83%));
background-clip: border-box;
background-origin: border-box !important;
/* Move the noise texture out of the top 1px strip because that overlaps
with the tabbar and we don't want to repaint it when animating tabs.
The noise image is at least 100px high, so repeating it only horizontally
@@ -493,83 +507,16 @@ toolbarpaletteitem[place="palette"] > #p
list-style-image: url("chrome://browser/skin/places/bookmarksToolbar-menuPanel@2x.png") !important;
}
#bookmarks-toolbar-placeholder > .toolbarbutton-icon {
width: 16px;
}
}
-/* ----- BOOKMARK STAR ANIMATION ----- */
-
-@keyframes animation-bookmarkAdded {
- from { transform: rotate(0deg) translateX(-14px) rotate(0deg) scale(1); opacity: 0; }
- 60% { transform: rotate(180deg) translateX(-14px) rotate(-180deg) scale(2.2); opacity: 1; }
- 80% { opacity: 1; }
- to { transform: rotate(180deg) translateX(-14px) rotate(-180deg) scale(1); opacity: 0; }
-}
-
-@keyframes animation-bookmarkPulse {
- from { transform: scale(1); }
- 50% { transform: scale(1.3); }
- to { transform: scale(1); }
-}
-
-#bookmarked-notification-container {
- min-height: 1px;
- min-width: 1px;
- height: 1px;
- margin-bottom: -1px;
- z-index: 5;
- position: relative;
-}
-
-#bookmarked-notification {
- background-size: 16px;
- background-position: center;
- background-repeat: no-repeat;
- width: 16px;
- height: 16px;
- opacity: 0;
-}
-
-#bookmarked-notification-dropmarker-anchor {
- z-index: -1;
- position: relative;
-}
-
-#bookmarked-notification-dropmarker-icon {
- width: 18px;
- height: 18px;
- visibility: hidden;
-}
-
-#bookmarked-notification-anchor[notification="finish"] > #bookmarked-notification {
- background-image: url("chrome://browser/skin/places/bookmarks-notification-finish.png");
- animation: animation-bookmarkAdded 800ms;
- animation-timing-function: ease, ease, ease;
-}
-
-@media (min-resolution: 2dppx) {
- #bookmarked-notification-anchor[notification="finish"] > #bookmarked-notification {
- background-image: url("chrome://browser/skin/places/bookmarks-notification-finish@2x.png");
- }
-}
-
-#bookmarks-menu-button[notification="finish"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
- list-style-image: none !important;
-}
-
-#bookmarked-notification-dropmarker-anchor[notification="finish"] > #bookmarked-notification-dropmarker-icon {
- visibility: visible;
- animation: animation-bookmarkPulse 300ms;
- animation-delay: 600ms;
- animation-timing-function: ease-out;
-}
-
/* ----- BOOKMARK MENUS ----- */
.bookmark-item > .menu-iconic-left > .menu-iconic-icon {
width: 16px;
height: 16px;
}
#bookmarksToolbarFolderMenu,
@@ -590,850 +537,57 @@ toolbarpaletteitem[place="palette"] > #p
list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png");
}
#BMB_unsortedBookmarks {
list-style-image: url("chrome://browser/skin/places/unfiledBookmarks@2x.png");
}
}
-/* ----- PRIMARY TOOLBAR BUTTONS ----- */
-
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > .toolbarbutton-icon,
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
- max-width: 16px;
- margin: 1px;
-}
-
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(@primaryToolbarButtons@, .toolbarbutton-legacy-addon) > .toolbarbutton-icon,
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(@primaryToolbarButtons@, .toolbarbutton-legacy-addon) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
- max-width: 18px;
- margin: 0;
-}
-
-toolbar .toolbarbutton-1:not([type="menu-button"]),
-.toolbarbutton-1 > .toolbarbutton-menubutton-button,
-.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
- -moz-box-orient: vertical;
- height: 24px;
- padding: 0;
- border: 0;
-}
-
-.findbar-button,
-toolbar .toolbarbutton-1:not(:-moz-any([type="menu-button"],#back-button,#forward-button)),
-toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
-toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
- border: 1px solid transparent;
- border-radius: @toolbarbuttonCornerRadius@;
- transition-property: background, border-color;
- transition-duration: 250ms;
-}
-
+%include ../shared/bookmarked-notification.inc.css
+
+%include ../shared/toolbarbuttons.inc.css
+%include ../shared/toolbarbutton-icons.inc.css
+%include ../shared/menupanel.inc.css
+
+/* Override OSX-specific toolkit findbar button styles */
.findbar-button {
background: none;
box-shadow: none;
-}
-
-toolbar .toolbarbutton-1:not(:-moz-any([type="menu-button"],#back-button,#forward-button)) {
- padding: 0 4px;
-}
-
-.findbar-button:not(:-moz-any([checked="true"],[disabled="true"])):hover,
-toolbar .toolbarbutton-1:not(:-moz-any([type="menu-button"],[disabled],[open],#back-button,#forward-button)):hover,
-toolbar .toolbarbutton-1[type="menu-button"]:not([disabled]) > .toolbarbutton-menubutton-button[open] + .toolbarbutton-menubutton-dropmarker,
-toolbar .toolbarbutton-1[type="menu-button"]:not([disabled]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button,
-toolbar .toolbarbutton-1[type="menu-button"]:not([disabled]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker,
-toolbar .toolbaritem-combined-buttons:hover > .toolbarbutton-combined {
- border-color: var(--toolbarbutton-hover-bordercolor);
- box-shadow: var(--toolbarbutton-hover-boxshadow);
-}
-
-.findbar-button:not(:-moz-any([checked="true"],[disabled="true"])):hover,
-toolbar .toolbarbutton-1:not(:-moz-any([type="menu-button"],[disabled],[open],#back-button,#forward-button)):hover,
-toolbar .toolbarbutton-1[type="menu-button"]:not(:-moz-any([disabled],[open]))[buttonover] > .toolbarbutton-menubutton-button,
-toolbar .toolbarbutton-1[type="menu-button"]:not(:-moz-any([disabled],[open],[buttonover])):hover > .toolbarbutton-menubutton-dropmarker {
- background: var(--toolbarbutton-hover-background);
-}
-
-.findbar-button:not([disabled=true]):-moz-any([checked="true"],:hover:active),
-toolbar .toolbarbutton-1:not(:-moz-any([type="menu-button"],[disabled],#back-button,#forward-button)):-moz-any(:hover:active,[open],[checked]),
-toolbar .toolbarbutton-1[type="menu-button"]:not([disabled]) > .toolbarbutton-menubutton-button[open],
-toolbar .toolbarbutton-1[type="menu-button"]:not(:-moz-any([disabled],[open]))[buttonover]:active > .toolbarbutton-menubutton-button,
-toolbar .toolbarbutton-1[type="menu-button"]:not(:-moz-any([disabled],[open],[buttonover])):hover:active > .toolbarbutton-menubutton-dropmarker,
-toolbar .toolbarbutton-1[type="menu-button"][open]:not([disabled]) > .toolbarbutton-menubutton-dropmarker {
- background: var(--toolbarbutton-active-background);
- border-color: var(--toolbarbutton-active-bordercolor);
- box-shadow: var(--toolbarbutton-active-boxshadow);
- transition-duration: 10ms;
-}
-
-.findbar-button[checked="true"]:not(:active):hover,
-toolbar .toolbarbutton-1[checked]:not(:active):hover {
- background-color: var(--toolbarbutton-checkedhover-backgroundcolor);
- transition: background-color 250ms;
-}
-
-.toolbarbutton-1[type="menu-button"]:not([overflowedItem=true]) {
- padding: 0;
-}
-
-.toolbarbutton-1 > .toolbarbutton-menubutton-button,
-.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
- margin: 0;
-}
-
-.toolbarbutton-1 {
- margin: 4px 2px;
-}
-
-/**
- * Draw seperators before toolbar button dropmarkers, as well as between
- * consecutive toolbarbutton-1's within a toolbaritem.
- */
-toolbar .toolbaritem-combined-buttons:not(:hover) > separator,
-toolbar .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
- content: "";
- display: -moz-box;
- width: 1px;
- height: 18px;
- margin-inline-start: -1px;
- background-image: linear-gradient(currentColor 0, currentColor 100%);
- background-position: center;
- background-repeat: no-repeat;
- background-size: 1px 18px;
- opacity: .2;
-}
-
-toolbar[brighttext] .toolbaritem-combined-buttons > separator,
-toolbar[brighttext] .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
- opacity: .3;
-}
-
-toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
- -moz-box-orient: horizontal;
-}
-
-toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
- margin: 0 4px;
-}
-
-#PanelUI-button {
- margin-top: -4px;
- margin-bottom: -4px;
- margin-inline-start: 5px;
- margin-inline-end: 1px;
- padding-inline-start: 5px;
- -moz-box-align: center;
+ border: none;
}
-%include ../shared/toolbarbutton-icons.inc.css
-%include ../shared/menupanel.inc.css
-
-@media not all and (min-resolution: 1.1dppx) {
- #back-button:hover:active:not([disabled="true"]) {
- -moz-image-region: rect(18px, 36px, 36px, 18px);
- }
-
- #forward-button:hover:active:not([disabled="true"]) {
- -moz-image-region: rect(18px, 72px, 36px, 54px);
- }
-
- #home-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 126px, 36px, 108px);
- }
-
- #bookmarks-menu-button[buttonover]@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 144px, 36px, 126px);
- }
-
- #bookmarks-menu-button[starred][buttonover]@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 162px, 36px, 144px);
- }
-
- #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
- -moz-image-region: rect(0px, 630px, 18px, 612px);
- }
-
- #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker:hover:active:not([disabled="true"]) > .dropmarker-icon {
- -moz-image-region: rect(18px, 630px, 36px, 612px);
- }
-
- #history-panelmenu@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 180px, 36px, 162px);
- }
-
- #downloads-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 198px, 36px, 180px);
- }
-
- #add-ons-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 216px, 36px, 198px);
- }
-
- #open-file-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 234px, 36px, 216px);
- }
-
- #save-page-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 252px, 36px, 234px);
- }
-
- #sync-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 792px, 36px, 774px);
- }
-
- #containers-panelmenu@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 810px, 36px, 792px);
- }
-
- #feed-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 288px, 36px, 270px);
- }
-
- #social-share-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 306px, 36px, 288px);
- }
-
- #characterencoding-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 324px, 36px, 306px);
- }
-
- #new-window-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 342px, 36px, 324px);
- }
-
- #e10s-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 342px, 36px, 324px);
- }
-
- #webide-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 738px, 36px, 720px);
- }
-
- #new-tab-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 360px, 36px, 342px);
- }
-
- #privatebrowsing-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 378px, 36px, 360px);
- }
-
- #find-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 396px, 36px, 378px);
- }
-
- #print-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 414px, 36px, 396px);
- }
-
- #restore-button:hover:active:not([disabled="true"]),
- #fullscreen-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 432px, 36px, 414px);
- }
-
- #developer-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 450px, 36px, 432px);
- }
-
- #preferences-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 468px, 36px, 450px);
- }
-
- #PanelUI-menu-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 486px, 36px, 468px);
- }
-
- #edit-controls[cui-areatype="toolbar"] > #cut-button:hover:active:not([disabled="true"]) {
- -moz-image-region: rect(18px, 504px, 36px, 486px);
- }
-
- #edit-controls[cui-areatype="toolbar"] > #copy-button:hover:active:not([disabled="true"]) {
- -moz-image-region: rect(18px, 522px, 36px, 504px);
- }
-
- #edit-controls[cui-areatype="toolbar"] > #paste-button:hover:active:not([disabled="true"]) {
- -moz-image-region: rect(18px, 540px, 36px, 522px);
- }
-
- #zoom-controls[cui-areatype="toolbar"] > #zoom-out-button:hover:active:not([disabled="true"]) {
- -moz-image-region: rect(18px, 558px, 36px, 540px);
- }
-
- #zoom-controls[cui-areatype="toolbar"] > #zoom-in-button:hover:active:not([disabled="true"]) {
- -moz-image-region: rect(18px, 576px, 36px, 558px);
- }
-
- #nav-bar-overflow-button:hover:active:not([disabled="true"]) {
- -moz-image-region: rect(18px, 612px, 36px, 594px);
- }
-
- #email-link-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 666px, 36px, 648px);
- }
-
- #sidebar-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 684px, 36px, 666px);
- }
-
- #panic-button@toolbarButtonPressed@ {
- -moz-image-region: rect(18px, 702px, 36px, 684px);
- }
-
- /**
- * OSX has a unique set of icons when fullscreen is in the checked state.
- */
-
- #fullscreen-button[checked="true"]:not([cui-areatype="menu-panel"]) {
- -moz-image-region: rect(36px, 432px, 54px, 414px);
- }
-
- #fullscreen-button[checked="true"]@toolbarButtonPressed@ {
- -moz-image-region: rect(54px, 432px, 72px, 414px);
- }
-}
-
-@media (min-resolution: 1.1dppx) {
- #back-button:hover:active:not([disabled="true"]) {
- -moz-image-region: rect(36px, 72px, 72px, 36px);
- }
-
- #forward-button:hover:active:not([disabled="true"]) {
- -moz-image-region: rect(36px, 144px, 72px, 108px);
- }
-
- #home-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 252px, 72px, 216px);
- }
-
- #bookmarks-menu-button@toolbarButtonPressed@[buttonover] {
- -moz-image-region: rect(36px, 288px, 72px, 252px);
- }
-
- #bookmarks-menu-button@toolbarButtonPressed@[starred][buttonover] {
- -moz-image-region: rect(36px, 324px, 72px, 288px);
- }
-
- #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker:hover:active:not([disabled="true"]) > .dropmarker-icon {
- -moz-image-region: rect(36px, 1260px, 72px, 1224px);
- }
-
- #history-panelmenu@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 360px, 72px, 324px);
- }
-
- #downloads-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 396px, 72px, 360px);
- }
-
- #add-ons-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 432px, 72px, 396px);
- }
-
- #open-file-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 468px, 72px, 432px);
- }
-
- #save-page-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 504px, 72px, 468px);
- }
-
- #sync-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 1584px, 72px, 1548px);
- }
-
- #containers-panelmenu@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 1620px, 72px, 1584px);
- }
-
- #feed-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 576px, 72px, 540px);
- }
-
- #social-share-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 612px, 72px, 576px);
- }
-
- #characterencoding-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 648px, 72px, 612px);
- }
-
- #new-window-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 684px, 72px, 648px);
- }
-
- #e10s-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 684px, 72px, 648px);
- }
-
- #e10s-button > .toolbarbutton-icon {
- transform: scaleY(-1);
- }
-
- #webide-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 1476px, 72px, 1440px);
- }
-
- #new-tab-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 720px, 72px, 684px);
- }
-
- #privatebrowsing-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 756px, 72px, 720px);
- }
-
- #find-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 792px, 72px, 756px);
- }
-
- #print-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 828px, 72px, 792px);
- }
-
- #restore-button:hover:active:not([disabled="true"]),
- #fullscreen-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 864px, 72px, 828px);
- }
-
- #fullscreen-button[cui-areatype="toolbar"][checked="true"] {
- -moz-image-region: rect(72px, 864px, 108px, 828px);
- }
-
- #fullscreen-button@toolbarButtonPressed@[checked="true"] {
- -moz-image-region: rect(108px, 864px, 144px, 828px);
- }
-
- #developer-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 900px, 72px, 864px);
- }
-
- #preferences-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 936px, 72px, 900px);
- }
-
- #PanelUI-menu-button:hover:active:not([disabled="true"]) {
- -moz-image-region: rect(36px, 972px, 72px, 936px);
- }
-
- #edit-controls[cui-areatype="toolbar"] > #cut-button:hover:active:not([disabled="true"]) {
- -moz-image-region: rect(36px, 1008px, 72px, 972px);
- }
-
- #edit-controls[cui-areatype="toolbar"] > #copy-button:hover:active:not([disabled="true"]) {
- -moz-image-region: rect(36px, 1044px, 72px, 1008px);
- }
-
- #edit-controls[cui-areatype="toolbar"] > #paste-button:hover:active:not([disabled="true"]) {
- -moz-image-region: rect(36px, 1080px, 72px, 1044px);
- }
-
- #zoom-controls[cui-areatype="toolbar"] > #zoom-out-button:hover:active:not([disabled="true"]) {
- -moz-image-region: rect(36px, 1116px, 72px, 1080px);
- }
-
- #zoom-controls[cui-areatype="toolbar"] > #zoom-in-button:hover:active:not([disabled="true"]) {
- -moz-image-region: rect(36px, 1152px, 72px, 1116px);
- }
-
- #nav-bar-overflow-button:hover:active:not([disabled="true"]) {
- -moz-image-region: rect(36px, 1224px, 72px, 1188px);
- }
-
- #email-link-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 1332px, 72px, 1296px);
- }
-
- #sidebar-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 1368px, 72px, 1332px);
- }
-
- #panic-button@toolbarButtonPressed@ {
- -moz-image-region: rect(36px, 1404px, 72px, 1368px);
- }
-}
-
-toolbar .toolbarbutton-1:not([type="menu-button"]),
-toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button {
- min-width: 28px;
-}
-
-#main-window:not([customizing]) .toolbarbutton-1[disabled="true"] > .toolbarbutton-icon,
-#main-window:not([customizing]) .toolbarbutton-1[disabled="true"] > .toolbarbutton-badge-stack > .toolbarbutton-icon,
-#main-window:not([customizing]) .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled="true"] > .toolbarbutton-icon,
-#main-window:not([customizing]) .toolbarbutton-1[disabled="true"] > .toolbarbutton-menu-dropmarker,
-#main-window:not([customizing]) .toolbarbutton-1[disabled="true"] > .toolbarbutton-menubutton-dropmarker,
+/* Inactive elements are faded out on OSX */
+
.toolbarbutton-1:not(:hover):-moz-window-inactive > #downloads-indicator-anchor,
.toolbarbutton-1:not(:hover):-moz-window-inactive > .toolbarbutton-icon,
.toolbarbutton-1:not(:hover):-moz-window-inactive > .toolbarbutton-text,
.toolbarbutton-1:not(:hover):-moz-window-inactive > .toolbarbutton-badge-stack > .toolbarbutton-icon,
.toolbarbutton-1:not(:hover):-moz-window-inactive > .toolbarbutton-menu-dropmarker,
.toolbarbutton-1:not(:hover):-moz-window-inactive > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
.toolbarbutton-1:not(:hover):-moz-window-inactive > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
- opacity: .5;
+ opacity: var(--toolbarbutton-disabled-opacity);
}
#main-window:not([customizing]) .toolbarbutton-1:-moz-window-inactive[disabled="true"] > .toolbarbutton-icon,
#main-window:not([customizing]) .toolbarbutton-1:-moz-window-inactive[disabled="true"] > .toolbarbutton-badge-stack > .toolbarbutton-icon,
#main-window:not([customizing]) .toolbarbutton-1:-moz-window-inactive > .toolbarbutton-menubutton-button[disabled="true"] > .toolbarbutton-icon {
- opacity: .25;
-}
-
-.toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
-.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
- list-style-image: url(chrome://browser/skin/toolbarbutton-dropmarker.png);
-}
-
-@media (min-resolution: 2dppx) {
- .toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
- .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
- list-style-image: url(chrome://browser/skin/toolbarbutton-dropmarker@2x.png);
- }
-
- .toolbarbutton-1 > .toolbarbutton-menu-dropmarker > .dropmarker-icon,
- .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
- width: 7px;
- }
-}
-
-.toolbarbutton-1 > .toolbarbutton-menu-dropmarker {
- margin-inline-end: 1px;
-}
-
-.toolbarbutton-1 > .toolbarbutton-menubutton-button {
- border-inline-end: none !important;
-}
-
-.toolbarbutton-1 > .toolbarbutton-menubutton-button:-moz-locale-dir(rtl),
-.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-locale-dir(ltr) {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
-}
-
-.toolbarbutton-1 > .toolbarbutton-menubutton-button:-moz-locale-dir(ltr),
-.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-locale-dir(rtl) {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
-}
-
-.toolbarbutton-1 > menupopup {
- margin-top: 1px;
-}
-
-.toolbarbutton-1 > menupopup.cui-widget-panel {
- margin-top: -5px;
-}
-
-/* Common back and forward button styles */
-
-#back-button,
-#forward-button {
- background: linear-gradient(rgba(255,255,255,0.5),
- rgba(255,255,255,0.2) 50%,
- rgba(255,255,255,0.1) 50%,
- rgba(255,255,255,0.2)) repeat-x;
- margin-top: 0;
- margin-bottom: 0;
-}
-
-#back-button:-moz-lwtheme,
-#forward-button:-moz-lwtheme {
- background-origin: border-box;
- border: 1px solid rgba(0,0,0,0.4);
- box-shadow: inset 0 1px rgba(255,255,255,0.3), 0 1px rgba(255,255,255,0.2);
-}
-
-#back-button:active:hover:-moz-lwtheme,
-#forward-button:active:hover:-moz-lwtheme {
- background-color: rgba(0,0,0,0.2);
- box-shadow: inset 0 2px 5px rgba(0,0,0,0.6), 0 1px rgba(255,255,255,0.2);
-}
-
-#back-button:-moz-window-inactive,
-#forward-button:-moz-window-inactive {
- background-color: rgba(0,0,0,0.04);
- border-color: rgba(0,0,0,0.2);
-}
-
-#back-button > .toolbarbutton-icon,
-#forward-button > .toolbarbutton-icon {
- max-width: none;
- width: 18px;
-}
-
-/* Back button styles */
-
-#back-button {
- width: 32px;
- height: 32px;
- padding: 4px 5px 4px 3px;
- margin-inline-end: 0;
- border-radius: 10000px;
-}
-
-#back-button:-moz-locale-dir(rtl) {
- transform: scaleX(-1);
-}
-
-#back-button:not(:-moz-lwtheme) {
- height: 33px;
- padding: 4px 5px 5px 3px;
- margin-bottom: -1px;
- background: url(chrome://browser/skin/keyhole-circle.png) 0 0 no-repeat;
-}
-
-@media (min-resolution: 2dppx) {
- #back-button:not(:-moz-lwtheme) {
- background-image: url(chrome://browser/skin/keyhole-circle@2x.png);
- background-size: 96px;
- }
-}
-
-#back-button:-moz-window-inactive:not(:-moz-lwtheme) {
- background-position: -64px 0;
-}
-
-#back-button:not([disabled="true"]):active:hover:not(:-moz-lwtheme),
-#back-button[open="true"]:not(:-moz-lwtheme) {
- background-position: -32px 0;
-}
-
-/* Forward button styles */
-
-#forward-button {
- margin-left: -2px;
- margin-right: 0;
- padding-left: 2px;
- width: 32px;
-}
-
-#forward-button > .toolbarbutton-icon {
- /* shift the icon away from the back button */
- margin-left: 3px;
- margin-right: -1px;
-}
-
-#forward-button:not(:-moz-lwtheme) {
- background-image: linear-gradient(hsla(0,0%,100%,.73), hsla(0,0%,100%,.05) 85%);
- border: 1px solid;
- border-color: hsla(0,0%,0%,.35) hsla(0,0%,0%,.25) hsla(0,0%,0%,.2);
- box-shadow: inset 0 1px 0 hsla(0,0%,100%,.2),
- inset 0 0 1px hsla(0,0%,100%,.1),
- 0 1px 0 hsla(0,0%,100%,.2);
-}
-
-#forward-button:hover:active:not(:-moz-lwtheme) {
- background-image: linear-gradient(hsla(0,0%,60%,.37), hsla(0,0%,100%,.35) 95%);
- border-color: hsla(0,0%,0%,.43) hsla(0,0%,0%,.25) hsla(0,0%,0%,.37);
- box-shadow: inset 0 1px 0 hsla(0,0%,0%,.02),
- inset 0 1px 2px hsla(0,0%,0%,.2),
- 0 1px 0 hsla(0,0%,100%,.2);
-}
-
-#forward-button:-moz-window-inactive:not(:-moz-lwtheme) {
- background-image: none;
- border-color: hsla(0,0%,0%,.2);
- box-shadow: inset 0 1px 0 hsla(0,0%,100%,.35);
-}
-
-@media (-moz-mac-yosemite-theme) {
- /* Base and hover styles */
- #forward-button:not(:-moz-lwtheme),
- #back-button:not(:-moz-lwtheme),
- #forward-button:hover:not(:-moz-lwtheme),
- #back-button:hover:not(:-moz-lwtheme) {
- background-image: none;
- background-color: #fbfbfb;
- background-clip: border-box;
- border: 1px solid #aeaeae;
- box-shadow: none;
- }
-
- #back-button:not(:-moz-lwtheme) {
- /* On non-lwtheme OS X, we use a 32-px image in a 33px container with negative margin bottom.
- * Except that on Yosemite, we want to use a border instead of an image - like for lwthemes.
- * So we need to readjust the height, padding and margin-bottom of the back button
- * similarly to how we do this for lwthemes (but keep a specific enough selector to
- * override the other :not(:-moz-lwtheme) selector above): */
- height: 32px;
- padding: 4px 5px 4px 3px;
- margin-bottom: 0;
- }
-
- /* White inset shadow on top of the back button */
- #back-button:not(:-moz-lwtheme),
- #back-button:hover:not(:-moz-lwtheme) {
- box-shadow: inset 0 1px 0.5px 0 #fff;
- }
-
- /* Bottom shadow and right border for the forward button to match the location bar */
- #forward-button:hover:not(:-moz-lwtheme),
- #forward-button:not(:-moz-lwtheme) {
- box-shadow: 0 1px 0 0 rgba(0,0,0,0.2);
- border: 0 none;
- border-right: 1px solid rgba(0,0,0,0.3);
- }
-
- /* Active styling: transparent white over toolbar colors */
- #forward-button:hover:active:not(:-moz-lwtheme),
- #back-button:not([disabled="true"]):hover:active:not(:-moz-lwtheme) {
- background-image: linear-gradient(to bottom, rgba(255,255,255, 0.3), rgba(255,255,255, 0.4));
- background-color: transparent;
- box-shadow: none;
- }
-
- /* Add white detail on top of forward button only when active */
- #forward-button:hover:active:not(:-moz-lwtheme) {
- box-shadow: inset 0 1px 0 #f1f1f1, 0 1px 0 0 rgba(0,0,0,0.2);
- }
-
- /* Inactive window styling (hover styling is identical;
- * we need to make this explicit because it is different on lion, see above. */
- #forward-button:-moz-window-inactive:not(:-moz-lwtheme),
- #back-button:-moz-window-inactive:not(:-moz-lwtheme),
- #forward-button:hover:-moz-window-inactive:not(:-moz-lwtheme),
- #back-button:hover:-moz-window-inactive:not(:-moz-lwtheme) {
- background-image: none;
- background-color: #f0f0f0;
- background-clip: border-box;
- border: 1px solid rgba(0,0,0,0.1);
- box-shadow: none;
- }
-
- /* Lightweight theme styles */
- #forward-button:-moz-lwtheme,
- #forward-button:hover:-moz-lwtheme {
- border: 0 none;
- border-right: 1px solid rgba(0,0,0,0.3);
- box-shadow: 0 1px 0 0 rgba(0,0,0,0.2);
- }
-
- #forward-button:-moz-lwtheme,
- #forward-button:hover:-moz-lwtheme,
- #back-button:-moz-lwtheme,
- #back-button:hover:-moz-lwtheme {
- background-color: rgba(255,255,255,0.5);
- background-image: none;
- background-clip: border-box;
- }
-
- #forward-button:hover:active:-moz-lwtheme,
- #back-button:hover:active:-moz-lwtheme {
- background-image: linear-gradient(to bottom, rgba(255,255,255, 0.7), rgba(255,255,255, 0.8));
- background-color: transparent;
- box-shadow: none;
- }
-
- #forward-button:hover:active:-moz-lwtheme {
- box-shadow: 0 1px 0 0 rgba(0,0,0,0.2);
- }
-}
-
-@conditionalForwardWithUrlbar@:not([switchingtabs]) > #forward-button {
- transition: margin-left @forwardTransitionLength@ ease-out;
-}
-
-@conditionalForwardWithUrlbar@ > #forward-button[disabled] {
- margin-left: calc(0px - var(--forwardbutton-width) - var(--backbutton-urlbar-overlap));
-}
-
-@conditionalForwardWithUrlbar@:hover:not([switchingtabs]) > #forward-button[disabled] {
- /* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */
- transition-delay: 100s;
-}
-
-@conditionalForwardWithUrlbar@:not(:hover) > #forward-button[disabled] {
- /* when not hovered anymore, trigger a new transition to hide the forward button immediately */
- margin-left: calc(-0.01px - var(--forwardbutton-width) - var(--backbutton-urlbar-overlap));
+ opacity: calc(var(--toolbarbutton-disabled-opacity) / 2);
}
.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;
}
.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;
}
-#cut-button {
- margin-inline-end: 0;
-}
-
-#edit-controls[cui-areatype="toolbar"] > #cut-button {
- border-inline-end: 0;
-}
-
-#paste-button {
- border-inline-start: none;
- margin-inline-start: 0;
-}
-
-#cut-button:-moz-locale-dir(ltr),
-#paste-button:-moz-locale-dir(rtl) {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
-}
-
-#cut-button:-moz-locale-dir(rtl),
-#paste-button:-moz-locale-dir(ltr) {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
-}
-
-#copy-button {
- border-radius: 0;
- margin-right: 0;
- margin-left: 0;
-}
-
-/* zoom controls */
-
-#zoom-out-button {
- margin-inline-end: 0;
-}
-
-#zoom-in-button {
- margin-inline-start: 0;
- border-inline-start: 0;
-}
-
-#zoom-controls[cui-areatype="toolbar"] > #zoom-out-button {
- border-inline-end: 0;
-}
-
-#zoom-controls[cui-areatype="toolbar"] > #zoom-in-button {
- border-inline-start-width: 1px;
-}
-
-#zoom-controls[cui-areatype="toolbar"] > #zoom-reset-button {
- border-radius: 0;
-}
-
-#zoom-out-button:-moz-locale-dir(ltr),
-#zoom-in-button:-moz-locale-dir(rtl) {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
-}
-
-#zoom-out-button:-moz-locale-dir(rtl),
-#zoom-in-button:-moz-locale-dir(ltr) {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
-}
-
-#zoom-controls[cui-areatype="toolbar"]:not([overflowedItem=true]) > #zoom-reset-button {
- min-width: 0;
- margin-left: 0;
- margin-right: 0;
- -moz-box-orient: horizontal;
- -moz-box-align: center;
-}
-
/* ----- FULLSCREEN WINDOW CONTROLS ----- */
#minimize-button,
#close-button,
#fullscreen-button ~ #window-controls > #restore-button {
display: none;
}
@@ -1479,17 +633,17 @@ toolbar .toolbarbutton-1 > .toolbarbutto
box-shadow: var(--focus-ring-box-shadow);
}
#urlbar-container {
-moz-box-align: center;
}
#urlbar {
- border-radius: @toolbarbuttonCornerRadius@;
+ border-radius: var(--toolbarbutton-border-radius);
}
@conditionalForwardWithUrlbar@ > #urlbar {
border-inline-start: none;
margin-left: 0;
}
@conditionalForwardWithUrlbar@ > #urlbar:-moz-locale-dir(ltr) {
@@ -1883,26 +1037,16 @@ html|span.ac-emphasize-text-url {
-moz-image-region: rect(0, 56px, 28px, 28px);
}
#urlbar-stop-button:hover:active {
-moz-image-region: rect(28px, 56px, 56px, 28px);
}
}
-#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
- width: 18px;
- height: 18px;
-}
-
-#bookmarks-menu-button[cui-areatype="toolbar"].bookmark-item > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
- width: 16px;
- height: 16px;
-}
-
#BMB_bookmarksPopup[side="top"],
#BMB_bookmarksPopup[side="bottom"] {
margin-left: -26px;
margin-right: -26px;
}
#BMB_bookmarksPopup[side="left"],
#BMB_bookmarksPopup[side="right"] {
@@ -3112,18 +2256,16 @@ html|*.addon-webext-perm-list {
/* On mac, the popup notification contents are indented by default and so
the default closebutton margins from notification.css require adjustment */
.click-to-play-plugins-notification-description-box > .popup-notification-closebutton {
margin-inline-end: -6px;
margin-top: -7px;
}
-
-
.gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
color: hsl(210,11%,16%);
}
/* Error counter */
#developer-toolbar-toolbox-button[error-count]:before {
color: #FDF3DE;
--- a/browser/themes/osx/compacttheme.css
+++ b/browser/themes/osx/compacttheme.css
@@ -1,18 +1,14 @@
% 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/.
%include ../shared/compacttheme.inc.css
-:root {
- --forwardbutton-width: 32px;
-}
-
/* Use only 1px separator between nav toolbox and page content */
#navigator-toolbox::after {
border-top-style: none;
margin-top: -1px;
}
/* Include extra space on left/right for dragging since there is no space above
the tabs */
@@ -33,70 +29,16 @@
}
/* Resize things so that the native titlebar is in line with the tabs */
#main-window[tabsintitlebar] > #titlebar > #titlebar-content > #titlebar-buttonbox-container,
#main-window[tabsintitlebar] > #titlebar > #titlebar-content > #titlebar-secondary-buttonbox > #titlebar-fullscreen-button {
margin-top: 6px;
}
-/* Square back and forward buttons. Need !important on these because there
- are a lot of more specific selectors sprinkled around elsewhere for changing
- background / shadows for different states */
-#back-button,
-#forward-button {
- height: 24px !important;
- box-shadow: none !important;
- border: 1px solid var(--chrome-nav-bar-controls-border-color) !important;
- background: var(--chrome-nav-buttons-background) !important;
-}
-
-#forward-button {
- border-inline-start: none !important;
- /* browser.css and friends set up the width of the button to be 32px.
- * They then set margin-left to -2px to ensure the button is not too wide
- * compared to the back button, and set padding-left to center the icon
- * correctly.
- * In our theme, the back and forward buttons are the same width, with the
- * back button being 32px with 1px border on both sides. To ensure the
- * forward button's content box looks like it is the same size with width
- * set to 32px and a 1px border on only 1 side, we overlap by 1px, so both
- * buttons end up with a content box that looks like it's 30px.
- */
- margin-left: -1px;
- padding-left: 1px;
-}
-
-#forward-button > .toolbarbutton-icon {
- margin-left: 0;
- margin-right: 0;
-}
-
-#back-button:hover:not([disabled="true"]),
-#forward-button:hover:not([disabled="true"]) {
- background: var(--chrome-nav-buttons-hover-background) !important;
-}
-
-#back-button {
- border-radius: 3px 0 0 3px !important;
- padding: 0 !important;
- margin: 0 !important;
-}
-
-#back-button:hover:active:not([disabled="true"]) {
- -moz-image-region: rect(18px, 54px, 36px, 36px);
-}
-
-/* Use smaller back button icon */
-@media (min-resolution: 2dppx) {
- #back-button:hover:active:not([disabled="true"]) {
- -moz-image-region: rect(36px, 108px, 72px, 72px);
- }
-}
-
/* Prevent the hover styling from on the identity icon from overlapping the
urlbar border. */
#identity-box {
margin-top: -1px !important;
margin-bottom: -1px !important;
padding-top: 3px !important;
padding-bottom: 3px !important;
}
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -8,18 +8,16 @@ browser.jar:
skin/classic/browser/sanitizeDialog.css
skin/classic/browser/aboutSessionRestore-window-icon.png
skin/classic/browser/aboutSyncTabs.css
* skin/classic/browser/syncedtabs/sidebar.css (syncedtabs/sidebar.css)
* skin/classic/browser/browser.css
* skin/classic/browser/compacttheme.css
skin/classic/browser/click-to-play-warning-stripes.png
skin/classic/browser/Info.png
- skin/classic/browser/keyhole-circle.png
- skin/classic/browser/keyhole-circle@2x.png
skin/classic/browser/subtle-pattern.png
skin/classic/browser/menu-back.png
skin/classic/browser/menu-forward.png
skin/classic/browser/menuPanel-customize.png
skin/classic/browser/menuPanel-customize@2x.png
skin/classic/browser/menuPanel-exit.png
skin/classic/browser/menuPanel-exit@2x.png
skin/classic/browser/menuPanel-help.png
@@ -83,18 +81,16 @@ browser.jar:
skin/classic/browser/places/allBookmarks.png (places/allBookmarks.png)
* skin/classic/browser/places/places.css (places/places.css)
skin/classic/browser/places/organizer.css (places/organizer.css)
skin/classic/browser/places/query.png (places/query.png)
skin/classic/browser/places/query@2x.png (places/query@2x.png)
skin/classic/browser/places/bookmarksMenu.png (places/bookmarksMenu.png)
skin/classic/browser/places/bookmarksToolbar.png (places/bookmarksToolbar.png)
skin/classic/browser/places/bookmarksToolbar@2x.png (places/bookmarksToolbar@2x.png)
- skin/classic/browser/places/bookmarks-notification-finish.png (places/bookmarks-notification-finish.png)
- skin/classic/browser/places/bookmarks-notification-finish@2x.png (places/bookmarks-notification-finish@2x.png)
skin/classic/browser/places/bookmarksToolbar-menuPanel.png (places/bookmarksToolbar-menuPanel.png)
skin/classic/browser/places/bookmarksToolbar-menuPanel@2x.png (places/bookmarksToolbar-menuPanel@2x.png)
skin/classic/browser/places/history.png (places/history.png)
skin/classic/browser/places/history@2x.png (places/history@2x.png)
skin/classic/browser/places/toolbar.png (places/toolbar.png)
skin/classic/browser/places/toolbarDropMarker.png (places/toolbarDropMarker.png)
skin/classic/browser/places/folderDropArrow.png (places/folderDropArrow.png)
skin/classic/browser/places/folderDropArrow@2x.png (places/folderDropArrow@2x.png)
deleted file mode 100644
index fc177587f1463dc66f78dcbbf35ea0565982134c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 28870280506661f7975fe6979d97d3e8a0a404cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
--- /dev/null
+++ b/browser/themes/shared/bookmarked-notification.inc.css
@@ -0,0 +1,67 @@
+/* ----- BOOKMARK STAR ANIMATION ----- */
+
+@keyframes animation-bookmarkAdded {
+ from { transform: rotate(0deg) translateX(-16px) rotate(0deg) scale(1); opacity: 0; }
+ 60% { transform: rotate(180deg) translateX(-16px) rotate(-180deg) scale(2.2); opacity: 1; }
+ 80% { opacity: 1; }
+ to { transform: rotate(180deg) translateX(-16px) rotate(-180deg) scale(1); opacity: 0; }
+}
+
+@keyframes animation-bookmarkPulse {
+ from { transform: scale(1); }
+ 50% { transform: scale(1.3); }
+ to { transform: scale(1); }
+}
+
+#bookmarked-notification-container {
+ min-height: 1px;
+ min-width: 1px;
+ height: 1px;
+ margin-bottom: -1px;
+ z-index: 5;
+ position: relative;
+}
+
+#bookmarked-notification {
+ background-size: 16px;
+ background-position: center;
+ background-repeat: no-repeat;
+ width: 16px;
+ height: 16px;
+ opacity: 0;
+}
+
+#bookmarked-notification-dropmarker-anchor {
+ z-index: -1;
+ position: relative;
+}
+
+#bookmarked-notification-dropmarker-icon {
+ width: 18px;
+ height: 18px;
+ visibility: hidden;
+}
+
+#bookmarked-notification-anchor[notification="finish"] > #bookmarked-notification {
+ background-image: url("chrome://browser/skin/places/bookmarks-notification-finish.png");
+ animation: animation-bookmarkAdded 800ms;
+ animation-timing-function: ease, ease, ease;
+}
+
+@media (min-resolution: 2dppx) {
+ #bookmarked-notification-anchor[notification="finish"] > #bookmarked-notification {
+ background-image: url("chrome://browser/skin/places/bookmarks-notification-finish@2x.png");
+ }
+}
+
+#bookmarks-menu-button[notification="finish"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+ list-style-image: none !important;
+}
+
+#bookmarked-notification-dropmarker-anchor[notification="finish"] > #bookmarked-notification-dropmarker-icon {
+ visibility: visible;
+ animation: animation-bookmarkPulse 300ms;
+ animation-delay: 600ms;
+ animation-timing-function: ease-out;
+}
+
--- a/browser/themes/shared/compacttheme.inc.css
+++ b/browser/themes/shared/compacttheme.inc.css
@@ -7,16 +7,18 @@
there are overrides for each platform in their compacttheme.css files. */
:root {
--tab-toolbar-navbar-overlap: 0px;
--navbar-tab-toolbar-highlight-overlap: 0px;
--space-above-tabbar: 0px;
--toolbarbutton-text-shadow: none;
--backbutton-urlbar-overlap: 0px;
+ /* 18px icon + 2 * 5px padding + 1 * 1px border */
+ --forwardbutton-width: 29px;
}
:root:-moz-lwtheme-brighttext {
/* Chrome */
--chrome-background-color: #272b35;
--chrome-color: #F5F7FA;
--chrome-secondary-background-color: #393F4C;
--chrome-navigator-toolbox-separator-color: rgba(0,0,0,.2);
@@ -181,16 +183,77 @@ toolbar[brighttext] #downloads-indicator
text-shadow: var(--toolbarbutton-text-shadow);
color: var(--chrome-color);
}
#TabsToolbar {
text-shadow: none !important;
}
+/* Back and forward button */
+
+#back-button > .toolbarbutton-icon,
+#forward-button > .toolbarbutton-icon {
+ background: var(--chrome-nav-buttons-background) !important;
+ border-radius: 0 !important;
+ padding: var(--toolbarbutton-vertical-inner-padding) 5px !important;
+ margin: 0 !important;
+ border: 1px solid var(--chrome-nav-bar-controls-border-color) !important;
+ box-shadow: none !important;
+ height: auto !important;
+}
+
+#back-button > .toolbarbutton-icon {
+ /* 18px icon + 2 * 5px padding + 2 * 1px border */
+ width: 30px !important;
+}
+
+/* the normal theme adds box-shadow: <stuff> !important when the back-button is [open]. Fix: */
+#back-button[open="true"] > .toolbarbutton-icon {
+ box-shadow: none !important;
+}
+
+#forward-button > .toolbarbutton-icon {
+ border-inline-start: none !important;
+}
+
+/* Override a box shadow for disabled back button */
+#main-window:not([customizing]) #back-button[disabled] > .toolbarbutton-icon {
+ box-shadow: none !important;
+}
+
+/* Override !important properties for hovered back button */
+#main-window #back-button:hover:not([disabled="true"]) > .toolbarbutton-icon,
+#main-window #forward-button:hover:not([disabled="true"]) > .toolbarbutton-icon {
+ background: var(--chrome-nav-buttons-hover-background) !important;
+ box-shadow: none !important;
+}
+
+#back-button > .toolbarbutton-icon {
+ border-radius: 2px 0 0 2px !important;
+}
+
+#nav-bar .toolbarbutton-1:not([type=menu-button]),
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
+#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+ padding-top: 2px;
+ padding-bottom: 2px;
+}
+
+#back-button:hover:active:not([disabled="true"]) {
+ -moz-image-region: rect(18px, 54px, 36px, 36px);
+}
+
+/* Use smaller back button icon */
+@media (min-resolution: 2dppx) {
+ #back-button:hover:active:not([disabled="true"]) {
+ -moz-image-region: rect(36px, 108px, 72px, 72px);
+ }
+}
+
/* URL bar and search bar*/
#urlbar,
#navigator-toolbox .searchbar-textbox {
background-color: var(--url-and-searchbar-background-color) !important;
background-image: none !important;
color: inherit !important;
border: 1px solid var(--chrome-nav-bar-controls-border-color) !important;
box-shadow: none !important;
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -105,16 +105,17 @@
skin/classic/browser/tabbrowser/connecting.png (../shared/tabbrowser/connecting.png)
skin/classic/browser/tabbrowser/connecting@2x.png (../shared/tabbrowser/connecting@2x.png)
skin/classic/browser/tabbrowser/crashed.svg (../shared/tabbrowser/crashed.svg)
skin/classic/browser/tabbrowser/pendingpaint.png (../shared/tabbrowser/pendingpaint.png)
skin/classic/browser/tabbrowser/tab-audio.svg (../shared/tabbrowser/tab-audio.svg)
skin/classic/browser/tabbrowser/tab-audio-small.svg (../shared/tabbrowser/tab-audio-small.svg)
skin/classic/browser/tabbrowser/tab-overflow-indicator.png (../shared/tabbrowser/tab-overflow-indicator.png)
skin/classic/browser/toolbarbutton-dropdown-arrow.png (../shared/toolbarbutton-dropdown-arrow.png)
+ skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png (../shared/toolbarbutton-dropdown-arrow-inverted.png)
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/update-badge.svg (../shared/update-badge.svg)
skin/classic/browser/update-badge-failed.svg (../shared/update-badge-failed.svg)
skin/classic/browser/warning.svg (../shared/warning.svg)
skin/classic/browser/warning-white.svg (../shared/warning-white.svg)
@@ -127,16 +128,18 @@
skin/classic/browser/welcome-back.svg (../shared/incontent-icons/welcome-back.svg)
skin/classic/browser/readerMode.svg (../shared/reader/readerMode.svg)
skin/classic/browser/panic-panel/header.png (../shared/panic-panel/header.png)
skin/classic/browser/panic-panel/header@2x.png (../shared/panic-panel/header@2x.png)
skin/classic/browser/panic-panel/header-small.png (../shared/panic-panel/header-small.png)
skin/classic/browser/panic-panel/header-small@2x.png (../shared/panic-panel/header-small@2x.png)
skin/classic/browser/panic-panel/icons.png (../shared/panic-panel/icons.png)
skin/classic/browser/panic-panel/icons@2x.png (../shared/panic-panel/icons@2x.png)
+ skin/classic/browser/places/bookmarks-notification-finish.png (../shared/places/bookmarks-notification-finish.png)
+ skin/classic/browser/places/bookmarks-notification-finish@2x.png (../shared/places/bookmarks-notification-finish@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/compacttheme/loading-inverted.png (../shared/compacttheme/loading-inverted.png)
skin/classic/browser/compacttheme/loading-inverted@2x.png (../shared/compacttheme/loading-inverted@2x.png)
rename from browser/themes/osx/places/bookmarks-notification-finish.png
rename to browser/themes/shared/places/bookmarks-notification-finish.png
rename from browser/themes/osx/places/bookmarks-notification-finish@2x.png
rename to browser/themes/shared/places/bookmarks-notification-finish@2x.png
rename from browser/themes/windows/toolbarbutton-dropdown-arrow-inverted.png
rename to browser/themes/shared/toolbarbutton-dropdown-arrow-inverted.png
copy from browser/themes/windows/browser.css
copy to browser/themes/shared/toolbarbuttons.inc.css
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/shared/toolbarbuttons.inc.css
@@ -1,596 +1,36 @@
/* 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/. */
-@import url("chrome://global/skin/");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
-@namespace svg url("http://www.w3.org/2000/svg");
-
-%include ../shared/browser.inc
-%include windowsShared.inc
%filter substitution
%define toolbarShadowColor hsla(209,67%,12%,0.35)
%define forwardTransitionLength 150ms
%define conditionalForwardWithUrlbar window:not([chromehidden~="toolbar"]) #urlbar-wrapper
-%include ../shared/browser.inc.css
-
-:root {
- --space-above-tabbar: 15px;
-
- --backbutton-urlbar-overlap: 6px;
-
- /* icon width + border + horizontal padding (without the overlap from backbutton-urlbar-overlap) */
- --forwardbutton-width: 25px;
-
- --toolbarbutton-vertical-inner-padding: 2px;
-
- --toolbarbutton-hover-background: rgba(0,0,0,.1);
- --toolbarbutton-hover-bordercolor: rgba(0,0,0,.2);
- --toolbarbutton-hover-boxshadow: none;
-
- --toolbarbutton-active-background: rgba(0,0,0,.15);
- --toolbarbutton-active-bordercolor: rgba(0,0,0,.3);
- --toolbarbutton-active-boxshadow: 0 0 0 1px rgba(0,0,0,.15) inset;
-
- --toolbarbutton-checkedhover-backgroundcolor: rgba(0,0,0,.1);
-
- --urlbar-dropmarker-url: url("chrome://browser/skin/urlbar-history-dropmarker.png");
- --urlbar-dropmarker-region: rect(0px, 11px, 14px, 0px);
- --urlbar-dropmarker-hover-region: rect(0px, 22px, 14px, 11px);
- --urlbar-dropmarker-active-region: rect(0px, 33px, 14px, 22px);
- --urlbar-dropmarker-2x-url: url("chrome://browser/skin/urlbar-history-dropmarker@2x.png");
- --urlbar-dropmarker-2x-region: rect(0, 22px, 28px, 0);
- --urlbar-dropmarker-hover-2x-region: rect(0, 44px, 28px, 22px);
- --urlbar-dropmarker-active-2x-region: rect(0, 66px, 28px, 44px);
-
- --panel-separator-color: ThreeDLightShadow;
- --arrowpanel-dimmed: hsla(0,0%,80%,.3);
- --arrowpanel-dimmed-further: hsla(0,0%,80%,.45);
- --arrowpanel-dimmed-even-further: hsla(0,0%,80%,.8);
-
- --urlbar-separator-color: ThreeDLightShadow;
-}
-
-@media (-moz-windows-default-theme) {
- :root {
- --panel-separator-color: hsla(210,4%,10%,.14);
- }
-}
-
-toolbar[brighttext] {
- --toolbarbutton-hover-background: rgba(255,255,255,.25);
- --toolbarbutton-hover-bordercolor: rgba(255,255,255,.5);
-
- --toolbarbutton-active-background: rgba(255,255,255,.4);
- --toolbarbutton-active-bordercolor: rgba(255,255,255,.7);
- --toolbarbutton-active-boxshadow: 0 0 0 1px rgba(255,255,255,.4) inset;
-
- --toolbarbutton-checkedhover-backgroundcolor: rgba(255,255,255,.3);
-}
-
toolbar:-moz-lwtheme {
--toolbarbutton-hover-background: rgba(255,255,255,.25);
--toolbarbutton-hover-bordercolor: rgba(0,0,0,.2);
--toolbarbutton-active-background: rgba(70%,70%,70%,.25);
--toolbarbutton-active-bordercolor: rgba(0,0,0,.3);
--toolbarbutton-active-boxshadow: 0 0 2px rgba(0,0,0,.6) inset;
--toolbarbutton-checkedhover-backgroundcolor: rgba(85%,85%,85%,.25);
}
-#menubar-items {
- -moz-box-orient: vertical; /* for flex hack */
-}
-
-#main-menubar {
- -moz-box-flex: 1; /* make menu items expand to fill toolbar height */
-}
-
-/* Hides the titlebar-placeholder underneath the window caption buttons when we
- are not autohiding the menubar. */
-#toolbar-menubar:not([autohide="true"]) + #TabsToolbar > .titlebar-placeholder[type="caption-buttons"] {
- display: none;
-}
-
-/* We want a 4px gap between the TabsToolbar and the toolbar-menubar when the
- toolbar-menu is displayed, and a 16px gap when it is not. 1px is taken care
- of by the (light) outer shadow of the tab, the remaining 3/15 are these margins. */
-#toolbar-menubar:not([autohide=true]) ~ #TabsToolbar:not([inFullscreen]),
-#toolbar-menubar[autohide=true]:not([inactive]) ~ #TabsToolbar:not([inFullscreen]) {
- margin-top: 3px;
-}
-
-#main-window[tabsintitlebar][sizemode="normal"]:not([inFullscreen])[chromehidden~="menubar"] #toolbar-menubar ~ #TabsToolbar,
-#main-window[tabsintitlebar][sizemode="normal"]:not([inFullscreen]) #toolbar-menubar[autohide="true"][inactive] ~ #TabsToolbar {
- margin-top: var(--space-above-tabbar);
-}
-
-#navigator-toolbox,
-#navigator-toolbox > toolbar {
- -moz-appearance: none;
-}
-
-#navigator-toolbox::after {
- content: "";
- display: -moz-box;
- -moz-box-ordinal-group: 101; /* tabs toolbar is 100 */
- border-bottom: 1px solid ThreeDShadow;
-}
-
-@media (-moz-windows-default-theme) {
- @media (-moz-os-version: windows-win7) {
- #navigator-toolbox::after {
- border-bottom-color: #aabccf;
- }
- }
-
- @media (-moz-os-version: windows-win8),
- (-moz-os-version: windows-win10) {
- #navigator-toolbox::after {
- border-bottom-color: #c2c2c2;
- }
- }
-}
-
-#navigator-toolbox:-moz-lwtheme::after {
- border-bottom-color: rgba(0,0,0,.3);
-}
-
-#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar) {
- background-clip: padding-box;
- background-image: linear-gradient(@toolbarHighlight@, @toolbarHighlight@);
-}
-
-@media (-moz-os-version: windows-win7) {
- #nav-bar {
- background-image: linear-gradient(@toolbarHighlight@, transparent) !important;
- }
-
- #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar) {
- background-image: none;
- }
-}
-
-#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme) {
- background-color: -moz-Dialog;
-}
-
-#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar):not(#addon-bar) {
- overflow: -moz-hidden-unscrollable;
- max-height: 4em;
- transition: min-height 170ms ease-out, max-height 170ms ease-out;
- padding: 0 5px;
-}
-
-#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar):not(#addon-bar)[collapsed=true] {
- min-height: 0.1px;
- max-height: 0;
- transition: min-height 170ms ease-out, max-height 170ms ease-out, visibility 170ms linear;
-}
-
-@media (-moz-windows-compositor: 0),
- (-moz-windows-default-theme: 0) {
- /* Please keep the menu text colors in this media block in sync with
- * compacttheme.css, minus the :not(:-moz-lwtheme) condition - see Bug 1165718.
- */
- #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar:not(:-moz-lwtheme),
- #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:not(:-moz-lwtheme) {
- color: CaptionText;
- }
-
- #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive,
- #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
- color: InactiveCaptionText;
- }
-}
-
-@media (-moz-windows-compositor: 0) {
- #main-window[tabsintitlebar] #titlebar:-moz-lwtheme {
- visibility: hidden;
- }
-
- #main-window[tabsintitlebar] #titlebar-content:-moz-lwtheme {
- -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
- visibility: visible;
- }
-
- /* Top-level menu appearance has transparent background, so the text color
- needs to be inherited from our custom menubar too. */
- #main-window[tabsintitlebar] #main-menubar > menu:not(:-moz-lwtheme) {
- color: inherit;
- }
-}
-
-/**
- * In the classic themes, the titlebar has a horizontal gradient, which is
- * problematic for reading the text of background tabs when they're in the
- * titlebar. We side-step this issue by layering our own background underneath
- * the tabs. Unfortunately, this requires a bunch of positioning in order to get
- * text and icons to not appear fuzzy.
- */
-@media (-moz-windows-classic) {
- /**
- * We need to bump up the z-index of the tabbrowser-tabs so that they appear
- * over top of the fog we're applying for classic themes, as well as the nav-bar.
- */
- #main-window[tabsintitlebar]:not([sizemode=fullscreen]) #tabbrowser-tabs {
- position: relative;
- z-index: 2;
- }
-
- #main-window[tabsintitlebar] #TabsToolbar:not(:-moz-lwtheme) {
- position: relative;
- }
-
- #main-window[tabsintitlebar]:not([sizemode=fullscreen]) #TabsToolbar:not(:-moz-lwtheme)::after {
- /* Because we use placeholders for window controls etc. in the tabstrip,
- * and position those with ordinal attributes, and because our layout code
- * expects :before/:after nodes to come first/last in the frame list,
- * we have to reorder this element to come last, hence the
- * ordinal group value (see bug 853415). */
- -moz-box-ordinal-group: 1001;
- box-shadow: 0 0 50px 8px ActiveCaption;
- content: "";
- display: -moz-box;
- height: 0;
- margin: 0 50px;
- position: absolute;
- pointer-events: none;
- top: 100%;
- width: -moz-available;
- }
-
- #main-window[tabsintitlebar]:not([sizemode=fullscreen]) #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive::after {
- box-shadow: 0 0 50px 8px InactiveCaption;
- }
-
- #main-window[tabsintitlebar]:not([sizemode=fullscreen]) toolbar[customindex]:not(:-moz-lwtheme),
- #main-window[tabsintitlebar]:not([sizemode=fullscreen]) #PersonalToolbar:not(:-moz-lwtheme) {
- position: relative;
- }
-
- /* Need to constrain the box shadow fade to avoid overlapping layers, see bug 886281. */
- #main-window[tabsintitlebar]:not([sizemode=fullscreen]) #navigator-toolbox:not(:-moz-lwtheme) {
- overflow: -moz-hidden-unscrollable;
- }
-
- /**
- * When the tabstrip is overflowed, pinned tab separators get position: absolute,
- * which makes the pinned tab separators leak over the nav-bar highlight. Forcing
- * the element to snap to the bottom of the client rect works around the issue.
- */
- #main-window[tabsintitlebar] #tabbrowser-tabs[positionpinnedtabs] > .tabbrowser-tab[pinned]::before {
- bottom: 0px;
- }
-
- #main-window[tabsintitlebar]:not([sizemode=fullscreen]) #TabsToolbar .toolbarbutton-1 {
- position: relative;
- z-index: 1;
- }
-
- /**
- * With the tabbrowser-tabs element z-index'd above the nav-bar, we now get the
- * scrollbox button borders leaking over the nav-bar highlight. This transparent bottom
- * border forces the scrollbox button borders to terminate a pixel early, working
- * around the issue.
- */
- #main-window[tabsintitlebar]:not([sizemode=fullscreen]) .tabbrowser-arrowscrollbox > .scrollbutton-up,
- #main-window[tabsintitlebar]:not([sizemode=fullscreen]) .tabbrowser-arrowscrollbox > .scrollbutton-down {
- border-bottom: 1px solid transparent;
- }
-
- #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme {
- /* Render a window top border: */
- background-image: linear-gradient(to bottom,
- ThreeDLightShadow 0, ThreeDLightShadow 1px,
- ThreeDHighlight 1px, ThreeDHighlight 2px,
- ActiveBorder 2px, ActiveBorder 4px, transparent 4px);
- }
-
- /* End classic titlebar gradient */
-
- #main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) toolbarbutton:not(:-moz-lwtheme) {
- color: inherit;
- }
-}
-
-#TabsToolbar:not([collapsed="true"]) + #nav-bar {
- /* Move up into the TabsToolbar for the inner highlight at the top of the nav-bar */
- margin-top: calc(-1 * var(--navbar-tab-toolbar-highlight-overlap));
- /* Position the toolbar above the bottom of background tabs */
- position: relative;
- z-index: 1;
-}
-
-#nav-bar {
- border-top: 1px solid @toolbarShadowColor@ !important;
- box-shadow: 0 1px 0 @toolbarHighlight@ inset;
-}
-@media (-moz-windows-compositor: 0) {
- #TabsToolbar[collapsed="true"] + #nav-bar {
- border-top-style: none !important;
- }
-}
-
-#personal-bookmarks {
- min-height: 24px;
-}
-
-#print-preview-toolbar:not(:-moz-lwtheme) {
- -moz-appearance: toolbox;
-}
-
-#browser-bottombox:not(:-moz-lwtheme) {
- background-color: -moz-dialog;
-}
-
-/* ::::: titlebar ::::: */
-
-#main-window[sizemode="normal"] > #titlebar {
- -moz-appearance: -moz-window-titlebar;
-}
-
-#main-window[sizemode="maximized"] > #titlebar {
- -moz-appearance: -moz-window-titlebar-maximized;
-}
-
-@media (-moz-windows-classic) {
- #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel > #navigator-toolbox > #toolbar-menubar {
- margin-top: 4px;
- }
-}
-
-/* The button box must appear on top of the navigator-toolbox in order for
- * click and hover mouse events to work properly for the button in the restored
- * window state. Otherwise, elements in the navigator-toolbox, like the menubar,
- * can swallow those events. It will also place the buttons above the fog on
- * Windows 7 with Aero Glass.
- */
-#titlebar-buttonbox {
- z-index: 1;
-}
-
-.titlebar-placeholder[type="caption-buttons"] {
- margin-left: 22px; /* space needed for Aero Snap */
-}
-
-/* titlebar command buttons */
-
-#titlebar-min {
- -moz-appearance: -moz-window-button-minimize;
-}
-
-#titlebar-max {
- -moz-appearance: -moz-window-button-maximize;
-}
-
-#main-window[sizemode="maximized"] #titlebar-max {
- -moz-appearance: -moz-window-button-restore;
-}
-
-#titlebar-close {
- -moz-appearance: -moz-window-button-close;
-}
-
-@media not all and (-moz-windows-classic) {
- #titlebar-min {
- margin-inline-end: 2px;
- }
-}
-
-/* ::::: bookmark buttons ::::: */
-
-toolbarbutton.bookmark-item:not(.subviewbutton),
-#personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder {
- margin: 0;
- padding: 2px 3px;
- -moz-appearance: none;
- border: 1px solid transparent;
- border-radius: 1px;
- background-origin: padding-box !important;
- background-clip: padding-box !important;
- transition-property: background-color, border-color, box-shadow;
- transition-duration: 150ms;
-}
-
-toolbarbutton.bookmark-item:not(.subviewbutton):hover:not([disabled="true"]):not([open]) {
- border-color: var(--toolbarbutton-hover-bordercolor);
- background: var(--toolbarbutton-hover-background);
-}
-
-toolbarbutton.bookmark-item:not(.subviewbutton):hover:active:not([disabled="true"]),
-toolbarbutton.bookmark-item[open="true"] {
- border-color: var(--toolbarbutton-active-bordercolor);
- box-shadow: var(--toolbarbutton-active-boxshadow);
- background: var(--toolbarbutton-active-background);
-}
-
-.bookmark-item > .toolbarbutton-icon,
-#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
- width: 16px;
- height: 16px;
-}
-
-/* Force the display of the label for bookmarks */
-.bookmark-item > .toolbarbutton-text,
-#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-text {
- display: -moz-box !important;
-}
-
-.bookmark-item > .toolbarbutton-menu-dropmarker {
- display: none;
-}
-
-#bookmarks-toolbar-placeholder {
- list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important;
-}
-
-toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-placeholder,
-#personal-bookmarks[cui-areatype="menu-panel"] > #bookmarks-toolbar-placeholder {
- list-style-image: url("chrome://browser/skin/places/bookmarksToolbar-menuPanel.png") !important;
-}
-
-/* ----- BOOKMARK STAR ANIMATION ----- */
-
-@keyframes animation-bookmarkAdded {
- from { transform: rotate(0deg) translateX(-16px) rotate(0deg) scale(1); opacity: 0; }
- 60% { transform: rotate(180deg) translateX(-16px) rotate(-180deg) scale(2.2); opacity: 1; }
- 80% { opacity: 1; }
- to { transform: rotate(180deg) translateX(-16px) rotate(-180deg) scale(1); opacity: 0; }
-}
-
-@keyframes animation-bookmarkPulse {
- from { transform: scale(1); }
- 50% { transform: scale(1.3); }
- to { transform: scale(1); }
-}
-
-#bookmarked-notification-container {
- min-height: 1px;
- min-width: 1px;
- height: 1px;
- margin-bottom: -1px;
- z-index: 5;
- position: relative;
-}
-
-#bookmarked-notification {
- background-size: 16px;
- background-position: center;
- background-repeat: no-repeat;
- width: 16px;
- height: 16px;
- opacity: 0;
-}
-
-#bookmarked-notification-dropmarker-anchor {
- z-index: -1;
- position: relative;
-}
-
-#bookmarked-notification-dropmarker-icon {
- width: 18px;
- height: 18px;
- visibility: hidden;
-}
-
-#bookmarked-notification-anchor[notification="finish"] > #bookmarked-notification {
- background-image: url("chrome://browser/skin/places/bookmarks-notification-finish.png");
- animation: animation-bookmarkAdded 800ms;
- animation-timing-function: ease, ease, ease;
-}
-
-#bookmarks-menu-button[notification="finish"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
- list-style-image: none !important;
-}
-
-#bookmarked-notification-dropmarker-anchor[notification="finish"] > #bookmarked-notification-dropmarker-icon {
- visibility: visible;
- animation: animation-bookmarkPulse 300ms;
- animation-delay: 600ms;
- animation-timing-function: ease-out;
-}
-
-/* ::::: bookmark menus ::::: */
-
-menu.bookmark-item,
-menuitem.bookmark-item {
- min-width: 0;
- max-width: 32em;
-}
-
-.bookmark-item:not(.subviewbutton) > .menu-iconic-left {
- margin-top: 0;
- margin-bottom: 0;
-}
-
-.bookmark-item > .menu-iconic-left > .menu-iconic-icon {
- padding-inline-start: 0px;
-}
-
-/* ::::: bookmark items ::::: */
-
-.bookmark-item {
- list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-}
-
-.bookmark-item[container] {
- list-style-image: url("chrome://global/skin/icons/folder-item.png");
- -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-.bookmark-item[container][open] {
- -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
-
-.bookmark-item[container][livemark] {
- list-style-image: url("chrome://browser/skin/livemark-folder.png");
- -moz-image-region: auto;
-}
-
-.bookmark-item[container][livemark] .bookmark-item {
- list-style-image: url("chrome://browser/skin/places/livemark-item.png");
- -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-.bookmark-item[container][livemark] .bookmark-item[visited] {
- -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-.bookmark-item[container][query] {
- list-style-image: url("chrome://browser/skin/places/query.png");
- -moz-image-region: auto;
-}
-
-.bookmark-item[query][tagContainer] {
- list-style-image: url("chrome://browser/skin/places/tag.png");
- -moz-image-region: auto;
-}
-
-.bookmark-item[query][dayContainer] {
- list-style-image: url("chrome://browser/skin/places/calendar.png");
- -moz-image-region: auto;
-}
-
-.bookmark-item[query][hostContainer] {
- list-style-image: url("chrome://global/skin/icons/folder-item.png");
- -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-.bookmark-item[query][hostContainer][open] {
- list-style-image: url("chrome://global/skin/icons/folder-item.png");
- -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
-
-.bookmark-item[cutting] > .toolbarbutton-icon,
-.bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-icon {
- opacity: 0.5;
-}
-
-.bookmark-item[cutting] > .toolbarbutton-text,
-.bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-text {
- opacity: 0.7;
-}
-
/* ::::: primary toolbar buttons ::::: */
-%include ../shared/toolbarbutton-icons.inc.css
-
#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-icon,
#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menu-dropmarker,
#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker,
#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
#main-window:not([customizing]) .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled=true] > .toolbarbutton-icon {
- opacity: .4;
+ opacity: var(--toolbarbutton-disabled-opacity);
}
.toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
}
toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
@@ -609,23 +49,21 @@ toolbar[brighttext] .toolbarbutton-1 > .
}
:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(@primaryToolbarButtons@, .toolbarbutton-legacy-addon) > .toolbarbutton-icon,
:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(@primaryToolbarButtons@, .toolbarbutton-legacy-addon) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
max-width: 18px;
}
-%include ../shared/menupanel.inc.css
-
-.findbar-button,
#nav-bar .toolbarbutton-1,
#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-moz-appearance: none;
padding: 0;
+ margin: 0;
}
#nav-bar .toolbarbutton-1:not([type=menu-button]),
#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
padding: 0 2px;
-moz-box-pack: center;
}
@@ -649,63 +87,45 @@ toolbar[brighttext] .toolbarbutton-1 > .
margin-top: -8px;
}
#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button {
padding-inline-end: 0;
}
#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+ -moz-appearance: none;
padding-inline-start: 0;
-moz-box-align: center;
+ margin: 0;
}
.findbar-button > .toolbarbutton-text,
#nav-bar .toolbarbutton-1 > .toolbarbutton-icon,
#nav-bar .toolbarbutton-1 > .toolbarbutton-text,
#nav-bar .toolbarbutton-1 > .toolbarbutton-badge-stack,
#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
@conditionalForwardWithUrlbar@ > .toolbarbutton-1:-moz-any([disabled],:not([open]):not([disabled]):not(:active)) > .toolbarbutton-icon {
padding: var(--toolbarbutton-vertical-inner-padding) 6px;
background-origin: padding-box !important;
background-clip: padding-box !important;
border: 1px solid transparent;
- border-radius: 1px;
+ border-radius: var(--toolbarbutton-border-radius);
transition-property: background-color, border-color, box-shadow;
transition-duration: 150ms;
}
#nav-bar .toolbarbutton-1 > .toolbarbutton-icon,
#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
#nav-bar #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
/* horizontal padding + border + actual icon width */
max-width: 32px;
}
-@media (-moz-os-version: windows-win7) {
- :root {
- --toolbarbutton-hover-background: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
- --toolbarbutton-hover-bordercolor: hsla(210,54%,20%,.15) hsla(210,54%,20%,.2) hsla(210,54%,20%,.25);
- --toolbarbutton-hover-boxshadow: 0 1px hsla(0,0%,100%,.3) inset,
- 0 1px hsla(210,54%,20%,.03),
- 0 0 2px hsla(210,54%,20%,.1);
-
- --toolbarbutton-active-background: hsla(210,54%,20%,.15) linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
- --toolbarbutton-active-bordercolor: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
- --toolbarbutton-active-boxshadow: 0 1px 1px hsla(210,54%,20%,.1) inset,
- 0 0 1px hsla(210,54%,20%,.2) inset,
-/* allows 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);
-
- --toolbarbutton-checkedhover-backgroundcolor: rgba(90%,90%,90%,.4);
- }
-}
-
#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon:-moz-locale-dir(ltr),
#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-locale-dir(rtl) {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon:-moz-locale-dir(rtl),
#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-locale-dir(ltr) {
@@ -746,16 +166,20 @@ toolbar[brighttext] .toolbarbutton-1 > .
max-width: 31px;
}
#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
padding-top: calc(var(--toolbarbutton-vertical-inner-padding) + 6px);
padding-bottom: calc(var(--toolbarbutton-vertical-inner-padding) + 6px);
}
+#nav-bar .toolbarbutton-1 > .toolbarbutton-text {
+ padding: var(--toolbarbutton-vertical-text-padding) 6px;
+}
+
#nav-bar .toolbaritem-combined-buttons {
margin-left: 2px;
margin-right: 2px;
}
#nav-bar .toolbaritem-combined-buttons > .toolbarbutton-1 {
padding-left: 0;
padding-right: 0;
@@ -775,16 +199,21 @@ toolbar[brighttext] .toolbarbutton-1 > .
opacity: .2;
}
#nav-bar[brighttext] .toolbaritem-combined-buttons > separator,
#nav-bar[brighttext] .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
opacity: .3;
}
+.findbar-button {
+ -moz-appearance: none;
+ padding: 0;
+}
+
.findbar-button:not(:-moz-any([checked="true"],[disabled="true"])):hover > .toolbarbutton-text,
#nav-bar .toolbarbutton-1:not([disabled=true]) > .toolbarbutton-menubutton-button[open] + .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon,
#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-text,
#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack,
@conditionalForwardWithUrlbar@ > #forward-button:not([open]):not(:active):not([disabled]):hover > .toolbarbutton-icon,
@@ -835,22 +264,22 @@ toolbar[brighttext] .toolbarbutton-1 > .
background-position: 1px -1px, 0 -1px, 100% -1px;
background-size: calc(100% - 2px) 100%, 1px 100%, 1px 100%;
background-repeat: no-repeat;
}
/* unified back/forward button */
:-moz-any(#back-button, #forward-button) > .toolbarbutton-icon {
- border-color: var(--urlbar-border-color-hover) !important;
+ border-color: var(--backbutton-border-color) !important;
}
:-moz-any(#back-button, #forward-button):not(:hover):not(:active):not([open=true]) > .toolbarbutton-icon,
:-moz-any(#back-button, #forward-button)[disabled=true] > .toolbarbutton-icon {
- background-color: rgba(255,255,255,.15) !important;
+ background: var(--backbutton-background) !important;
}
#forward-button {
-moz-box-align: stretch; /* let the button shape grow vertically with the location bar */
padding: 0 !important;
}
#forward-button > menupopup {
@@ -906,1613 +335,41 @@ toolbar[brighttext] .toolbarbutton-1 > .
padding: 6px !important;
max-width: 32px !important; /* icon width + horizontal padding + border */
}
#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
transform: scaleX(-1);
}
-.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;
-}
-
-.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;
-}
-
/* zoom control text (reset) button special case: */
#nav-bar #zoom-reset-button > .toolbarbutton-text {
/* To make this line up with the icons, it needs the same height (18px) +
* padding (2 * 2px) + border (2 * 1px), but as a minimum because otherwise
* increase in text sizes would break things...
*/
min-height: 24px;
}
-/* ::::: fullscreen window controls ::::: */
-
-#minimize-button,
-#restore-button,
-#close-button {
- -moz-appearance: none;
- border: none;
- margin: 0 !important;
- padding: 6px 12px;
-}
-
-#minimize-button {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize);
-}
-
-#restore-button {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore);
-}
-
-#minimize-button:hover,
-#restore-button:hover {
- background-color: hsla(0, 0%, 0%, .12);
-}
-
-#minimize-button:hover:active,
-#restore-button:hover:active {
- background-color: hsla(0, 0%, 0%, .22);
-}
-
-#close-button {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#close);
-}
-
-#close-button:hover {
- background-color: hsl(355, 86%, 49%);
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-white);
-}
-
-#close-button:hover:active {
- background-color: hsl(355, 82%, 69%);
-}
-
-toolbar[brighttext] #minimize-button {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-white);
-}
-
-toolbar[brighttext] #restore-button {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-white);
-}
-
-toolbar[brighttext] #close-button {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-white);
-}
-
-@media (-moz-os-version: windows-win7) {
- #window-controls {
- margin-inline-start: 4px;
- }
-
- #minimize-button,
- #restore-button,
- #close-button {
- /* Important to ensure this applies even on toolbar[brighttext] */
- list-style-image: url("chrome://global/skin/icons/windowControls.png") !important;
- /* Also override background color to a avoid hover background styling
- * leaking through around the image. */
- background-color: transparent !important;
- 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;
- }
-
- #close-button:hover {
- -moz-image-region: rect(16px, 48px, 32px, 32px);
- }
-
- #close-button:hover:active {
- -moz-image-region: rect(32px, 48px, 48px, 32px);
- }
-}
-
-@media (-moz-os-version: windows-win7) {
- #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);
- }
-}
-
-/* ::::: Location Bar ::::: */
-
-#main-window {
- --urlbar-border-color: ThreeDShadow;
- --urlbar-border-color-hover: var(--urlbar-border-color);
-}
-
-#navigator-toolbox:-moz-lwtheme {
- --urlbar-border-color: var(--toolbarbutton-hover-bordercolor);
-}
-
-@media (-moz-windows-default-theme) {
- @media (-moz-os-version: windows-win7),
- (-moz-os-version: windows-win8) {
- #main-window:not(:-moz-lwtheme) {
- --urlbar-border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.27) hsla(210,54%,20%,.3);
- --urlbar-border-color-hover: hsla(210,54%,20%,.35) hsla(210,54%,20%,.37) hsla(210,54%,20%,.4);
- }
- }
-
- @media (-moz-os-version: windows-win10) {
- #main-window:not(:-moz-lwtheme) {
- --urlbar-border-color: hsl(0,0%,90%);
- --urlbar-border-color-hover: hsl(0,0%,80%);
- }
- }
-}
-
-#urlbar,
-.searchbar-textbox {
- -moz-appearance: none;
- margin: 0 3px;
- padding: 0;
- background-clip: padding-box;
- border: 1px solid;
- border-color: var(--urlbar-border-color);
-}
-
-#urlbar:hover,
-.searchbar-textbox:hover {
- border-color: var(--urlbar-border-color-hover);
-}
-
-@media (-moz-windows-default-theme) {
- #urlbar,
- .searchbar-textbox {
- border-radius: 1px;
- }
-
- @media (-moz-os-version: windows-win7),
- (-moz-os-version: windows-win8) {
- #urlbar:not(:-moz-lwtheme),
- .searchbar-textbox:not(:-moz-lwtheme) {
- box-shadow: 0 1px 0 hsla(0,0%,0%,.01) inset,
- 0 1px 0 hsla(0,0%,100%,.1);
- }
- }
+/* bookmarks menu-button */
- @media (-moz-os-version: windows-win10) {
- #urlbar:not(:-moz-lwtheme),
- .searchbar-textbox:not(:-moz-lwtheme) {
- padding: 1px;
- transition-property: border-color, box-shadow;
- transition-duration: .1s;
- }
-
- #urlbar:not(:-moz-lwtheme)[focused],
- .searchbar-textbox:not(:-moz-lwtheme)[focused] {
- box-shadow: 0 0 0 1px Highlight inset;
- }
- }
-
- #urlbar:not(:-moz-lwtheme)[focused],
- .searchbar-textbox:not(:-moz-lwtheme)[focused] {
- border-color: Highlight;
- }
-}
-
-@media (-moz-os-version: windows-win10) {
- #urlbar,
- .searchbar-textbox {
- font-size: 1.15em;
- min-height: 28px;
- }
-
- :root {
- /* let toolbar buttons match the location and search bar's minimum height */
- --toolbarbutton-vertical-inner-padding: 4px;
- }
-}
-
-#urlbar:-moz-lwtheme,
-.searchbar-textbox:-moz-lwtheme {
- background-color: rgba(255,255,255,.8);
- color: black;
-}
-
-#urlbar:-moz-lwtheme:hover:not([readonly]),
-.searchbar-textbox:-moz-lwtheme:hover {
- background-color: rgba(255,255,255,.9);
-}
-
-#urlbar:-moz-lwtheme[focused]:not([readonly]),
-.searchbar-textbox:-moz-lwtheme[focused] {
- background-color: white;
-}
-
-@conditionalForwardWithUrlbar@ > #urlbar {
- border-inline-start: none;
- padding-inline-start: 0;
- margin-left: 0;
-}
-
-@conditionalForwardWithUrlbar@ > #urlbar:-moz-locale-dir(ltr) {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
-}
-
-@conditionalForwardWithUrlbar@ > #urlbar:-moz-locale-dir(rtl) {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
-}
-
-@conditionalForwardWithUrlbar@ {
- clip-path: url("chrome://browser/content/browser.xul#urlbar-back-button-clip-path");
- margin-inline-start: calc(-1 * var(--backbutton-urlbar-overlap));
-}
-
-@media (-moz-os-version: windows-win10) {
- @conditionalForwardWithUrlbar@ {
- clip-path: url("chrome://browser/content/browser.xul#urlbar-back-button-clip-path-win10");
- }
-
- :root {
- --backbutton-urlbar-overlap: 9px;
- }
-}
-
-@conditionalForwardWithUrlbar@:-moz-locale-dir(rtl),
-@conditionalForwardWithUrlbar@ > #urlbar:-moz-locale-dir(rtl) {
- /* let urlbar-back-button-clip-path clip the urlbar's right side for RTL */
- transform: scaleX(-1);
-}
-
-@conditionalForwardWithUrlbar@:-moz-locale-dir(rtl) {
- -moz-box-direction: reverse;
-}
-
-html|*.urlbar-input:-moz-lwtheme::placeholder,
-.searchbar-textbox:-moz-lwtheme > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input::placeholder {
- opacity: 1.0;
- color: #777;
-}
-
-#urlbar-container {
- -moz-box-align: center;
-}
-
-.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;
- height: 16px;
-}
-
-/* ::::: URL Bar Zoom Reset Button ::::: */
-@keyframes urlbar-zoom-reset-pulse {
- 0% {
- transform: scale(0);
- }
- 75% {
- transform: scale(1.5);
- }
- 100% {
- transform: scale(1.0);
- }
-}
-
-#urlbar-zoom-button {
- -moz-appearance: none;
- color: inherit;
-}
-
-.search-go-container {
- padding: 2px 2px;
-}
-
-#urlbar-search-footer {
- border-top: 1px solid var(--panel-separator-color);
- background-color: var(--arrowpanel-dimmed);
-}
-
-#urlbar-search-settings {
- -moz-appearance: none;
- -moz-user-focus: ignore;
- color: GrayText;
- margin: 0;
- border: 0;
- padding: 8px 20px;
- background: transparent;
-}
-
-#urlbar-search-settings:hover {
- background-color: var(--arrowpanel-dimmed);
-}
-
-#urlbar-search-settings:hover:active {
- background-color: var(--arrowpanel-dimmed-further);
-}
-
-#urlbar-search-splitter {
- /* The splitter width should equal the location and search bars' combined
- neighboring margin and border width. */
- min-width: 8px;
- margin: 0 -4px;
- position: relative;
- border: none;
- background: transparent;
-}
-
-.urlbar-display {
- margin-top: 0;
- margin-bottom: 0;
- margin-inline-start: 0;
- color: GrayText;
-}
-
-%include ../shared/urlbarSearchSuggestionsNotification.inc.css
-
-#search-container {
- min-width: calc(54px + 11ch);
-}
-
-/* identity box */
-
-#identity-box:-moz-focusring {
- outline: 1px dotted;
- outline-offset: -3px;
-}
-
-/* Location bar dropmarker */
-
-.urlbar-history-dropmarker {
- -moz-appearance: none;
- padding: 0 3px;
- background-color: transparent;
- border: none;
- width: auto;
- list-style-image: var(--urlbar-dropmarker-url);
- -moz-image-region: var(--urlbar-dropmarker-region);
- transition: opacity 0.15s ease;
+#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker {
+ -moz-appearance: none !important;
}
-#urlbar-wrapper[switchingtabs] > #urlbar > .urlbar-textbox-container > .urlbar-history-dropmarker {
- transition: none;
-}
-
-#navigator-toolbox:not(:hover) #nav-bar:not([customizing="true"]) #urlbar:not([focused]) > .urlbar-textbox-container > .urlbar-history-dropmarker {
- opacity: 0;
-}
-
-.urlbar-history-dropmarker:hover {
- -moz-image-region: var(--urlbar-dropmarker-hover-region);
-}
-
-.urlbar-history-dropmarker:hover:active,
-.urlbar-history-dropmarker[open="true"] {
- -moz-image-region: var(--urlbar-dropmarker-active-region);
-}
-
-@media (min-resolution: 1.1dppx) {
- .urlbar-history-dropmarker {
- list-style-image: var(--urlbar-dropmarker-2x-url);
- -moz-image-region: var(--urlbar-dropmarker-2x-region);
- }
-
- .urlbar-history-dropmarker:hover {
- -moz-image-region: var(--urlbar-dropmarker-hover-2x-region);
- }
-
- .urlbar-history-dropmarker[open="true"],
- .urlbar-history-dropmarker:hover:active {
- -moz-image-region: var(--urlbar-dropmarker-active-2x-region);
- }
-
- .urlbar-history-dropmarker > .dropmarker-icon {
- width: 11px;
- }
-}
-
-/* page proxy icon */
-
-%include ../shared/identity-block/identity-block.inc.css
-
-/* autocomplete */
-
-%include ../shared/autocomplete.inc.css
-
-#PopupAutoComplete > richlistbox > richlistitem[originaltype~="datalist-first"] {
- border-top: 1px solid ThreeDShadow;
-}
-
-#treecolAutoCompleteImage {
- max-width: 36px;
-}
-
-.autocomplete-richlistbox {
- padding: 4px;
-}
-
-.autocomplete-richlistitem {
- height: 30px;
- min-height: 30px;
- font: message-box;
- border-radius: 2px;
- border: 1px solid transparent;
-}
-
-.ac-title {
- font-size: 14px;
-}
-
-.ac-tags {
- font-size: 12px;
-}
-
-html|span.ac-tag {
- border-radius: 2px;
- border: 1px solid transparent;
- padding: 0 1px;
-}
-
-.ac-separator,
-.ac-url,
-.ac-action {
- font-size: 12px;
-}
-
-html|span.ac-emphasize-text-title,
-html|span.ac-emphasize-text-tag,
-html|span.ac-emphasize-text-url {
- font-weight: 600;
-}
-
-@media (-moz-windows-default-theme) {
- .autocomplete-richlistitem:hover,
- treechildren.searchbar-treebody::-moz-tree-row(hover) {
- background-color: hsla(0, 0%, 0%, 0.06);
- border-color: hsla(0, 0%, 0%, 0.1);
- }
-
- .autocomplete-richlistitem[selected] {
- background-color: hsl(210, 80%, 52%);
- color: hsl(0, 0%, 100%);
- }
-
- treechildren.searchbar-treebody::-moz-tree-row(selected) {
- background-color: Highlight;
- }
-
- .ac-title:not([selected=true]) {
- color: hsl(0, 0%, 0%);
- }
-
- .ac-separator:not([selected=true]) {
- color: hsl(0, 0%, 50%);
- }
-
- .ac-url:not([selected=true]) {
- color: hsl(210, 77%, 47%);
- }
-
- .ac-action:not([selected=true]) {
- color: hsl(178, 100%, 28%);
- }
-
- html|span.ac-tag {
- background-color: hsl(216, 0%, 88%);
- color: hsl(0, 0%, 0%);
- }
-
- .ac-tags-text[selected] > html|span.ac-tag {
- background-color: hsl(0, 0%, 100%);
- color: hsl(210, 80%, 40%);
- }
-}
-
-@media (-moz-windows-default-theme: 0) {
- .ac-separator:not([selected=true]),
- .ac-url:not([selected=true]),
- .ac-action:not([selected=true]) {
- color: -moz-nativehyperlinktext;
- }
-
- html|span.ac-tag {
- background-color: -moz-FieldText;
- color: -moz-Field;
- }
-
- .ac-tags-text[selected] > html|span.ac-tag {
- background-color: HighlightText;
- color: Highlight;
- }
-}
-
-.ac-type-icon[type=bookmark] {
- list-style-image: url("chrome://browser/skin/urlbar-star.svg#star");
-}
-
-.ac-type-icon[type=bookmark][selected][current] {
- list-style-image: url("chrome://browser/skin/urlbar-star.svg#star-inverted");
-}
-
-.ac-type-icon[type=keyword],
-.ac-site-icon[type=searchengine] {
- list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg);
- -moz-context-properties: fill;
- fill: GrayText;
-}
-
-.ac-type-icon[type=keyword][selected],
-.ac-site-icon[type=searchengine][selected] {
- fill: highlighttext;
-}
-
-.ac-type-icon[type=switchtab],
-.ac-type-icon[type=remotetab] {
- list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab");
-}
-
-.ac-type-icon[type=switchtab][selected],
-.ac-type-icon[type=remotetab][selected] {
- list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab-inverted");
-}
-
-.autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
- color: GrayText;
-}
-
-.autocomplete-treebody::-moz-tree-cell-text(suggesthint, treecolAutoCompleteComment),
-.autocomplete-treebody::-moz-tree-cell-text(suggestfirst, treecolAutoCompleteComment)
-{
- color: GrayText;
- font-size: smaller;
-}
-
-.autocomplete-treebody::-moz-tree-cell(suggesthint) {
- border-top: 1px solid GrayText;
-}
-
-/* combined go/reload/stop button in location bar */
-
-#urlbar-go-button,
-#urlbar-reload-button,
-#urlbar-stop-button {
- -moz-appearance: none;
- border-style: none;
- list-style-image: url("chrome://browser/skin/reload-stop-go.png");
- padding: 0 9px;
- margin-inline-start: 5px;
- 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-reload-button {
- -moz-image-region: rect(0, 14px, 14px, 0);
-}
-
-#urlbar-reload-button:not([disabled]):hover {
- -moz-image-region: rect(14px, 14px, 28px, 0);
-}
-
-#urlbar-reload-button:not([disabled]):hover:active {
- -moz-image-region: rect(28px, 14px, 42px, 0);
-}
-
-#urlbar-reload-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
- transform: scaleX(-1);
-}
-
-#urlbar-go-button {
- -moz-image-region: rect(0, 42px, 14px, 28px);
-}
-
-#urlbar-go-button:hover {
- -moz-image-region: rect(14px, 42px, 28px, 28px);
-}
-
-#urlbar-go-button:hover:active {
- -moz-image-region: rect(28px, 42px, 42px, 28px);
-}
-
-#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
- transform: scaleX(-1);
-}
-
-#urlbar-stop-button {
- -moz-image-region: rect(0, 28px, 14px, 14px);
-}
-
-#urlbar-stop-button:not([disabled]):hover {
- -moz-image-region: rect(14px, 28px, 28px, 14px);
-}
-
-#urlbar-stop-button:hover:active {
- -moz-image-region: rect(28px, 28px, 42px, 14px);
-}
-
-@media (min-resolution: 1.1dppx) {
- #urlbar-go-button,
- #urlbar-reload-button,
- #urlbar-stop-button {
- list-style-image: url("chrome://browser/skin/reload-stop-go@2x.png");
- }
-
- #urlbar-go-button > .toolbarbutton-icon,
- #urlbar-reload-button > .toolbarbutton-icon,
- #urlbar-stop-button > .toolbarbutton-icon {
- width: 14px;
- }
-
- #urlbar-go-button {
- -moz-image-region: rect(0, 84px, 28px, 56px);
- }
-
- #urlbar-go-button:hover {
- -moz-image-region: rect(28px, 84px, 56px, 56px);
- }
-
- #urlbar-go-button:hover:active {
- -moz-image-region: rect(56px, 84px, 84px, 56px);
- }
-
- #urlbar-reload-button {
- -moz-image-region: rect(0, 28px, 28px, 0);
- }
-
- #urlbar-reload-button:not([disabled]):hover {
- -moz-image-region: rect(28px, 28px, 56px, 0);
- }
-
- #urlbar-reload-button:not([disabled]):hover:active {
- -moz-image-region: rect(56px, 28px, 84px, 0);
- }
-
- #urlbar-stop-button {
- -moz-image-region: rect(0, 56px, 28px, 28px);
- }
-
- #urlbar-stop-button:not([disabled]):hover {
- -moz-image-region: rect(28px, 56px, 56px, 28px);
- }
-
- #urlbar-stop-button:hover:active {
- -moz-image-region: rect(56px, 56px, 84px, 28px);
- }
-}
-
-/* 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);
-}
-
-#page-report-button:hover {
- -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);
-}
-
-/* Reader mode button */
-
-#reader-mode-button {
- list-style-image: url("chrome://browser/skin/readerMode.svg");
- -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-#reader-mode-button:hover,
-#reader-mode-button[readeractive]:hover {
- -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-#reader-mode-button:hover:active,
-#reader-mode-button[readeractive] {
- -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
-/* social share panel */
-%include ../shared/social/social.inc.css
-
-.social-panel-frame {
- border-radius: inherit;
-}
-
-.social-share-frame {
- min-width: 756px;
- height: 150px;
-}
-#share-container {
- min-width: 756px;
- background-color: white;
- background-repeat: no-repeat;
- background-position: center center;
-}
-#share-container[loading] {
- background-image: url(chrome://browser/skin/tabbrowser/pendingpaint.png);
-}
-#share-container > browser {
- transition: opacity 150ms ease-in-out;
- opacity: 1;
-}
-#share-container[loading] > browser {
- opacity: 0;
-}
-
-.social-share-toolbar {
- border-bottom: 1px solid #e2e5e8;
- padding: 2px;
-}
-
-#social-share-provider-buttons {
- padding: 0;
- margin: 0;
-}
-
-.share-provider-button {
- padding: 5px;
- margin: 2px;
-}
-
-.share-provider-button > .toolbarbutton-text {
- display: none;
-}
-.share-provider-button > .toolbarbutton-icon {
- width: 16px;
- min-height: 16px;
- max-height: 16px;
-}
-
-#social-share-panel {
- min-height: 100px;
- min-width: 766px;
-}
-
-#share-container,
-.social-share-frame {
- border-top-left-radius: 0;
- border-bottom-left-radius: inherit;
- border-top-right-radius: 0;
- border-bottom-right-radius: inherit;
-}
-
-#social-share-panel > .social-share-toolbar {
- border-top-left-radius: inherit;
- border-top-right-radius: inherit;
-}
-
-#social-share-provider-buttons {
- border-top-left-radius: inherit;
- border-top-right-radius: inherit;
-}
-
-/* bookmarks menu-button */
-
-#nav-bar #bookmarks-menu-button[cui-areatype="toolbar"]:not([overflowedItem=true]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+#bookmarks-menu-button[cui-areatype="toolbar"]:not([overflowedItem=true]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
padding-top: var(--toolbarbutton-vertical-inner-padding);
padding-bottom: var(--toolbarbutton-vertical-inner-padding);
}
#BMB_bookmarksPopup[side="top"],
#BMB_bookmarksPopup[side="bottom"] {
margin-left: -20px;
margin-right: -20px;
}
#BMB_bookmarksPopup[side="left"],
#BMB_bookmarksPopup[side="right"] {
margin-top: -20px;
margin-bottom: -20px;
}
-/* bookmarking panel */
-
-#editBookmarkPanelStarIcon {
- 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");
-}
-
-#editBookmarkPanelTitle {
- font-size: 130%;
-}
-
-#editBookmarkPanelHeader,
-#editBookmarkPanelContent {
- margin-bottom: .5em;
-}
-
-/* Implements editBookmarkPanel resizing on folderTree un-collapse. */
-#editBMPanel_folderTree {
- min-width: 27em;
-}
-
-/* ::::: content area ::::: */
-
-#sidebar {
- background-color: Window;
-}
-
-#sidebar-title {
- padding-inline-start: 0px;
-}
-
-#sidebar-header > .close-icon {
- -moz-appearance: none;
- padding: 2px;
- margin: 0;
- border: none;
-}
-
-@media not all and (min-resolution: 1.1dppx) {
- #sidebar-header > .close-icon:-moz-lwtheme-brighttext {
- list-style-image: url("chrome://global/skin/icons/close-inverted.png");
- }
-}
-
-@media (min-resolution: 1.1dppx) {
- #sidebar-header > .close-icon:-moz-lwtheme-brighttext {
- list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
- }
-}
-
-@media (-moz-os-version: windows-win7) {
- #sidebar-header > .close-icon {
- padding-top: 4px;
- padding-bottom: 4px;
- }
-}
-
-.browserContainer > findbar {
- background-color: -moz-dialog;
- color: -moz-DialogText;
- text-shadow: none;
-}
-
-/* Tabstrip */
-
-#TabsToolbar {
- min-height: 0;
- padding: 0;
- margin-bottom: calc(-1 * var(--tab-toolbar-navbar-overlap)); /* overlap the nav-bar's top border */
-}
-
-%include ../shared/tabs.inc.css
-
-/* Remove border between tab strip and navigation toolbar on Windows 10+ */
-@media not all and (-moz-os-version: windows-win7) {
- @media not all and (-moz-os-version: windows-win8) {
- @media (-moz-windows-default-theme) {
- .tab-background-end[selected=true]::after,
- .tab-background-start[selected=true]::after {
- content: none;
- }
-
- #TabsToolbar {
- --tab-stroke-background-size: 0 0;
- }
-
- :root {
- --tab-toolbar-navbar-overlap: 0px;
- }
-
- #nav-bar {
- border-top-style: none !important;
- box-shadow: none;
- }
- }
- }
-}
-
-/* Invert the unhovered close tab icons on bright-text tabs */
-@media not all and (min-resolution: 1.1dppx) {
- .tab-close-button:-moz-lwtheme-brighttext,
- #TabsToolbar[brighttext] .tab-close-button:not([selected="true"]) {
- list-style-image: url("chrome://global/skin/icons/close-inverted.png");
- }
-}
-
-@media (min-resolution: 1.1dppx) {
- .tab-close-button:-moz-lwtheme-brighttext,
- #TabsToolbar[brighttext] .tab-close-button:not([selected="true"]) {
- list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
- }
-}
-
-/* tabbrowser-tab focus ring */
-.tabbrowser-tab:focus > .tab-stack > .tab-content {
- outline: 1px dotted;
- outline-offset: -6px;
-}
-
-/* Tab DnD indicator */
-.tab-drop-indicator {
- list-style-image: url(chrome://browser/skin/tabbrowser/tabDragIndicator.png);
- margin-bottom: -9px;
- z-index: 3;
-}
-
-/* Tab close button */
-.tab-close-button {
- -moz-appearance: none;
- border: none;
-}
-
-/* Tab scrollbox arrow, tabstrip new tab and all-tabs buttons */
-
-.tabbrowser-arrowscrollbox > .scrollbutton-up,
-.tabbrowser-arrowscrollbox > .scrollbutton-down {
- list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.svg");
- margin: 0 0 var(--tab-toolbar-navbar-overlap);
-}
-
-#TabsToolbar[brighttext] > #tabbrowser-tabs > .tabbrowser-arrowscrollbox > .scrollbutton-up,
-#TabsToolbar[brighttext] > #tabbrowser-tabs > .tabbrowser-arrowscrollbox > .scrollbutton-down {
- list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.svg);
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-up[disabled],
-.tabbrowser-arrowscrollbox > .scrollbutton-down[disabled] {
- opacity: .4;
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl),
-.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr) {
- transform: scaleX(-1);
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-down {
- transition: 1s background-color ease-out;
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-down[highlight] {
- background-color: Highlight;
- transition: none;
-}
-
-.tabs-newtab-button > .toolbarbutton-icon {
- 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.svg);
- -moz-image-region: auto;
-}
-
-#TabsToolbar[brighttext] .tabs-newtab-button,
-#TabsToolbar[brighttext] > #new-tab-button,
-#TabsToolbar[brighttext] > toolbarpaletteitem > #new-tab-button {
- list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted.svg);
-}
-
-.tabs-newtab-button > .toolbarbutton-icon,
-#TabsToolbar > #new-tab-button > .toolbarbutton-icon,
-#TabsToolbar > toolbarpaletteitem > #new-tab-button > .toolbarbutton-icon {
- width: 16px;
-}
-
-#TabsToolbar > #new-tab-button {
- width: 26px;
-}
-
-#alltabs-button {
- list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
-}
-
-#TabsToolbar[brighttext] > #alltabs-button,
-#TabsToolbar[brighttext] > toolbarpaletteitem > #alltabs-button {
- list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
-}
-
-#alltabs-button > .toolbarbutton-icon {
- margin: 0 2px;
-}
-
-#alltabs-button > .toolbarbutton-menu-dropmarker {
- display: none;
-}
-
-/* All tabs menupopup */
-.alltabs-item > .menu-iconic-left > .menu-iconic-icon {
- list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-}
-
-.alltabs-item[selected="true"] {
- font-weight: bold;
-}
-
-.alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
- list-style-image: url("chrome://global/skin/icons/loading.png");
-}
-
-@media (min-resolution: 1.1dppx) {
- .alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
- list-style-image: url("chrome://global/skin/icons/loading@2x.png");
- }
-}
-
-toolbarbutton.chevron {
- list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
-}
-
-toolbar[brighttext] toolbarbutton.chevron {
- list-style-image: url("chrome://global/skin/toolbar/chevron-inverted.png") !important;
-}
-
-toolbarbutton.chevron:-moz-locale-dir(rtl) > .toolbarbutton-icon {
- transform: scaleX(-1);
-}
-
-toolbarbutton.chevron > .toolbarbutton-text,
-toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
- display: none;
-}
-
-toolbarbutton.chevron > .toolbarbutton-icon {
- margin: 0;
-}
-
-#sidebar-throbber[loading="true"] {
- list-style-image: url("chrome://global/skin/icons/loading.png");
- margin-inline-end: 4px;
-}
-
-@media (min-resolution: 1.1dppx) {
- #sidebar-throbber[loading="true"] {
- list-style-image: url("chrome://global/skin/icons/loading@2x.png");
- width: 16px;
- }
-}
-
-/* Bookmarks toolbar */
-#PlacesToolbarDropIndicator {
- 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;
-}
-
-/* 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;
-}
-
-.menupopup-drop-indicator {
- list-style-image: none;
- height: 2px;
- margin-inline-end: -4em;
- background-color: Highlight;
-}
-
-%include ../shared/notification-icons.inc.css
-
-.popup-notification-body[popupid="addon-progress"],
-.popup-notification-body[popupid="addon-install-confirmation"] {
- width: 28em;
- max-width: 28em;
-}
-
-.addon-install-confirmation-name {
- font-weight: bold;
-}
-
-html|*.addon-webext-perm-list {
- margin-block-end: 0;
- padding-inline-start: 10px;
-}
-
-.addon-webext-perm-text {
- margin-inline-start: 0;
-}
-
-.popup-notification-description[popupid="addon-webext-permissions"] {
- margin: 0;
- padding: 0;
-}
-
-.addon-webext-name {
- display: inline;
- font-weight: bold;
- margin: 0;
-}
-
-.addon-addon-icon {
- width: 14px;
- height: 14px;
- list-style-image: url("chrome://browser/skin/menuPanel.svg");
- -moz-image-region: rect(0px, 288px, 32px, 256px);
-}
-
-.addon-toolbar-icon {
- width: 14px;
- height: 14px;
- list-style-image: url("chrome://browser/skin/Toolbar.png");
- -moz-image-region: rect(0, 486px, 18px, 468px);
-}
-
-/* Notification icon box */
-
-.notification-anchor-icon:-moz-focusring {
- outline: 1px dotted -moz-DialogText;
-}
-
-/* Translation infobar */
-
-%include ../shared/translation/infobar.inc.css
-
-notification[value="translation"] {
- min-height: 40px;
-}
-
-@media (-moz-windows-default-theme) {
- notification[value="translation"],
- notification[value="translation"] button,
- notification[value="translation"] menulist {
- min-height: 30px;
- color: #545454;
- }
-
- notification[value="translation"] {
- background-color: #EEE;
- }
-
- notification[value="translation"] button,
- notification[value="translation"] menulist {
- padding-inline-end: 1ch;
- }
-
- notification[value="translation"] menulist {
- border: 1px solid #C1C1C1;
- background-color: #FFF;
- }
-
- notification[value="translation"] button {
- border: 1px solid #C1C1C1;
- background-color: #FBFBFB;
- }
-
- notification[value="translation"] button,
- notification[value="translation"] menulist,
- notification[value="translation"] menulist > .menulist-label-box {
- margin-inline-start: 1ch;
- margin-inline-end: 1ch;
- }
-
- notification[value="translation"] button:hover,
- notification[value="translation"] button:active,
- notification[value="translation"] menulist:hover,
- notification[value="translation"] menulist:active {
- background-color: #EBEBEB;
- }
-
- notification[value="translation"] button[anonid="translate"] {
- color: #FFF;
- background-color: #0095DD;
- box-shadow: none;
- border: 1px solid #006B9D;
- }
-
- notification[value="translation"] button[anonid="translate"]:hover,
- notification[value="translation"] button[anonid="translate"]:active {
- background-color: #008ACB;
- }
-
- notification[value="translation"] button[type="menu"] > .button-box > .button-menu-dropmarker,
- notification[value="translation"] menulist > .menulist-dropmarker {
- list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
- }
-
- notification[value="translation"] button > .button-box,
- notification[value="translation"] button[type="menu"] > .button-box > .button-menu-dropmarker {
- padding: 0;
- margin-inline-start: 3ch;
- }
-
- notification[value="translation"] button:not([type="menu"]) > .button-box {
- margin-inline-end: 3ch;
- }
-}
-
-.translation-menupopup {
- -moz-appearance: none;
-}
-
-/* Bookmarks roots menu-items */
-#subscribeToPageMenuitem:not([disabled]),
-#subscribeToPageMenupopup {
- list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png");
-}
-
-#bookmarksToolbarFolderMenu,
-#BMB_bookmarksToolbar,
-#panelMenu_bookmarksToolbar {
- list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
- -moz-image-region: auto;
-}
-
-#menu_unsortedBookmarks,
-#BMB_unsortedBookmarks,
-#panelMenu_unsortedBookmarks {
- list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png");
- -moz-image-region: auto;
-}
-
-/* Status panel */
-
-.statuspanel-label {
- margin: 0;
- padding: 2px 4px;
- background: -moz-dialog;
- border: 1px none ThreeDShadow;
- border-top-style: solid;
- color: -moz-dialogText;
- text-shadow: none;
-}
-
-@media (-moz-windows-default-theme) {
- .statuspanel-label {
- background: linear-gradient(#fff, #ddd);
- border-color: #ccc;
- color: #333;
- }
-}
-
-.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;
-}
-
-.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;
-}
-
-%include ../shared/fullscreen/warning.inc.css
-%include ../shared/ctrlTab.inc.css
-%include ../shared/plugin-doorhanger.inc.css
-
-notification.pluginVulnerable > .notification-inner > .messageCloseButton {
- list-style-image: url("chrome://global/skin/icons/close-inverted.png");
-}
-
-@media (min-resolution: 1.1dppx) {
- notification.pluginVulnerable > .notification-inner > .messageCloseButton {
- list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
- }
-}
-
-
-%include downloads/indicator.css
-
-/* 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;
- margin-inline-end: 5px;
-}
-
-/* Customization mode */
-
-%include ../shared/customizableui/customizeMode.inc.css
-
-/**
- * This next rule is a hack to disable subpixel anti-aliasing on all
- * labels during the customize mode transition. Subpixel anti-aliasing
- * on Windows with Direct2D layers acceleration is particularly slow to
- * paint, so this hack is how we sidestep that performance bottleneck.
- */
-#main-window:-moz-any([customize-entering],[customize-exiting]) label {
- transform: perspective(0.01px);
-}
-
-#main-window[customize-entered] > #tab-view-deck {
- background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
- background-attachment: fixed;
-}
-
-#main-window[customization-lwtheme]:-moz-lwtheme {
- background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
- background-repeat: repeat;
- background-attachment: fixed;
- background-position: left top;
-}
-
-#main-window[customize-entered] #browser-bottombox,
-#main-window[customize-entered] #customization-container {
- border-left: 1px solid @toolbarShadowColor@;
- border-right: 1px solid @toolbarShadowColor@;
- background-clip: padding-box;
-}
-
-#main-window[customize-entered] #browser-bottombox {
- border-bottom: 1px solid @toolbarShadowColor@;
-}
-
-#customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="left"] {
- margin-right: -2px;
-}
-
-#customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="right"] {
- margin-left: -2px;
-}
-
-/* End customization mode */
-
-/* Private browsing indicators */
-
-/**
- * Currently, we have two places where we put private browsing indicators on
- * Windows. When tabsintitlebar is enabled, we draw the indicator in the titlebar.
- * When tabsintitlebar is disabled, we draw the indicator at the end of the
- * tabstrip. The titlebar indicator is the fiddliest of the bunch, since we
- * want the bottom border of the image to line up with the bottom of the window
- * caption buttons. That's why there's so much special-casing going on in here.
- */
-.private-browsing-indicator {
- display: none;
- pointer-events: none;
-}
-
-#private-browsing-indicator-titlebar {
- display: block;
- position: absolute;
-}
-
-#main-window[privatebrowsingmode=temporary][tabsintitlebar] #private-browsing-indicator-titlebar > .private-browsing-indicator {
- display: block;
-}
-
-#main-window[privatebrowsingmode=temporary]:-moz-any([inFullscreen],:not([tabsintitlebar])) #TabsToolbar > .private-browsing-indicator {
- display: -moz-box;
-}
-
-#TabsToolbar > .private-browsing-indicator {
- background: url("chrome://browser/skin/privatebrowsing-mask-tabstrip.png") no-repeat center -3px;
- margin-inline-start: 4px;
- width: 48px;
-}
-
-/* Bug 1008183: We're intentionally using the titlebar asset here for fullscreen
- * mode, since the tabstrip "mimics" the titlebar in that case with its own
- * min/max/close window buttons.
- */
-#private-browsing-indicator-titlebar > .private-browsing-indicator,
-#main-window[inFullscreen] #TabsToolbar > .private-browsing-indicator {
- background: url("chrome://browser/skin/privatebrowsing-mask-titlebar.png") no-repeat center 0px;
- margin-inline-end: 4px;
- width: 40px;
- height: 20px;
- position: relative;
-}
-
-@media (-moz-windows-classic) {
- /**
- * We have to use top instead of background-position in this case, otherwise
- * the bottom of the indicator would get cut off by the bounds of the
- * private-browsing-indicator element.
- */
- #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator {
- top: 4px;
- }
-}
-
-@media (-moz-os-version: windows-win7) {
- @media (-moz-windows-glass) {
- #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator {
- top: 1px;
- }
- #main-window[sizemode="maximized"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator {
- top: -1px;
- }
- }
-
- /**
- * This next block targets Aero Basic, which has different positioning for the
- * window caption buttons, and therefore needs to be special-cased.
- */
- @media (-moz-windows-default-theme) {
- @media (-moz-windows-compositor: 0) {
- #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator {
- background-image: url("chrome://browser/skin/privatebrowsing-mask-titlebar-win7-tall.png");
- height: 28px;
- }
- }
- }
-}
-
-/* End private browsing indicators */
-
-%include ../shared/UITour.inc.css
-
-#UITourTooltipButtons {
- /**
- * Override the --arrowpanel-padding so the background extends
- * to the sides and bottom of the panel.
- */
- margin-left: -10px;
- margin-right: -10px;
- margin-bottom: -10px;
-}
-
-%include ../shared/contextmenu.inc.css
-
-#context-navigation {
- background-color: menu;
- padding-bottom: 4px;
-}
-
-#context-sep-navigation {
- margin-inline-start: -28px;
- margin-top: -4px;
-}
-
-%include browser-aero.css
-
-.browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent {
- padding: 0;
- overflow: hidden;
-}
-
-@media (-moz-os-version: windows-win7) {
- .cui-widget-panelview[id^=PanelUI-webext-] {
- border-radius: 4px;
- }
-}
-
-.webextension-popup-browser {
- border-radius: inherit;
-}
-
-.contentSelectDropdown-ingroup > .menu-iconic-text {
- padding-inline-start: 20px;
-}
-
-#ContentSelectDropdown > menupopup {
- background-color: -moz-field;
- -moz-border-top-colors: GrayText;
- -moz-border-right-colors: GrayText;
- -moz-border-bottom-colors: GrayText;
- -moz-border-left-colors: GrayText;
-}
-
-#ContentSelectDropdown > menupopup > menucaption,
-#ContentSelectDropdown > menupopup > menuitem {
- padding: 0 6px;
- border-width: 0;
- font: -moz-list;
-}
-
-#ContentSelectDropdown > menupopup > menucaption > .menu-iconic-text,
-#ContentSelectDropdown > menupopup > menuitem > .menu-iconic-text {
- /* Padding should follow the 4/12 ratio, where 12px is the default font-size
- with 4px being the preferred padding size. */
- padding-top: .3333em;
- padding-bottom: .3333em;
-}
-
-#ContentSelectDropdown > menupopup > menucaption > .menu-iconic-text {
- font-weight: bold;
-}
-
-#ContentSelectDropdown > menupopup > menuitem[_moz-menuactive="true"][disabled="true"] {
- color: GrayText;
- background-color: unset;
-}
-
-#ContentSelectDropdown > menupopup > menucaption {
- background-color: buttonface;
-}
-
-#ContentSelectDropdown > menupopup > menucaption[disabled="true"] {
- color: GrayText;
-}
-
-#ContentSelectDropdown > .isOpenedViaTouch > menucaption > .menu-iconic-text,
-#ContentSelectDropdown > .isOpenedViaTouch > menuitem > .menu-iconic-text {
- /* Touch padding should follow the 11/12 ratio, where 12px is the default
- font-size with 11px being the preferred padding size. */
- padding-top: .9167em;
- padding-bottom: .9167em;
-}
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -5,43 +5,48 @@
@import url("chrome://global/skin/");
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/1999/xhtml");
@namespace svg url("http://www.w3.org/2000/svg");
%include ../shared/browser.inc
%include windowsShared.inc
-%filter substitution
%define toolbarShadowColor hsla(209,67%,12%,0.35)
-%define forwardTransitionLength 150ms
-%define conditionalForwardWithUrlbar window:not([chromehidden~="toolbar"]) #urlbar-wrapper
%include ../shared/browser.inc.css
:root {
--space-above-tabbar: 15px;
--backbutton-urlbar-overlap: 6px;
/* icon width + border + horizontal padding (without the overlap from backbutton-urlbar-overlap) */
--forwardbutton-width: 25px;
--toolbarbutton-vertical-inner-padding: 2px;
+ --toolbarbutton-vertical-text-padding: var(--toolbarbutton-vertical-inner-padding);
+
+ --toolbarbutton-border-radius: 1px;
--toolbarbutton-hover-background: rgba(0,0,0,.1);
--toolbarbutton-hover-bordercolor: rgba(0,0,0,.2);
--toolbarbutton-hover-boxshadow: none;
--toolbarbutton-active-background: rgba(0,0,0,.15);
--toolbarbutton-active-bordercolor: rgba(0,0,0,.3);
--toolbarbutton-active-boxshadow: 0 0 0 1px rgba(0,0,0,.15) inset;
--toolbarbutton-checkedhover-backgroundcolor: rgba(0,0,0,.1);
+ --toolbarbutton-disabled-opacity: 0.4;
+ --backbutton-border-color: var(--urlbar-border-color-hover);
+
+ --backbutton-background: rgba(255,255,255,.15);
+
--urlbar-dropmarker-url: url("chrome://browser/skin/urlbar-history-dropmarker.png");
--urlbar-dropmarker-region: rect(0px, 11px, 14px, 0px);
--urlbar-dropmarker-hover-region: rect(0px, 22px, 14px, 11px);
--urlbar-dropmarker-active-region: rect(0px, 33px, 14px, 22px);
--urlbar-dropmarker-2x-url: url("chrome://browser/skin/urlbar-history-dropmarker@2x.png");
--urlbar-dropmarker-2x-region: rect(0, 22px, 28px, 0);
--urlbar-dropmarker-hover-2x-region: rect(0, 44px, 28px, 22px);
--urlbar-dropmarker-active-2x-region: rect(0, 66px, 28px, 44px);
@@ -66,27 +71,16 @@ toolbar[brighttext] {
--toolbarbutton-active-background: rgba(255,255,255,.4);
--toolbarbutton-active-bordercolor: rgba(255,255,255,.7);
--toolbarbutton-active-boxshadow: 0 0 0 1px rgba(255,255,255,.4) inset;
--toolbarbutton-checkedhover-backgroundcolor: rgba(255,255,255,.3);
}
-toolbar:-moz-lwtheme {
- --toolbarbutton-hover-background: rgba(255,255,255,.25);
- --toolbarbutton-hover-bordercolor: rgba(0,0,0,.2);
-
- --toolbarbutton-active-background: rgba(70%,70%,70%,.25);
- --toolbarbutton-active-bordercolor: rgba(0,0,0,.3);
- --toolbarbutton-active-boxshadow: 0 0 2px rgba(0,0,0,.6) inset;
-
- --toolbarbutton-checkedhover-backgroundcolor: rgba(85%,85%,85%,.25);
-}
-
#menubar-items {
-moz-box-orient: vertical; /* for flex hack */
}
#main-menubar {
-moz-box-flex: 1; /* make menu items expand to fill toolbar height */
}
@@ -385,17 +379,17 @@ toolbar:-moz-lwtheme {
/* ::::: bookmark buttons ::::: */
toolbarbutton.bookmark-item:not(.subviewbutton),
#personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder {
margin: 0;
padding: 2px 3px;
-moz-appearance: none;
border: 1px solid transparent;
- border-radius: 1px;
+ border-radius: var(--toolbarbutton-border-radius);
background-origin: padding-box !important;
background-clip: padding-box !important;
transition-property: background-color, border-color, box-shadow;
transition-duration: 150ms;
}
toolbarbutton.bookmark-item:not(.subviewbutton):hover:not([disabled="true"]):not([open]) {
border-color: var(--toolbarbutton-hover-bordercolor);
@@ -429,77 +423,16 @@ toolbarbutton.bookmark-item[open="true"]
list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important;
}
toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-placeholder,
#personal-bookmarks[cui-areatype="menu-panel"] > #bookmarks-toolbar-placeholder {
list-style-image: url("chrome://browser/skin/places/bookmarksToolbar-menuPanel.png") !important;
}
-/* ----- BOOKMARK STAR ANIMATION ----- */
-
-@keyframes animation-bookmarkAdded {
- from { transform: rotate(0deg) translateX(-16px) rotate(0deg) scale(1); opacity: 0; }
- 60% { transform: rotate(180deg) translateX(-16px) rotate(-180deg) scale(2.2); opacity: 1; }
- 80% { opacity: 1; }
- to { transform: rotate(180deg) translateX(-16px) rotate(-180deg) scale(1); opacity: 0; }
-}
-
-@keyframes animation-bookmarkPulse {
- from { transform: scale(1); }
- 50% { transform: scale(1.3); }
- to { transform: scale(1); }
-}
-
-#bookmarked-notification-container {
- min-height: 1px;
- min-width: 1px;
- height: 1px;
- margin-bottom: -1px;
- z-index: 5;
- position: relative;
-}
-
-#bookmarked-notification {
- background-size: 16px;
- background-position: center;
- background-repeat: no-repeat;
- width: 16px;
- height: 16px;
- opacity: 0;
-}
-
-#bookmarked-notification-dropmarker-anchor {
- z-index: -1;
- position: relative;
-}
-
-#bookmarked-notification-dropmarker-icon {
- width: 18px;
- height: 18px;
- visibility: hidden;
-}
-
-#bookmarked-notification-anchor[notification="finish"] > #bookmarked-notification {
- background-image: url("chrome://browser/skin/places/bookmarks-notification-finish.png");
- animation: animation-bookmarkAdded 800ms;
- animation-timing-function: ease, ease, ease;
-}
-
-#bookmarks-menu-button[notification="finish"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
- list-style-image: none !important;
-}
-
-#bookmarked-notification-dropmarker-anchor[notification="finish"] > #bookmarked-notification-dropmarker-icon {
- visibility: visible;
- animation: animation-bookmarkPulse 300ms;
- animation-delay: 600ms;
- animation-timing-function: ease-out;
-}
-
/* ::::: bookmark menus ::::: */
menu.bookmark-item,
menuitem.bookmark-item {
min-width: 0;
max-width: 32em;
}
@@ -571,121 +504,22 @@ menuitem.bookmark-item {
opacity: 0.5;
}
.bookmark-item[cutting] > .toolbarbutton-text,
.bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-text {
opacity: 0.7;
}
-/* ::::: primary toolbar buttons ::::: */
+%include ../shared/bookmarked-notification.inc.css
+%include ../shared/toolbarbuttons.inc.css
%include ../shared/toolbarbutton-icons.inc.css
-
-#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-icon,
-#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menu-dropmarker,
-#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker,
-#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-#main-window:not([customizing]) .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled=true] > .toolbarbutton-icon {
- opacity: .4;
-}
-
-.toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
-.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
- 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");
-}
-
-.toolbarbutton-1 > .toolbarbutton-icon,
-.toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
- margin-inline-end: 0;
-}
-
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > .toolbarbutton-icon,
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
- max-width: 16px;
-}
-
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(@primaryToolbarButtons@, .toolbarbutton-legacy-addon) > .toolbarbutton-icon,
-:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-moz-any(@primaryToolbarButtons@, .toolbarbutton-legacy-addon) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,
-#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
- max-width: 18px;
-}
-
%include ../shared/menupanel.inc.css
-.findbar-button,
-#nav-bar .toolbarbutton-1,
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button {
- -moz-appearance: none;
- padding: 0;
-}
-
-#nav-bar .toolbarbutton-1:not([type=menu-button]),
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
- padding: 0 2px;
- -moz-box-pack: center;
-}
-
-#nav-bar #PanelUI-menu-button {
- padding-inline-start: 5px;
- padding-inline-end: 5px;
-}
-
-#nav-bar .toolbarbutton-1[type=panel],
-#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#PanelUI-menu-button) {
- padding-left: 5px;
- padding-right: 5px;
-}
-
-#nav-bar .toolbarbutton-1 > menupopup {
- margin-top: -3px;
-}
-
-#nav-bar .toolbarbutton-1 > menupopup.cui-widget-panel {
- margin-top: -8px;
-}
-
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button {
- padding-inline-end: 0;
-}
-
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
- padding-inline-start: 0;
- -moz-box-align: center;
-}
-
-.findbar-button > .toolbarbutton-text,
-#nav-bar .toolbarbutton-1 > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1 > .toolbarbutton-text,
-#nav-bar .toolbarbutton-1 > .toolbarbutton-badge-stack,
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
-@conditionalForwardWithUrlbar@ > .toolbarbutton-1:-moz-any([disabled],:not([open]):not([disabled]):not(:active)) > .toolbarbutton-icon {
- padding: var(--toolbarbutton-vertical-inner-padding) 6px;
- background-origin: padding-box !important;
- background-clip: padding-box !important;
- border: 1px solid transparent;
- border-radius: 1px;
- transition-property: background-color, border-color, box-shadow;
- transition-duration: 150ms;
-}
-
-#nav-bar .toolbarbutton-1 > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-#nav-bar #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
- /* horizontal padding + border + actual icon width */
- max-width: 32px;
-}
-
@media (-moz-os-version: windows-win7) {
:root {
--toolbarbutton-hover-background: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
--toolbarbutton-hover-bordercolor: hsla(210,54%,20%,.15) hsla(210,54%,20%,.2) hsla(210,54%,20%,.25);
--toolbarbutton-hover-boxshadow: 0 1px hsla(0,0%,100%,.3) inset,
0 1px hsla(210,54%,20%,.03),
0 0 2px hsla(210,54%,20%,.1);
@@ -696,246 +530,26 @@ toolbar[brighttext] .toolbarbutton-1 > .
/* allows 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);
--toolbarbutton-checkedhover-backgroundcolor: rgba(90%,90%,90%,.4);
}
}
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon:-moz-locale-dir(ltr),
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-locale-dir(rtl) {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
-}
-
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon:-moz-locale-dir(rtl),
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-locale-dir(ltr) {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
-}
-
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
- border-inline-end-style: none;
-}
-
-#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@, .toolbarbutton-legacy-addon)) > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@, .toolbarbutton-legacy-addon)) > .toolbarbutton-badge-stack,
-#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@, .toolbarbutton-legacy-addon)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
- padding: calc(var(--toolbarbutton-vertical-inner-padding) + 1px) 7px;
-}
-
-#nav-bar .toolbarbutton-1[type=panel] > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1[type=panel] > .toolbarbutton-badge-stack,
-#nav-bar .toolbarbutton-1[type=menu]:not(#PanelUI-menu-button):not(#back-button):not(#forward-button):not(#new-tab-button) > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1[type=menu]:not(#PanelUI-menu-button) > .toolbarbutton-badge-stack,
-#nav-bar .toolbarbutton-1[type=menu] > .toolbarbutton-text /* hack for add-ons that forcefully display the label */ {
- padding-inline-end: 17px;
-}
-
-#nav-bar .toolbarbutton-1[type=panel] > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1[type=menu]:not(#PanelUI-menu-button):not(#back-button):not(#forward-button):not(#new-tab-button) > .toolbarbutton-icon {
- /* horizontal padding + border + icon width */
- max-width: 43px;
-}
-
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menu-dropmarker {
- margin-inline-start: -15px;
-}
-
-#nav-bar #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
- /* horizontal padding + border + actual icon width */
- max-width: 31px;
-}
-
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
- padding-top: calc(var(--toolbarbutton-vertical-inner-padding) + 6px);
- padding-bottom: calc(var(--toolbarbutton-vertical-inner-padding) + 6px);
-}
-
-#nav-bar .toolbaritem-combined-buttons {
- margin-left: 2px;
- margin-right: 2px;
-}
-
-#nav-bar .toolbaritem-combined-buttons > .toolbarbutton-1 {
- padding-left: 0;
- padding-right: 0;
-}
-
-#nav-bar .toolbaritem-combined-buttons:not(:hover) > separator,
-#nav-bar .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
- content: "";
- display: -moz-box;
- width: 1px;
- height: 16px;
- margin-inline-end: -1px;
- background-image: linear-gradient(currentColor 0, currentColor 100%);
- background-position: center;
- background-repeat: no-repeat;
- background-size: 1px 16px;
- opacity: .2;
-}
-
-#nav-bar[brighttext] .toolbaritem-combined-buttons > separator,
-#nav-bar[brighttext] .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
- opacity: .3;
-}
-
-.findbar-button:not(:-moz-any([checked="true"],[disabled="true"])):hover > .toolbarbutton-text,
-#nav-bar .toolbarbutton-1:not([disabled=true]) > .toolbarbutton-menubutton-button[open] + .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
-#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
-#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-text,
-#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack,
-@conditionalForwardWithUrlbar@ > #forward-button:not([open]):not(:active):not([disabled]):hover > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon {
- background: var(--toolbarbutton-hover-background);
- border-color: var(--toolbarbutton-hover-bordercolor);
- box-shadow: var(--toolbarbutton-hover-boxshadow);
-}
-
-.findbar-button:not([disabled=true]):-moz-any([checked="true"],:hover:active) > .toolbarbutton-text,
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):-moz-any(:hover:active, [open]) > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon,
-#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-text,
-#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-stack {
- background: var(--toolbarbutton-active-background);
- border-color: var(--toolbarbutton-active-bordercolor);
- box-shadow: var(--toolbarbutton-active-boxshadow);
- transition-duration: 10ms;
-}
-
-#nav-bar .toolbarbutton-1[checked]:not(:active):hover > .toolbarbutton-icon {
- background-color: var(--toolbarbutton-checkedhover-backgroundcolor);
- transition: background-color .4s;
-}
-
-#TabsToolbar .toolbarbutton-1,
-#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
-.tabbrowser-arrowscrollbox > .scrollbutton-up,
-.tabbrowser-arrowscrollbox > .scrollbutton-down {
- -moz-appearance: none;
- border-style: none;
- padding: 0 3px;
-}
-
-#TabsToolbar .toolbarbutton-1 {
- margin-bottom: var(--tab-toolbar-navbar-overlap);
-}
-
-#TabsToolbar .toolbarbutton-1:not([disabled=true]):hover,
-#TabsToolbar .toolbarbutton-1[open],
-#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):hover,
-.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled=true]):hover,
-.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled=true]):hover {
- background-image: linear-gradient(transparent, 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;
-}
-
-/* unified back/forward button */
-
-:-moz-any(#back-button, #forward-button) > .toolbarbutton-icon {
- border-color: var(--urlbar-border-color-hover) !important;
-}
-
-:-moz-any(#back-button, #forward-button):not(:hover):not(:active):not([open=true]) > .toolbarbutton-icon,
-:-moz-any(#back-button, #forward-button)[disabled=true] > .toolbarbutton-icon {
- background-color: rgba(255,255,255,.15) !important;
-}
-
-#forward-button {
- -moz-box-align: stretch; /* let the button shape grow vertically with the location bar */
- padding: 0 !important;
-}
-
-#forward-button > menupopup {
- margin-top: 1px !important;
-}
-
-#forward-button > .toolbarbutton-icon {
- border-left-style: none !important;
- border-radius: 0 !important;
- padding-left: calc(var(--backbutton-urlbar-overlap) + 3px) !important;
- padding-right: 3px !important;
- max-width: calc(var(--forwardbutton-width) + var(--backbutton-urlbar-overlap)) !important;
-}
-
-@conditionalForwardWithUrlbar@:not([switchingtabs]) > #forward-button {
- transition: margin-left @forwardTransitionLength@ ease-out;
-}
-
-@conditionalForwardWithUrlbar@ > #forward-button[disabled] {
- margin-left: calc(0px - var(--forwardbutton-width) - var(--backbutton-urlbar-overlap));
-}
-
-@conditionalForwardWithUrlbar@:hover:not([switchingtabs]) > #forward-button[disabled] {
- /* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */
- transition-delay: 100s;
-}
-
-@conditionalForwardWithUrlbar@:not(:hover) > #forward-button[disabled] {
- /* when not hovered anymore, trigger a new transition to hide the forward button immediately */
- margin-left: calc(-0.01px - var(--forwardbutton-width) - var(--backbutton-urlbar-overlap));
-}
-
-#back-button {
- padding-top: 3px !important;
- padding-bottom: 3px !important;
- padding-inline-start: 5px !important;
- padding-inline-end: 0 !important;
- position: relative !important;
- z-index: 1 !important;
- border-radius: 0 10000px 10000px 0 !important;
-}
-
-#back-button:-moz-locale-dir(rtl) {
- border-radius: 10000px 0 0 10000px !important;
-}
-
-#back-button > menupopup {
- margin-top: -1px !important;
-}
-
-#back-button > .toolbarbutton-icon {
- border-radius: 10000px !important;
- padding: 6px !important;
- max-width: 32px !important; /* icon width + horizontal padding + border */
-}
-
-#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
- transform: scaleX(-1);
-}
-
.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;
}
.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;
}
-/* zoom control text (reset) button special case: */
-
-#nav-bar #zoom-reset-button > .toolbarbutton-text {
- /* To make this line up with the icons, it needs the same height (18px) +
- * padding (2 * 2px) + border (2 * 1px), but as a minimum because otherwise
- * increase in text sizes would break things...
- */
- min-height: 24px;
-}
-
/* ::::: fullscreen window controls ::::: */
#minimize-button,
#restore-button,
#close-button {
-moz-appearance: none;
border: none;
margin: 0 !important;
@@ -1758,35 +1372,16 @@ html|span.ac-emphasize-text-url {
border-top-right-radius: inherit;
}
#social-share-provider-buttons {
border-top-left-radius: inherit;
border-top-right-radius: inherit;
}
-/* bookmarks menu-button */
-
-#nav-bar #bookmarks-menu-button[cui-areatype="toolbar"]:not([overflowedItem=true]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
- padding-top: var(--toolbarbutton-vertical-inner-padding);
- padding-bottom: var(--toolbarbutton-vertical-inner-padding);
-}
-
-#BMB_bookmarksPopup[side="top"],
-#BMB_bookmarksPopup[side="bottom"] {
- margin-left: -20px;
- margin-right: -20px;
-}
-
-#BMB_bookmarksPopup[side="left"],
-#BMB_bookmarksPopup[side="right"] {
- margin-top: -20px;
- margin-bottom: -20px;
-}
-
/* bookmarking panel */
#editBookmarkPanelStarIcon {
list-style-image: url("chrome://browser/skin/places/starred48.png");
width: 48px;
height: 48px;
}
--- a/browser/themes/windows/compacttheme.css
+++ b/browser/themes/windows/compacttheme.css
@@ -1,16 +1,15 @@
% 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/.
%include ../shared/compacttheme.inc.css
:root {
- --forwardbutton-width: 29px;
/* Matches the #browser-border-start, #browser-border-end color */
--chrome-nav-bar-separator-color: rgba(10, 31, 51, 0.35);
}
/* The window background is white due to no accentcolor in the lightweight
theme. It can't be changed to transparent when there is no compositor
(Win 7 in classic / basic theme), or else dragging and focus become
broken. So instead just show the normal titlebar in that case, and override
@@ -30,69 +29,16 @@
background: transparent !important;
}
}
#TabsToolbar::after {
display: none;
}
-#back-button > .toolbarbutton-icon,
-#forward-button > .toolbarbutton-icon {
- background: var(--chrome-nav-buttons-background) !important;
- border-radius: 0 !important;
- height: auto !important;
- padding: var(--toolbarbutton-vertical-inner-padding) 5px !important;
- margin: 0 !important;
- border: 1px solid var(--chrome-nav-bar-controls-border-color) !important;
- box-shadow: none !important;
-}
-
-#back-button > .toolbarbutton-icon {
- /* 18px icon + 2 * 5px padding + 2 * 1px border */
- width: 30px !important;
-}
-
-#forward-button > .toolbarbutton-icon {
- /* 18px icon + 2 * 5px padding + 1 * 1px border */
- width: 29px !important;
-}
-
-/* the normal theme adds box-shadow: <stuff> !important when the back-button is [open]. Fix: */
-#back-button[open="true"] > .toolbarbutton-icon {
- box-shadow: none !important;
-}
-
-#forward-button > .toolbarbutton-icon {
- border-inline-start: none !important;
-}
-
-/* Override a box shadow for disabled back button */
-#main-window:not([customizing]) #back-button[disabled] > .toolbarbutton-icon {
- box-shadow: none !important;
-}
-
-/* Override !important properties for hovered back button */
-#main-window #back-button:hover:not([disabled="true"]) > .toolbarbutton-icon,
-#main-window #forward-button:hover:not([disabled="true"]) > .toolbarbutton-icon {
- background: var(--chrome-nav-buttons-hover-background) !important;
- box-shadow: none !important;
-}
-
-#back-button > .toolbarbutton-icon {
- border-radius: 2px 0 0 2px !important;
-}
-
-#nav-bar .toolbarbutton-1:not([type=menu-button]),
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
-#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
- padding-top: 2px;
- padding-bottom: 2px;
-}
-
.tabbrowser-tab {
background-color: var(--tab-background-color);
}
#toolbar-menubar {
text-shadow: none !important;
}
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -43,17 +43,16 @@ browser.jar:
skin/classic/browser/Toolbar@2x.png
skin/classic/browser/Toolbar-win7.png
skin/classic/browser/Toolbar-win7@2x.png
skin/classic/browser/Toolbar-inverted.png
skin/classic/browser/Toolbar-inverted@2x.png
skin/classic/browser/Toolbar-win8.png
skin/classic/browser/Toolbar-win8@2x.png
skin/classic/browser/toolbarbutton-dropdown-arrow-win7.png
- skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png
skin/classic/browser/urlbar-popup-blocked.png
skin/classic/browser/urlbar-history-dropmarker.png
skin/classic/browser/urlbar-history-dropmarker@2x.png
skin/classic/browser/urlbar-history-dropmarker-win7.png
skin/classic/browser/urlbar-history-dropmarker-win7@2x.png
skin/classic/browser/webRTC-indicator.css (../shared/webRTC-indicator.css)
* skin/classic/browser/controlcenter/panel.css (controlcenter/panel.css)
skin/classic/browser/customizableui/background-noise-toolbar.png (customizableui/background-noise-toolbar.png)
@@ -75,17 +74,16 @@ browser.jar:
skin/classic/browser/feeds/subscribe.css (feeds/subscribe.css)
* skin/classic/browser/newtab/newTab.css (newtab/newTab.css)
skin/classic/browser/places/places.css (places/places.css)
* skin/classic/browser/places/organizer.css (places/organizer.css)
skin/classic/browser/places/query.png (places/query.png)
skin/classic/browser/places/bookmarksMenu.png (places/bookmarksMenu.png)
skin/classic/browser/places/bookmarksToolbar.png (places/bookmarksToolbar.png)
skin/classic/browser/places/bookmarksToolbar-menuPanel.png (places/bookmarksToolbar-menuPanel.png)
- skin/classic/browser/places/bookmarks-notification-finish.png (places/bookmarks-notification-finish.png)
skin/classic/browser/places/calendar.png (places/calendar.png)
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/starred48.png (places/starred48.png)
skin/classic/browser/places/unstarred48.png (places/unstarred48.png)
skin/classic/browser/places/tag.png (places/tag.png)
skin/classic/browser/places/history.png (places/history.png)
deleted file mode 100644
index 1e3f565f92620ed289ebbf3e578a19d3a24d8cec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/osx/global/shared.inc
+++ b/toolkit/themes/osx/global/shared.inc
@@ -10,12 +10,11 @@
%define roundButtonShadow 0 1px rgba(255,255,255,.5), inset 0 1px 1px rgba(255,255,255,.5)
%define roundButtonPressedBackground #dadada
%define roundButtonPressedShadow 0 1px rgba(255,255,255,.4), inset 0 1px 3px rgba(0,0,0,.2)
%define scopeBarBackground linear-gradient(#E8E8E8, #D0D0D0) repeat-x
%define scopeBarSeparatorBorder 1px solid #888
%define scopeBarTitleColor #6D6D6D
-%define toolbarbuttonCornerRadius 3px
%define toolbarbuttonBackground linear-gradient(#FFF, #ADADAD) repeat-x
%define toolbarbuttonPressedInnerShadow inset rgba(0, 0, 0, 0.3) 0 -6px 10px, inset #000 0 1px 3px, inset rgba(0, 0, 0, 0.2) 0 1px 3px
%define toolbarbuttonInactiveBorderColor rgba(146, 146, 146, 0.84)
