diff options
107 files changed, 3067 insertions, 1911 deletions
diff --git a/arc-firefox-theme/chrome/browser/bad-content-blocked-16.png b/arc-firefox-theme/chrome/browser/bad-content-blocked-16.png Binary files differdeleted file mode 100644 index 7cf33ec..0000000 --- a/arc-firefox-theme/chrome/browser/bad-content-blocked-16.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/bad-content-blocked-16@2x.png b/arc-firefox-theme/chrome/browser/bad-content-blocked-16@2x.png Binary files differdeleted file mode 100644 index c2e49b3..0000000 --- a/arc-firefox-theme/chrome/browser/bad-content-blocked-16@2x.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/bad-content-blocked-64.png b/arc-firefox-theme/chrome/browser/bad-content-blocked-64.png Binary files differdeleted file mode 100644 index 75cf7f9..0000000 --- a/arc-firefox-theme/chrome/browser/bad-content-blocked-64.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/bad-content-unblocked-16.png b/arc-firefox-theme/chrome/browser/bad-content-unblocked-16.png Binary files differdeleted file mode 100644 index 2bf0868..0000000 --- a/arc-firefox-theme/chrome/browser/bad-content-unblocked-16.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/bad-content-unblocked-64.png b/arc-firefox-theme/chrome/browser/bad-content-unblocked-64.png Binary files differdeleted file mode 100644 index 54eb9f3..0000000 --- a/arc-firefox-theme/chrome/browser/bad-content-unblocked-64.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/browser.css b/arc-firefox-theme/chrome/browser/browser.css index 74f5abd..95b4df1 100644 --- a/arc-firefox-theme/chrome/browser/browser.css +++ b/arc-firefox-theme/chrome/browser/browser.css @@ -62,8 +62,8 @@ #TabsToolbar:not([collapsed="true"]) + #nav-bar { border-top: 1px solid rgba(212, 213, 219, 0.95) !important; background-clip: padding-box; - margin-top: -1px; /* 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; } @@ -99,7 +99,7 @@ /* Places toolbar */ toolbarbutton.bookmark-item:not(.subviewbutton), #personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder { - margin: 1px; + margin: 0; padding: 2px 3px; } toolbarbutton.bookmark-item:not(.subviewbutton):not(:hover):not(:active):not([open]) { @@ -283,7 +283,7 @@ menuitem.bookmark-item { opacity: 0.7; } /* Stock icons for the menu bar items */ -menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { +menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip):not([endimage]) { -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); } #placesContext_open\:newwindow, @@ -442,10 +442,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { #panelMenu_unsortedBookmarks { list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); } -#menu_readingList, -#BMB_readingList { - list-style-image: url("chrome://browser/skin/readinglist/readinglist-icon.svg"); } - #panelMenu_pocket, #menu_pocket, #BMB_pocket { @@ -495,7 +491,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { .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-container, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-badge-stack, :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon { -moz-margin-end: 0; padding: 2px 6px; @@ -505,13 +501,13 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { transition-duration: 150ms; } :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-icon, -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-badge-container, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-badge-stack, :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { padding: 3px 7px; } /* Help SDK icons fit: */ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon, -toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-container > .toolbarbutton-icon { +toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-stack > .toolbarbutton-icon { width: 16px; } :-moz-any(#TabsToolbar, #nav-bar) toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon { @@ -531,7 +527,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba :-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-container, +:-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); border-width: 1px; @@ -553,7 +549,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba .findbar-button:not([disabled=true]):-moz-any([checked="true"], :hover:active) > .toolbarbutton-text, :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([open="true"]) > .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-container, +:-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); box-shadow: var(--toolbarbutton-active-boxshadow); @@ -564,7 +560,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba #TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):-moz-any(:hover:active, [open="true"]) > .toolbarbutton-icon, #TabsToolbar .toolbarbutton-1[open="true"] > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon, -#TabsToolbar .toolbarbutton-1:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-badge-container, +#TabsToolbar .toolbarbutton-1:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-badge-stack, #TabsToolbar .toolbarbutton-1:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-icon { background: none; color: #ffffff; @@ -604,9 +600,9 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba transform: scaleX(-1); } #forward-button { + padding: 0; margin-left: 2px; - margin-right: 2px; - padding: 0; } + margin-right: 2px; } /* tabview menu item */ #menu_tabview { @@ -743,6 +739,13 @@ toolbar[brighttext] #sync-button[status="active"] { #PanelUI-menu-button { -moz-image-region: rect(0, 486px, 18px, 468px); } +#PanelUI-menu-button.thumburger { + list-style-image: url("chrome://browser/skin/customizableui/thumburger.png") !important; + -moz-image-region: auto !important; } + +toolbar[brighttext] #PanelUI-menu-button.thumburger { + list-style-image: url("chrome://browser/skin/customizableui/thumburger-inverted.png") !important; } + #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #cut-button { -moz-image-region: rect(0, 504px, 18px, 486px); } @@ -785,33 +788,33 @@ toolbar[brighttext] #sync-button[status="active"] { #web-apps-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 720px, 18px, 702px); } -#loop-button > .toolbarbutton-badge-container { +#loop-button { list-style-image: url("chrome://browser/skin/custom_images/light/loop-toolbar-icons.svg"); -moz-image-region: rect(0, 18px, 18px, 0); } - #TabsToolbar #loop-button > .toolbarbutton-badge-container { + #TabsToolbar #loop-button { list-style-image: url("chrome://browser/skin/custom_images/light/loop-tabbar-icons.svg"); } -#loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-badge-container, -#TabsToolbar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-badge-container { - list-style-image: url("chrome://browser/skin/custom_images/loop-toolbar-icons-active.svg"); } +#loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), +#TabsToolbar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) { + list-style-image: url("chrome://browser/skin/custom_images/loop-toolbar-icons-active.svg") !important; } -#loop-button[state="disabled"] > .toolbarbutton-badge-container, -#loop-button[disabled="true"] > .toolbarbutton-badge-container { +#loop-button[state="disabled"], +#loop-button[disabled="true"] { -moz-image-region: rect(0, 36px, 18px, 18px); } -#loop-button:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="error"] { -moz-image-region: rect(0, 54px, 18px, 36px); } -#loop-button:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="action"] { -moz-image-region: rect(0, 72px, 18px, 54px); } -#loop-button:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 90px, 18px, 72px); } -#loop-button:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="active"] { -moz-image-region: rect(0, 108px, 18px, 90px); } -#loop-button:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 126px, 18px, 108px); } #webide-button[cui-areatype="toolbar"] { @@ -975,32 +978,32 @@ toolbar[brighttext] #sync-button[status="active"] { toolbaritem[sdkstylewidget="true"] > toolbarbutton { -moz-image-region: rect(0, 832px, 32px, 800px); } - #loop-button[cui-areatype="menu-panel"] > .toolbarbutton-badge-container, - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"], + toolbarpaletteitem[place="palette"] > #loop-button { list-style-image: url(chrome://browser/skin/loop/menuPanel.png); -moz-image-region: rect(0, 32px, 32px, 0); } /* Make sure that the state icons are not shown in the customization palette. */ - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + toolbarpaletteitem[place="palette"] > #loop-button { -moz-image-region: rect(0, 32px, 32px, 0) !important; } - #loop-button[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container, - #loop-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"][state="disabled"], + #loop-button[cui-areatype="menu-panel"][disabled="true"] { -moz-image-region: rect(0, 64px, 32px, 32px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { -moz-image-region: rect(0, 96px, 32px, 64px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { -moz-image-region: rect(0, 128px, 32px, 96px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 160px, 32px, 128px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { -moz-image-region: rect(0, 192px, 32px, 160px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 224px, 32px, 192px); } /* Wide panel control icons */ @@ -1119,32 +1122,32 @@ toolbar[brighttext] #sync-button[status="active"] { #pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { -moz-image-region: rect(64px, 1984px, 128px, 1920px); } - #loop-button[cui-areatype="menu-panel"] > .toolbarbutton-badge-container, - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"], + toolbarpaletteitem[place="palette"] > #loop-button { list-style-image: url(chrome://browser/skin/loop/menuPanel@2x.png); -moz-image-region: rect(0, 64px, 64px, 0); } /* Make sure that the state icons are not shown in the customization palette. */ - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + toolbarpaletteitem[place="palette"] > #loop-button { -moz-image-region: rect(0, 64px, 64px, 0) !important; } - #loop-button[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container, - #loop-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"][state="disabled"], + #loop-button[cui-areatype="menu-panel"][disabled="true"] { -moz-image-region: rect(0, 128px, 64px, 64px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { -moz-image-region: rect(0, 192px, 64px, 128px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { -moz-image-region: rect(0, 256px, 64px, 192px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 320px, 64px, 256px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { -moz-image-region: rect(0, 384px, 64px, 320px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 448px, 64px, 384px); } #new-tab-button[cui-areatype="menu-panel"], @@ -1282,7 +1285,7 @@ toolbar[brighttext] #sync-button[status="active"] { #urlbar, .searchbar-textbox { -moz-appearance: none; - padding: 3px; + padding: 2px 3px; border-radius: 3px; margin: 0 3px; color: #5c616c; @@ -1314,6 +1317,25 @@ toolbar[brighttext] #sync-button[status="active"] { #urlbar-icons { -moz-box-align: center; } +#urlbar-search-footer { + border-top: 1px solid rgba(24, 26, 27, 0.14); + background-color: rgba(24, 26, 27, 0.07); } + +#urlbar-search-settings { + -moz-appearance: none; + -moz-user-focus: ignore; + color: inherit; + margin: 0; + border: 0; + padding: 8px 20px; + background: transparent; } + +#urlbar-search-settings:hover { + background-color: rgba(24, 26, 27, 0.07); } + +#urlbar-search-settings:hover:active { + background-color: rgba(24, 26, 27, 0.12); } + #urlbar-search-splitter { -moz-appearance: none; width: 8px; } @@ -1330,14 +1352,57 @@ toolbar[brighttext] #sync-button[status="active"] { -moz-margin-start: 0; color: GrayText; } +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] { + border-bottom: 1px solid rgba(24, 26, 27, 0.14); + background-color: rgba(24, 26, 27, 0.07); + padding: 6px 0; + -moz-padding-start: 44px; + -moz-padding-end: 6px; + background-image: url("chrome://browser/skin/info.svg"); + background-clip: padding-box; + background-position: 20px center; + background-repeat: no-repeat; + background-size: 16px 16px; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"]:-moz-locale-dir(rtl) { + background-position: right 20px center; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description { + margin: 0; + padding: 0; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description > label.text-link { + -moz-margin-start: 0; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button { + -moz-appearance: none; + -moz-user-focus: ignore; + min-width: 80px; + border-radius: 3px; + padding: 4px 16px; + margin: 0; + -moz-margin-start: 10px; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"] { + color: #616161; + background-color: #e0e0e0; + border: 1px solid #d1d1d1; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"]:hover { + background-color: #d6d6d6; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-enable"] { + color: white; + background-color: #67cc14; + border: 1px solid #67cc14; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-enable"]:hover { + background-color: #5eba12; } + #search-container { min-width: calc(54px + 11ch); } /* identity box */ -#identity-box { - padding: 1px; - font-size: .9em; } - #identity-box:-moz-locale-dir(ltr) { border-top-left-radius: 1.5px; border-bottom-left-radius: 1.5px; } @@ -1346,133 +1411,99 @@ toolbar[brighttext] #sync-button[status="active"] { border-top-right-radius: 1.5px; border-bottom-right-radius: 1.5px; } -#notification-popup-box:not([hidden]) + #identity-box { - border-radius: 0; } - -window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box { - border-radius: 0; } - -/* forward button hiding is delayed when hovered */ -/* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */ -/* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */ -#urlbar[pageproxystate="valid"] > #identity-box.chromeUI, -#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { - -moz-margin-end: 4px; } - -#identity-box.verifiedIdentity:not(:-moz-lwtheme) { - background-color: var(--verified-identity-box-backgroundcolor); } +#identity-box.verifiedIdentity:not(:-moz-lwtheme):not(:hover):not([open=true]) { + background-color: var(--identity-box-verified-background-color); } #identity-box:-moz-focusring { outline: 1px dotted #000; outline-offset: -3px; } -#identity-icon-labels { - -moz-padding-start: 2px; - -moz-padding-end: 5px; } - -:root { +#identity-box { --identity-box-verified-color: #479900; - --identity-box-verified-background-image: linear-gradient(transparent 15%, rgba(39, 74, 8, 0.2) 15%, rgba(39, 74, 8, 0.2) 85%, transparent 85%); --identity-box-chrome-color: #e57300; - --identity-box-chrome-background-image: linear-gradient(transparent 15%, rgba(229, 114, 0, 0.5) 15%, rgba(229, 114, 0, 0.5) 85%, transparent 85%); } - -#urlbar[pageproxystate="valid"] > #identity-box.chromeUI, -#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { - background-position: right; - background-size: 1px; - background-repeat: no-repeat; } - -#urlbar[pageproxystate="valid"] > #identity-box.chromeUI:-moz-locale-dir(rtl), -#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity:-moz-locale-dir(rtl) { - background-position: left; } + border-inline-end: 1px solid var(--urlbar-separator-color); + border-image: linear-gradient(transparent 15%, var(--urlbar-separator-color) 15%, var(--urlbar-separator-color) 85%, transparent 85%); + border-image-slice: 1; + font-size: .9em; + padding: 3px 5px 3px 3px; + margin-inline-end: 4px; + overflow: hidden; } #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { - color: var(--identity-box-verified-color); - background-image: var(--identity-box-verified-background-image); } + color: var(--identity-box-verified-color); } #urlbar[pageproxystate="valid"] > #identity-box.chromeUI { - color: var(--identity-box-chrome-color); - background-image: var(--identity-box-chrome-background-image); } - -/* page proxy icon */ -#page-proxy-favicon { - width: 16px; - height: 16px; - list-style-image: url(chrome://browser/skin/identity-icons-generic.png); } + color: var(--identity-box-chrome-color); } -.chromeUI > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://branding/content/identity-icons-brand.png); } - -.verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https.png); } - -.verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-ev.png); } +#identity-icon-labels { + padding-inline-start: 2px; } -.mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active.png); } +#notification-popup-box:not([hidden]) + #identity-box { + padding-inline-start: 5px; + border-radius: 0; } -.mixedDisplayContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display.png); } +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box { + border-radius: 0; } -.mixedDisplayContentLoadedActiveBlocked > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display.png); } +/* TRACKING PROTECTION ICON */ +#tracking-protection-icon { + width: 16px; + height: 16px; + margin-inline-start: 0; + margin-inline-end: 2px; + list-style-image: url(chrome://browser/skin/tracking-protection-16.svg); + opacity: 1; } -#page-proxy-favicon[pageproxystate="invalid"] { - opacity: 0.3; } +#tracking-protection-icon[state="loaded-tracking-content"] { + list-style-image: url(chrome://browser/skin/tracking-protection-disabled-16.svg); } -@media not all and (min-resolution: 1.1dppx) { - #page-proxy-favicon { - -moz-image-region: rect(0, 16px, 16px, 0); } +#tracking-protection-icon[animate] { + transition: margin-left 200ms ease-out, margin-right 200ms ease-out; } - #identity-box:hover > #page-proxy-favicon { - -moz-image-region: rect(0, 32px, 16px, 16px); } +#tracking-protection-icon:not([state]) { + margin-inline-start: -18px; + pointer-events: none; + opacity: 0; + /* Only animate the shield in, when it disappears hide it immediately. */ + transition: none; } - #identity-box:hover:active > #page-proxy-favicon, - #identity-box[open=true] > #page-proxy-favicon { - -moz-image-region: rect(0, 48px, 16px, 32px); } } -@media (min-resolution: 1.1dppx) { - #page-proxy-favicon { - list-style-image: url(chrome://browser/skin/identity-icons-generic@2x.png); - -moz-image-region: rect(0, 32px, 32px, 0); } +#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icons > #tracking-protection-icon { + visibility: collapse; } - .chromeUI > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://branding/content/identity-icons-brand@2x.png); } +/* MAIN IDENTITY ICON */ +#page-proxy-favicon { + width: 16px; + height: 16px; + list-style-image: url(chrome://browser/skin/identity-not-secure.svg); } - .verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https@2x.png); } +.chromeUI > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://branding/content/identity-icons-brand.svg); } - .verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-ev@2x.png); } +.verifiedDomain > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], +.verifiedIdentity > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-secure.svg); } - .mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active@2x.png); } +.mixedActiveContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); } - .mixedDisplayContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display@2x.png); } +.weakCipher > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], +.mixedDisplayContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], +.mixedDisplayContentLoadedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); } - .mixedDisplayContentLoadedActiveBlocked > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display@2x.png); } +.mixedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg); } - #identity-box:hover > #page-proxy-favicon { - -moz-image-region: rect(0, 64px, 32px, 32px); } +#page-proxy-favicon[pageproxystate="invalid"] { + opacity: 0.3; } - #identity-box:hover:active > #page-proxy-favicon, - #identity-box[open=true] > #page-proxy-favicon { - -moz-image-region: rect(0, 96px, 32px, 64px); } } -#urlbar[actiontype="searchengine"] > #identity-box > #page-proxy-favicon { +#urlbar[actiontype="searchengine"] > #identity-box > #identity-icons > #page-proxy-favicon { -moz-image-region: inherit; list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); width: 16px; height: 16px; opacity: 1; } -#page-proxy-favicon { - margin-top: 1px; - margin-bottom: 1px; - -moz-margin-start: 3px; - -moz-margin-end: 1px; } - .popup-notification-icon { width: 64px; height: 64px; @@ -1525,13 +1556,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box .popup-notification-icon[popupid="webapps-install"] { list-style-image: url(chrome://global/skin/icons/webapps-64.png); } -.popup-notification-icon[popupid="bad-content"] { - list-style-image: url(chrome://browser/skin/bad-content-blocked-64.png); } - -.popup-notification-icon[popupid="bad-content"][mixedblockdisabled], -.popup-notification-icon[popupid="bad-content"][trackingblockdisabled] { - list-style-image: url(chrome://browser/skin/bad-content-unblocked-64.png); } - .popup-notification-icon[popupid="webRTC-sharingDevices"], .popup-notification-icon[popupid="webRTC-shareDevices"] { list-style-image: url(chrome://browser/skin/webRTC-shareDevice-64.png); } @@ -1637,14 +1661,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box opacity: 0; } to { opacity: 1; } } -.bad-content-blocked-notification-icon, -#bad-content-blocked-notification-icon { - list-style-image: url(chrome://browser/skin/bad-content-blocked-16.png); } - -.bad-content-unblocked-notification-icon, -#bad-content-unblocked-notification-icon { - list-style-image: url(chrome://browser/skin/bad-content-unblocked-16.png); } - .webRTC-shareDevices-notification-icon, #webRTC-shareDevices-notification-icon { list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16.png); } @@ -1763,9 +1779,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box /* Notification icon box */ #notification-popup-box { - border-radius: 2.5px 0 0 2.5px; - margin-top: -1px; - margin-bottom: -1px; } + border-radius: 2.5px 0 0 2.5px; } .notification-anchor-icon:-moz-focusring { outline: 1px dotted -moz-DialogText; } @@ -1938,7 +1952,9 @@ richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-t width: 16px; height: 16px; } -.ac-comment { +.ac-comment, +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description, +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button { font-size: 1.05em; } .ac-extra > .ac-comment { @@ -2055,33 +2071,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- #page-report-button { list-style-image: url("chrome://browser/skin/Info.png"); } -/* Reading List button */ -#urlbar:not([focused]):not(:hover) #readinglist-addremove-button { - opacity: 0; - width: 0px; } - -#readinglist-addremove-button { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage"); - -moz-image-region: rect(0, 14px, 14px, 0); - transition: width 150ms ease-in-out, opacity 150ms ease-in-out 150ms; - opacity: 1; - width: 20px; } - -#readinglist-addremove-button:hover { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-hover"); } - -#readinglist-addremove-button:active { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-active"); } - -#readinglist-addremove-button[already-added="true"] { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded"); } - -#readinglist-addremove-button[already-added="true"]:hover { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded-hover"); } - -#readinglist-addremove-button[already-added="true"]:active { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded-active"); } - /* Reader mode button */ #reader-mode-button { list-style-image: url("chrome://browser/skin/readerMode.svg"); @@ -2276,12 +2265,11 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- /* Tabstrip */ :root { --tab-toolbar-navbar-overlap: 1px; + --navbar-tab-toolbar-highlight-overlap: 1px; --tab-min-height: 31px; } #TabsToolbar { - --tab-separator-image: url(chrome://browser/skin/tabbrowser/tab-separator.png); - --tab-separator-size: 3px 100%; - --tab-separator-opacity: 1; } + --tab-stroke-background-size: auto 100%; } /* image preloading hack */ #tabbrowser-tabs::before { @@ -2331,6 +2319,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- .tab-throbber, .tab-icon-image, +.tab-icon-sound, .tab-close-button { margin-top: 1px; } @@ -2346,14 +2335,33 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- .tab-icon-overlay { width: 16px; height: 16px; - margin-top: 10px; + margin-top: -12px; -moz-margin-start: -16px; - display: none; } + position: relative; } .tab-icon-overlay[crashed] { - display: -moz-box; list-style-image: url("chrome://browser/skin/tabbrowser/crashed.svg"); } +.tab-icon-overlay[soundplaying], +.tab-icon-overlay[muted]:not([crashed]) { + border-radius: 8px; } + +.tab-icon-overlay[soundplaying]:hover, +.tab-icon-overlay[muted]:not([crashed]):hover { + background-color: white; } + +.tab-icon-overlay[soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio-small.svg#tab-audio"); } + +.tab-icon-overlay[muted]:not([crashed]) { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio-small.svg#tab-audio-muted"); } + +.tabbrowser-tab[visuallyselected=true] .tab-icon-overlay[soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio-small.svg#tab-audio"); } + +.tabbrowser-tab[visuallyselected=true] .tab-icon-overlay[muted]:not([crashed]) { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio-small.svg#tab-audio-muted"); } + .tab-throbber[busy] { list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png"); } @@ -2369,6 +2377,48 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- -moz-margin-end: -2px; padding: 0; } +.tab-icon-sound { + -moz-margin-start: 4px; + width: 16px; + height: 16px; + padding: 0; } + +.tab-icon-sound[soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab"); } + +.tab-icon-sound[soundplaying]:hover { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-hover"); } + +.tab-icon-sound[soundplaying]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-pressed"); } + +.tab-icon-sound[muted] { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-muted"); } + +.tab-icon-sound[muted]:hover { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-hover"); } + +.tab-icon-sound[muted]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-pressed"); } + +.tab-icon-sound[visuallyselected=true][soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio"); } + +.tab-icon-sound[visuallyselected=true][soundplaying]:hover { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-hover"); } + +.tab-icon-sound[visuallyselected=true][soundplaying]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-pressed"); } + +.tab-icon-sound[visuallyselected=true][muted] { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-muted"); } + +.tab-icon-sound[visuallyselected=true][muted]:hover { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-muted-hover"); } + +.tab-icon-sound[visuallyselected=true][muted]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-muted-pressed"); } + .tab-background, .tabs-newtab-button { /* overlap the tab curves */ @@ -2385,7 +2435,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- background-image: url(chrome://browser/skin/custom_images/light/tabs/tab-overflow-indicator.png); background-size: 100% 100%; width: 14px; - margin-bottom: var(--tab-toolbar-navbar-overlap); + margin-bottom: var(--navbar-tab-toolbar-highlight-overlap); pointer-events: none; position: relative; z-index: 3; @@ -2476,7 +2526,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- background-color: transparent; background-image: url(chrome://browser/skin/custom_images/light/tabs/tab-middle.svg); background-repeat: repeat-x; - background-size: auto 100%; + background-size: var(--tab-stroke-background-size); /* The padding-top combined with background-clip: content-box (the bottom-most) ensure the background-color doesn't extend above the top border. */ padding-top: 2px; } @@ -2489,7 +2539,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- /*, lwtHeader;*/ /* Don't stretch the LWT header images */ - background-size: auto 100%, auto 100%, auto auto; } + background-size: var(--tab-stroke-background-size), auto 100%, auto auto; } /* These LWT styles are normally overridden by browser-lightweightTheme.css */ .tab-background-start[visuallyselected=true]:-moz-lwtheme::before, @@ -2516,6 +2566,9 @@ lwtHeader;*/ .tab-background-middle, .tabs-newtab-button, +.tab-icon-overlay[soundplaying], +.tab-icon-overlay[muted]:not([crashed]), +.tab-icon-sound, .tab-close-button { pointer-events: auto; } @@ -2531,6 +2584,8 @@ lwtHeader;*/ background-repeat: no-repeat; background-size: 85% 100%; } +/* Tab separators */ +/* Also show separators beside the selected tab when dragging it. */ /* New tab button */ .tabs-newtab-button { width: calc(36px + 30px); } @@ -2553,8 +2608,9 @@ lwtHeader;*/ #TabsToolbar:not(:-moz-lwtheme):-moz-system-metric(menubar-drag) { -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag"); } -.tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label { - outline: 1px dotted; } +.tabbrowser-tab:focus > .tab-stack > .tab-content { + outline: 1px dotted; + outline-offset: -6px; } #context_reloadTab { list-style-image: url("moz-icon://stock/gtk-refresh?size=menu"); } @@ -2759,19 +2815,12 @@ toolbarbutton.chevron > .toolbarbutton-icon { padding: 30px 50px; box-shadow: 0 0 2px white; } -#full-screen-warning-container[obscure-browser] { - background-color: rgba(0, 0, 0, 0.3); } - .full-screen-description { font-size: 150%; } #full-screen-domain-text { font-size: 300%; } -.full-screen-approval-button, -#full-screen-remember-decision { - font-size: 120%; } - /* Responsive Mode */ .browserContainer[responsivemode] { background-color: #222; @@ -3297,23 +3346,6 @@ notification.pluginVulnerable { notification.pluginVulnerable .messageImage { list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png"); } -.popup-notification-item-title[popupid="bad-content"] { - font-weight: bold; } - -.popup-notification-item-message[popupid="bad-content"] { - width: 17em; } - -.popup-notification-item-message[popupid="bad-content"][mixedblockdisabled]:not(.popup-notification-item-message-critical), -.popup-notification-item-message[popupid="bad-content"][trackingblockdisabled]:not(.popup-notification-item-message-critical) { - color: GrayText; } - -.popup-notification-item-message-critical[popupid="bad-content"] { - color: #d74345; - font-style: italic; } - -.popup-notification-footer[popupid="bad-content"] { - padding-top: 1em; } - #notification-popup[popupid="login-fill"] > .panel-arrowcontainer > .panel-arrowcontent { /* Since we display a sliding subview that extends to the border, we cannot * keep the default padding of arrow panels. We use the same padding in the @@ -3963,13 +3995,13 @@ toolbarpaletteitem[notransition][place="panel"] { transition: none; } toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon, -toolbarpaletteitem > toolbarbutton > .toolbarbutton-badge-container > .toolbarbutton-icon, +toolbarpaletteitem > toolbarbutton > .toolbarbutton-badge-stack > .toolbarbutton-icon, toolbarpaletteitem > toolbaritem.panel-wide-item, toolbarpaletteitem > toolbarbutton[type="menu-button"] { transition: transform 0.3s cubic-bezier(0.6, 2, 0.75, 1.5) !important; } toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-icon, -toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-badge-container > .toolbarbutton-icon { +toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-badge-stack > .toolbarbutton-icon { transform: scale(1.3); } toolbarpaletteitem[mousedown] > toolbaritem.panel-wide-item, @@ -4289,9 +4321,11 @@ toolbarpaletteitem[place="toolbar"] { margin: 24px -16px -16px; padding: 2em 15px; } +#UITourTooltipButtons > label, #UITourTooltipButtons > button { margin: 0 15px; } +#UITourTooltipButtons > label:first-child, #UITourTooltipButtons > button:first-child { -moz-margin-start: 0; } @@ -4300,6 +4334,7 @@ toolbarpaletteitem[place="toolbar"] { height: 16px; -moz-margin-end: 5px; } +#UITourTooltipButtons > label, #UITourTooltipButtons > button .button-text { font-size: 1.15rem; } @@ -4319,6 +4354,7 @@ toolbarpaletteitem[place="toolbar"] { border-color: rgba(24, 26, 27, 0.15); box-shadow: 0 1px 0 0 rgba(24, 26, 27, 0.05) inset; } +#UITourTooltipButtons > label, #UITourTooltipButtons > button.button-link { -moz-appearance: none; background: transparent; @@ -4538,3 +4574,6 @@ notification.heartbeat { /* override toolkit/themes/linux/global/menu.css */ -moz-padding-end: 0 !important; -moz-margin-end: 0 !important; } + +.browser-action-panel > .panel-arrowcontainer > .panel-arrowcontent { + padding: 0; } diff --git a/arc-firefox-theme/chrome/browser/controlcenter/arrow-subview-back.svg b/arc-firefox-theme/chrome/browser/controlcenter/arrow-subview-back.svg new file mode 100644 index 0000000..8566d63 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/controlcenter/arrow-subview-back.svg @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> + <polygon fill="#fff" points="12,3.5 10.5,2 4.625,8 10.5,14 12,12.5 7.625,8" /> +</svg> diff --git a/arc-firefox-theme/chrome/browser/controlcenter/conn-degraded.svg b/arc-firefox-theme/chrome/browser/controlcenter/conn-degraded.svg new file mode 100644 index 0000000..e3e82c1 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/controlcenter/conn-degraded.svg @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" + width="24" height="24" viewBox="0 0 24 24"> + <style> + .icon-default { + fill: #808080; + } + </style> + + <defs> + <rect id="shape-lock-clasp-outer" x="5" y="1" width="14" height="20" rx="7" ry="7" /> + <rect id="shape-lock-clasp-inner" x="8" y="4" width="8" height="14" rx="4" ry="4" /> + <rect id="shape-lock-base" x="3" y="10" width="18" height="13" rx="1.5" ry="1.5" /> + + <mask id="mask-clasp-cutout"> + <rect width="24" height="24" fill="#000" /> + <use xlink:href="#shape-lock-clasp-outer" fill="#fff" /> + <use xlink:href="#shape-lock-clasp-inner" fill="#000" /> + </mask> + </defs> + + <use xlink:href="#shape-lock-clasp-outer" mask="url(#mask-clasp-cutout)" class="icon-default" /> + <use xlink:href="#shape-lock-base" class="icon-default" /> +</svg> diff --git a/arc-firefox-theme/chrome/browser/controlcenter/mcb-disabled.svg b/arc-firefox-theme/chrome/browser/controlcenter/mcb-disabled.svg new file mode 100644 index 0000000..af45b90 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/controlcenter/mcb-disabled.svg @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + width="24" height="24" viewBox="0 0 24 24"> + <defs> + <rect id="shape-lock-clasp-outer" x="5" y="1" width="14" height="20" rx="7" ry="7" /> + <rect id="shape-lock-clasp-inner" x="8" y="4" width="8" height="14" rx="4" ry="4" /> + <rect id="shape-lock-base" x="3" y="10" width="18" height="13" rx="1.5" ry="1.5" /> + + <mask id="mask-clasp-cutout"> + <rect width="24" height="24" fill="#000" /> + <use xlink:href="#shape-lock-clasp-outer" fill="#fff" /> + <use xlink:href="#shape-lock-clasp-inner" fill="#000" /> + <line x1="3" y1="21" x2="21.5" y2="0.5" stroke="#000" stroke-width="3" /> + <line x1="3" y1="25" x2="21.5" y2="4.5" stroke="#000" stroke-width="3" /> + <rect x="3" y="10" width="18" height="13" rx="1.5" ry="1.5" /> + </mask> + + <mask id="mask-base-cutout"> + <rect width="24" height="24" fill="#000" /> + <use xlink:href="#shape-lock-base" fill="#fff" /> + <line x1="2.25" y1="24.75" x2="21.5" y2="4.5" stroke="#000" stroke-width="3" /> + </mask> + </defs> + + <use xlink:href="#shape-lock-clasp-outer" mask="url(#mask-clasp-cutout)" fill="#999" /> + <use xlink:href="#shape-lock-base" mask="url(#mask-base-cutout)" fill="#999" /> + + <line x1="2.25" y1="22.75" x2="21.5" y2="2.5" stroke="#d92d21" stroke-width="3" /> +</svg> diff --git a/arc-firefox-theme/chrome/browser/controlcenter/panel.css b/arc-firefox-theme/chrome/browser/controlcenter/panel.css index 56c6245..27c2258 100644 --- a/arc-firefox-theme/chrome/browser/controlcenter/panel.css +++ b/arc-firefox-theme/chrome/browser/controlcenter/panel.css @@ -2,25 +2,46 @@ * 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/. */ -#identity-popup-securityView:not(.verifiedIdentity) > #identity-popup-content-owner, -#identity-popup-securityView:not(.verifiedIdentity):not(.verifiedDomain) > #identity-popup-content-verifier, -#identity-popup-securityView:not(.verifiedIdentity):not(.mixedContent) > #identity-popup-content-supplemental, -#identity-popup-security-content:not(.verifiedIdentity):not(.verifiedDomain) > .identity-popup-connection-secure, -#identity-popup-securityView:not(.verifiedIdentity):not(.verifiedDomain) > #identity-popup-securityView-header > .identity-popup-connection-secure, -#identity-popup-securityView:not(.unknownIdentity) > #identity-popup-securityView-header > .identity-popup-connection-not-secure, -#identity-popup-securityView:not(.chromeUI) > #identity-popup-securityView-header > .identity-popup-connection-internal, -#identity-popup-security-content:not(.unknownIdentity) > .identity-popup-connection-not-secure, -#identity-popup-securityView:not(.verifiedIdentity) > #identity-popup-securityView-connection, -#identity-popup-security-content.unknownIdentity:not(.mixedContent) + .identity-popup-expander, -#identity-popup-security-content:not(.chromeUI) > .identity-popup-connection-internal, -#identity-popup-security-content.chromeUI + .identity-popup-expander { + +/* Hide all conditional elements by default. */ +:-moz-any([when-connection],[when-mixedcontent],[when-ciphers]) { + display: none; +} + +/* Show the right elements for the right connection states. */ +#identity-popup[connection=not-secure] [when-connection~=not-secure], +#identity-popup[connection=secure-ev] [when-connection~=secure-ev], +#identity-popup[connection=secure] [when-connection~=secure], +#identity-popup[connection=chrome] [when-connection~=chrome], +#identity-popup[connection=file] [when-connection~=file], +/* Show weak cipher messages when needed. */ +#identity-popup[ciphers=weak] [when-ciphers~=weak], +/* Show mixed content warnings when needed */ +#identity-popup[mixedcontent~=active-loaded] [when-mixedcontent=active-loaded], +#identity-popup[mixedcontent~=passive-loaded]:not([mixedcontent~=active-loaded]) [when-mixedcontent=passive-loaded], +#identity-popup[mixedcontent~=active-blocked]:not([mixedcontent~=passive-loaded]) [when-mixedcontent=active-blocked], +/* Show the right elements when there is mixed passive content loaded and active blocked. */ +#identity-popup[mixedcontent~=active-blocked][mixedcontent~=passive-loaded] [when-mixedcontent~=active-blocked][when-mixedcontent~=passive-loaded], +/* Show 'disable MCB' button always when there is mixed active content blocked. */ +#identity-popup-securityView-body[mixedcontent~=active-blocked] > button[when-mixedcontent=active-blocked] { + display: inherit; +} + +/* Hide 'not secure' message in subview when weak cipher or mixed content messages are shown. */ +#identity-popup-securityView-body:-moz-any([mixedcontent],[ciphers]) > description[when-connection=not-secure], +/* Hide 'passive-loaded (only)' message when there is mixed passive content loaded and active blocked. */ +#identity-popup-securityView-body[mixedcontent~=passive-loaded][mixedcontent~=active-blocked] > description[when-mixedcontent=passive-loaded] { display: none; } -/* PANEL */ +/* Make sure hidden elements don't accidentally become visible from one of the + above selectors (see Bug 1194258) */ +#identity-popup [hidden] { + display: none !important; +} #identity-popup, -.panel-viewstack[viewtype="main"]:not([transitioning]) > .panel-mainview[panelid=identity-popup] > #identity-popup-mainView { +#identity-popup:not([panelopen]) .panel-viewstack[viewtype="main"]:not([transitioning]) #identity-popup-mainView { /* Tiny hack to ensure the panel shrinks back to its original size after closing a subview that is bigger than the main view. */ max-height: 0; @@ -65,8 +86,9 @@ #identity-popup-securityView, #identity-popup-security-content, -#identity-popup-permissions-content { - padding: 0.75em 0 1em; +#identity-popup-permissions-content, +#tracking-protection-content { + padding: 0.5em 0 1em; -moz-padding-start: calc(2em + 24px); -moz-padding-end: 1em; background-repeat: no-repeat; @@ -76,7 +98,8 @@ #identity-popup-securityView:-moz-locale-dir(rtl), #identity-popup-security-content:-moz-locale-dir(rtl), -#identity-popup-permissions-content:-moz-locale-dir(rtl) { +#identity-popup-permissions-content:-moz-locale-dir(rtl), +#tracking-protection-content:-moz-locale-dir(rtl) { background-position: calc(100% - 1em) 1em; } @@ -103,18 +126,11 @@ .identity-popup-expander[panel-multiview-anchor] { transition: background-color 250ms ease-in; - background-color: #0069d9; - background-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted.png"), + background-color: Highlight; + background-image: url("chrome://browser/skin/controlcenter/arrow-subview-back.svg"), linear-gradient(rgba(255,255,255,0.3), transparent); } -@media (min-resolution: 1.1dppx) { - .identity-popup-expander[panel-multiview-anchor] { - background-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted@2x.png"), - linear-gradient(rgba(255,255,255,0.3), transparent); - } -} - .identity-popup-expander > .button-box { padding: 0; -moz-appearance: none; @@ -138,23 +154,38 @@ /* CONTENT */ -.identity-popup-text { +#identity-popup-security-content > description, +#identity-popup-security-descriptions > description, +#identity-popup-securityView-header > description, +#identity-popup-securityView-body > description, +#tracking-protection-content > label { white-space: pre-wrap; font-size: 110%; margin: 0; } .identity-popup-headline { - margin: 2px 0 4px; + margin: 3px 0 4px; font-size: 150%; } -/* SECURITY */ +.identity-popup-warning-gray { + -moz-padding-start: 24px; + background: url(chrome://browser/skin/controlcenter/warning-gray.svg) no-repeat 0 50%; +} + +.identity-popup-warning-yellow { + -moz-padding-start: 24px; + background: url(chrome://browser/skin/controlcenter/warning-yellow.svg) no-repeat 0 50%; +} -#identity-popup-securityView > .identity-popup-text:not(#identity-popup-content-owner) { - margin: 2px 0 4px; +.identity-popup-warning-gray:-moz-locale-dir(rtl), +.identity-popup-warning-yellow:-moz-locale-dir(rtl) { + background-position: 100% 50%; } +/* SECURITY */ + .identity-popup-connection-secure { color: #418220; } @@ -163,12 +194,6 @@ color: #d74345; } -#identity-popup-security-content.chromeUI { - background-image: url(chrome://branding/content/icon48.png); -} - -/* SECURITY SUBVIEW */ - #identity-popup-securityView { padding-bottom: 2em; overflow: hidden; @@ -179,86 +204,112 @@ background-image: url(chrome://browser/skin/controlcenter/conn-not-secure.svg); } -#identity-popup-securityView.verifiedDomain, -#identity-popup-securityView.verifiedIdentity, -#identity-popup-security-content.verifiedDomain, -#identity-popup-security-content.verifiedIdentity { +#identity-popup[connection=chrome] #identity-popup-securityView, +#identity-popup[connection=chrome] #identity-popup-security-content { + background-image: url(chrome://branding/content/icon48.png); +} + +#identity-popup[connection^=secure] #identity-popup-securityView, +#identity-popup[connection^=secure] #identity-popup-security-content { background-image: url(chrome://browser/skin/controlcenter/conn-secure.svg); } +/* Use [isbroken] to make sure we don't show a lock on an http page. See Bug 1192162. */ +#identity-popup[ciphers=weak] #identity-popup-securityView, +#identity-popup[ciphers=weak] #identity-popup-security-content, +#identity-popup[mixedcontent~=passive-loaded][isbroken] #identity-popup-securityView, +#identity-popup[mixedcontent~=passive-loaded][isbroken] #identity-popup-security-content { + background-image: url(chrome://browser/skin/controlcenter/conn-degraded.svg); +} + +#identity-popup[mixedcontent~=active-loaded][isbroken] #identity-popup-securityView, +#identity-popup[mixedcontent~=active-loaded][isbroken] #identity-popup-security-content { + background-image: url(chrome://browser/skin/controlcenter/mcb-disabled.svg); +} + +#identity-popup-security-descriptions > description { + margin-top: 6px; + color: Graytext; +} + #identity-popup-securityView-header { border-bottom: 1px solid var(--panel-separator-color); padding-bottom: 1em; - margin-bottom: 1em; } -#identity-popup-content-owner { - font-weight: 700; +#identity-popup-securityView-body { + -moz-padding-end: 1em; } -#identity-popup-content-verifier { +#identity-popup-content-verifier ~ description { + margin-top: 1em; color: Graytext; } -#identity-popup-content-owner, -#identity-popup-securityView > #identity-popup-securityView-connection.identity-popup-text { +description#identity-popup-content-verified-by, +description#identity-popup-content-owner, +description#identity-popup-content-verifier, +#identity-popup-securityView-body > button { margin-top: 1em; } -/* PERMISSIONS */ - -#identity-popup-permissions-content { - background-image: url(chrome://browser/skin/controlcenter/permissions.svg); +#identity-popup-securityView-body > button { + margin-inline-start: 0; + margin-inline-end: 0; } -#identity-popup-permission-list { - margin-top: 5px; -} +/* TRACKING PROTECTION */ -.identity-popup-permission-label { - -moz-margin-start: 0; +#tracking-protection-content { + background-image: url("chrome://browser/skin/controlcenter/tracking-protection.svg"); } -/* FOOTER BUTTONS */ +#tracking-protection-content[state="loaded-tracking-content"] { + background-image: url("chrome://browser/skin/controlcenter/tracking-protection-disabled.svg"); +} -#identity-popup-button-container { - background-color: hsla(210,4%,10%,.07); +#tracking-action-block, +#tracking-action-unblock, +#tracking-action-unblock-private { + margin: 1em 0 0; } -#identity-popup-more-info-button { - border: none; - border-top: 1px solid var(--panel-separator-color); - background: transparent; - -moz-appearance: none; - margin-top: 5px; - margin: 0; +#tracking-protection-content[state] > #tracking-not-detected, +#tracking-protection-content:not([state="blocked-tracking-content"]) > #tracking-blocked, +#main-window[privatebrowsingmode] #tracking-action-unblock, +#main-window:not([privatebrowsingmode]) #tracking-action-unblock-private, +#tracking-protection-content:not([state="blocked-tracking-content"]) #tracking-action-unblock, +#tracking-protection-content:not([state="blocked-tracking-content"]) #tracking-action-unblock-private, +#tracking-protection-content:not([state="loaded-tracking-content"]) > #tracking-loaded, +#tracking-protection-content:not([state="loaded-tracking-content"]) #tracking-action-block, +#tracking-protection-content:not([state]) > #tracking-actions { + display: none; } -#identity-popup-more-info-button > .button-box { - -moz-appearance: none; - padding: 1em; +/* PERMISSIONS */ + +#identity-popup-permissions-content { + background-image: url(chrome://browser/skin/controlcenter/permissions.svg); } -#identity-popup-more-info-button:hover { - background-color: hsla(210,4%,10%,.07); +#identity-popup-permission-list menulist { + min-width: 60px; } -#identity-popup-more-info-button:hover:active { - color: inherit; - background-color: hsla(210,4%,10%,.12); - box-shadow: 0 1px 0 hsla(210,4%,10%,.05) inset; +#identity-popup-permission-list { + margin-top: 5px; } -#identity-popup-more-info-button:-moz-focusring { - border-color: transparent; +.identity-popup-permission-label { + -moz-margin-start: 0; + word-wrap: break-word; } -.identity-popup-expander:-moz-focusring, -#identity-popup-more-info-button { + +.identity-popup-expander:-moz-focusring { padding: 1px; } -.identity-popup-expander:-moz-focusring > .button-box, -#identity-popup-more-info-button:-moz-focusring > .button-box { +.identity-popup-expander:-moz-focusring > .button-box { outline: 1px -moz-dialogtext dotted; } diff --git a/arc-firefox-theme/chrome/browser/controlcenter/tracking-protection-disabled.svg b/arc-firefox-theme/chrome/browser/controlcenter/tracking-protection-disabled.svg new file mode 100644 index 0000000..363b0df --- /dev/null +++ b/arc-firefox-theme/chrome/browser/controlcenter/tracking-protection-disabled.svg @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" + width="24" height="24" viewBox="0 0 24 24"> + <defs> + <path id="shape-shield-outer" d="M12,1L3.4,2.4C2.6,2.5,2,3.1,2,3.9c0,1.9,0,5.2,0.2,6.6c0.4,4.2,1.3,6.3,3.2,8.8C8,22.6,12,23,12,23s4-0.4,6.6-3.7 c1.9-2.4,2.8-4.5,3.2-8.8C22,9.1,22,5.7,22,3.9c0-0.8-0.6-1.4-1.4-1.5L12,1L12,1z"/> + <path id="shape-shield-inner" d="M12,3l7.9,1.2c0.1,0,0.1,0,0.1,0.1c0,2.9,0,5.2-0.1,6.1c-0.4,4-1.2,5.6-2.8,7.6c-1.8,2.3-4.4,2.8-5.1,3 c-0.7-0.1-3.3-0.7-5.1-3c-1.6-1.9-2.4-3.6-2.8-7.6C4,9.5,4,7.3,4,4.3c0,0,0-0.1,0.1-0.1L12,3"/> + <path id="shape-shield-detail" d="M12,20c-0.8-0.2-2.9-0.7-4.4-2.6c-1.4-1.8-2.1-3.2-2.5-7C5,9.6,5,7.7,5,5.1L12,4 V20z"/> + + <mask id="mask-shield-cutout"> + <rect width="24" height="24" fill="#000" /> + <use xlink:href="#shape-shield-outer" fill="#fff" /> + <use xlink:href="#shape-shield-inner" fill="#000" /> + <use xlink:href="#shape-shield-detail" fill="#fff" /> + <line x1="3" y1="24" x2="23" y2="3" stroke="#000" stroke-width="3" /> + </mask> + </defs> + + <use xlink:href="#shape-shield-outer" mask="url(#mask-shield-cutout)" fill="#a6a6a6" /> + <line x1="3" y1="22" x2="23" y2="1" stroke="#d92d21" stroke-width="3" /> +</svg> diff --git a/arc-firefox-theme/chrome/browser/controlcenter/tracking-protection.svg b/arc-firefox-theme/chrome/browser/controlcenter/tracking-protection.svg new file mode 100644 index 0000000..a58d8bd --- /dev/null +++ b/arc-firefox-theme/chrome/browser/controlcenter/tracking-protection.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" + width="24" height="24" viewBox="0 0 24 24"> + <defs> + <path id="shape-shield-outer" d="M12,1L3.4,2.4C2.6,2.5,2,3.1,2,3.9c0,1.9,0,5.2,0.2,6.6c0.4,4.2,1.3,6.3,3.2,8.8C8,22.6,12,23,12,23s4-0.4,6.6-3.7 c1.9-2.4,2.8-4.5,3.2-8.8C22,9.1,22,5.7,22,3.9c0-0.8-0.6-1.4-1.4-1.5L12,1L12,1z"/> + <path id="shape-shield-inner" d="M12,3l7.9,1.2c0.1,0,0.1,0,0.1,0.1c0,2.9,0,5.2-0.1,6.1c-0.4,4-1.2,5.6-2.8,7.6c-1.8,2.3-4.4,2.8-5.1,3 c-0.7-0.1-3.3-0.7-5.1-3c-1.6-1.9-2.4-3.6-2.8-7.6C4,9.5,4,7.3,4,4.3c0,0,0-0.1,0.1-0.1L12,3"/> + <path id="shape-shield-detail" d="M12,20c-0.8-0.2-2.9-0.7-4.4-2.6c-1.4-1.8-2.1-3.2-2.5-7C5,9.6,5,7.7,5,5.1L12,4 V20z"/> + + <mask id="mask-shield-cutout"> + <rect width="24" height="24" fill="#000" /> + <use xlink:href="#shape-shield-outer" fill="#fff" /> + <use xlink:href="#shape-shield-inner" fill="#000" /> + <use xlink:href="#shape-shield-detail" fill="#fff" /> + </mask> + </defs> + + <use xlink:href="#shape-shield-outer" mask="url(#mask-shield-cutout)" fill="#a6a6a6" /> +</svg> diff --git a/arc-firefox-theme/chrome/browser/controlcenter/warning-gray.svg b/arc-firefox-theme/chrome/browser/controlcenter/warning-gray.svg new file mode 100644 index 0000000..5f122c3 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/controlcenter/warning-gray.svg @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" + width="16" height="16" viewBox="0 0 16 16"> + <path fill="#808080" d="M14.8,12.5L9.3,1.9C9,1.3,8.5,1,8,1C7.5,1,7,1.3,6.7,1.9L1.2,12.5c-0.3,0.6-0.3,1.2,0,1.7C1.5,14.7,2,15,2.6,15h10.8 c0.6,0,1.1-0.3,1.4-0.8C15.1,13.7,15.1,13.1,14.8,12.5z"/> + <path fill="#fff" d="M8,11c-0.8,0-1.5,0.7-1.5,1.5C6.5,13.3,7.2,14,8,14 c0.8,0,1.5-0.7,1.5-1.5C9.5,11.7,8.8,11,8,11z M8,10L8,10C8.6,10,9,9.6,9,9l0.2-4.2c0-0.7-0.5-1.2-1.2-1.2S6.8,4.1,6.8,4.8L7,9 C7,9.6,7.4,10,8,10z"/> +</svg> diff --git a/arc-firefox-theme/chrome/browser/controlcenter/warning-yellow.svg b/arc-firefox-theme/chrome/browser/controlcenter/warning-yellow.svg new file mode 100644 index 0000000..e2d3a36 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/controlcenter/warning-yellow.svg @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" + width="16" height="16" viewBox="0 0 16 16"> + <path fill="#ffbf00" d="M14.8,12.5L9.3,1.9C9,1.3,8.5,1,8,1C7.5,1,7,1.3,6.7,1.9L1.2,12.5c-0.3,0.6-0.3,1.2,0,1.7C1.5,14.7,2,15,2.6,15h10.8 c0.6,0,1.1-0.3,1.4-0.8C15.1,13.7,15.1,13.1,14.8,12.5z"/> + <path fill="#fff" d="M8,11c-0.8,0-1.5,0.7-1.5,1.5C6.5,13.3,7.2,14,8,14 c0.8,0,1.5-0.7,1.5-1.5C9.5,11.7,8.8,11,8,11z M8,10L8,10C8.6,10,9,9.6,9,9l0.2-4.2c0-0.7-0.5-1.2-1.2-1.2S6.8,4.1,6.8,4.8L7,9 C7,9.6,7.4,10,8,10z"/> +</svg> diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-audio-small.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-audio-small.svg new file mode 100644 index 0000000..c5bff69 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-audio-small.svg @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="16" + height="16" + viewBox="0 0 16 16" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="tab-audio-small.svg"> + <metadata + id="metadata30"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs28" /> + <sodipodi:namedview + pagecolor="#b1b1b1" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="640" + inkscape:window-height="480" + id="namedview26" + showgrid="false" + inkscape:zoom="12.46875" + inkscape:cx="-0.22891557" + inkscape:cy="5.5804938" + inkscape:current-layer="svg2" /> + <style + id="style4"> + .icon:not(:target) { + display: none; + } + + .icon { + fill: #262626; + } + .icon > .outline { + fill: #fff; + } + + .icon.white { + fill: #fff; + } + .icon.white > .outline { + fill: #000; + fill-opacity: .5; + } + </style> + <g + id="tab-audio" + class="icon"> + <path + class="outline" + d="M12.4,3.6l-1-0.6l-0.9,2.5H10V1.8c0-0.4-0.5-0.7-0.9-0.4L5.6,5H4C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.6l3.6,3.6 c0.3,0.3,0.9,0.1,0.9-0.4v-3.7h0.5l0.9,2.5l1-0.6C14,11.5,15,9.8,15,8S14,4.5,12.4,3.6z M9,13l-3-3H4c-0.6,0-1-0.4-1-1V7 c0-0.6,0.4-1,1-1h2l3-3V13z M10,9.5v-3c0.8,0,1.5,0.7,1.5,1.5S10.8,9.5,10,9.5z M11.9,11.5l-0.4-0.9C12.4,10,13,9.1,13,8 s-0.6-2-1.4-2.5l0.3-1C13.2,5.2,14,6.5,14,8S13.2,10.8,11.9,11.5z" + id="path7" + style="fill:#2f343f;fill-opacity:1" /> + <path + d="M4,6C3.4,6,3,6.4,3,7v2c0,0.6,0.4,1,1,1h2l3,3V3L6,6H4z M10,6.5v3c0.8,0,1.5-0.7,1.5-1.5S10.8,6.5,10,6.5z M11.9,4.5 l-0.4,0.9C12.4,6,13,6.9,13,8s-0.6,2-1.4,2.5l0.4,0.9c1.2-0.7,2.1-2,2.1-3.5S13.2,5.2,11.9,4.5z" + id="path9" + style="fill:#d3dae3;fill-opacity:1" /> + </g> + <g + id="tab-audio-muted" + class="icon"> + <path + class="outline" + d="M5.6,5H4C2.9,5,2,5.9,2,7v2c0,0.7,0.3,1.3,0.9,1.7l-1.8,1.8l2.5,2.5l3-3l2.6,2.6c0.3,0.3,0.9,0.1,0.9-0.4V8.5l3.9-3.9 l-2.5-2.5L10,3.5V1.8c0-0.4-0.5-0.7-0.9-0.4L5.6,5z" + id="path12" + style="fill:#2f343f;fill-opacity:1" /> + <path + d="M11.5,3.5L9,5.9V3L6,6H4C3.4,6,3,6.4,3,7v2c0,0.6,0.4,1,1,1h0.9l-2.5,2.5l1.1,1.1l9-9L11.5,3.5z M9,13V9.7l-1.7,1.7L9,13z" + id="path14" + style="fill:#d3dae3;fill-opacity:1" /> + </g> +</svg> diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-audio.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-audio.svg new file mode 100644 index 0000000..c2ff76e --- /dev/null +++ b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-audio.svg @@ -0,0 +1,150 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="16" + height="16" + viewBox="0 0 16 16" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="tab-audio.svg"> + <metadata + id="metadata52"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs50" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="640" + inkscape:window-height="480" + id="namedview48" + showgrid="false" + inkscape:zoom="12.46875" + inkscape:cx="-11.788201" + inkscape:cy="0.63847986" + inkscape:current-layer="svg2" /> + <style + id="style4"> + .icon:not(:target) { + display: none; + } + + .icon { + fill: #333; + opacity: .75; + } + .icon.hover { + fill: #1a1a1a; + opacity: .85; + } + .icon.pressed { + fill: #0d0d0d; + opacity: .95; + } + + .icon.white { + fill: #fff; + } + .icon.white.hover { + opacity: .9; + } + .icon.white.pressed { + opacity: 1; + } + .icon.white > .outline { + fill: #000; + fill-opacity: .5; + } + + .icon.backgroundTab, + .icon.backgroundTab.hover, + .icon.backgroundTab.pressed { + fill: -moz-MenuBarText; + } + </style> + <path + id="tab-audio" + class="icon" + d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z" + style="fill:#d3dae3;fill-opacity:1" /> + <path + id="tab-audio-hover" + class="icon hover" + d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z" + style="fill:#d3dae3;fill-opacity:1" /> + <path + id="tab-audio-pressed" + class="icon pressed" + d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z" + style="fill:#d3dae3;fill-opacity:1" /> + <path + id="tab-audio-muted" + class="icon" + d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z" + style="fill:#d3dae3;fill-opacity:1" /> + <path + id="tab-audio-muted-hover" + class="icon hover" + d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z" + style="fill:#d3dae3;fill-opacity:1" /> + <path + id="tab-audio-muted-pressed" + class="icon pressed" + d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z" + style="fill:#d3dae3;fill-opacity:1" /> + <path + id="tab-audio-backgroundTab" + class="icon backgroundTab" + d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z" + style="fill:#d3dae3;fill-opacity:1" /> + <path + id="tab-audio-backgroundTab-hover" + class="icon backgroundTab hover" + d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z" + style="fill:#d3dae3;fill-opacity:1" /> + <path + id="tab-audio-backgroundTab-pressed" + class="icon backgroundTab pressed" + d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z" + style="fill:#d3dae3;fill-opacity:1" /> + <path + id="tab-audio-backgroundTab-muted" + class="icon backgroundTab" + d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z" + style="fill:#d3dae3;fill-opacity:1" /> + <path + id="tab-audio-backgroundTab-muted-hover" + class="icon backgroundTab hover" + d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z" + style="fill:#d3dae3;fill-opacity:1" /> + <path + id="tab-audio-backgroundTab-muted-pressed" + class="icon backgroundTab pressed" + d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z" + style="fill:#d3dae3;fill-opacity:1" /> +</svg> diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-audio-small.svg b/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-audio-small.svg new file mode 100644 index 0000000..8326f46 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-audio-small.svg @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="16" + height="16" + viewBox="0 0 16 16" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="tab-audio-small.svg"> + <metadata + id="metadata30"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs28" /> + <sodipodi:namedview + pagecolor="#a1a1a1" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="640" + inkscape:window-height="480" + id="namedview26" + showgrid="false" + inkscape:zoom="12.46875" + inkscape:cx="-7.2063593" + inkscape:cy="5.5804938" + inkscape:current-layer="svg2" /> + <style + id="style4"> + .icon:not(:target) { + display: none; + } + + .icon { + fill: #262626; + } + .icon > .outline { + fill: #fff; + } + + .icon.white { + fill: #fff; + } + .icon.white > .outline { + fill: #000; + fill-opacity: .5; + } + </style> + <g + id="tab-audio" + class="icon"> + <path + class="outline" + d="M12.4,3.6l-1-0.6l-0.9,2.5H10V1.8c0-0.4-0.5-0.7-0.9-0.4L5.6,5H4C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.6l3.6,3.6 c0.3,0.3,0.9,0.1,0.9-0.4v-3.7h0.5l0.9,2.5l1-0.6C14,11.5,15,9.8,15,8S14,4.5,12.4,3.6z M9,13l-3-3H4c-0.6,0-1-0.4-1-1V7 c0-0.6,0.4-1,1-1h2l3-3V13z M10,9.5v-3c0.8,0,1.5,0.7,1.5,1.5S10.8,9.5,10,9.5z M11.9,11.5l-0.4-0.9C12.4,10,13,9.1,13,8 s-0.6-2-1.4-2.5l0.3-1C13.2,5.2,14,6.5,14,8S13.2,10.8,11.9,11.5z" + id="path7" /> + <path + d="M4,6C3.4,6,3,6.4,3,7v2c0,0.6,0.4,1,1,1h2l3,3V3L6,6H4z M10,6.5v3c0.8,0,1.5-0.7,1.5-1.5S10.8,6.5,10,6.5z M11.9,4.5 l-0.4,0.9C12.4,6,13,6.9,13,8s-0.6,2-1.4,2.5l0.4,0.9c1.2-0.7,2.1-2,2.1-3.5S13.2,5.2,11.9,4.5z" + id="path9" + style="fill:#5c616c;fill-opacity:1" /> + </g> + <g + id="tab-audio-muted" + class="icon"> + <path + class="outline" + d="M5.6,5H4C2.9,5,2,5.9,2,7v2c0,0.7,0.3,1.3,0.9,1.7l-1.8,1.8l2.5,2.5l3-3l2.6,2.6c0.3,0.3,0.9,0.1,0.9-0.4V8.5l3.9-3.9 l-2.5-2.5L10,3.5V1.8c0-0.4-0.5-0.7-0.9-0.4L5.6,5z" + id="path12" /> + <path + d="M11.5,3.5L9,5.9V3L6,6H4C3.4,6,3,6.4,3,7v2c0,0.6,0.4,1,1,1h0.9l-2.5,2.5l1.1,1.1l9-9L11.5,3.5z M9,13V9.7l-1.7,1.7L9,13z" + id="path14" + style="fill:#5c616c;fill-opacity:1" /> + </g> +</svg> diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-audio.svg b/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-audio.svg new file mode 100644 index 0000000..24231c6 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-audio.svg @@ -0,0 +1,150 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="16" + height="16" + viewBox="0 0 16 16" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="tab-audio.svg"> + <metadata + id="metadata52"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs50" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="640" + inkscape:window-height="480" + id="namedview48" + showgrid="false" + inkscape:zoom="12.46875" + inkscape:cx="1.0438795" + inkscape:cy="0.63847986" + inkscape:current-layer="svg2" /> + <style + id="style4"> + .icon:not(:target) { + display: none; + } + + .icon { + fill: #333; + opacity: .75; + } + .icon.hover { + fill: #1a1a1a; + opacity: .85; + } + .icon.pressed { + fill: #0d0d0d; + opacity: .95; + } + + .icon.white { + fill: #fff; + } + .icon.white.hover { + opacity: .9; + } + .icon.white.pressed { + opacity: 1; + } + .icon.white > .outline { + fill: #000; + fill-opacity: .5; + } + + .icon.backgroundTab, + .icon.backgroundTab.hover, + .icon.backgroundTab.pressed { + fill: -moz-MenuBarText; + } + </style> + <path + id="tab-audio" + class="icon" + d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z" + style="fill:#5c616c;fill-opacity:1" /> + <path + id="tab-audio-hover" + class="icon hover" + d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z" + style="fill:#5c616c;fill-opacity:1" /> + <path + id="tab-audio-pressed" + class="icon pressed" + d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z" + style="fill:#5c616c;fill-opacity:1" /> + <path + id="tab-audio-muted" + class="icon" + d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z" + style="fill:#5c616c;fill-opacity:1" /> + <path + id="tab-audio-muted-hover" + class="icon hover" + d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z" + style="fill:#5c616c;fill-opacity:1" /> + <path + id="tab-audio-muted-pressed" + class="icon pressed" + d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z" + style="fill:#5c616c;fill-opacity:1" /> + <path + id="tab-audio-backgroundTab" + class="icon backgroundTab" + d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z" + style="fill:#5c616c;fill-opacity:1" /> + <path + id="tab-audio-backgroundTab-hover" + class="icon backgroundTab hover" + d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z" + style="fill:#5c616c;fill-opacity:1" /> + <path + id="tab-audio-backgroundTab-pressed" + class="icon backgroundTab pressed" + d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z" + style="fill:#5c616c;fill-opacity:1" /> + <path + id="tab-audio-backgroundTab-muted" + class="icon backgroundTab" + d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z" + style="fill:#5c616c;fill-opacity:1" /> + <path + id="tab-audio-backgroundTab-muted-hover" + class="icon backgroundTab hover" + d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z" + style="fill:#5c616c;fill-opacity:1" /> + <path + id="tab-audio-backgroundTab-muted-pressed" + class="icon backgroundTab pressed" + d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z" + style="fill:#5c616c;fill-opacity:1" /> +</svg> diff --git a/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css b/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css index 8937d70..c96ee12 100644 --- a/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css +++ b/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css @@ -83,8 +83,8 @@ } #PanelUI-button { - -moz-margin-start: 2px; - -moz-border-start: 1px solid; + margin-inline-start: 2px; + border-inline-start: 1px solid; border-image: linear-gradient(transparent, rgba(0,0,0,.1) 20%, rgba(0,0,0,.1) 80%, transparent); border-image-slice: 1; } @@ -93,10 +93,33 @@ border-image-source: linear-gradient(transparent, rgba(100%,100%,100%,.2) 20%, rgba(100%,100%,100%,.2) 80%, transparent); } -#PanelUI-menu-button[update-status="succeeded"] .toolbarbutton-badge::after { - content: url(chrome://browser/skin/update-badge.svg); - background-color: #74BF43; +#PanelUI-menu-button[badge-status] > .toolbarbutton-badge-stack > .toolbarbutton-badge { + display: -moz-box; height: 10px; + width: 10px; + background-size: contain; + border: none; +} + +#PanelUI-menu-button[badge-status="update-succeeded"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { + background: #74BF43 url(chrome://browser/skin/update-badge.svg) no-repeat center; + height: 13px; +} + +#PanelUI-menu-button[badge-status="update-failed"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { + background: #D90000 url(chrome://browser/skin/update-badge-failed.svg) no-repeat center; + height: 13px; +} + +#PanelUI-menu-button[badge-status="fxa-needs-authentication"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { + background: transparent url(chrome://browser/skin/warning.svg) no-repeat center; + height: 13px; + box-shadow: none; + filter: drop-shadow(0 1px 0 hsla(206, 50%, 10%, .15)); +} + +#PanelUI-menu-button[badge-status="fxa-needs-authentication"] > .toolbarbutton-badge-stack > .toolbarbutton-badge:-moz-window-inactive { + filter: none; } .panel-subviews { @@ -163,16 +186,6 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan flex-direction: column; } -#app-extension-point-end > #PanelUI-menu-button { - padding: 2px 5px; -} -#app-extension-point-end > #PanelUI-menu-button .toolbarbutton-text { - display: none; -} -#app-extension-point-end > #PanelUI-menu-button .toolbarbutton-icon { - margin: 0; -} - #PanelUI-popup > arrowscrollbox > autorepeatbutton { display: none; } @@ -298,9 +311,9 @@ toolbarpaletteitem[place="panel"]:not([haswideitem=true]) > .toolbarbutton-1 { /* Help SDK buttons fit in. */ toolbarpaletteitem[place="palette"] > toolbarbutton[constrain-size="true"] > .toolbarbutton-icon, -toolbarpaletteitem[place="palette"] > toolbarbutton[constrain-size="true"] > .toolbarbutton-badge-container > .toolbarbutton-icon, +toolbarpaletteitem[place="palette"] > toolbarbutton[constrain-size="true"] > .toolbarbutton-badge-stack > .toolbarbutton-icon, toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton-icon, -toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton-badge-container > .toolbarbutton-icon { +toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton-badge-stack > .toolbarbutton-icon { height: 32px; width: 32px; } @@ -418,10 +431,10 @@ toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-it .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon, .panelUI-grid .toolbarbutton-1 > .toolbarbutton-icon, -.panelUI-grid .toolbarbutton-1 > .toolbarbutton-badge-container, +.panelUI-grid .toolbarbutton-1 > .toolbarbutton-badge-stack, .customization-palette .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon, .customization-palette .toolbarbutton-1 > .toolbarbutton-icon, -.customization-palette .toolbarbutton-1 > .toolbarbutton-badge-container, +.customization-palette .toolbarbutton-1 > .toolbarbutton-badge-stack, .panelUI-grid #bookmarks-toolbar-placeholder > .toolbarbutton-icon, .customization-palette #bookmarks-toolbar-placeholder > .toolbarbutton-icon, .panel-customization-placeholder-child > .toolbarbutton-icon { @@ -447,8 +460,8 @@ toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-it /* above we treat the container as the icon for the margins, that is so the /* badge itself is positioned correctly. Here we make sure that the icon itself /* has the minimum size we want, but no padding/margin. */ -.panelUI-grid .toolbarbutton-1 > .toolbarbutton-badge-container > .toolbarbutton-icon, -.customization-palette .toolbarbutton-1 > .toolbarbutton-badge-container > .toolbarbutton-icon { +.panelUI-grid .toolbarbutton-1 > .toolbarbutton-badge-stack > .toolbarbutton-icon, +.customization-palette .toolbarbutton-1 > .toolbarbutton-badge-stack > .toolbarbutton-icon { width: 32px; height: 32px; min-width: 32px; @@ -501,6 +514,38 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { display: none; } +#PanelUI-footer-fxa[fxastatus="error"] > #PanelUI-fxa-status::after { + content: url(chrome://browser/skin/warning.svg); + filter: drop-shadow(0 1px 0 hsla(206, 50%, 10%, .15)); + width: 47px; + padding-top: 1px; + display: block; + text-align: center; + position: relative; + top: 25%; +} + +#PanelUI-update-status[update-status]::after { + content: ""; + width: 14px; + height: 14px; + margin-right: 16.5px; + box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px rgba(0, 0, 0, 0.1) inset, 0px 1px 0px rgba(12, 27, 38, 0.2); + border-radius: 2px; + background-size: contain; + display: -moz-box; +} + +#PanelUI-update-status[update-status="succeeded"]::after { + background-image: url(chrome://browser/skin/update-badge.svg); + background-color: #74BF43; +} + +#PanelUI-update-status[update-status="failed"]::after { + background-image: url(chrome://browser/skin/update-badge-failed.svg); + background-color: #D90000; +} + #PanelUI-fxa-status { display: flex; flex: 1 1 0%; @@ -628,8 +673,8 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { #PanelUI-footer-fxa[fxastatus="migrate-signup"] > #PanelUI-fxa-status > #PanelUI-fxa-label, #PanelUI-footer-fxa[fxastatus="migrate-verify"] > #PanelUI-fxa-status > #PanelUI-fxa-label { - list-style-image: url(chrome://browser/skin/warning16.png); - -moz-image-region: rect(0, 32px, 16px, 16px); + list-style-image: url(chrome://browser/skin/warning.svg); + -moz-image-region: auto; } #PanelUI-customize { @@ -690,7 +735,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { } #PanelUI-footer-fxa[fxaprofileimage="enabled"] > #PanelUI-fxa-status > #PanelUI-fxa-avatar { - list-style-image: url(chrome://browser/skin/fxa/default-profile-image.svg); + list-style-image: url(chrome://browser/skin/fxa/default-avatar.png) } #PanelUI-customize:hover, @@ -741,16 +786,16 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { } #PanelUI-footer-fxa[fxastatus="error"] { - background-color: rgb(255, 236, 158); - border-top: 1px solid rgb(254, 212, 21); + background-color: hsla(42, 94%, 88%, 1.0); + border-top: 1px solid hsla(42, 94%, 70%, 1.0); } #PanelUI-footer-fxa[fxastatus="error"] > #PanelUI-fxa-status:hover { - background-color: #F9E79A; + background-color: hsla(42, 94%, 85%, 1.0); } #PanelUI-footer-fxa[fxastatus="error"] > #PanelUI-fxa-status:hover:active { - background-color: #ECDB92; + background-color: hsla(42, 94%, 82%, 1.0); box-shadow: 0 1px 0 hsla(210,4%,10%,.05) inset; } @@ -1482,6 +1527,10 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left { list-style-image: url(chrome://branding/content/icon32.png); } + #PanelUI-footer-fxa[fxaprofileimage="enabled"] > #PanelUI-fxa-status > #PanelUI-fxa-avatar { + list-style-image: url(chrome://browser/skin/fxa/default-avatar@2x.png) + } + #PanelUI-fxa-label, #PanelUI-fxa-icon { list-style-image: url(chrome://browser/skin/sync-horizontalbar@2x.png); @@ -1491,12 +1540,6 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left { list-style-image: url(chrome://browser/skin/syncProgress-horizontalbar@2x.png); } - #PanelUI-footer-fxa[fxastatus="migrate-signup"] > #PanelUI-fxa-status > #PanelUI-fxa-label, - #PanelUI-footer-fxa[fxastatus="migrate-verify"] > #PanelUI-fxa-status > #PanelUI-fxa-label { - list-style-image: url(chrome://browser/skin/warning16@2x.png); - -moz-image-region: rect(0, 64px, 32px, 32px); - } - #PanelUI-customize { list-style-image: url(chrome://browser/skin/menuPanel-customize@2x.png); } diff --git a/arc-firefox-theme/chrome/browser/customizableui/thumburger-inverted.png b/arc-firefox-theme/chrome/browser/customizableui/thumburger-inverted.png Binary files differnew file mode 100755 index 0000000..5bd6385 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/customizableui/thumburger-inverted.png diff --git a/arc-firefox-theme/chrome/browser/customizableui/thumburger.png b/arc-firefox-theme/chrome/browser/customizableui/thumburger.png Binary files differnew file mode 100755 index 0000000..bd75b44 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/customizableui/thumburger.png diff --git a/arc-firefox-theme/chrome/browser/devedition.css b/arc-firefox-theme/chrome/browser/devedition.css index 44e3228..d1ddeca 100644 --- a/arc-firefox-theme/chrome/browser/devedition.css +++ b/arc-firefox-theme/chrome/browser/devedition.css @@ -6,8 +6,10 @@ :root { --tab-toolbar-navbar-overlap: 0px; + --navbar-tab-toolbar-highlight-overlap: 0px; --space-above-tabbar: 0px; --toolbarbutton-text-shadow: none; + --backbutton-urlbar-overlap: 0px; } :root[devtoolstheme="dark"] { @@ -45,15 +47,10 @@ --toolbarbutton-combined-boxshadow: none; --toolbarbutton-combined-backgroundimage: linear-gradient(#5F6670 0, #5F6670 18px); - /* Identity box */ - --identity-box-chrome-color: #46afe3; - --identity-box-chrome-background-image: linear-gradient(#5F6670 0, #5F6670 100%); - --identity-box-verified-background-image: linear-gradient(#5F6670 0, #5F6670 100%); - --verified-identity-box-backgroundcolor: transparent; - /* Url and search bars */ --url-and-searchbar-background-color: #171B1F; --url-and-searchbar-color: #fff; + --urlbar-separator-color: #5F6670; --urlbar-dropmarker-url: url("chrome://browser/skin/devedition/urlbar-history-dropmarker.svg"); --urlbar-dropmarker-region: rect(0px, 11px, 14px, 0px); --urlbar-dropmarker-hover-region: rect(0, 22px, 14px, 11px); @@ -65,6 +62,12 @@ --search-button-image: url("chrome://browser/skin/devedition/search.svg#search-icon-inverted"); } +:root[devtoolstheme="dark"] #identity-box { + --identity-box-chrome-color: #46afe3; + --identity-box-verified-background-color: transparent; + --identity-box-selected-background-color: rgba(231,230,230,.2); +} + :root[devtoolstheme="dark"] .searchbar-dropmarker-image { --searchbar-dropmarker-url: url("chrome://browser/skin/devtools/dropmarker.svg"); --searchbar-dropmarker-2x-url: url("chrome://browser/skin/devtools/dropmarker.svg"); @@ -229,11 +232,21 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper { -moz-margin-start: 0; } -/* Make the white notication box stick out less. */ +/* Swap out the white arrow with a dark one for the dark theme */ +:root[devtoolstheme="dark"] #notification-popup-box { + border-image: url("chrome://browser/skin/devedition/urlbar-arrow.png") 0 8 0 0 fill; +} + +@media (min-resolution: 1.1dppx) { + :root[devtoolstheme="dark"] #notification-popup-box { + border-image: url("chrome://browser/skin/devedition/urlbar-arrow@2x.png") 0 16 0 0 fill; + } +} + +/* The (white) notification box background color should match the theme */ #notification-popup-box { border-radius: 0; - border: none; - background: transparent; + background-color: var(--url-and-searchbar-background-color); } /* Nav bar specific stuff */ @@ -281,11 +294,6 @@ searchbar:not([oneoffui]) .search-go-button { border-color: transparent; } -.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]), -.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:not([collapsed]) { - margin-bottom: 0; -} - .tabbrowser-tab { /* We normally rely on other tab elements for pointer events, but this theme hides those so we need it set here instead */ diff --git a/arc-firefox-theme/chrome/browser/devedition/urlbar-arrow.png b/arc-firefox-theme/chrome/browser/devedition/urlbar-arrow.png Binary files differnew file mode 100644 index 0000000..c14afc7 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/devedition/urlbar-arrow.png diff --git a/arc-firefox-theme/chrome/browser/devedition/urlbar-arrow@2x.png b/arc-firefox-theme/chrome/browser/devedition/urlbar-arrow@2x.png Binary files differnew file mode 100644 index 0000000..e6867a4 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/devedition/urlbar-arrow@2x.png diff --git a/arc-firefox-theme/chrome/browser/devtools/canvasdebugger.css b/arc-firefox-theme/chrome/browser/devtools/canvasdebugger.css index 69e847c..a749260 100644 --- a/arc-firefox-theme/chrome/browser/devtools/canvasdebugger.css +++ b/arc-firefox-theme/chrome/browser/devtools/canvasdebugger.css @@ -1,8 +1,4 @@ /* 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/. */ - -/* 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/. */ diff --git a/arc-firefox-theme/chrome/browser/devtools/computedview.css b/arc-firefox-theme/chrome/browser/devtools/computedview.css index f8b0d62..f770681 100644 --- a/arc-firefox-theme/chrome/browser/devtools/computedview.css +++ b/arc-firefox-theme/chrome/browser/devtools/computedview.css @@ -124,11 +124,6 @@ body { border-bottom-width: 1px; } -/* This rule is necessary because Templater.jsm breaks LTR TDs in RTL docs */ -.rule-text { - direction: ltr; -} - .matched { text-decoration: line-through; } diff --git a/arc-firefox-theme/chrome/browser/devtools/dark-theme.css b/arc-firefox-theme/chrome/browser/devtools/dark-theme.css index bfc0fa1..53a868f 100644 --- a/arc-firefox-theme/chrome/browser/devtools/dark-theme.css +++ b/arc-firefox-theme/chrome/browser/devtools/dark-theme.css @@ -138,7 +138,7 @@ .cm-s-mozilla .cm-unused-line { text-decoration: line-through; - text-decoration-color: #5f88b0; + text-decoration-color: #0072ab; } .cm-s-mozilla .cm-executed-line { @@ -953,73 +953,57 @@ div.CodeMirror span.eval-text { text-shadow: none; } -.devtools-sidebar-tabs tabs > tab:first-child { - -moz-border-start-width: 0; +.devtools-sidebar-tabs tabs > tab { + border-image: linear-gradient(transparent 15%, var(--theme-splitter-color) 15%, var(--theme-splitter-color) 85%, transparent 85%) 1 1; } -.theme-dark .devtools-sidebar-tabs tabs > tab { - border-image: linear-gradient(transparent 15%, #5a6169 15%, #5a6169 85%, transparent 85%) 1 1; +.devtools-sidebar-tabs tabs > tab[selected], +.devtools-sidebar-tabs tabs > tab[selected] + tab { + border-image: linear-gradient(var(--theme-splitter-color), var(--theme-splitter-color)) 1 1; +} + +.devtools-sidebar-tabs tabs > tab:first-child { + -moz-border-start-width: 0; } .theme-dark .devtools-sidebar-tabs tabs > tab:hover { background: hsla(206,37%,4%,.2); - border-image: linear-gradient(transparent 15%, #5a6169 15%, #5a6169 85%, transparent 85%) 1 1; } .theme-dark .devtools-sidebar-tabs tabs > tab:hover:active { background: hsla(206,37%,4%,.4); - border-image: linear-gradient(transparent 15%, #5a6169 15%, #5a6169 85%, transparent 85%) 1 1; -} - -.theme-dark .devtools-sidebar-tabs tabs > tab[selected] + tab { - border-image: linear-gradient(#2d5b7d, #2d5b7d) 1 1; } .theme-dark .devtools-sidebar-tabs tabs > tab[selected] + tab:hover { background: hsla(206,37%,4%,.2); - border-image: linear-gradient(#2d5b7d, #2d5b7d) 1 1; } .theme-dark .devtools-sidebar-tabs tabs > tab[selected] + tab:hover:active { background: hsla(206,37%,4%,.4); - border-image: linear-gradient(#2d5b7d, #2d5b7d) 1 1; } .theme-dark .devtools-sidebar-tabs tabs > tab[selected], .theme-dark .devtools-sidebar-tabs tabs > tab[selected]:hover:active { color: var(--theme-selection-color); background: #1d4f73; - border-image: linear-gradient(#2d5b7d, #2d5b7d) 1 1; -} - -.theme-light .devtools-sidebar-tabs tabs > tab { - border-image: linear-gradient(transparent 15%, #aaa 15%, #aaa 85%, transparent 85%) 1 1; } .theme-light .devtools-sidebar-tabs tabs > tab:hover { background: #ddd; - border-image: linear-gradient(transparent 15%, #aaa 15%, #aaa 85%, transparent 85%) 1 1; } .theme-light .devtools-sidebar-tabs tabs > tab:hover:active { background: #ddd; - border-image: linear-gradient(transparent 15%, #aaa 15%, #aaa 85%, transparent 85%) 1 1; -} - -.theme-light .devtools-sidebar-tabs tabs > tab[selected] + tab { - border-image: linear-gradient(#aaa, #aaa); } .theme-light .devtools-sidebar-tabs tabs > tab[selected] + tab:hover { background: #ddd; - border-image: linear-gradient(#aaa, #aaa); } .theme-light .devtools-sidebar-tabs tabs > tab[selected], .theme-light .devtools-sidebar-tabs tabs > tab[selected]:hover:active { color: var(--theme-selection-color); background: #4c9ed9; - border-image: linear-gradient(#aaa, #aaa); } /* Toolbox - moved from toolbox.css. diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger.css b/arc-firefox-theme/chrome/browser/devtools/debugger.css index fb7be09..97eb3b0 100644 --- a/arc-firefox-theme/chrome/browser/devtools/debugger.css +++ b/arc-firefox-theme/chrome/browser/devtools/debugger.css @@ -1,7 +1,3 @@ -/* 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/. */ - /* vim:set ts=2 sw=2 sts=2 et: */ /* 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 @@ -96,6 +92,10 @@ } } +#toggle-promise-debugger { + /* TODO Bug 1186119: Add a toggle promise debugger image */ +} + #sources-toolbar .devtools-toolbarbutton:not([label]) { -moz-image-region: rect(0px,16px,16px,0px); } diff --git a/arc-firefox-theme/chrome/browser/devtools/filetype-dir-close.svg b/arc-firefox-theme/chrome/browser/devtools/filetype-dir-close.svg index fa893f4..ae6f221 100644 --- a/arc-firefox-theme/chrome/browser/devtools/filetype-dir-close.svg +++ b/arc-firefox-theme/chrome/browser/devtools/filetype-dir-close.svg @@ -2,6 +2,6 @@ <!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" fill="#000" width="16" height="16">
+<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" fill="#0A0805" width="16" height="16">
<path d="M 0.00,160.00 L 512.00,160.00 L 480.00,480.00 L 32.00,480.00 L 0.00,160.00 Z M 464.00,96.00 L 480.00,128.00 L 32.00,128.00 L 64.00,64.00 L 240.00,64.00 L 256.00,96.00 L 464.00,96.00 Z"/>
</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/filetype-dir-open.svg b/arc-firefox-theme/chrome/browser/devtools/filetype-dir-open.svg index 1faebe4..c7fafc2 100644 --- a/arc-firefox-theme/chrome/browser/devtools/filetype-dir-open.svg +++ b/arc-firefox-theme/chrome/browser/devtools/filetype-dir-open.svg @@ -2,6 +2,6 @@ <!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" fill="#000" width="16" height="16">
+<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" fill="#0A0805" width="16" height="16">
<path d="M 416.00,480.00L 512.00,224.00L 96.00,224.00L0.00,480.00 zM 64.00,192.00 L 0.00,480.00 L 0.00,64.00 L 144.00,64.00 L 208.00,128.00 L 416.00,128.00 L 416.00,192.00 Z"/>
</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/filetype-globe.svg b/arc-firefox-theme/chrome/browser/devtools/filetype-globe.svg index bf1fe2d..a5580b4 100644 --- a/arc-firefox-theme/chrome/browser/devtools/filetype-globe.svg +++ b/arc-firefox-theme/chrome/browser/devtools/filetype-globe.svg @@ -2,5 +2,5 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="20" viewBox="0 0 878 1024">
- <path d="M438.857 73.143q119.429 0 220.286 58.857t159.714 159.714 58.857 220.286-58.857 220.286-159.714 159.714-220.286 58.857-220.286-58.857-159.714-159.714-58.857-220.286 58.857-220.286 159.714-159.714 220.286-58.857zM595.429 370.857q-1.143 0.571-5.429 5.429t-7.714 5.429q1.143 0 2.571-2.857t2.857-6.286 2-4q3.429-4 12.571-8.571 8-3.429 29.714-6.857 19.429-4.571 29.143 6.286-1.143-1.143 5.429-7.429t8.286-6.857q1.714-1.143 8.571-2.571t8.571-4.286l1.143-12.571q-6.857 0.571-10-4t-3.714-12q0 1.143-3.429 4.571 0-4-2.571-4.571t-6.571 0.571-5.143 0.571q-5.714-1.714-8.571-4.286t-4.571-9.429-2.286-8.571q-1.143-2.857-5.429-6t-5.429-6q-0.571-1.143-1.429-3.143t-1.714-3.714-2.286-3.143-3.143-1.429-4 2.857-4.286 5.714-2.571 2.857q-1.714-1.143-3.429-0.857t-2.571 0.571-2.571 1.714-2.857 2q-1.714 1.143-4.857 1.714t-4.857 1.143q8.571-2.857-0.571-6.286-5.714-2.286-9.143-1.714 5.143-2.286 4.286-6.857t-4.857-8h2.857q-0.571-2.286-4.857-4.857t-10-4.857-7.429-3.429q-4.571-2.857-19.429-5.429t-18.857-0.286q-2.857 3.429-2.571 6t2.286 8 2 7.143q0.571 3.429-3.143 7.429t-3.714 6.857q0 4 8 8.857t5.714 12.286q-1.714 4.571-9.143 9.143t-9.143 6.857q-2.857 4.571-0.857 10.571t6 9.429q1.143 1.143 0.857 2.286t-2 2.571-3.143 2.286-3.714 2l-1.714 1.143q-6.286 2.857-11.714-3.429t-7.714-14.857q-4-14.286-9.143-17.143-13.143-4.571-16.571 0.571-2.857-7.429-23.429-14.857-14.286-5.143-33.143-2.286 3.429-0.571 0-8.571-4-8.571-10.857-6.857 1.714-3.429 2.286-10t0.571-7.714q1.714-7.429 6.857-13.143 0.571-0.571 4-4.857t5.429-7.714 0.286-3.429q20 2.286 28.571-6.286 2.857-2.857 6.571-9.714t6-9.714q5.143-3.429 8-3.143t8.286 3.143 8.286 2.857q8 0.571 8.857-6.286t-4.286-11.429q6.857 0.571 1.714-9.714-2.857-4-4.571-5.143-6.857-2.286-15.429 2.857-4.571 2.286 1.143 4.571-0.571-0.571-5.429 6t-9.429 10-9.143-2.857q-0.571-0.571-3.143-7.714t-5.429-7.714q-4.571 0-9.143 8.571 1.714-4.571-6.286-8.571t-13.714-4.571q10.857-6.857-4.571-15.429-4-2.286-11.714-2.857t-11.143 2.286q-2.857 4-3.143 6.571t2.857 4.571 6 3.143 6.571 2.286 4.857 1.714q8 5.714 4.571 8-1.143 0.571-4.857 2t-6.571 2.571-3.429 2.286q-1.714 2.286 0 8t-1.143 8q-2.857-2.857-5.143-10t-4-9.429q4 5.143-14.286 3.429l-5.714-0.571q-2.286 0-9.143 1.143t-11.714 0.571-7.714-4.571q-2.286-4.571 0-11.429 0.571-2.286 2.286-1.143-2.286-1.714-6.286-5.429t-5.714-4.857q-26.286 8.571-53.714 23.429 3.429 0.571 6.857-0.571 2.857-1.143 7.429-3.714t5.714-3.143q19.429-8 24-4l2.857-2.857q8 9.143 11.429 14.286-4-2.286-17.143-0.571-11.429 3.429-12.571 6.857 4 6.857 2.857 10.286-2.286-1.714-6.571-5.714t-8.286-6.286-8.571-2.857q-9.143 0-12.571 0.571-83.429 45.714-134.286 126.857 4 4 6.857 4.571 2.286 0.571 2.857 5.143t1.429 6.286 6.571-1.714q5.143 4.571 1.714 10.857 0.571-0.571 25.143 15.429 10.857 9.714 12 12 1.714 6.286-5.714 10.286-0.571-1.143-5.143-5.143t-5.143-2.286q-1.714 2.857 0.286 10.571t6 7.143q-4 0-5.429 9.143t-1.429 20.286-0.571 13.429l1.143 0.571q-1.714 6.857 3.143 19.714t12.286 11.143q-7.429 1.714 11.429 24.571 3.429 4.571 4.571 5.143 1.714 1.143 6.857 4.286t8.571 5.714 5.714 6q2.286 2.857 5.714 12.857t8 13.429q-1.143 3.429 5.429 11.429t6 13.143q-0.571 0-1.429 0.571t-1.429 0.571q1.714 4 8.857 8t8.857 7.429q0.571 1.714 1.143 5.714t1.714 6.286 4.571 1.143q1.143-11.429-13.714-35.429-8.571-14.286-9.714-16.571-1.714-2.857-3.143-8.857t-2.571-8.286q1.143 0 3.429 0.857t4.857 2 4.286 2.286 1.143 1.714q-1.714 4 1.143 10t6.857 10.571 9.714 10.857 6.857 7.429q3.429 3.429 8 11.143t0 7.714q5.143 0 11.429 5.714t9.714 11.429q2.857 4.571 4.571 14.857t2.857 13.714q1.143 4 4.857 7.714t7.143 5.429l9.143 4.571t7.429 4q2.857 1.143 10.571 6t12.286 6.571q5.714 2.286 9.143 2.286t8.286-1.429 7.714-2q8.571-1.143 16.571 8.571t12 12q20.571 10.857 31.429 6.286-1.143 0.571 0.286 4.286t4.571 8.857 5.143 8.286 3.143 4.857q2.857 3.429 10.286 8.571t10.286 8.571q3.429-2.286 4-5.143-1.714 4.571 4 11.429t10.286 5.714q8-1.714 8-18.286-17.714 8.571-28-10.286 0-0.571-1.429-3.143t-2.286-4.857-1.429-4.857 0-4.286 2.857-1.714q5.143 0 5.714-2t-1.143-7.143-2.286-7.429q-0.571-4.571-6.286-11.429t-6.857-8.571q-2.857 5.143-9.143 4.571t-9.143-5.143q0 0.571-0.857 3.143t-0.857 3.714q-7.429 0-8.571-0.571 0.571-1.714 1.429-10t2-12.857q0.571-2.286 3.143-6.857t4.286-8.286 2.286-7.143-2.571-5.429-10-1.429q-10.857 0.571-14.857 11.429-0.571 1.714-1.714 6t-2.857 6.571-5.143 4q-4 1.714-13.714 1.143t-13.714-2.857q-7.429-4.571-12.857-16.571t-5.429-21.143q0-5.714 1.429-15.143t1.714-14.286-3.143-14q1.714-1.143 5.143-5.429t5.714-6q1.143-0.571 2.571-0.857t2.571 0 2.286-0.857 1.714-3.429q-0.571-0.571-2.286-1.714-1.714-1.714-2.286-1.714 4 1.714 16.286-0.857t15.714 0.857q8.571 6.286 12.571-1.143 0-0.571-1.429-5.429t-0.286-7.714q2.857 15.429 16.571 5.143 1.714 1.714 8.857 2.857t10 2.857q1.714 1.143 4 3.143t3.143 2.571 2.857-0.286 4.857-3.714q5.714 8 6.857 13.714 6.286 22.857 10.857 25.143 4 1.714 6.286 1.143t2.571-5.429 0-8-0.857-7.143l-0.571-4.571v-10.286l-0.571-4.571q-8.571-1.714-10.571-6.857t0.857-10.571 8.571-10.571q0.571-0.571 4.571-2t8.857-3.714 7.143-4.571q12-10.857 8.571-20 4 0 6.286-5.143-0.571 0-2.857-1.714t-4.286-2.857-2.571-1.143q5.143-2.857 1.143-9.143 2.857-1.714 4.286-6.286t4.286-5.714q5.143 6.857 12 1.143 4-4.571 0.571-9.143 2.857-4 11.714-6t10.571-5.429q4 1.143 4.571-1.143t0.571-6.857 1.714-6.857q2.286-2.857 8.571-5.143t7.429-2.857l9.714-6.286q1.714-2.286 0-2.286 10.286 1.143 17.714-6.286 5.714-6.286-3.429-11.429 1.714-3.429-1.714-5.429t-8.571-3.143q1.714-0.571 6.571-0.286t6-0.857q8.571-5.714-4-9.143-9.714-2.857-24.571 6.857zM502.286 872q117.714-20.571 200.571-108-1.714-1.714-7.143-2.571t-7.143-2q-10.286-4-13.714-4.571 0.571-4-1.429-7.429t-4.571-5.143-7.143-4.571-6.286-4q-1.143-1.143-4-3.429t-4-3.143-4.286-2.571-4.857-1.143-5.714 0.571l-1.714 0.571q-1.714 0.571-3.143 1.429t-3.143 1.714-2.286 1.714 0 1.429q-12-9.714-20.571-12.571-2.857-0.571-6.286-3.143t-6-4-5.714-0.857-6.571 4q-2.857 2.857-3.429 8.571t-1.143 7.429q-4-2.857 0-10t1.143-10.571q-1.714-3.429-6-2.571t-6.857 2.571-6.571 4.857-5.143 3.714-4.857 3.143-4.857 4.286q-1.714 2.286-3.429 6.857t-2.857 6.286q-1.143-2.286-6.571-3.714t-5.429-3.143q1.143 5.714 2.286 20t2.857 21.714q4 17.714-6.857 27.429-15.429 14.286-16.571 22.857-2.286 12.571 6.857 14.857 0 4-4.571 11.714t-4 12.286q0 3.429 1.143 9.143z"/>
+ <path fill="#0A0805" d="M438.857 73.143q119.429 0 220.286 58.857t159.714 159.714 58.857 220.286-58.857 220.286-159.714 159.714-220.286 58.857-220.286-58.857-159.714-159.714-58.857-220.286 58.857-220.286 159.714-159.714 220.286-58.857zM595.429 370.857q-1.143 0.571-5.429 5.429t-7.714 5.429q1.143 0 2.571-2.857t2.857-6.286 2-4q3.429-4 12.571-8.571 8-3.429 29.714-6.857 19.429-4.571 29.143 6.286-1.143-1.143 5.429-7.429t8.286-6.857q1.714-1.143 8.571-2.571t8.571-4.286l1.143-12.571q-6.857 0.571-10-4t-3.714-12q0 1.143-3.429 4.571 0-4-2.571-4.571t-6.571 0.571-5.143 0.571q-5.714-1.714-8.571-4.286t-4.571-9.429-2.286-8.571q-1.143-2.857-5.429-6t-5.429-6q-0.571-1.143-1.429-3.143t-1.714-3.714-2.286-3.143-3.143-1.429-4 2.857-4.286 5.714-2.571 2.857q-1.714-1.143-3.429-0.857t-2.571 0.571-2.571 1.714-2.857 2q-1.714 1.143-4.857 1.714t-4.857 1.143q8.571-2.857-0.571-6.286-5.714-2.286-9.143-1.714 5.143-2.286 4.286-6.857t-4.857-8h2.857q-0.571-2.286-4.857-4.857t-10-4.857-7.429-3.429q-4.571-2.857-19.429-5.429t-18.857-0.286q-2.857 3.429-2.571 6t2.286 8 2 7.143q0.571 3.429-3.143 7.429t-3.714 6.857q0 4 8 8.857t5.714 12.286q-1.714 4.571-9.143 9.143t-9.143 6.857q-2.857 4.571-0.857 10.571t6 9.429q1.143 1.143 0.857 2.286t-2 2.571-3.143 2.286-3.714 2l-1.714 1.143q-6.286 2.857-11.714-3.429t-7.714-14.857q-4-14.286-9.143-17.143-13.143-4.571-16.571 0.571-2.857-7.429-23.429-14.857-14.286-5.143-33.143-2.286 3.429-0.571 0-8.571-4-8.571-10.857-6.857 1.714-3.429 2.286-10t0.571-7.714q1.714-7.429 6.857-13.143 0.571-0.571 4-4.857t5.429-7.714 0.286-3.429q20 2.286 28.571-6.286 2.857-2.857 6.571-9.714t6-9.714q5.143-3.429 8-3.143t8.286 3.143 8.286 2.857q8 0.571 8.857-6.286t-4.286-11.429q6.857 0.571 1.714-9.714-2.857-4-4.571-5.143-6.857-2.286-15.429 2.857-4.571 2.286 1.143 4.571-0.571-0.571-5.429 6t-9.429 10-9.143-2.857q-0.571-0.571-3.143-7.714t-5.429-7.714q-4.571 0-9.143 8.571 1.714-4.571-6.286-8.571t-13.714-4.571q10.857-6.857-4.571-15.429-4-2.286-11.714-2.857t-11.143 2.286q-2.857 4-3.143 6.571t2.857 4.571 6 3.143 6.571 2.286 4.857 1.714q8 5.714 4.571 8-1.143 0.571-4.857 2t-6.571 2.571-3.429 2.286q-1.714 2.286 0 8t-1.143 8q-2.857-2.857-5.143-10t-4-9.429q4 5.143-14.286 3.429l-5.714-0.571q-2.286 0-9.143 1.143t-11.714 0.571-7.714-4.571q-2.286-4.571 0-11.429 0.571-2.286 2.286-1.143-2.286-1.714-6.286-5.429t-5.714-4.857q-26.286 8.571-53.714 23.429 3.429 0.571 6.857-0.571 2.857-1.143 7.429-3.714t5.714-3.143q19.429-8 24-4l2.857-2.857q8 9.143 11.429 14.286-4-2.286-17.143-0.571-11.429 3.429-12.571 6.857 4 6.857 2.857 10.286-2.286-1.714-6.571-5.714t-8.286-6.286-8.571-2.857q-9.143 0-12.571 0.571-83.429 45.714-134.286 126.857 4 4 6.857 4.571 2.286 0.571 2.857 5.143t1.429 6.286 6.571-1.714q5.143 4.571 1.714 10.857 0.571-0.571 25.143 15.429 10.857 9.714 12 12 1.714 6.286-5.714 10.286-0.571-1.143-5.143-5.143t-5.143-2.286q-1.714 2.857 0.286 10.571t6 7.143q-4 0-5.429 9.143t-1.429 20.286-0.571 13.429l1.143 0.571q-1.714 6.857 3.143 19.714t12.286 11.143q-7.429 1.714 11.429 24.571 3.429 4.571 4.571 5.143 1.714 1.143 6.857 4.286t8.571 5.714 5.714 6q2.286 2.857 5.714 12.857t8 13.429q-1.143 3.429 5.429 11.429t6 13.143q-0.571 0-1.429 0.571t-1.429 0.571q1.714 4 8.857 8t8.857 7.429q0.571 1.714 1.143 5.714t1.714 6.286 4.571 1.143q1.143-11.429-13.714-35.429-8.571-14.286-9.714-16.571-1.714-2.857-3.143-8.857t-2.571-8.286q1.143 0 3.429 0.857t4.857 2 4.286 2.286 1.143 1.714q-1.714 4 1.143 10t6.857 10.571 9.714 10.857 6.857 7.429q3.429 3.429 8 11.143t0 7.714q5.143 0 11.429 5.714t9.714 11.429q2.857 4.571 4.571 14.857t2.857 13.714q1.143 4 4.857 7.714t7.143 5.429l9.143 4.571t7.429 4q2.857 1.143 10.571 6t12.286 6.571q5.714 2.286 9.143 2.286t8.286-1.429 7.714-2q8.571-1.143 16.571 8.571t12 12q20.571 10.857 31.429 6.286-1.143 0.571 0.286 4.286t4.571 8.857 5.143 8.286 3.143 4.857q2.857 3.429 10.286 8.571t10.286 8.571q3.429-2.286 4-5.143-1.714 4.571 4 11.429t10.286 5.714q8-1.714 8-18.286-17.714 8.571-28-10.286 0-0.571-1.429-3.143t-2.286-4.857-1.429-4.857 0-4.286 2.857-1.714q5.143 0 5.714-2t-1.143-7.143-2.286-7.429q-0.571-4.571-6.286-11.429t-6.857-8.571q-2.857 5.143-9.143 4.571t-9.143-5.143q0 0.571-0.857 3.143t-0.857 3.714q-7.429 0-8.571-0.571 0.571-1.714 1.429-10t2-12.857q0.571-2.286 3.143-6.857t4.286-8.286 2.286-7.143-2.571-5.429-10-1.429q-10.857 0.571-14.857 11.429-0.571 1.714-1.714 6t-2.857 6.571-5.143 4q-4 1.714-13.714 1.143t-13.714-2.857q-7.429-4.571-12.857-16.571t-5.429-21.143q0-5.714 1.429-15.143t1.714-14.286-3.143-14q1.714-1.143 5.143-5.429t5.714-6q1.143-0.571 2.571-0.857t2.571 0 2.286-0.857 1.714-3.429q-0.571-0.571-2.286-1.714-1.714-1.714-2.286-1.714 4 1.714 16.286-0.857t15.714 0.857q8.571 6.286 12.571-1.143 0-0.571-1.429-5.429t-0.286-7.714q2.857 15.429 16.571 5.143 1.714 1.714 8.857 2.857t10 2.857q1.714 1.143 4 3.143t3.143 2.571 2.857-0.286 4.857-3.714q5.714 8 6.857 13.714 6.286 22.857 10.857 25.143 4 1.714 6.286 1.143t2.571-5.429 0-8-0.857-7.143l-0.571-4.571v-10.286l-0.571-4.571q-8.571-1.714-10.571-6.857t0.857-10.571 8.571-10.571q0.571-0.571 4.571-2t8.857-3.714 7.143-4.571q12-10.857 8.571-20 4 0 6.286-5.143-0.571 0-2.857-1.714t-4.286-2.857-2.571-1.143q5.143-2.857 1.143-9.143 2.857-1.714 4.286-6.286t4.286-5.714q5.143 6.857 12 1.143 4-4.571 0.571-9.143 2.857-4 11.714-6t10.571-5.429q4 1.143 4.571-1.143t0.571-6.857 1.714-6.857q2.286-2.857 8.571-5.143t7.429-2.857l9.714-6.286q1.714-2.286 0-2.286 10.286 1.143 17.714-6.286 5.714-6.286-3.429-11.429 1.714-3.429-1.714-5.429t-8.571-3.143q1.714-0.571 6.571-0.286t6-0.857q8.571-5.714-4-9.143-9.714-2.857-24.571 6.857zM502.286 872q117.714-20.571 200.571-108-1.714-1.714-7.143-2.571t-7.143-2q-10.286-4-13.714-4.571 0.571-4-1.429-7.429t-4.571-5.143-7.143-4.571-6.286-4q-1.143-1.143-4-3.429t-4-3.143-4.286-2.571-4.857-1.143-5.714 0.571l-1.714 0.571q-1.714 0.571-3.143 1.429t-3.143 1.714-2.286 1.714 0 1.429q-12-9.714-20.571-12.571-2.857-0.571-6.286-3.143t-6-4-5.714-0.857-6.571 4q-2.857 2.857-3.429 8.571t-1.143 7.429q-4-2.857 0-10t1.143-10.571q-1.714-3.429-6-2.571t-6.857 2.571-6.571 4.857-5.143 3.714-4.857 3.143-4.857 4.286q-1.714 2.286-3.429 6.857t-2.857 6.286q-1.143-2.286-6.571-3.714t-5.429-3.143q1.143 5.714 2.286 20t2.857 21.714q4 17.714-6.857 27.429-15.429 14.286-16.571 22.857-2.286 12.571 6.857 14.857 0 4-4.571 11.714t-4 12.286q0 3.429 1.143 9.143z"/>
</svg>
diff --git a/arc-firefox-theme/chrome/browser/devtools/filetype-store.svg b/arc-firefox-theme/chrome/browser/devtools/filetype-store.svg index 01d3625..c85c560 100644 --- a/arc-firefox-theme/chrome/browser/devtools/filetype-store.svg +++ b/arc-firefox-theme/chrome/browser/devtools/filetype-store.svg @@ -1,7 +1,7 @@ <!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<svg width="16" xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16"> +<svg width="16" xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16" fill="#0A0805"> <path d="m1.3,12.5v-2.4c0,0 0,2.5 6.7,2.5 6.7,0 6.7-2.5 6.7-2.5v2.4c0,0 0,2.7-6.8,2.7-6.6,0-6.6-2.7-6.6-2.7z"/> <path d="m14.7,3.4c0-1.4-3-2.5-6.7-2.5s-6.7,1.1-6.7,2.5c0,.2 0,.3 .1,.5-.1-.3-.1-.4-.1-.4v1.5c0,0 0,2.7 6.7,2.7 6.7,0 6.8-2.7 6.8-2.7v-1.6c0,.1 0,.2-.1,.5-0-.2-0-.3-0-.5z"/> <path d="m1.3,8.7v-2.4c0,0 0,2.5 6.7,2.5 6.7,0 6.7-2.5 6.7-2.5v2.4c0,0 0,2.7-6.8,2.7-6.6-0-6.6-2.7-6.6-2.7z"/> diff --git a/arc-firefox-theme/chrome/browser/devtools/filters.svg b/arc-firefox-theme/chrome/browser/devtools/filters.svg index 1f51d32..700fdbf 100644 --- a/arc-firefox-theme/chrome/browser/devtools/filters.svg +++ b/arc-firefox-theme/chrome/browser/devtools/filters.svg @@ -3,20 +3,14 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <svg height="0" xmlns="http://www.w3.org/2000/svg"> -<filter id="invert" x="0%" y="0%" width="100%" height="100%" > - <feComponentTransfer> - <feFuncR type="table" tableValues=".1 0"/> - <feFuncG type="table" tableValues=".1 0"/> - <feFuncB type="table" tableValues=".1 0"/> - </feComponentTransfer> -</filter> -<filter id="invert-white" x="0%" y="0%" width="100%" height="100%" > - <feComponentTransfer> - <feFuncR type="table" tableValues=".6 0"/> - <feFuncG type="table" tableValues=".6 0"/> - <feFuncB type="table" tableValues=".6 0"/> - </feComponentTransfer> - </filter> + <filter id="invert" x="0%" y="0%" width="100%" height="100%" + primitiveUnits="objectBoundingBox"> + <feComponentTransfer> + <feFuncR type="table" tableValues=".1 0"/> + <feFuncG type="table" tableValues=".1 0"/> + <feFuncB type="table" tableValues=".1 0"/> + </feComponentTransfer> + </filter> <!-- Web Audio Gradients --> <linearGradient id="bypass-light" x1="6%" y1="8%" x2="12%" y2="12%" spreadMethod="repeat"> diff --git a/arc-firefox-theme/chrome/browser/devtools/light-theme.css b/arc-firefox-theme/chrome/browser/devtools/light-theme.css index ea8b1fe..92515ff 100644 --- a/arc-firefox-theme/chrome/browser/devtools/light-theme.css +++ b/arc-firefox-theme/chrome/browser/devtools/light-theme.css @@ -28,7 +28,7 @@ --theme-highlight-green: #2cbb0f; --theme-highlight-blue: #0088cc; - --theme-highlight-bluegrey: #5f88b0; + --theme-highlight-bluegrey: #0072ab; --theme-highlight-purple: #5b5fff; --theme-highlight-lightorange: #d97e00; --theme-highlight-orange: #f13c00; @@ -951,73 +951,57 @@ div.CodeMirror span.eval-text { text-shadow: none; } -.devtools-sidebar-tabs tabs > tab:first-child { - -moz-border-start-width: 0; +.devtools-sidebar-tabs tabs > tab { + border-image: linear-gradient(transparent 15%, var(--theme-splitter-color) 15%, var(--theme-splitter-color) 85%, transparent 85%) 1 1; } -.theme-dark .devtools-sidebar-tabs tabs > tab { - border-image: linear-gradient(transparent 15%, #5a6169 15%, #5a6169 85%, transparent 85%) 1 1; +.devtools-sidebar-tabs tabs > tab[selected], +.devtools-sidebar-tabs tabs > tab[selected] + tab { + border-image: linear-gradient(var(--theme-splitter-color), var(--theme-splitter-color)) 1 1; +} + +.devtools-sidebar-tabs tabs > tab:first-child { + -moz-border-start-width: 0; } .theme-dark .devtools-sidebar-tabs tabs > tab:hover { background: hsla(206,37%,4%,.2); - border-image: linear-gradient(transparent 15%, #5a6169 15%, #5a6169 85%, transparent 85%) 1 1; } .theme-dark .devtools-sidebar-tabs tabs > tab:hover:active { background: hsla(206,37%,4%,.4); - border-image: linear-gradient(transparent 15%, #5a6169 15%, #5a6169 85%, transparent 85%) 1 1; -} - -.theme-dark .devtools-sidebar-tabs tabs > tab[selected] + tab { - border-image: linear-gradient(#2d5b7d, #2d5b7d) 1 1; } .theme-dark .devtools-sidebar-tabs tabs > tab[selected] + tab:hover { background: hsla(206,37%,4%,.2); - border-image: linear-gradient(#2d5b7d, #2d5b7d) 1 1; } .theme-dark .devtools-sidebar-tabs tabs > tab[selected] + tab:hover:active { background: hsla(206,37%,4%,.4); - border-image: linear-gradient(#2d5b7d, #2d5b7d) 1 1; } .theme-dark .devtools-sidebar-tabs tabs > tab[selected], .theme-dark .devtools-sidebar-tabs tabs > tab[selected]:hover:active { color: var(--theme-selection-color); background: #1d4f73; - border-image: linear-gradient(#2d5b7d, #2d5b7d) 1 1; -} - -.theme-light .devtools-sidebar-tabs tabs > tab { - border-image: linear-gradient(transparent 15%, #aaa 15%, #aaa 85%, transparent 85%) 1 1; } .theme-light .devtools-sidebar-tabs tabs > tab:hover { background: #ddd; - border-image: linear-gradient(transparent 15%, #aaa 15%, #aaa 85%, transparent 85%) 1 1; } .theme-light .devtools-sidebar-tabs tabs > tab:hover:active { background: #ddd; - border-image: linear-gradient(transparent 15%, #aaa 15%, #aaa 85%, transparent 85%) 1 1; -} - -.theme-light .devtools-sidebar-tabs tabs > tab[selected] + tab { - border-image: linear-gradient(#aaa, #aaa); } .theme-light .devtools-sidebar-tabs tabs > tab[selected] + tab:hover { background: #ddd; - border-image: linear-gradient(#aaa, #aaa); } .theme-light .devtools-sidebar-tabs tabs > tab[selected], .theme-light .devtools-sidebar-tabs tabs > tab[selected]:hover:active { color: var(--theme-selection-color); background: #4c9ed9; - border-image: linear-gradient(#aaa, #aaa); } /* Toolbox - moved from toolbox.css. diff --git a/arc-firefox-theme/chrome/browser/devtools/netmonitor.css b/arc-firefox-theme/chrome/browser/devtools/netmonitor.css index 92f2efc..9448a39 100644 --- a/arc-firefox-theme/chrome/browser/devtools/netmonitor.css +++ b/arc-firefox-theme/chrome/browser/devtools/netmonitor.css @@ -143,31 +143,28 @@ } .requests-security-state-icon { + width: 16px; + height: 16px; -moz-margin-end: 4px; - -moz-image-region:rect(0px, 16px, 16px, 0px); -} - -.requests-security-state-icon:hover { - -moz-image-region: rect(0px, 32px, 16px, 16px); } .security-state-insecure { - list-style-image: url(chrome://browser/skin/identity-icons-generic.png); + list-style-image: url(chrome://browser/skin/identity-not-secure.svg); } .security-state-secure { cursor: pointer; - list-style-image: url(chrome://browser/skin/identity-icons-https.png); + list-style-image: url(chrome://browser/skin/identity-secure.svg); } .security-state-weak { cursor: pointer; - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display.png); + list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); } .security-state-broken { cursor: pointer; - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active.png); + list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); } .requests-menu-type { diff --git a/arc-firefox-theme/chrome/browser/devtools/performance.css b/arc-firefox-theme/chrome/browser/devtools/performance.css index 1187fd8..8eafa36 100644 --- a/arc-firefox-theme/chrome/browser/devtools/performance.css +++ b/arc-firefox-theme/chrome/browser/devtools/performance.css @@ -1,7 +1,3 @@ -/* 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/. */ - /* vim:set ts=2 sw=2 sts=2 et: */ /* 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, @@ -225,10 +221,10 @@ width: 4.5vw; } -.call-tree-header[type="allocations"], -.call-tree-cell[type="allocations"], -.call-tree-header[type="self-allocations"], -.call-tree-cell[type="self-allocations"] { +.call-tree-header[type="count"], +.call-tree-cell[type="count"], +.call-tree-header[type="self-count"], +.call-tree-cell[type="self-count"] { width: 9vw; } diff --git a/arc-firefox-theme/chrome/browser/devtools/promisedebugger.css b/arc-firefox-theme/chrome/browser/devtools/promisedebugger.css new file mode 100644 index 0000000..e003224 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/devtools/promisedebugger.css @@ -0,0 +1,3 @@ +/* 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/. */ diff --git a/arc-firefox-theme/chrome/browser/devtools/ruleview.css b/arc-firefox-theme/chrome/browser/devtools/ruleview.css index c38224c..8fad666 100644 --- a/arc-firefox-theme/chrome/browser/devtools/ruleview.css +++ b/arc-firefox-theme/chrome/browser/devtools/ruleview.css @@ -243,14 +243,28 @@ border-bottom-color: hsl(0,0%,50%); } -.ruleview-selector { +.ruleview-selectorcontainer { word-wrap: break-word; + cursor: text; } .ruleview-selector-separator, .ruleview-selector-unmatched { color: #888; } +.ruleview-selector-matched > .ruleview-selector-attribute { + /* TODO: Bug 1178535 Awaiting UX feedback on highlight colors */ +} + +.ruleview-selector-matched > .ruleview-selector-pseudo-class { + /* TODO: Bug 1178535 Awaiting UX feedback on highlight colors */ +} + +.ruleview-selector-matched > .ruleview-selector-pseudo-class-lock { + font-weight: bold; + color: var(--theme-highlight-orange); +} + .ruleview-selectorhighlighter { background: url("chrome://browser/skin/devtools/vview-open-inspector.png") no-repeat 0 0; padding-left: 16px; diff --git a/arc-firefox-theme/chrome/browser/devtools/scratchpad.css b/arc-firefox-theme/chrome/browser/devtools/scratchpad.css index 96d6f70..4c8a5d1 100644 --- a/arc-firefox-theme/chrome/browser/devtools/scratchpad.css +++ b/arc-firefox-theme/chrome/browser/devtools/scratchpad.css @@ -1,7 +1,3 @@ -/* 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/. */ - #scratchpad-sidebar > tabs { height: 0; diff --git a/arc-firefox-theme/chrome/browser/devtools/shadereditor.css b/arc-firefox-theme/chrome/browser/devtools/shadereditor.css index c63a4c6..9ba9ff8 100644 --- a/arc-firefox-theme/chrome/browser/devtools/shadereditor.css +++ b/arc-firefox-theme/chrome/browser/devtools/shadereditor.css @@ -1,8 +1,4 @@ /* 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/. */ - -/* 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/. */ diff --git a/arc-firefox-theme/chrome/browser/devtools/splitview.css b/arc-firefox-theme/chrome/browser/devtools/splitview.css index 9710c38..902fedb 100644 --- a/arc-firefox-theme/chrome/browser/devtools/splitview.css +++ b/arc-firefox-theme/chrome/browser/devtools/splitview.css @@ -133,20 +133,3 @@ min-width: 48px; min-height: 0; } - - -/* Resizers */ - -.splitview-portrait-resizer { - -moz-appearance: none; - background: linear-gradient(black 1px, rgba(255,255,255,0.2) 1px), - linear-gradient(hsl(210,11%,36%), hsl(210,11%,18%)); - height: 12px; - background-size: 10px 2px, 100% 12px; - background-clip: content-box, border-box; - background-repeat: repeat-y, no-repeat; - background-position: center center; - padding: 2px 0; - border-top: 1px solid hsla(210,8%,5%,.5); - border-bottom: 1px solid hsla(210,8%,5%,.5); -} diff --git a/arc-firefox-theme/chrome/browser/devtools/storage.css b/arc-firefox-theme/chrome/browser/devtools/storage.css index 5f6d78e..a5a897e 100644 --- a/arc-firefox-theme/chrome/browser/devtools/storage.css +++ b/arc-firefox-theme/chrome/browser/devtools/storage.css @@ -10,8 +10,8 @@ overflow: auto; } -.theme-dark #storage-tree { - background: #343c45; /* Toolbars */ +#storage-tree { + background: var(--theme-sidebar-background); } #storage-tree .tree-widget-item[type="store"]:after { diff --git a/arc-firefox-theme/chrome/browser/devtools/webaudioeditor.css b/arc-firefox-theme/chrome/browser/devtools/webaudioeditor.css index 11439a6..0d66638 100644 --- a/arc-firefox-theme/chrome/browser/devtools/webaudioeditor.css +++ b/arc-firefox-theme/chrome/browser/devtools/webaudioeditor.css @@ -1,8 +1,4 @@ /* 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/. */ - -/* 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/. */ diff --git a/arc-firefox-theme/chrome/browser/devtools/widgets.css b/arc-firefox-theme/chrome/browser/devtools/widgets.css index 17a96ad..18a6757 100644 --- a/arc-firefox-theme/chrome/browser/devtools/widgets.css +++ b/arc-firefox-theme/chrome/browser/devtools/widgets.css @@ -7,6 +7,14 @@ * 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/. */ +.theme-dark { + --table-splitter-color: rgba(255,255,255,0.15); + --table-zebra-background: rgba(255,255,255,0.05); +} +.theme-light { + --table-splitter-color: rgba(0,0,0,0.15); + --table-zebra-background: rgba(0,0,0,0.05); +} /* Generic pane helpers */ @@ -1199,43 +1207,16 @@ overflow: auto; } -.theme-light .table-widget-body { - background: var(--theme-sidebar-background); -} - -.theme-dark .table-widget-body, -.theme-dark .table-widget-empty-text { - background-color: var(--theme-toolbar-background); -} - -.theme-dark .table-widget-body:-moz-locale-dir(ltr) { - box-shadow: inset -1px 0 0 #000; -} - -.theme-dark .table-widget-body:-moz-locale-dir(rtl) { - box-shadow: inset 1px 0 0 #000; -} - -.table-widget-body:-moz-locale-dir(ltr) { - box-shadow: inset -1px 0 0 #aaa; -} - -.table-widget-body:-moz-locale-dir(rtl) { - box-shadow: inset 1px 0 0 #aaa; +.table-widget-body, +.table-widget-empty-text { + background-color: var(--theme-body-background); } /* Column Headers */ -.theme-dark .table-widget-column-header, -.theme-dark .table-widget-cell { - -moz-border-end: 1px solid rgba(0,0,0,0.2); - box-shadow: inset 1px 0 0 rgba(128,128,128,0.15); -} - -.theme-light .table-widget-column-header, -.theme-light .table-widget-cell { - -moz-border-end: 1px solid rgba(128,128,128,0.25); - box-shadow: inset 1px 0 0 transparent; +.table-widget-column-header, +.table-widget-cell { + -moz-border-end: 1px solid var(--table-splitter-color) !important; } /* Table widget column header colors are taken from netmonitor.inc.css to match @@ -1246,10 +1227,8 @@ background: rgba(0,0,0,0); position: sticky; top: 0; - min-height: 32px; width: 100%; - border: none; - padding: 8px 0 0 !important; + padding: 5px 0 0 !important; color: inherit; text-align: center; font-weight: inherit !important; @@ -1257,27 +1236,29 @@ } .table-widget-column-header:hover { - background: rgba(0,0,0,0.10); + background-image: linear-gradient(rgba(0,0,0,0.10), rgba(0,0,0,0.10)); } .table-widget-column-header:hover:active { - background: rgba(0,0,0,0.25); + background-image: linear-gradient(rgba(0,0,0,0.25), rgba(0,0,0,0.25)); } .table-widget-column-header:not(:active)[sorted] { - background: rgba(0,0,0,0.15); + background-image: linear-gradient(rgba(0,0,0,0.15), rgba(0,0,0,0.15)); } .table-widget-column-header:not(:active)[sorted=ascending] { - background-image: radial-gradient(farthest-side at center top, hsla(200,100%,70%,.7), hsla(200,100%,70%,0.3)); - background-size: 100% 1px; - background-repeat: no-repeat; + background-image: radial-gradient(farthest-side at center top, hsla(200,100%,70%,.7), hsla(200,100%,70%,0.3)), + linear-gradient(rgba(0,0,0,0.15), rgba(0,0,0,0.15)); + background-size: 100% 1px, auto; + background-repeat: no-repeat, repeat; } .table-widget-column-header:not(:active)[sorted=descending] { - background-image: radial-gradient(farthest-side at center bottom, hsla(200,100%,70%,.7), hsla(200,100%,70%,0.3)); - background-size: 100% 1px; - background-repeat: no-repeat; + background-image: radial-gradient(farthest-side at center bottom, hsla(200,100%,70%,.7), hsla(200,100%,70%,0.3)), + linear-gradient(rgba(0,0,0,0.15), rgba(0,0,0,0.15)); + background-size: 100% 1px, auto; + background-repeat: no-repeat, repeat; background-position: bottom; } @@ -1285,44 +1266,22 @@ .table-widget-cell { width: 100%; - margin: -1px 0 !important; padding: 3px 4px; background-clip: padding-box; min-width: 100px; -moz-user-focus: normal; -} - -.theme-dark .table-widget-cell { - border-top: 1px solid rgba(0,0,0,0.2); - border-bottom: 1px solid rgba(128,128,128,0.15); - color: var(--theme-selection-color); -} - -.theme-dark:not(.filtering) .table-widget-cell:nth-child(odd):not(.theme-selected), -.theme-dark .table-widget-cell:not(.theme-selected)[odd] { - background: rgba(255,255,255,0.05); -} - -.theme-dark .table-widget-cell:last-of-type { - box-shadow: inset 0 -1px 0 rgba(0,0,0,0.2); -} - -.theme-light .table-widget-cell { - border-top: 1px solid rgba(128,128,128,0.15); + margin-bottom: -1px !important; border-bottom: 1px solid transparent; -} - -.theme-light .table-widget-cell:not(.theme-selected) { color: var(--theme-body-color); } -.theme-light:not(.filtering) .table-widget-cell:nth-child(odd):not(.theme-selected), -.theme-light .table-widget-cell:not(.theme-selected)[odd] { - background: rgba(128,128,128,0.05); +.table-widget-cell:last-child { + border-bottom: 1px solid var(--table-splitter-color); } -.theme-light .table-widget-cell:last-of-type { - box-shadow: inset 0 -1px 0 rgba(128,128,128,0.15); +:root:not(.filtering) .table-widget-cell:nth-child(odd):not(.theme-selected), +.table-widget-cell:not(.theme-selected)[odd] { + background: var(--table-zebra-background); } .table-widget-cell.flash-out { @@ -1344,10 +1303,6 @@ margin-top: -20px !important; } -.theme-light .table-widget-empty-text { - background: #F7F7F7; /* Background-Sidebar */ -} - .table-widget-body:empty + .table-widget-empty-text:not([value=""]), .table-widget-body[empty] + .table-widget-empty-text:not([value=""]) { display: block; @@ -1399,11 +1354,11 @@ } .tree-widget-item[level="1"] { - font-weight: 800; + font-weight: 700; } /* Twisties */ -.tree-widget-item:before { +.tree-widget-item::before { content: ""; width: 14px; height: 14px; @@ -1416,24 +1371,24 @@ background-position: -28px -14px; } -.tree-widget-item:-moz-locale-dir(rtl):before { +.tree-widget-item:-moz-locale-dir(rtl)::before { float: right; transform: scaleX(-1); } -.theme-light .tree-widget-item:before { +.theme-light .tree-widget-item:not(.theme-selected)::before { background-position: 0 -14px; } -.tree-widget-item[empty]:before { +.tree-widget-item[empty]::before { background: transparent; } -.tree-widget-item[expanded]:before { +.tree-widget-item[expanded]::before { background-position: -42px -14px; } -.theme-light .tree-widget-item[expanded]:before { +.theme-light .tree-widget-item:not(.theme-selected)[expanded]:before { background-position: -14px -14px; } @@ -1511,7 +1466,7 @@ /* Custom icons for certain tree items indicating the type of the item */ -.tree-widget-item[type]:after { +.tree-widget-item[type]::after { content: ""; float: left; width: 16px; @@ -1519,31 +1474,36 @@ -moz-margin-end: 4px; background-repeat: no-repeat; background-size: 20px auto; - filter: url('filters.svg#invert'); background-position: 0 0; background-size: auto 20px; + opacity: 0.75; +} + +.tree-widget-item.theme-selected[type]::after { + opacity: 1; } -.tree-widget-item:-moz-locale-dir(rtl):after { +.tree-widget-item:-moz-locale-dir(rtl)::after { float: right; } -.theme-dark .tree-widget-item[type]:after { - filter: url('filters.svg#invert-white'); +.theme-light .tree-widget-item.theme-selected[type]::after, +.theme-dark .tree-widget-item[type]::after { + filter: invert(1); } -.tree-widget-item[type="dir"]:after { +.tree-widget-item[type="dir"]::after { background-image: url(chrome://browser/skin/devtools/filetype-dir-close.svg); background-position: 2px 0; background-size: auto 16px; width: 20px; } -.tree-widget-item[type="dir"][expanded]:not([empty]):after { +.tree-widget-item[type="dir"][expanded]:not([empty])::after { background-image: url(chrome://browser/skin/devtools/filetype-dir-open.svg); } -.tree-widget-item[type="url"]:after { +.tree-widget-item[type="url"]::after { background-image: url(chrome://browser/skin/devtools/filetype-globe.svg); background-size: auto 18px; width: 18px; diff --git a/arc-firefox-theme/chrome/browser/feeds/subscribe.css b/arc-firefox-theme/chrome/browser/feeds/subscribe.css index 4cd70fa..03b534a 100644 --- a/arc-firefox-theme/chrome/browser/feeds/subscribe.css +++ b/arc-firefox-theme/chrome/browser/feeds/subscribe.css @@ -20,6 +20,7 @@ html { border-radius: 10px; margin: -4em auto 0 auto; background-color: InfoBackground; + -moz-appearance: -moz-gtk-info-bar; } #feedHeader { @@ -29,19 +30,19 @@ html { -moz-margin-end: 1em; -moz-padding-start: 2.9em; font-size: 110%; - color: InfoText; + color: -moz-gtk-info-bar-text; } .feedBackground { - background: url("chrome://browser/skin/feeds/feedIcon.png") 0% 10% no-repeat InfoBackground; + background: url("chrome://browser/skin/feeds/feedIcon.png") 0% 10% no-repeat; } .videoPodcastBackground { - background: url("chrome://browser/skin/feeds/videoFeedIcon.png") 0% 10% no-repeat InfoBackground; + background: url("chrome://browser/skin/feeds/videoFeedIcon.png") 0% 10% no-repeat; } .audioPodcastBackground { - background: url("chrome://browser/skin/feeds/audioFeedIcon.png") 0% 10% no-repeat InfoBackground; + background: url("chrome://browser/skin/feeds/audioFeedIcon.png") 0% 10% no-repeat; } #feedHeader[dir="rtl"] { diff --git a/arc-firefox-theme/chrome/browser/fxa/android.png b/arc-firefox-theme/chrome/browser/fxa/android.png Binary files differnew file mode 100644 index 0000000..bb1ada8 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/fxa/android.png diff --git a/arc-firefox-theme/chrome/browser/fxa/android@2x.png b/arc-firefox-theme/chrome/browser/fxa/android@2x.png Binary files differnew file mode 100644 index 0000000..957b907 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/fxa/android@2x.png diff --git a/arc-firefox-theme/chrome/browser/fxa/default-avatar.png b/arc-firefox-theme/chrome/browser/fxa/default-avatar.png Binary files differnew file mode 100644 index 0000000..6ed0e7a --- /dev/null +++ b/arc-firefox-theme/chrome/browser/fxa/default-avatar.png diff --git a/arc-firefox-theme/chrome/browser/fxa/default-avatar@2x.png b/arc-firefox-theme/chrome/browser/fxa/default-avatar@2x.png Binary files differnew file mode 100644 index 0000000..0bda852 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/fxa/default-avatar@2x.png diff --git a/arc-firefox-theme/chrome/browser/fxa/default-profile-image.svg b/arc-firefox-theme/chrome/browser/fxa/default-profile-image.svg deleted file mode 100644 index 2b95431..0000000 --- a/arc-firefox-theme/chrome/browser/fxa/default-profile-image.svg +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- This Source Code Form is subject to the terms of the Mozilla Public - - License, v. 2.0. If a copy of the MPL was not distributed with this - - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000"> - <path fill="#c3cfd8" d="M500-0.3c276.1,0,500,223.9,500,500s-223.9,500-500,500S0,775.8,0,499.7C0,223.5,223.9-0.3,500-0.3z"/> - <circle fill="#fff" cx="500" cy="317" r="139.1"/> - <path fill="#fff" d="M751.8,643.6L751.8,643.6c0.1-2.3,0.2-4.6,0.2-6.9c0-68-55.3-127-136.2-156.3L505.9,590.4h0 c-0.4,29.8-1.4,58.8-2.8,86.6c-1,0.1-2,0.3-3.1,0.3s-2-0.2-3.1-0.3c-1.4-27.9-2.4-56.9-2.8-86.7h0L384.3,480.4 C303.3,509.7,248,568.7,248,636.7c0,2.3,0.1,4.6,0.2,6.9l7.4,49.7c57.1,72,145.4,118.2,244.4,118.2c99,0,187.3-46.2,244.4-118.2 L751.8,643.6z"/> -</svg> diff --git a/arc-firefox-theme/chrome/browser/fxa/logo.png b/arc-firefox-theme/chrome/browser/fxa/logo.png Binary files differnew file mode 100644 index 0000000..b54b392 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/fxa/logo.png diff --git a/arc-firefox-theme/chrome/browser/fxa/logo@2x.png b/arc-firefox-theme/chrome/browser/fxa/logo@2x.png Binary files differnew file mode 100644 index 0000000..5d25f05 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/fxa/logo@2x.png diff --git a/arc-firefox-theme/chrome/browser/fxa/sync-illustration.png b/arc-firefox-theme/chrome/browser/fxa/sync-illustration.png Binary files differnew file mode 100644 index 0000000..c6de26c --- /dev/null +++ b/arc-firefox-theme/chrome/browser/fxa/sync-illustration.png diff --git a/arc-firefox-theme/chrome/browser/fxa/sync-illustration@2x.png b/arc-firefox-theme/chrome/browser/fxa/sync-illustration@2x.png Binary files differnew file mode 100644 index 0000000..bc13da3 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/fxa/sync-illustration@2x.png diff --git a/arc-firefox-theme/chrome/browser/identity-icons-generic.png b/arc-firefox-theme/chrome/browser/identity-icons-generic.png Binary files differdeleted file mode 100644 index a39e493..0000000 --- a/arc-firefox-theme/chrome/browser/identity-icons-generic.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/identity-icons-generic@2x.png b/arc-firefox-theme/chrome/browser/identity-icons-generic@2x.png Binary files differdeleted file mode 100644 index e7c041e..0000000 --- a/arc-firefox-theme/chrome/browser/identity-icons-generic@2x.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/identity-icons-https-ev.png b/arc-firefox-theme/chrome/browser/identity-icons-https-ev.png Binary files differdeleted file mode 100644 index d49be13..0000000 --- a/arc-firefox-theme/chrome/browser/identity-icons-https-ev.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/identity-icons-https-ev@2x.png b/arc-firefox-theme/chrome/browser/identity-icons-https-ev@2x.png Binary files differdeleted file mode 100644 index 93a615d..0000000 --- a/arc-firefox-theme/chrome/browser/identity-icons-https-ev@2x.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/identity-icons-https-mixed-active.png b/arc-firefox-theme/chrome/browser/identity-icons-https-mixed-active.png Binary files differdeleted file mode 100644 index 3c77bc8..0000000 --- a/arc-firefox-theme/chrome/browser/identity-icons-https-mixed-active.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/identity-icons-https-mixed-active@2x.png b/arc-firefox-theme/chrome/browser/identity-icons-https-mixed-active@2x.png Binary files differdeleted file mode 100644 index cb3456e..0000000 --- a/arc-firefox-theme/chrome/browser/identity-icons-https-mixed-active@2x.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/identity-icons-https-mixed-display.png b/arc-firefox-theme/chrome/browser/identity-icons-https-mixed-display.png Binary files differdeleted file mode 100644 index 09b4e97..0000000 --- a/arc-firefox-theme/chrome/browser/identity-icons-https-mixed-display.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/identity-icons-https-mixed-display@2x.png b/arc-firefox-theme/chrome/browser/identity-icons-https-mixed-display@2x.png Binary files differdeleted file mode 100644 index c79694f..0000000 --- a/arc-firefox-theme/chrome/browser/identity-icons-https-mixed-display@2x.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/identity-icons-https.png b/arc-firefox-theme/chrome/browser/identity-icons-https.png Binary files differdeleted file mode 100644 index ffd6694..0000000 --- a/arc-firefox-theme/chrome/browser/identity-icons-https.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/identity-icons-https@2x.png b/arc-firefox-theme/chrome/browser/identity-icons-https@2x.png Binary files differdeleted file mode 100644 index a4af07b..0000000 --- a/arc-firefox-theme/chrome/browser/identity-icons-https@2x.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/identity-mixed-active-blocked.svg b/arc-firefox-theme/chrome/browser/identity-mixed-active-blocked.svg new file mode 100644 index 0000000..8b442ba --- /dev/null +++ b/arc-firefox-theme/chrome/browser/identity-mixed-active-blocked.svg @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" + width="16" height="16" viewBox="0 0 16 16"> + <style> + .icon-default { + fill: #4d9a26; + } + </style> + + <defs> + <rect id="shape-lock-clasp-outer" x="2" y="1" width="8" height="10" rx="4" ry="4" /> + <rect id="shape-lock-clasp-inner" x="4" y="3" width="4" height="6" rx="2" ry="2" /> + <rect id="shape-lock-base" x="1" y="6" width="10" height="7" rx="1" ry="1" /> + + <mask id="mask-clasp-cutout"> + <rect width="16" height="16" fill="#000" /> + <use xlink:href="#shape-lock-clasp-outer" fill="#fff" /> + <use xlink:href="#shape-lock-clasp-inner" fill="#000" /> + </mask> + </defs> + + <use xlink:href="#shape-lock-clasp-outer" mask="url(#mask-clasp-cutout)" class="icon-default" /> + <use xlink:href="#shape-lock-base" class="icon-default" /> + <path fill="#fff" d="M10.5,5C9.8,5,9.1,5.4,8.8,6.2l-3.5,6.8c-0.4,0.7-0.4,1.4,0,2c0.4,0.6,1,1,1.8,1H14c0.8,0,1.4-0.4,1.8-1 c0.3-0.6,0.3-1.4,0-2l-3.5-6.8C11.9,5.4,11.2,5,10.5,5L10.5,5z"/> + <path fill="#999" d="M14.8,13.4l-3.5-6.8C11.2,6.2,10.9,6,10.5,6c-0.3,0-0.7,0.2-0.9,0.6l-3.5,6.8c-0.2,0.4-0.2,0.8,0,1.1C6.3,14.8,6.6,15,7,15 H14c0.4,0,0.7-0.2,0.9-0.5C15.1,14.2,15,13.8,14.8,13.4z"/> + <path fill="#fff" d="M10,8.5C10,8.2,10.2,8,10.5,8S11,8.2,11,8.5L10.8,11h-0.6L10,8.5z" /> + <circle fill="#fff" cx="10.5" cy="12.5" r=".75" /> +</svg> diff --git a/arc-firefox-theme/chrome/browser/identity-mixed-active-loaded.svg b/arc-firefox-theme/chrome/browser/identity-mixed-active-loaded.svg new file mode 100644 index 0000000..b7191a8 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/identity-mixed-active-loaded.svg @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" + width="16" height="16" viewBox="0 0 16 16"> + <style> + .icon-default { + fill: #999; + } + </style> + + <defs> + <rect id="shape-lock-clasp-outer" x="4" y="2" width="8" height="10" rx="4" ry="4" /> + <rect id="shape-lock-clasp-inner" x="6" y="4" width="4" height="6" rx="2" ry="2" /> + <rect id="shape-lock-base" x="3" y="7" width="10" height="7" rx="1" ry="1" /> + + <mask id="mask-clasp-cutout"> + <rect width="16" height="16" fill="#000" /> + <use xlink:href="#shape-lock-clasp-outer" fill="#fff" /> + <use xlink:href="#shape-lock-clasp-inner" fill="#000" /> + <line x1="2" y1="13" x2="14" y2="1.5" stroke="#000" stroke-width="2" /> + <line x1="2" y1="15" x2="14" y2="3.5" stroke="#000" stroke-width="2" /> + <rect x="3" y="7" width="10" height="7" rx="1" ry="1" fill="#000" /> + </mask> + + <mask id="mask-base-cutout"> + <rect width="16" height="16" fill="#000" /> + <use xlink:href="#shape-lock-base" fill="#fff" /> + <line x1="2" y1="14.8" x2="14" y2="3.2" stroke="#000" stroke-width="1.8" /> + </mask> + </defs> + + <use xlink:href="#shape-lock-clasp-outer" mask="url(#mask-clasp-cutout)" class="icon-default" /> + <use xlink:href="#shape-lock-base" mask="url(#mask-base-cutout)" class="icon-default" /> + + <line x1="2" y1="14.1" x2="14" y2="2.5" stroke="#d92d21" stroke-width="1.8" /> +</svg> diff --git a/arc-firefox-theme/chrome/browser/identity-mixed-passive-loaded.svg b/arc-firefox-theme/chrome/browser/identity-mixed-passive-loaded.svg new file mode 100644 index 0000000..d1e9dbd --- /dev/null +++ b/arc-firefox-theme/chrome/browser/identity-mixed-passive-loaded.svg @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" + width="16" height="16" viewBox="0 0 16 16"> + <style> + .icon-default { + fill: #808080; + } + </style> + + <defs> + <rect id="shape-lock-clasp-outer" x="2" y="1" width="8" height="10" rx="4" ry="4" /> + <rect id="shape-lock-clasp-inner" x="4" y="3" width="4" height="6" rx="2" ry="2" /> + <rect id="shape-lock-base" x="1" y="6" width="10" height="7" rx="1" ry="1" /> + + <mask id="mask-clasp-cutout"> + <rect width="16" height="16" fill="#000" /> + <use xlink:href="#shape-lock-clasp-outer" fill="#fff" /> + <use xlink:href="#shape-lock-clasp-inner" fill="#000" /> + </mask> + </defs> + + <use xlink:href="#shape-lock-clasp-outer" mask="url(#mask-clasp-cutout)" class="icon-default" /> + <use xlink:href="#shape-lock-base" class="icon-default" /> + <path fill="#fff" d="M10.5,5C9.8,5,9.1,5.4,8.8,6.2l-3.5,6.8c-0.4,0.7-0.4,1.4,0,2c0.4,0.6,1,1,1.8,1H14c0.8,0,1.4-0.4,1.8-1 c0.3-0.6,0.3-1.4,0-2l-3.5-6.8C11.9,5.4,11.2,5,10.5,5L10.5,5z"/> + <path fill="#ffbf00" d="M14.8,13.4l-3.5-6.8C11.2,6.2,10.9,6,10.5,6c-0.3,0-0.7,0.2-0.9,0.6l-3.5,6.8c-0.2,0.4-0.2,0.8,0,1.1C6.3,14.8,6.6,15,7,15 H14c0.4,0,0.7-0.2,0.9-0.5C15.1,14.2,15,13.8,14.8,13.4z"/> + <path fill="#fff" d="M10,8.5C10,8.2,10.2,8,10.5,8S11,8.2,11,8.5L10.8,11h-0.6L10,8.5z" /> + <circle fill="#fff" cx="10.5" cy="12.5" r=".75" /> +</svg> diff --git a/arc-firefox-theme/chrome/browser/identity-not-secure.svg b/arc-firefox-theme/chrome/browser/identity-not-secure.svg new file mode 100644 index 0000000..a57a5af --- /dev/null +++ b/arc-firefox-theme/chrome/browser/identity-not-secure.svg @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> + <circle fill="#a6a6a6" cx="8" cy="8" r="7" /> + <path transform="translate(1 1)" fill="#fff" d="M5.31617536,1.74095137 C5.29841561,1.73995137 5.27868256,1.74095137 5.26190947,1.74795137 C5.25796286,1.74995137 5.2530296,1.75395137 5.24908299,1.75895137 C5.2550029,1.75895137 5.26190947,1.75895137 5.26684273,1.75795137 C5.28460248,1.75395137 5.29841561,1.74195137 5.31617536,1.74095137 L5.31617536,1.74095137 Z M5.33886837,2.59995137 C5.36156138,2.57095137 5.30729549,2.54695137 5.27670926,2.54895137 C5.28460248,2.51395137 5.32900184,2.49595137 5.31716201,2.45195137 C5.30630884,2.40595137 5.25105629,2.41495137 5.22145672,2.43995137 C5.1948171,2.46295137 5.18100396,2.50295137 5.15831095,2.52995137 C5.14548447,2.54495137 5.12180481,2.54995137 5.11292494,2.56795137 C5.10503172,2.58495137 5.11489824,2.61395137 5.11391159,2.63295137 C5.15041773,2.63795137 5.18889718,2.62695137 5.2155368,2.60095137 L5.23329655,2.59295137 C5.22934994,2.59595137 5.22737663,2.60295137 5.22540333,2.60695137 C5.24316307,2.62895137 5.32209528,2.62295137 5.33886837,2.59995137 L5.33886837,2.59995137 Z M5.37636117,1.37295137 C5.37438786,1.42695137 5.42668044,1.43295137 5.46515989,1.45395137 C5.45332006,1.48495137 5.410894,1.48395137 5.39116095,1.50895137 C5.36748129,1.53995137 5.410894,1.56695137 5.43260036,1.58095137 C5.47502642,1.60695137 5.45134676,1.63695137 5.44345354,1.67395137 C5.43161371,1.72595137 5.54310544,1.71195137 5.56777176,1.71095137 C5.61019782,1.70895137 5.67729019,1.71595137 5.71774294,1.69595137 C5.76115565,1.67195137 5.78384866,1.61895137 5.82923468,1.59295137 C5.86672748,1.57095137 5.92000671,1.55895137 5.96144612,1.57395137 C6.00485883,1.58895137 5.99992557,1.64495137 6.03544506,1.66895137 C6.07688447,1.69795137 6.12227048,1.70695137 6.15778997,1.66395137 C6.18048298,1.63695137 6.23080226,1.60295137 6.23277557,1.57395137 C6.23672218,1.52295137 6.25152196,1.48295137 6.30776116,1.47195137 C6.35314718,1.46295137 6.34328065,1.50695137 6.37485353,1.51495137 C6.44490586,1.53295137 6.47845205,1.31895137 6.55442429,1.38195137 C6.57218404,1.39695137 6.5771173,1.45495137 6.60770353,1.44995137 C6.63927641,1.44495137 6.64026306,1.39895137 6.67380925,1.39795137 C6.68466243,1.42895137 6.61559675,1.46695137 6.60671688,1.50095137 C6.64914294,1.46595137 6.66986264,1.47095137 6.71820861,1.46595137 C6.7310351,1.49895137 6.63631645,1.55295137 6.61165014,1.55795137 C6.5771173,1.56695137 6.5563976,1.54695137 6.52975798,1.56595137 C6.50903828,1.57995137 6.48042535,1.57895137 6.45575904,1.58095137 C6.4212262,1.58495137 6.35610713,1.63095137 6.35709379,1.66895137 C6.35709379,1.68395137 6.36893362,1.71795137 6.35610713,1.72995137 C6.3442673,1.74295137 6.31565438,1.73095137 6.31269442,1.71795137 C6.28309485,1.76195137 6.2446154,1.68495137 6.21994908,1.74695137 C6.25941518,1.75695137 6.29592133,1.79495137 6.34032069,1.80595137 C6.3837334,1.81695137 6.42714612,1.82795137 6.46957217,1.83995137 C6.54159781,1.86195137 6.64914294,1.77495137 6.70439548,1.73295137 C6.75668806,1.69395137 6.82279378,1.60595137 6.83660692,1.54295137 C6.85239336,1.47395137 6.92737895,1.39495137 6.91159251,1.32695137 C6.89777937,1.26295137 6.88791285,1.23295137 6.95993848,1.20995137 C6.99052471,1.19995137 7.06452365,1.18395137 7.07537683,1.14895137 C7.09116327,1.09695137 6.9283656,1.11095137 6.90369929,1.09895137 C6.82180713,1.06195137 6.78628764,1.02095137 6.69156899,1.05795137 C6.64223637,1.07695137 6.59389039,1.09295137 6.54258446,1.10695137 C6.51594484,1.11395137 6.48930523,1.11595137 6.47450544,1.13895137 C6.46858552,1.14795137 6.4606923,1.15495137 6.45082578,1.15995137 C6.40839972,1.17695137 6.4606923,1.09595137 6.46562556,1.09095137 C6.4794387,1.07495137 6.50213171,1.02595137 6.45773234,1.03695137 C6.39261328,1.05195137 6.34525395,1.15195137 6.27520162,1.15695137 C6.22192239,1.16095137 6.23869548,1.11395137 6.25250862,1.08695137 C6.27914824,1.03795137 6.20317599,1.03195137 6.1696298,1.03195137 C6.12227048,1.03195137 6.08675099,1.05895137 6.04136497,1.06395137 C5.99893892,1.06795137 5.94960629,1.07595137 5.90718023,1.07495137 C5.82232811,1.07195137 5.76608892,1.12195137 5.68222345,1.09395137 C5.59342472,1.06495137 5.49771943,1.13895137 5.41188066,1.14895137 C5.38326773,1.15295137 5.34182833,1.14695137 5.3299885,1.18095137 C5.32012197,1.20895137 5.3299885,1.25195137 5.35169485,1.27295137 L5.35860142,1.26695137 C5.33985502,1.28595137 5.33788172,1.31295137 5.31025545,1.32295137 C5.28361583,1.33195137 5.25697621,1.36695137 5.24316307,1.39095137 C5.2323099,1.40895137 5.20172367,1.48395137 5.2550029,1.44495137 C5.29348235,1.41595137 5.31518871,1.36195137 5.37636117,1.37295137 L5.37636117,1.37295137 Z M2.18355356,6.10795137 C2.09278153,6.04195137 1.88657115,6.02595137 1.91222411,5.87195137 C1.92801055,5.77795137 2.0247025,5.70495137 2.10264805,5.65895137 C2.20525992,5.59895137 2.31971161,5.59695137 2.43514996,5.60695137 C2.46277623,5.60995137 2.51506881,5.60495137 2.5298686,5.62695137 C2.53776182,5.63795137 2.55354826,5.64495137 2.56637474,5.64895137 C2.59696097,5.65795137 2.62853385,5.65895137 2.66010674,5.66495137 C2.70746606,5.67395137 2.74101224,5.71495137 2.78837156,5.68095137 C2.84263745,5.64295137 2.85151733,5.63495137 2.91762305,5.64295137 C2.9768222,5.64995137 3.01234169,5.60495137 3.06167432,5.60895137 C3.07746076,5.60995137 3.09127389,5.61295137 3.10311372,5.61795137 C3.10804699,5.60095137 3.11495355,5.58595137 3.12580673,5.58295137 C3.15047305,5.57595137 3.20473893,5.63595137 3.2303919,5.64095137 C3.29551097,5.65495137 3.29156436,5.60895137 3.29649762,5.56195137 C3.32905715,5.55595137 3.34484359,5.60095137 3.37444317,5.57295137 C3.37345652,5.58195137 3.37937643,5.59595137 3.37937643,5.60495137 C3.38529635,5.60895137 3.39220292,5.60895137 3.39812283,5.60395137 C3.40108279,5.59895137 3.40206944,5.59395137 3.40009614,5.58795137 C3.41588258,5.59295137 3.4237758,5.58195137 3.4257491,5.56295137 C3.43758893,5.56395137 3.45633533,5.55695137 3.46817516,5.55895137 C3.47705503,5.52495137 3.49678809,5.47995137 3.47212177,5.44895137 C3.47804169,5.44795137 3.48494825,5.44595137 3.49185482,5.44495137 C3.49185482,5.41095137 3.51454783,5.39595137 3.51553448,5.36895137 C3.48001499,5.36395137 3.44054889,5.36595137 3.40404275,5.36695137 C3.4257491,5.34695137 3.47804169,5.30295137 3.48297495,5.27595137 C3.49284148,5.22795137 3.43068237,5.19895137 3.43561563,5.14195137 C3.44153554,5.17195137 3.47508173,5.24095137 3.50665461,5.25095137 C3.57769359,5.27495137 3.55697389,5.20395137 3.56190715,5.16695137 C3.5796669,5.04995137 3.68425207,5.14695137 3.68622537,5.20795137 C3.7168116,5.13795137 3.79278385,5.21595137 3.75825101,5.27595137 C3.74147791,5.30495137 3.71878491,5.29395137 3.73950461,5.33195137 C3.7543044,5.35895137 3.77601075,5.35995137 3.80758363,5.35295137 C3.81547685,5.33695137 3.82238342,5.31895137 3.82238342,5.29995137 C3.87664931,5.28295137 3.9121688,5.34795137 3.88059592,5.38695137 C3.92104868,5.36495137 3.96248808,5.34395137 4.00590079,5.33295137 C3.98024783,5.24295137 3.95360821,5.15495137 3.9703813,5.05895137 C3.97432791,5.03795137 3.97728787,5.01395137 3.99307431,4.99795137 C4.01280736,4.97695137 3.98814105,4.98495137 3.98616774,4.97095137 C3.98024783,4.92895137 4.02464719,4.88595137 4.04142028,4.84795137 C3.99504762,4.83795137 4.03747367,4.74595137 4.0680599,4.72995137 C4.10160609,4.71295137 4.20027134,4.74095137 4.20717791,4.71395137 C4.22691096,4.72495137 4.24565736,4.74095137 4.26933702,4.74095137 C4.32360291,4.74195137 4.36010905,4.74295137 4.39760185,4.78695137 C4.41634825,4.80995137 4.44397452,4.86095137 4.47752071,4.86495137 C4.47653405,4.90295137 4.51994676,4.93095137 4.47456075,4.96295137 C4.43904126,4.98795137 4.38970863,4.98195137 4.37490884,5.02995137 C4.36504232,5.05995137 4.33642939,5.07395137 4.3798421,5.09495137 C4.3985885,5.10495137 4.42226816,5.10695137 4.44298787,5.10695137 C4.44792113,5.13595137 4.46272092,5.17495137 4.50021371,5.16995137 C4.573226,5.16095137 4.58901244,5.06895137 4.64722494,5.03795137 C4.74194358,4.98795137 4.7271438,5.20395137 4.80903596,5.14995137 C4.82876901,5.13695137 4.82876901,5.08195137 4.83863553,5.06095137 C4.85836858,5.01695137 4.88106159,4.97195137 4.90967452,4.93295137 C4.94618066,4.88295137 4.99156668,4.83095137 4.97578024,4.76595137 C4.96690036,4.72995137 4.89783469,4.71495137 4.8662618,4.68995137 C4.82876901,4.65895137 4.79226286,4.62595137 4.76956986,4.58295137 C4.75575672,4.55695137 4.7478635,4.54795137 4.76956986,4.53495137 C4.78239634,4.52795137 4.77844973,4.51395137 4.77351647,4.50395137 C4.74983681,4.45395137 4.68570439,4.36495137 4.77548977,4.33395137 C4.79522282,4.32695137 4.83666223,4.26295137 4.83962219,4.23795137 C4.84455545,4.19595137 4.78140969,4.15795137 4.81002261,4.11595137 C4.83074231,4.08495137 4.8830349,4.06495137 4.90967452,4.03395137 C4.922501,4.01895137 4.93730079,4.00595137 4.95703384,4.00195137 C4.95802049,3.98495137 4.9619671,3.96595137 4.97676689,3.95495137 C5.00044655,3.93695137 5.03793935,3.94595137 5.06556562,3.93695137 C5.11095163,3.92295137 5.13068468,3.87595137 5.16620418,3.84995137 C5.19580375,3.82795137 5.22934994,3.83595137 5.26092282,3.81995137 C5.27769591,3.81195137 5.28460248,3.79395137 5.30137557,3.78595137 C5.34281498,3.76595137 5.3901743,3.79795137 5.4089207,3.83295137 C5.45332006,3.91695137 5.5085726,4.04695137 5.63486413,4.01295137 C5.68617006,3.99895137 5.72464951,3.95695137 5.74043595,3.90895137 C5.75523574,3.86295137 5.73747599,3.82495137 5.74043595,3.77995137 C5.74438256,3.69995137 5.82232811,3.64895137 5.83120798,3.56995137 C5.77200883,3.57095137 5.80259506,3.53395137 5.78286201,3.49995137 C5.76115565,3.46195137 5.71182303,3.48995137 5.67926349,3.48395137 C5.71280968,3.40295137 5.71280968,3.37495137 5.63387748,3.33595137 C5.59934464,3.31895137 5.54211879,3.23895137 5.51547917,3.24195137 C5.53718553,3.21195137 5.58849146,3.26195137 5.6042779,3.27595137 C5.63881074,3.30895137 5.66939697,3.32395137 5.71774294,3.32795137 C5.70392981,3.30695137 5.69702324,3.26895137 5.70590311,3.24495137 C5.71478298,3.22295137 5.69307663,3.19995137 5.69504993,3.17195137 C5.75030248,3.24295137 5.7414226,3.32395137 5.77299548,3.40195137 C5.78582197,3.43495137 5.8183815,3.45695137 5.83219464,3.49095137 C5.84995438,3.53395137 5.83811455,3.53295137 5.87560735,3.55895137 C5.89830036,3.57495137 5.90619358,3.60295137 5.91014019,3.62795137 C5.91704675,3.67195137 5.9328332,3.65295137 5.95651286,3.67795137 C5.97032599,3.69295137 6.00584548,3.69495137 5.99893892,3.72595137 C5.99400565,3.74795137 5.97920586,3.76595137 5.97624591,3.78895137 C5.96736603,3.85495137 6.09661752,3.76495137 6.109444,3.75595137 C6.13707027,3.73495137 6.18245629,3.73095137 6.20416264,3.70595137 C6.22685565,3.67995137 6.22192239,3.64195137 6.24560205,3.61795137 C6.27520162,3.58695137 6.30381455,3.60795137 6.33933404,3.60195137 C6.38077345,3.59595137 6.41629294,3.56295137 6.44687917,3.53795137 C6.51199823,3.48295137 6.55343764,3.42295137 6.60770353,3.35995137 C6.58402387,3.36595137 6.50311836,3.42495137 6.4981851,3.36995137 C6.46759887,3.36995137 6.39655989,3.36495137 6.38570671,3.33095137 C6.37682684,3.30595137 6.37978679,3.27795137 6.37978679,3.25295137 C6.37880014,3.22595137 6.34624061,3.23495137 6.32453425,3.22095137 C6.28112154,3.19295137 6.25941518,3.14095137 6.21304252,3.11695137 C6.13904358,3.07795137 6.09464421,3.01495137 6.05024485,2.94795137 C6.02459188,2.90895137 5.93381985,2.82995137 5.94072642,2.78295137 C5.94467303,2.75195137 5.97032599,2.71895137 5.96835269,2.68795137 C5.96736603,2.65995137 5.94565968,2.64495137 5.94861964,2.61395137 C5.95157959,2.57795137 5.86475417,2.51495137 5.94072642,2.50795137 C5.96440608,2.50595137 5.96835269,2.47695137 5.9949923,2.46095137 C6.02459188,2.44295137 6.01768531,2.42695137 6.05024485,2.43595137 C6.10253743,2.45195137 6.13904358,2.39395137 6.17456307,2.36295137 C6.23573552,2.30895137 6.13805692,2.30795137 6.13312366,2.26695137 C6.1281904,2.22595137 6.10451074,2.19595137 6.09760417,2.14795137 C6.09365756,2.11295137 6.06109802,2.12695137 6.04235163,2.13595137 C6.01669866,2.14795137 5.99104569,2.12995137 5.96637938,2.12495137 C5.94368637,2.11995137 5.92493997,2.08195137 5.8973137,2.09395137 C5.876594,2.10395137 5.87758065,2.12895137 5.84798108,2.12595137 C5.82627472,2.12395137 5.81246159,2.10295137 5.79075523,2.09895137 C5.75720904,2.09495137 5.78680862,2.12695137 5.74931582,2.12995137 C5.72267621,2.13195137 5.63683743,2.09595137 5.63486413,2.12995137 C5.60822451,2.08395137 5.59737133,2.16195137 5.56875841,2.16995137 C5.53718553,2.17895137 5.50363934,2.17095137 5.47206646,2.18295137 C5.40300078,2.21095137 5.42569379,2.27995137 5.49179951,2.29095137 C5.54507875,2.29895137 5.47601307,2.33595137 5.49377282,2.37195137 C5.50955926,2.40395137 5.51449252,2.42595137 5.54902536,2.43895137 C5.60625121,2.45995137 5.66742366,2.47695137 5.64769061,2.55095137 C5.62203765,2.64295137 5.55790523,2.72995137 5.46811985,2.77195137 C5.38228108,2.81195137 5.35860142,2.70295137 5.29348235,2.67495137 C5.2530296,2.65795137 5.20764358,2.66395137 5.16521752,2.66895137 C5.15831095,2.67995137 5.22441667,2.70095137 5.23526985,2.71995137 C5.2550029,2.75895137 5.20073701,2.75395137 5.1967904,2.78395137 C5.19284379,2.80895137 5.16028426,2.82695137 5.17804401,2.85195137 C5.15929761,2.82895137 5.12279146,2.85995137 5.10996498,2.87395137 C5.09121858,2.89395137 5.09516519,2.90695137 5.10305841,2.93195137 C5.11884485,2.98295137 5.04188596,3.03595137 4.99649994,3.02995137 C4.95802049,3.02395137 4.92151435,3.02695137 4.8850082,3.00895137 C4.84159549,2.98795137 4.85639528,3.00095137 4.84751541,2.95195137 C4.83863553,2.90595137 4.77548977,2.88595137 4.81298257,2.82895137 C4.83962219,2.78695137 4.8267957,2.79095137 4.82186244,2.75095137 C4.81594253,2.70895137 4.83468892,2.70295137 4.86823511,2.69695137 C4.90474125,2.68995137 4.92052769,2.62495137 4.94223405,2.59395137 C4.94716731,2.58695137 4.96986032,2.52895137 4.93434083,2.54395137 C4.91460778,2.55295137 4.92940757,2.57795137 4.89882134,2.58195137 C4.87711498,2.58595137 4.85540863,2.57095137 4.83271562,2.57095137 C4.80706265,2.57095137 4.78042303,2.58395137 4.75674337,2.56795137 C4.7685832,2.55395137 4.85343532,2.48395137 4.78634295,2.46995137 C4.75970333,2.46395137 4.78140969,2.50795137 4.7458902,2.50195137 C4.73898363,2.53695137 4.69655757,2.53395137 4.67583787,2.55595137 C4.68471774,2.51895137 4.76266329,2.49095137 4.73701032,2.46095137 C4.79324952,2.41195137 4.80508935,2.40295137 4.7291171,2.37595137 C4.60973215,2.33395137 4.61861202,2.21095137 4.70050418,2.13695137 C4.77548977,2.06895137 4.89882134,1.98295137 4.97183363,2.09595137 C5.04977918,2.21695137 5.0991118,2.12895137 5.16324422,2.05095137 C5.14153786,2.04195137 5.16127091,2.03595137 5.15436434,2.00895137 C5.08332536,2.03795137 5.0201796,1.94595137 5.06852557,1.89095137 C5.09812515,1.85795137 5.14351117,1.86695137 5.18297727,1.85695137 C5.21751011,1.84795137 5.24908299,1.81395137 5.26388278,1.78195137 C5.2342832,1.78995137 5.23822981,1.77195137 5.24908299,1.75895137 C5.23132324,1.75695137 5.21159019,1.74895137 5.1967904,1.74395137 C5.15436434,1.72895137 5.1573243,1.69595137 5.11193829,1.68995137 C5.00439316,1.67395137 5.22441667,1.54995137 5.11687155,1.54995137 C5.08233871,1.54895137 5.05175248,1.49695137 5.02609952,1.50695137 C5.00833977,1.51395137 5.00340651,1.52795137 4.98170015,1.51895137 C4.96690036,1.51295137 4.94914062,1.49995137 4.93138087,1.50995137 C4.89290142,1.53395137 4.8850082,1.50495137 4.84751541,1.51595137 C4.81692918,1.52595137 4.80015608,1.55595137 4.76463659,1.54795137 C4.80015608,1.49995137 4.8435688,1.45995137 4.87514168,1.40995137 C4.89586138,1.37595137 4.92151435,1.34495137 4.95604719,1.32395137 C4.97479358,1.31295137 5.02807282,1.30195137 5.03103278,1.27595137 C5.03596604,1.23295137 5.00932642,1.23695137 4.97972685,1.25395137 C4.90276795,1.29995137 4.82284909,1.34895137 4.7478635,1.39795137 C4.70247748,1.42695137 4.66695799,1.45195137 4.6107188,1.44395137 C4.56730609,1.43695137 4.54954634,1.48495137 4.5150135,1.48095137 C4.49824041,1.41395137 4.12824571,1.65695137 4.08285969,1.67795137 C4.01083406,1.70995137 3.92992855,1.76495137 3.85296965,1.78395137 C3.82139677,1.79195137 3.75529105,1.86595137 3.75923766,1.78395137 C3.71977156,1.77895137 3.69017198,1.81895137 3.66353236,1.83895137 C3.62603957,1.86795137 3.5816402,1.88595137 3.54118745,1.91095137 C3.45436203,1.96695137 3.37246987,2.03395137 3.29156436,2.09695137 C3.21460546,2.15695137 3.13764656,2.22695137 3.05674105,2.28095137 C3.02911478,2.29995137 2.92748957,2.35195137 2.93044953,2.39095137 C3.00247516,2.40495137 3.24815165,2.09695137 3.31721732,2.17995137 C3.33497707,2.20095137 3.21263216,2.26295137 3.1928991,2.27495137 C3.17612601,2.28395137 3.15639296,2.28295137 3.13961987,2.29195137 C3.11791351,2.30495137 3.10410038,2.32695137 3.08338067,2.34095137 C3.02812813,2.37595137 2.98175546,2.42095137 2.94130271,2.47095137 C2.91268978,2.50795137 2.89197008,2.55595137 2.8603972,2.58995137 C2.86533046,2.55395137 2.85842389,2.52795137 2.85941055,2.49295137 C2.81895779,2.51895137 2.8021847,2.56295137 2.74594551,2.55095137 C2.69463957,2.53895137 2.65418682,2.59095137 2.61768068,2.61895137 C2.53282856,2.68395137 2.47560271,2.75595137 2.40456373,2.83195137 C2.36509763,2.87495137 2.32267157,2.90495137 2.29800525,2.95795137 C2.27136564,3.01495137 2.23387284,3.06595137 2.19934,3.11895137 C2.13323428,3.21595137 2.05726204,3.30495137 1.99214297,3.40195137 C1.85894488,3.60095137 1.7711328,3.82895137 1.66161437,4.04095137 C1.60537517,4.15095137 1.55110929,4.25895137 1.52841628,4.38195137 C1.50868323,4.48795137 1.50769657,4.59595137 1.50966988,4.70395137 C1.56985568,4.65695137 1.56689573,4.75495137 1.55110929,4.78395137 C1.52841628,4.82895137 1.5195364,4.87995137 1.51262984,4.92995137 C1.50276331,4.99495137 1.49092348,5.05995137 1.49092348,5.12595137 C1.49092348,5.18195137 1.47316374,5.23395137 1.47217708,5.28795137 C1.45145738,5.27195137 1.49585674,5.20395137 1.45639064,5.21395137 C1.43665759,5.21895137 1.43567094,5.24795137 1.43073768,5.26295137 C1.41495124,5.31495137 1.34489891,5.30995137 1.33404573,5.36895137 C1.32812581,5.40495137 1.3241792,5.42595137 1.30049954,5.45495137 C1.28175314,5.47695137 1.29951289,5.48695137 1.3034595,5.50895137 C1.31233937,5.56095137 1.245247,5.63295137 1.26300675,5.67495137 C1.27977984,5.71595137 1.26794001,5.76195137 1.28668641,5.80095137 C1.29655293,5.82095137 1.31924594,5.84695137 1.31036607,5.87195137 C1.26794001,5.87995137 1.3222059,5.97795137 1.32615251,6.00795137 C1.33207242,6.05695137 1.37548513,6.21095137 1.42284446,6.23295137 C1.48204361,6.32395137 1.56294912,6.45095137 1.66753428,6.49695137 C1.74153322,6.52895137 1.76817284,6.43295137 1.80961225,6.39295137 C1.86190483,6.34095137 1.92998386,6.30795137 1.99904954,6.28395137 C2.05726204,6.26295137 2.30096521,6.19195137 2.18355356,6.10795137 L2.18355356,6.10795137 Z M2.28616542,9.39295137 C2.29800525,9.37295137 2.28912538,9.32195137 2.26741903,9.30495137 C2.21512644,9.26095137 2.19440674,9.36495137 2.22795292,9.39595137 C2.24077941,9.42895137 2.27136564,9.41795137 2.28616542,9.39295137 L2.28616542,9.39295137 Z M2.50026902,6.36895137 C2.48546924,6.35595137 2.47461606,6.36395137 2.47362941,6.33695137 C2.47461606,6.31295137 2.47658936,6.26695137 2.44501648,6.29595137 C2.43613661,6.29895137 2.44797644,6.30395137 2.43514996,6.30895137 C2.42627008,6.31195137 2.41936352,6.30495137 2.4134436,6.30195137 C2.39667051,6.29495137 2.38680398,6.29395137 2.3739775,6.31195137 C2.36509763,6.32395137 2.36509763,6.33795137 2.35029784,6.34795137 L2.32464487,6.35695137 C2.315765,6.35995137 2.29011203,6.37795137 2.28912538,6.38795137 C2.28517877,6.40295137 2.30787178,6.41395137 2.32365822,6.41795137 C2.3364847,6.42695137 2.3532578,6.43495137 2.36608428,6.44395137 C2.37891076,6.45295137 2.39963047,6.46895137 2.41541691,6.47295137 C2.4509364,6.49295137 2.50618894,6.51495137 2.53381521,6.47295137 C2.54170843,6.45695137 2.54762835,6.44495137 2.53677517,6.43095137 C2.52690864,6.41595137 2.5111222,6.41195137 2.50618894,6.39995137 C2.50224233,6.38695137 2.51309551,6.37895137 2.50026902,6.36895137 L2.50026902,6.36895137 Z M7.24508107,7.12395137 C7.22633467,7.12495137 7.19278848,7.13695137 7.17798869,7.14995137 C7.14838912,7.17595137 7.21153488,7.19095137 7.23620119,7.19795137 C7.26382747,7.21395137 7.30329357,7.22195137 7.32993319,7.23795137 C7.35262619,7.25495137 7.36841263,7.27795137 7.3940656,7.28895137 C7.42563848,7.30395137 7.46905119,7.31095137 7.50358403,7.31995137 C7.51838382,7.32495137 7.54107683,7.32395137 7.56080988,7.32795137 C7.58251623,7.34095137 7.59238276,7.36095137 7.61014251,7.37495137 C7.64072873,7.40295137 7.68414145,7.40995137 7.7245942,7.40795137 C7.76307365,7.41195137 7.79168657,7.41895137 7.82621941,7.40995137 C7.86568551,7.39995137 7.89331178,7.41995137 7.92981793,7.41995137 C7.94461771,7.41995137 7.9594175,7.40795137 7.97323064,7.40895137 C7.99197704,7.40895137 7.99395034,7.41695137 8.00283021,7.43295137 C8.01861666,7.45595137 8.05906941,7.49095137 8.08768233,7.49195137 C8.10544208,7.49195137 8.11925521,7.48895137 8.134055,7.49395137 C8.15082809,7.50395137 8.15773466,7.50395137 8.16957449,7.51395137 C8.1902942,7.52295137 8.20805394,7.52895137 8.21693381,7.54495137 C8.23272026,7.57295137 8.2317336,7.60395137 8.25639992,7.62595137 C8.27317301,7.63895137 8.29093275,7.65295137 8.3086925,7.66595137 C8.32053233,7.67695137 8.31066581,7.67495137 8.32842555,7.67495137 C8.33829208,7.67695137 8.35703847,7.67695137 8.36986496,7.67295137 C8.41919758,7.66995137 8.39255797,7.59995137 8.37677153,7.57695137 C8.366905,7.55695137 8.35802513,7.54095137 8.36197174,7.52195137 C8.36493169,7.49895137 8.37578487,7.48295137 8.36098508,7.46395137 C8.35309186,7.45195137 8.34223869,7.44595137 8.33138551,7.43995137 C8.32546559,7.43195137 8.32250564,7.42395137 8.31559907,7.41195137 C8.30079928,7.39295137 8.27218636,7.38695137 8.25343996,7.36895137 C8.22186708,7.33695137 8.20509398,7.29095137 8.16464123,7.26095137 C8.14293487,7.24795137 8.12320182,7.25795137 8.09656221,7.24695137 C8.08570903,7.23995137 8.07978911,7.23295137 8.06400267,7.22795137 C8.04920288,7.22295137 8.0363764,7.22595137 8.02256327,7.22495137 C7.99395034,7.22295137 7.96928403,7.19795137 7.94165776,7.19995137 C7.91107153,7.20395137 7.90515161,7.23695137 7.88739187,7.25495137 C7.87160543,7.26795137 7.85384568,7.26795137 7.84792577,7.24695137 C7.84595246,7.21995137 7.85581899,7.20395137 7.86963212,7.18695137 C7.89133848,7.16395137 7.86963212,7.15095137 7.8410192,7.14895137 C7.80451305,7.14895137 7.79760649,7.17795137 7.7828067,7.20895137 C7.75912704,7.24195137 7.74432725,7.21895137 7.71078106,7.21395137 C7.68808806,7.21495137 7.67230162,7.22395137 7.65059526,7.21495137 C7.63579547,7.20995137 7.63283551,7.19795137 7.62198234,7.19095137 C7.60520924,7.18195137 7.59238276,7.18495137 7.58054293,7.19295137 C7.56376984,7.19695137 7.56376984,7.19695137 7.54699674,7.18795137 C7.53219696,7.18195137 7.52825034,7.16995137 7.50950395,7.16595137 C7.47990437,7.15995137 7.44931814,7.18495137 7.42465183,7.17795137 C7.41379865,7.17195137 7.40491878,7.15595137 7.39011899,7.15095137 C7.3733459,7.14095137 7.37630585,7.14995137 7.36545268,7.16195137 C7.34670628,7.17995137 7.32105331,7.18595137 7.30329357,7.17195137 C7.28060056,7.15595137 7.27862725,7.12895137 7.24508107,7.12395137 L7.24508107,7.12395137 Z M8.37183826,8.30595137 C8.3876247,8.30395137 8.39551792,8.28795137 8.40933106,8.28995137 C8.4251175,8.28695137 8.41722428,8.30295137 8.42807746,8.31295137 C8.43794398,8.32195137 8.44781051,8.32195137 8.45767703,8.32195137 C8.47543678,8.32495137 8.50996962,8.32695137 8.51687619,8.31095137 C8.52476941,8.28595137 8.48333,8.28095137 8.47247682,8.26095137 C8.4626103,8.23195137 8.4853033,8.20395137 8.49319652,8.17895137 C8.50503635,8.14495137 8.4626103,8.12995137 8.46655691,8.10295137 C8.46557025,8.07395137 8.4853033,8.06395137 8.47938339,8.03595137 C8.47445013,8.01495137 8.45669038,7.99195137 8.4438639,7.97695137 C8.43202407,7.96095137 8.40933106,7.94595137 8.41130436,7.92295137 C8.41327767,7.89895137 8.45669038,7.89995137 8.43597068,7.87095137 C8.42413085,7.84595137 8.39255797,7.85095137 8.36394504,7.84695137 C8.35407852,7.84695137 8.34421199,7.84795137 8.33434547,7.83795137 C8.32546559,7.82395137 8.3294122,7.81695137 8.3294122,7.80695137 C8.32349229,7.77995137 8.30277259,7.76995137 8.27909292,7.75895137 C8.2711997,7.75495137 8.25935987,7.74995137 8.25442661,7.73795137 C8.25048,7.72595137 8.26231983,7.72195137 8.25837322,7.71095137 C8.24554674,7.68495137 8.19818742,7.72095137 8.17845437,7.71195137 C8.16464123,7.70995137 8.16661454,7.69695137 8.15773466,7.68295137 L8.134055,7.67195137 C8.10149547,7.65695137 8.08866899,7.68395137 8.0945889,7.71095137 C8.10938869,7.77195137 8.15378805,7.81195137 8.14885479,7.87295137 C8.15181475,7.89795137 8.15576136,7.90995137 8.16464123,7.93295137 C8.17253445,7.96595137 8.18141432,7.98195137 8.16661454,8.01395137 C8.14293487,8.03195137 8.16464123,8.05395137 8.17253445,8.07695137 C8.17746771,8.10795137 8.18536093,8.13195137 8.18437428,8.16495137 C8.17845437,8.22495137 8.15970797,8.28395137 8.16464123,8.34495137 C8.16760119,8.36995137 8.16562788,8.39295137 8.17450776,8.41695137 C8.17845437,8.44795137 8.20312068,8.45895137 8.22877365,8.47595137 C8.25343996,8.49695137 8.36789165,8.56595137 8.33434547,8.48195137 C8.32447894,8.46295137 8.3086925,8.43595137 8.30375924,8.41395137 C8.29586602,8.39095137 8.32349229,8.37495137 8.32447894,8.35095137 C8.32842555,8.32395137 8.30770585,8.31495137 8.3461853,8.30795137 C8.35407852,8.30195137 8.36591835,8.30795137 8.37183826,8.30595137 L8.37183826,8.30595137 Z M7.1819353,1.09995137 C7.21252153,1.09295137 7.24310776,1.10195137 7.27172069,1.09095137 C7.28652047,1.08495137 7.33486645,1.06795137 7.33190649,1.04795137 C7.32697323,1.01095137 7.17009547,1.03495137 7.14444251,1.04595137 C7.13654929,1.06895137 7.16022895,1.08695137 7.18094865,1.09295137 C7.18094865,1.09495137 7.1819353,1.09795137 7.1819353,1.09995137 L7.1819353,1.09995137 Z M7.93573784,7.78795137 C7.92981793,7.77495137 7.93573784,7.76295137 7.93573784,7.74995137 C7.93277788,7.72895137 7.92685797,7.72295137 7.92981793,7.70095137 C7.93672449,7.68895137 7.93672449,7.66995137 7.93376454,7.65495137 C7.92784462,7.64295137 7.9179781,7.63295137 7.90909822,7.62395137 C7.90909822,7.61795137 7.90613827,7.60795137 7.8992317,7.60195137 C7.88739187,7.58995137 7.87456538,7.60795137 7.8617389,7.61395137 C7.85187238,7.62295137 7.83312598,7.62895137 7.83016602,7.63895137 C7.8202995,7.65395137 7.82621941,7.66595137 7.82621941,7.67895137 L7.82917937,7.69395137 C7.80747301,7.71595137 7.82819272,7.77395137 7.82523276,7.79595137 C7.82523276,7.82095137 7.78971327,7.89095137 7.83707259,7.86995137 C7.84989907,7.86395137 7.8597656,7.85495137 7.87160543,7.84895137 C7.88739187,7.83995137 7.90712492,7.83995137 7.92587132,7.83395137 C7.93179123,7.83395137 7.96632407,7.83095137 7.96632407,7.82495137 C7.96731072,7.81195137 7.9386978,7.80295137 7.93573784,7.78795137 L7.93573784,7.78795137 Z M7.0447906,9.05195137 C7.0842567,9.07095137 7.15332238,9.03295137 7.19081518,9.02095137 C7.2381745,9.00595137 7.31316009,8.95595137 7.36150607,8.98395137 C7.38123912,8.99495137 7.39110564,9.01795137 7.41182535,9.02695137 C7.43747831,9.03795137 7.46806454,9.02795137 7.49371751,9.02195137 C7.52035712,9.01595137 7.55094335,9.01195137 7.57560967,8.99995137 C7.59731602,8.98895137 7.61112916,8.97095137 7.62987556,8.95695137 C7.67822153,8.91995137 7.71966094,8.95495137 7.77294017,8.94695137 C7.8035264,8.94295137 7.83213933,8.92795137 7.8617389,8.91995137 C7.88344526,8.91495137 7.92192471,8.91495137 7.9386978,8.89895137 C7.9574442,8.88095137 7.94856432,8.84195137 7.94856432,8.81895137 C7.94757767,8.78795137 7.94955098,8.75595137 7.9386978,8.72695137 C7.91699144,8.66995137 7.83805924,8.60295137 7.9199514,8.55795137 C7.93573784,8.45795137 7.81931284,8.47495137 7.78576666,8.40295137 C7.7640603,8.35595137 7.75715373,8.31995137 7.69499462,8.31495137 C7.64270204,8.30995137 7.61112916,8.33795137 7.56574314,8.35595137 C7.51443721,8.37495137 7.47497111,8.35795137 7.43057174,8.33295137 C7.40393213,8.31795137 7.34769293,8.28295137 7.33683975,8.32895137 C7.32697323,8.36895137 7.36545268,8.40795137 7.3338798,8.44395137 C7.30625352,8.47595137 7.25790755,8.48995137 7.21844145,8.49895137 C7.13260268,8.51695137 7.06452365,8.58295137 7.00236454,8.63995137 L7.00927111,8.64595137 C6.9846048,8.64495137 6.94809865,8.71095137 6.947112,8.73095137 C6.95697853,8.73395137 6.9658584,8.73695137 6.97671158,8.73995137 C6.97572493,8.77395137 7.01420437,8.75095137 7.01716433,8.72695137 C7.02505755,8.72895137 7.03295077,8.73395137 7.04084399,8.73495137 C7.04775056,8.73695137 7.06255035,8.73595137 7.06847026,8.73895137 C7.08524336,8.74595137 7.08820331,8.76195137 7.10892302,8.76395137 C7.09708319,8.81595137 7.10793636,8.87095137 7.08327005,8.91995137 C7.06748361,8.94995137 6.98756476,9.02395137 7.0447906,9.05195137 L7.0447906,9.05195137 Z M7.4522781,1.35995137 C7.48187768,1.39195137 7.51838382,1.40095137 7.51147725,1.45095137 C7.54897005,1.45595137 7.57264971,1.46995137 7.59435606,1.43795137 C7.6081692,1.41795137 7.6288889,1.40195137 7.65158191,1.39395137 C7.67920818,1.38295137 7.79267322,1.38395137 7.78773996,1.43095137 C7.78478,1.45395137 7.77096687,1.47395137 7.76702026,1.49695137 C7.762087,1.52895137 7.79661983,1.50595137 7.81141962,1.51395137 C7.79464653,1.52595137 7.77392683,1.53295137 7.75320712,1.53795137 C7.762087,1.54395137 7.76800691,1.55195137 7.76899356,1.56195137 C7.7433406,1.56795137 7.73051411,1.63995137 7.6851281,1.65395137 C7.65750183,1.66295137 7.61704907,1.64395137 7.5894228,1.64095137 C7.55686327,1.63695137 7.53219696,1.62695137 7.49963742,1.62495137 C7.46806454,1.62295137 7.49371751,1.58095137 7.4542514,1.58895137 C7.44734484,1.61695137 7.46115797,1.68795137 7.46609124,1.71595137 C7.4710245,1.75095137 7.50062407,1.77095137 7.53515691,1.77695137 C7.58350289,1.78495137 7.6061959,1.80095137 7.6476353,1.82495137 C7.68019484,1.84295137 7.71670098,1.83195137 7.75222047,1.83495137 C7.77590013,1.83695137 7.79563318,1.84595137 7.81339293,1.86095137 C7.80944632,1.87195137 7.80056644,1.88995137 7.80648636,1.90195137 C7.81339293,1.91795137 7.86371221,1.89995137 7.87555204,1.89895137 C7.91107153,1.89495137 7.94461771,1.85595137 7.9781639,1.86095137 C7.99099038,1.86295137 8.05018954,1.88095137 8.04722958,1.89595137 C8.0156567,1.88295137 7.99493699,1.92195137 7.97027068,1.90095137 C7.94856432,1.88195137 7.89035183,1.89795137 7.92784462,1.92495137 C7.93080458,1.92795137 7.9406711,2.00295137 7.9406711,2.01095137 C7.93771115,2.03895137 7.88739187,2.06895137 7.89133848,2.08695137 C7.89824505,2.08795137 7.94363106,2.09095137 7.95349759,2.09995137 C7.95645755,2.08795137 7.94757767,2.08295137 7.97520394,2.07495137 C7.99592365,2.06895137 8.02058996,2.06695137 8.04130966,2.07695137 C8.04920288,2.11195137 8.02354992,2.14795137 8.07189589,2.13895137 C8.11728191,2.12995137 8.13701496,2.15995137 8.18437428,2.12895137 C8.21397386,2.11095137 8.24554674,2.11395137 8.2711997,2.13995137 C8.30573254,2.17395137 8.23568021,2.22095137 8.27613297,2.25395137 C8.29191941,2.26695137 8.30474589,2.30695137 8.32053233,2.31395137 C8.33138551,2.31895137 8.39058466,2.29795137 8.40143784,2.29295137 C8.42018424,2.32695137 8.43695733,2.27495137 8.45175712,2.27195137 C8.45767703,2.24995137 8.4853033,2.22495137 8.51194292,2.22195137 C8.55140902,2.21795137 8.55239568,2.22495137 8.5790353,2.24395137 C8.65698085,2.29795137 8.64612767,2.16595137 8.68658042,2.13195137 C8.75959271,2.07195137 8.79609885,2.01495137 8.84641813,1.93795137 C8.88588423,1.87595137 8.94113678,1.86095137 9.01118911,1.84995137 C9.06644165,1.84095137 9.15129377,1.82795137 9.17398677,1.76795137 C9.20062639,1.69795137 9.13649398,1.65995137 9.08025478,1.63895137 C9.01710902,1.61695137 8.94607004,1.59295137 8.97369631,1.51295137 C9.00625584,1.41995137 8.97764292,1.36595137 8.87897767,1.33595137 C8.67079398,1.27095137 8.48333,1.16195137 8.2711997,1.10195137 C8.08373572,1.04895137 7.89429844,1.02995137 7.70190119,1.01995137 C7.61606242,0.98995137 7.43451835,0.98695137 7.38222577,1.05995137 C7.34867958,1.10695137 7.39110564,1.14795137 7.38715903,1.19695137 C7.38222577,1.25595137 7.41083869,1.31595137 7.4522781,1.35995137 L7.4522781,1.35995137 Z M10.7269779,10.6309514 L10.7259912,10.6299514 C10.7289512,10.6349514 10.7269779,10.6439514 10.7279645,10.6509514 C10.766444,10.6509514 10.7832171,10.6859514 10.8246565,10.6729514 C10.8670825,10.6609514 10.8917488,10.6199514 10.8582027,10.5859514 C10.8286031,10.5569514 10.8029501,10.5319514 10.7595374,10.5399514 C10.7082315,10.5499514 10.7190846,10.5909514 10.7269779,10.6309514 L10.7269779,10.6309514 Z M12.0678387,9.29395137 C12.0658654,9.28495137 12.0638921,9.27695137 12.0619187,9.26795137 C12.021466,9.25595137 11.995813,9.29795137 11.9583202,9.26695137 C11.8862946,9.31595137 11.9632535,9.41295137 11.8448552,9.40695137 C11.8655749,9.43195137 11.8636016,9.45995137 11.8537351,9.48895137 C11.8389353,9.53395137 11.8270954,9.52995137 11.7965092,9.53595137 C11.7323768,9.54595137 11.7017906,9.50595137 11.6820575,9.45195137 C11.6189118,9.45395137 11.5320863,9.55195137 11.4827537,9.58295137 C11.4699272,9.58995137 11.4472342,9.61095137 11.4334211,9.61995137 C11.4225679,9.62595137 11.3959283,9.63895137 11.3821151,9.64695137 C11.348569,9.66395137 11.2765433,9.68695137 11.2725967,9.72495137 C11.2558236,9.72195137 11.2301707,9.73195137 11.2133976,9.72995137 C11.2074776,9.73795137 11.2074776,9.74695137 11.2133976,9.75595137 C11.2903565,9.76895137 11.3308092,9.74295137 11.3959283,9.71495137 C11.4640073,9.68395137 11.5370196,9.69095137 11.601152,9.66695137 C11.6317382,9.65595137 11.6327249,9.62195137 11.6830442,9.64195137 C11.7047505,9.65195137 11.7304035,9.68395137 11.7353368,9.70595137 C11.7452033,9.75595137 11.6929107,9.82995137 11.6406181,9.83295137 C11.6277916,9.80195137 11.646538,9.76995137 11.6524579,9.74495137 C11.5833923,9.72195137 11.4699272,9.81995137 11.4511808,9.87795137 C11.5222198,9.89295137 11.5518194,9.99695137 11.5133399,10.0539514 C11.5005135,10.0679514 11.4857137,10.0859514 11.4610474,10.0939514 C11.4205946,10.1059514 11.4018482,10.0689514 11.3623821,10.0979514 C11.3110762,10.1369514 11.3673154,10.2439514 11.3377158,10.3039514 C11.3150228,10.3499514 11.2765433,10.3669514 11.2439838,10.3989514 C11.2222774,10.4219514 11.209451,10.4469514 11.1798514,10.4669514 C11.1413719,10.4929514 11.0476399,10.5489514 11.0555332,10.6029514 C11.1403853,10.6319514 11.3160094,10.4839514 11.3890217,10.4349514 C11.4353944,10.4039514 11.4640073,10.3559514 11.5113666,10.3249514 C11.5646459,10.2919514 11.6346982,10.2749514 11.669231,10.2159514 C11.6889641,10.1819514 11.6731776,10.1519514 11.6850175,10.1179514 C11.6958707,10.0879514 11.7165904,10.0779514 11.7363234,10.0549514 C11.7728296,10.0109514 11.8063757,9.99695137 11.8478151,9.96095137 C11.8991211,9.91495137 11.8872812,9.84295137 11.9109609,9.78195137 C11.9316806,9.72895137 11.9721334,9.68795137 12.0007463,9.63795137 C12.0451457,9.55895137 12.1615707,9.37095137 12.112238,9.28195137 C12.1003982,9.29195137 12.0786918,9.28895137 12.0678387,9.29395137 L12.0678387,9.29395137 Z M13.0752109,6.73495137 C13.0495579,6.68695137 13.0880374,6.54895137 13.0880374,6.49195137 C13.0870507,6.38695137 13.0554778,6.30795137 13.0406781,6.20995137 C13.0317982,6.11795137 13.0189717,5.87395137 13.0525179,5.79095137 C13.0998772,5.67395137 12.8690005,5.47595137 12.856174,5.34895137 C12.8443342,5.23895137 12.7821751,5.13495137 12.6923897,5.07195137 C12.6558836,5.04495137 12.5769514,4.68195137 12.5305787,4.69895137 C12.5078857,4.70995137 12.555245,4.78995137 12.5522851,4.81495137 C12.5394586,4.90295137 12.4950592,4.81495137 12.4486865,4.83495137 C12.3628478,4.86995137 12.2720757,4.95295137 12.2612226,5.03795137 C12.2207698,5.35295137 11.9977863,5.02695137 12.0155461,5.01395137 C12.0648787,4.97595137 12.0826384,4.98795137 12.1408509,4.97995137 C12.2049834,4.95695137 12.1053315,4.91095137 12.20597,4.90095137 C12.1822904,4.83595137 12.2355696,4.81495137 12.2099166,4.76395137 C12.1714372,4.68895137 12.1438109,4.69795137 12.1822904,4.61695137 C12.1990634,4.57295137 12.0984249,4.43395137 12.0905317,4.38095137 C12.0826384,4.32895137 12.0816518,4.26095137 12.0747452,4.20295137 C12.0707986,4.16595137 12.1309844,4.13095137 12.1201312,4.10195137 C12.1181579,3.99895137 12.1408509,3.88795137 12.1043448,3.78795137 C12.0786918,3.71995137 12.0490923,3.62995137 12.0056796,3.57195137 C11.9908798,3.55195137 11.9445071,3.44895137 11.9395738,3.41995137 C11.927734,3.35595137 11.8991211,3.37995137 11.8636016,3.35495137 C11.8438685,3.32995137 11.7550698,3.24695137 11.7294168,3.23495137 C11.7057372,3.22395137 11.5340596,3.06695137 11.530113,3.05395137 C11.5153132,3.00895137 11.4186213,2.97395137 11.4294745,2.92495137 C11.4452609,2.85095137 11.1877446,2.65895137 11.115719,2.64595137 C11.0693463,2.63795137 11.2577969,2.86395137 11.2568103,2.85895137 C11.2597702,2.87195137 11.3781685,3.02295137 11.3781685,3.02295137 C11.4048082,3.03195137 11.4699272,3.21695137 11.4679539,3.24095137 C11.4610474,3.31095137 11.2804899,3.12595137 11.2666768,3.10095137 C11.1778781,2.99195137 11.0170537,2.90395137 10.9154285,2.83095137 C10.8434029,2.76395137 10.8789224,2.72595137 10.7555908,2.66895137 C10.7102048,2.64795137 10.5868732,2.54695137 10.5483938,2.54395137 C10.5020211,2.54195137 10.5553003,2.63995137 10.556287,2.65095137 C10.5631935,2.72095137 10.6391658,2.72595137 10.6845518,2.77195137 C10.7210579,2.80995137 10.7536175,2.85695137 10.7220446,2.89895137 C10.7210579,2.89895137 10.6648188,3.00295137 10.6618588,2.99395137 C10.6776452,3.03795137 10.80887,3.13495137 10.8414296,3.17095137 C10.8355096,3.16195137 11.0131071,3.39495137 11.0279069,3.27095137 C11.0338268,3.22595137 10.9835075,3.17195137 10.9904141,3.13295137 C10.9953474,3.10895137 11.1936645,3.35995137 11.2045177,3.38195137 C11.2528637,3.51495137 11.2489171,3.36195137 11.2992363,3.37795137 C11.3406757,3.39095137 11.4521675,3.52995137 11.3594221,3.53595137 C11.2183308,3.54495137 11.3850751,3.66795137 11.4245412,3.68695137 C11.5064334,3.72695137 11.5626726,3.81995137 11.6475247,3.85495137 C11.7807228,3.90895137 11.7530965,4.00495137 11.8201889,4.10295137 C11.8418952,4.13395137 11.4373677,4.10295137 11.4057948,4.12095137 C11.3525156,4.16295137 11.6090452,4.44995137 11.6100319,4.49295137 C11.6120052,4.58295137 11.6633111,4.64895137 11.6771243,4.73895137 C11.6850175,4.82195137 11.675151,4.93095137 11.7294168,4.99795137 C11.7738162,5.03895137 11.8152556,4.92995137 11.8853079,4.99495137 C11.9109609,5.00695137 11.9474671,5.03595137 11.9553603,5.05795137 C11.9790399,5.11995137 12.1132247,5.49895137 11.9524003,5.47095137 C11.8813613,5.45795137 11.9218141,5.76895137 11.9267473,5.81395137 C11.9484537,5.91195137 11.9879198,5.90395137 11.9622668,6.02795137 C11.9652268,6.13095137 11.882348,6.18295137 11.8231488,6.25695137 C11.7955226,6.29095137 11.7777628,6.33095137 11.7649363,6.37395137 C11.7323768,6.34195137 11.7165904,6.29095137 11.6712043,6.27395137 C11.6218717,6.25495137 11.5133399,6.31495137 11.4699272,6.33595137 C11.3653421,6.38895137 11.442301,6.48495137 11.4008615,6.56795137 C11.371262,6.62895137 11.2824632,6.65895137 11.2242507,6.68895137 C11.1541984,6.72495137 11.0604664,6.76295137 10.9914007,6.70495137 C10.9322016,6.65695137 10.9578546,6.55995137 10.8956954,6.51795137 C10.8256431,6.47095137 10.8187366,6.57595137 10.8029501,6.61795137 C10.7723639,6.69695137 10.6806052,6.72395137 10.7042849,6.82295137 C10.7141514,6.86395137 10.7348711,6.90095137 10.7427643,6.94195137 C10.7526308,6.99295137 10.7269779,7.03895137 10.7240179,7.08995137 C10.718098,7.17695137 10.80887,7.19695137 10.8325497,7.26795137 C10.8532694,7.33195137 10.831563,7.43095137 10.7605241,7.45495137 C10.6845518,7.48195137 10.6006863,7.41295137 10.5257007,7.40495137 C10.4507152,7.39695137 10.3550099,7.41795137 10.3411967,7.50395137 C10.3283702,7.57995137 10.4053291,7.64195137 10.3678363,7.71995137 C10.3520499,7.75295137 10.3244236,7.77895137 10.3046906,7.80895137 C10.2701577,7.85895137 10.2504247,7.91695137 10.2178652,7.96795137 C10.2563446,7.96895137 10.252398,7.94495137 10.2869308,7.95195137 C10.323437,7.95995137 10.3559965,7.92295137 10.3865827,7.91095137 C10.3925027,7.93495137 10.3895427,7.95995137 10.3925027,7.98395137 C10.4181556,7.99195137 10.4438086,7.98195137 10.4665016,7.97295137 C10.4694616,7.99395137 10.459595,8.01795137 10.4684749,8.03895137 C10.4753815,8.05695137 10.4961012,8.06295137 10.507941,8.07695137 C10.5385272,8.11395137 10.5010344,8.17495137 10.4793281,8.20695137 C10.417169,8.29895137 10.3106105,8.34995137 10.2415448,8.43595137 C10.1764257,8.51595137 10.1705058,8.61295137 10.1221599,8.69995137 C10.1053868,8.72995137 10.0886137,8.77095137 10.133013,8.78495137 C10.1428796,8.76895137 10.1576794,8.75595137 10.1783991,8.75595137 C10.2089853,8.75495137 10.1971455,8.77795137 10.2129319,8.79595137 C10.2770643,8.87795137 10.3451433,8.74295137 10.3727696,8.70395137 C10.4003959,8.66195137 10.5148476,8.59895137 10.5464205,8.66895137 C10.5710868,8.72195137 10.5424738,8.79695137 10.5178075,8.84495137 C10.5592469,8.86395137 10.5474071,8.89395137 10.5572736,8.92995137 C10.5701001,8.97995137 10.6154861,9.01195137 10.6154861,9.06695137 C10.6154861,9.13295137 10.4714349,9.26395137 10.5276741,9.31395137 C10.5977264,9.37595137 10.6806052,9.20395137 10.7082315,9.16695137 C10.7605241,9.09595137 10.879909,9.08595137 10.9095086,8.99895137 C10.9420681,8.89995137 10.9312149,8.84095137 11.0624397,8.83795137 C11.1176923,8.83695137 11.158145,8.80195137 11.2104376,8.79095137 C11.2676635,8.77995137 11.2933164,8.77395137 11.3298226,8.72995137 C11.3821151,8.66695137 11.4294745,8.74195137 11.4314478,8.79195137 C11.4334211,8.84295137 11.4107281,8.90695137 11.442301,8.95295137 C11.4807804,9.00895137 11.5232065,8.93495137 11.5626726,8.89895137 C11.558726,8.93695137 11.6090452,8.95895137 11.6386448,8.97095137 C11.6840308,8.93995137 11.7126437,8.88895137 11.7609897,8.86095137 C11.7836827,8.84795137 11.8093357,8.84295137 11.8349887,8.83895137 C11.8418952,8.87995137 11.8488018,8.92395137 11.8853079,8.94395137 C11.9376005,8.97395137 11.8734681,9.00295137 11.9425338,9.03495137 C12.0283726,9.06795137 12.0569855,9.15495137 12.0984249,9.22495137 C12.1181579,9.25695137 12.2977287,9.06195137 12.3667944,9.05495137 C12.5956978,9.02895137 12.7150827,8.72995137 12.7999348,8.55295137 C12.9222798,8.29995137 12.9775323,8.01895137 13.0091052,7.75795137 C13.0870507,7.59695137 13.1186236,7.30195137 13.0870507,7.11495137 C13.0683043,7.00095137 13.1334234,6.84295137 13.0752109,6.73495137 L13.0752109,6.73495137 Z M11.0032406,10.5319514 C11.0091605,10.5039514 11.0683596,10.3999514 11.0131071,10.3849514 C10.993374,10.3799514 10.976601,10.4099514 10.9588412,10.4149514 C10.9351615,10.4229514 10.9095086,10.4079514 10.8878022,10.4189514 C10.8680692,10.4299514 10.8493228,10.4619514 10.8374829,10.4799514 C10.8226832,10.5019514 10.8286031,10.5109514 10.8522827,10.5229514 C10.8759624,10.5359514 10.9065486,10.5419514 10.9203618,10.5679514 C10.9322016,10.5909514 10.9262817,10.6219514 10.9233217,10.6459514 C10.9233217,10.6449514 10.9272683,10.6409514 10.928255,10.6369514 C10.9322016,10.6359514 10.9391082,10.6349514 10.9430548,10.6359514 L10.9381215,10.6459514 C11.0012673,10.6559514 10.996334,10.5729514 11.0032406,10.5319514 L11.0032406,10.5319514 Z M11.7422433,9.28095137 C11.7442166,9.31095137 11.7767762,9.30795137 11.7984825,9.29995137 C11.8182156,9.29395137 11.8310421,9.27695137 11.8438685,9.26195137 C11.8616283,9.23895137 11.8724815,9.21595137 11.856695,9.18895137 C11.8409086,9.16095137 11.8310421,9.14095137 11.8231488,9.10795137 C11.8103223,9.11495137 11.7945359,9.12695137 11.7807228,9.13095137 C11.7669096,9.13595137 11.7649363,9.13195137 11.7491499,9.13095137 C11.7126437,9.12995137 11.720537,9.15795137 11.7047505,9.18095137 C11.691924,9.20095137 11.6633111,9.20895137 11.6741643,9.23495137 C11.6820575,9.25495137 11.7146171,9.27195137 11.7333635,9.28095137 L11.7382967,9.27495137 C11.7373101,9.27695137 11.7363234,9.27795137 11.7353368,9.27995137 C11.7373101,9.28095137 11.74027,9.28095137 11.7422433,9.28095137 L11.7422433,9.28095137 Z M8.18042767,11.4279514 C8.21693381,11.3629514 8.28205288,11.3219514 8.34026538,11.2769514 C8.41031771,11.2229514 8.47247682,11.1599514 8.52772936,11.0919514 C8.49516983,11.0839514 8.49319652,11.0529514 8.47247682,11.0329514 C8.44090394,11.0019514 8.39255797,11.0219514 8.3856514,10.9749514 C8.37874483,10.9329514 8.34421199,10.9239514 8.31066581,10.9069514 C8.23370691,10.8679514 8.20213403,10.7919514 8.13997492,10.7389514 C8.07189589,10.6789514 7.97915055,10.6989514 7.89627174,10.6829514 C7.82325945,10.6689514 7.74926051,10.5519514 7.67131496,10.6019514 C7.62198234,10.6329514 7.59928933,10.7119514 7.63283551,10.7609514 C7.65947513,10.7989514 7.70486115,10.8179514 7.72262089,10.8629514 C7.69598128,10.8879514 7.69006136,10.9039514 7.72262089,10.9269514 C7.76110034,10.9539514 7.83509928,10.9819514 7.81635289,11.0409514 C7.80648636,11.0729514 7.77984674,11.1039514 7.7453139,11.1099514 C7.72064759,11.1149514 7.66046178,11.1009514 7.67328827,11.1459514 C7.645662,11.0719514 7.56771645,11.1879514 7.52529039,11.1269514 C7.49075755,11.0779514 7.46905119,11.0339514 7.4147853,11.0009514 C7.34473297,10.9579514 7.44339823,10.9159514 7.4315584,10.8509514 C7.41379865,10.7559514 7.2983603,10.7819514 7.2569209,10.7119514 C7.23225458,10.6719514 7.26580077,10.6399514 7.28158721,10.6049514 C7.29737365,10.5689514 7.33979971,10.5979514 7.36249272,10.6079514 C7.43649166,10.6429514 7.54502344,10.6299514 7.60718255,10.5789514 C7.63579547,10.5549514 7.69894123,10.4439514 7.61902238,10.4439514 C7.56376984,10.4449514 7.52134378,10.4929514 7.46905119,10.4959514 C7.46115797,10.4329514 7.4315584,10.3259514 7.49865077,10.2839514 C7.55982323,10.2459514 7.68808806,10.2019514 7.63382217,10.1039514 C7.61408912,10.0699514 7.57955628,10.1259514 7.55094335,10.1009514 C7.53910352,10.0909514 7.5479834,10.0679514 7.55193001,10.0569514 C7.53318361,10.0399514 7.51542386,10.0189514 7.50555734,9.99495137 C7.46214463,9.88895137 7.59040945,9.80595137 7.53614357,9.69395137 C7.51345056,9.64695137 7.47497111,9.61895137 7.43254505,9.58995137 C7.39011899,9.55995137 7.38814568,9.52195137 7.37235924,9.47695137 C7.36446602,9.45195137 7.32302662,9.39295137 7.28750713,9.40795137 C7.2569209,9.41995137 7.24804102,9.47295137 7.22436136,9.49495137 C7.17108213,9.54695137 7.05860374,9.56695137 6.98756476,9.54995137 C6.93033891,9.53695137 6.93329887,9.51495137 6.9056726,9.47695137 C6.89679272,9.46295137 6.87705967,9.46195137 6.86225988,9.45595137 C6.83660692,9.44595137 6.83364696,9.42295137 6.82772704,9.39995137 C6.80404738,9.31295137 6.63236984,9.42095137 6.60573022,9.29895137 C6.59981031,9.27095137 6.60967683,9.22395137 6.56922408,9.21795137 C6.52383806,9.20995137 6.52186476,9.16595137 6.52186476,9.12895137 C6.52186476,9.09895137 6.52383806,9.05695137 6.49226518,9.03995137 C6.45181243,9.01795137 6.4419459,9.02795137 6.42911942,8.98195137 C6.41431963,8.92295137 6.37386688,8.98395137 6.34032069,8.97195137 C6.26928171,8.94395137 6.28210819,8.97895137 6.22488235,9.00895137 C6.12720374,9.06095137 6.11635057,8.81995137 6.08280438,8.77295137 C6.01768531,8.68295137 6.03445841,8.88395137 5.99005904,8.90895137 C5.94960629,8.93195137 5.90718023,8.87895137 5.89238044,8.84795137 C5.88350057,8.82995137 5.87856731,8.80995137 5.86771413,8.79195137 C5.85094103,8.76595137 5.82134146,8.75495137 5.80456837,8.72895137 C5.79075523,8.70595137 5.77003553,8.67895137 5.760169,8.65395137 C5.75128913,8.63195137 5.75326243,8.60395137 5.73648934,8.58595137 C5.71576964,8.56295137 5.7414226,8.52495137 5.75622239,8.49595137 C5.78187536,8.48595137 5.82035481,8.50595137 5.8391012,8.52295137 C5.88547387,8.56195137 5.9555262,8.73295137 6.03643171,8.70095137 C6.01965862,8.67895137 6.0305118,8.65195137 6.01867197,8.62795137 C6.00584548,8.60295137 5.98117917,8.58795137 5.96243277,8.56795137 C5.92099336,8.51995137 5.87560735,8.47195137 5.84798108,8.41395137 C5.82430142,8.36395137 5.81246159,8.31095137 5.76411561,8.27595137 C5.72464951,8.24695137 5.64670396,8.21895137 5.66347705,8.15695137 C5.66347705,8.15595137 5.66446371,8.15495137 5.66446371,8.15495137 C5.69702324,8.16195137 5.71971625,8.18595137 5.74339591,8.20695137 C5.77792875,8.23695137 5.82232811,8.25195137 5.86278087,8.27195137 C5.93677981,8.30795137 6.02261858,8.33295137 6.08576434,8.38795137 C6.12523044,8.42095137 6.10451074,8.49495137 6.15384336,8.53595137 C6.19034951,8.56595137 6.2446154,8.66695137 6.31170777,8.62695137 C6.33637408,8.61195137 6.34722726,8.58295137 6.37189357,8.56595137 C6.39853319,8.54695137 6.44293256,8.52995137 6.47351878,8.51595137 C6.49226518,8.50695137 6.52383806,8.50995137 6.53863785,8.49495137 C6.56231751,8.47195137 6.50607832,8.40595137 6.49325184,8.38895137 C6.44293256,8.32395137 6.39655989,8.25295137 6.32946751,8.20395137 C6.29493468,8.17895137 6.26138849,8.15195137 6.22093574,8.13495137 C6.19922938,8.12595137 6.16074993,8.12695137 6.15680332,8.09695137 C6.1676565,8.10395137 6.17357641,8.10195137 6.17554972,8.09095137 C6.17456307,8.07095137 6.14595014,8.06995137 6.13213701,8.06595137 C6.09859082,8.05695137 6.07589781,8.05695137 6.06307133,8.02895137 C6.04629824,7.99495137 5.98709908,7.99595137 5.9555262,7.98795137 C5.90816688,7.97595137 5.87067409,7.93995137 5.82528807,7.92195137 C5.77200883,7.90195137 5.73155608,7.92295137 5.67926349,7.93495137 C5.67038362,7.93695137 5.65262388,7.96795137 5.63585078,7.99395137 C5.59835799,7.98495137 5.55691858,7.98895137 5.5253457,8.01395137 C5.47798638,8.05095137 5.45036011,8.10695137 5.41286731,8.15295137 C5.39708087,8.17195137 5.37438786,8.19095137 5.35169485,8.18395137 C5.34774824,8.18195137 5.34972155,8.17695137 5.34676159,8.17495137 C5.37537451,7.96995137 5.39116095,7.76295137 5.37241456,7.80395137 C5.33492176,7.88395137 5.30729549,7.93995137 5.27868256,7.99795137 C5.23724316,7.97995137 5.18889718,7.97895137 5.17113744,8.02295137 C5.15239104,8.06995137 5.17705735,8.13095137 5.14745778,8.17195137 C5.14055121,8.18295137 5.12969803,8.18195137 5.11983151,8.18695137 C5.1178582,8.18195137 5.10799168,8.16895137 5.10897833,8.16795137 C5.10009846,8.18295137 5.0991118,8.18795137 5.09121858,8.20095137 C5.06161901,8.20195137 5.02511286,8.18995137 4.98860672,8.17795137 C4.98860672,8.17795137 4.98860672,8.17495137 4.98762007,8.17495137 C4.98663341,8.17595137 4.98663341,8.17595137 4.98564676,8.17695137 C4.94223405,8.16195137 4.89684803,8.14795137 4.85738193,8.16195137 C4.77844973,8.18995137 4.77548977,8.30295137 4.72517049,8.37195137 C4.6501849,8.47695137 4.456801,8.43195137 4.42325482,8.30695137 C4.45088109,8.27295137 4.47752071,8.23895137 4.50514698,8.20495137 C4.46272092,8.09695137 4.34925588,8.02195137 4.23480418,8.02495137 C4.20224465,8.02595137 4.16771181,8.03195137 4.13811223,8.01795137 C4.107526,8.00295137 4.09075291,7.97095137 4.06411329,7.95095137 C3.98123448,7.88895137 3.8707294,7.97095137 3.80166372,8.04795137 C3.68326541,8.06795137 3.57374698,8.13495137 3.49974804,8.23095137 C3.45238872,8.22695137 3.4050294,8.22295137 3.35865673,8.21895137 C3.386283,8.29495137 3.29452432,8.35695137 3.25308491,8.42695137 C3.20177898,8.51195137 3.2284186,8.61095137 3.27873787,8.70195137 C3.27281796,8.71595137 3.26887135,8.73095137 3.25604487,8.73695137 C3.19585906,8.76895137 3.2116455,8.78795137 3.22940525,8.85295137 C3.24519169,8.90895137 3.23927177,9.01395137 3.22644529,9.06995137 C3.21657877,9.11395137 3.17316605,9.21995137 3.11988682,9.19495137 C3.09226055,9.18095137 3.06266097,9.16995137 3.037008,9.19595137 C3.02516817,9.20695137 3.01727495,9.22095137 3.01332834,9.23595137 C2.9955686,9.23695137 2.97780885,9.23895137 2.96103576,9.24295137 C2.92748957,9.24995137 2.89197008,9.25795137 2.85941055,9.24395137 C2.82685101,9.22995137 2.7834383,9.20295137 2.74693216,9.21495137 C2.71634593,9.22495137 2.65616013,9.25195137 2.64333364,9.28395137 C2.63741373,9.29795137 2.65616013,9.33495137 2.65616013,9.35395137 C2.65517347,9.38795137 2.68181309,9.43895137 2.67095991,9.46995137 C2.6462936,9.45795137 2.60978746,9.45395137 2.59301436,9.42895137 C2.57722792,9.40795137 2.55354826,9.41295137 2.53578852,9.39095137 C2.53184191,9.42895137 2.51802877,9.48195137 2.47264275,9.49195137 C2.42923004,9.50195137 2.38680398,9.46695137 2.34240462,9.47895137 C2.22597962,9.50895137 2.41245695,9.65495137 2.43712326,9.68295137 C2.47856267,9.72995137 2.4923758,9.79195137 2.52296203,9.84495137 C2.55650822,9.90295137 2.6255739,9.92195137 2.66602665,9.97295137 C2.69957284,10.0159514 2.7064794,10.0739514 2.75482538,10.1059514 C2.80810462,10.1429514 2.85645059,10.1759514 2.87815695,10.2389514 C2.90084995,10.2169514 2.94820928,10.3209514 2.99655525,10.2379514 C3.02220822,10.1929514 3.06759423,10.1539514 3.09620716,10.2269514 C3.12087347,10.2899514 3.09620716,10.3299514 3.15047305,10.3849514 C3.19191245,10.4279514 3.18993915,10.4789514 3.11890016,10.4739514 C3.13073999,10.5059514 3.14948639,10.5379514 3.11890016,10.5669514 C3.10508703,10.5809514 3.06562093,10.6099514 3.09423385,10.6299514 C3.12679338,10.6149514 3.16132622,10.6059514 3.19388576,10.5909514 C3.22940525,10.5759514 3.26393809,10.5399514 3.30537749,10.5409514 C3.3073508,10.5539514 3.25012495,10.5919514 3.28564444,10.5949514 C3.31524402,10.5979514 3.35767008,10.5669514 3.38134974,10.5929514 C3.40798936,10.6209514 3.37444317,10.6639514 3.39022961,10.6949514 C3.40601605,10.7269514 3.45929529,10.7029514 3.48494825,10.7079514 C3.47409508,10.7359514 3.43265567,10.7309514 3.40996266,10.7419514 C3.46225525,10.8059514 3.39417622,10.8999514 3.31820398,10.9019514 C3.28169783,10.9019514 3.15244635,10.7529514 3.14652644,10.8489514 C3.14553978,10.8769514 3.15441966,10.9119514 3.16329953,10.9389514 C3.17513936,10.9739514 3.25999148,10.9589514 3.29057771,10.9719514 C3.33497707,10.9899514 3.386283,11.0329514 3.40404275,11.0779514 C3.42081584,11.1239514 3.45929529,11.1539514 3.47409508,11.1979514 C3.502708,11.2799514 3.58065355,11.2909514 3.66155906,11.3149514 C3.76910418,11.3469514 3.7168116,11.5139514 3.71089169,11.5939514 C3.70595842,11.6729514 3.81646351,11.6919514 3.86678279,11.7369514 C3.92302198,11.7859514 3.93190185,11.8809514 3.83915652,11.8889514 C3.79179719,11.8929514 3.71286499,11.8709514 3.69510524,11.9319514 C3.66945228,12.0179514 3.79969041,12.0089514 3.85691626,12.0279514 C3.88355588,12.0369514 3.99110101,12.0479514 4.00096753,12.0729514 C4.01576732,12.1119514 4.00392749,12.1649514 4.01774062,12.2059514 C4.05128681,12.3109514 4.14797876,12.3809514 4.24171075,12.4329514 C4.44298787,12.5459514 4.68175778,12.6169514 4.90276795,12.6799514 C5.02609952,12.7159514 5.15140439,12.7439514 5.27769591,12.7609514 C5.40004083,12.7769514 5.50758595,12.7669514 5.61217112,12.8349514 C5.68419676,12.8819514 5.72958277,12.8469514 5.80358171,12.8599514 C5.83515459,12.8659514 5.84896773,12.8949514 5.87264739,12.9119514 C5.89928701,12.9329514 5.92987324,12.9059514 5.95848616,12.9169514 C5.96341942,12.8979514 5.96144612,12.8799514 5.95256625,12.8619514 C6.00880544,12.8829514 6.07787112,12.9429514 6.13707027,12.8949514 C6.16666985,12.8709514 6.1864029,12.8379514 6.21698913,12.8149514 C6.25349527,12.8179514 6.28901476,12.8199514 6.3255209,12.8199514 C6.47845205,12.8199514 6.59882366,12.7499514 6.72116857,12.6679514 C6.85239336,12.5799514 7.01025776,12.5779514 7.16220225,12.5639514 C7.32302662,12.5479514 7.49371751,12.5269514 7.64072873,12.4569514 C7.76899356,12.3949514 7.8015531,12.2819514 7.83805924,12.1569514 C7.87752534,12.0209514 7.99592365,11.9659514 8.0738692,11.8559514 C8.16562788,11.7279514 8.10544208,11.5609514 8.18042767,11.4279514 L8.18042767,11.4279514 Z M2.2950453,9.62395137 C2.29011203,9.59195137 2.2782722,9.57195137 2.25360589,9.55295137 C2.25261924,9.55595137 2.25163259,9.55795137 2.25163259,9.56195137 C2.2180864,9.54495137 2.21413979,9.48095137 2.16875377,9.48595137 C2.13126098,9.42595137 2.03654233,9.45295137 2.00694276,9.50795137 C1.98720971,9.54495137 2.01088937,9.56195137 2.03259572,9.58895137 C2.06022199,9.62295137 2.05528873,9.64895137 2.06515526,9.68795137 C2.08982157,9.78895137 2.17368704,9.71995137 2.23288619,9.75895137 C2.2555792,9.77395137 2.26445907,9.81695137 2.29800525,9.80995137 C2.33549805,9.80095137 2.33352475,9.74495137 2.32365822,9.71995137 C2.30984509,9.68395137 2.29997856,9.66295137 2.2950453,9.62395137 L2.2950453,9.62395137 Z M3.08338067,10.8149514 C3.08930059,10.7979514 3.06266097,10.7789514 3.04490122,10.7799514 C3.02911478,10.7809514 3.014315,10.8029514 3.00839508,10.8149514 C2.98866203,10.8499514 3.01036839,10.8969514 3.0557544,10.8969514 C3.06660758,10.8779514 3.06266097,10.8409514 3.09127389,10.8379514 C3.08930059,10.8289514 3.08338067,10.8259514 3.07548745,10.8229514 L3.08338067,10.8149514 L3.08338067,10.8149514 Z M2.24472602,9.54595137 C2.24768598,9.54795137 2.25064593,9.54995137 2.25360589,9.55295137 C2.25656585,9.54795137 2.25952581,9.54395137 2.26149911,9.53795137 L2.24472602,9.54595137 L2.24472602,9.54595137 Z M11.4896603,10.9489514 C11.4728872,10.9649514 11.4778204,10.9829514 11.4699272,11.0019514 C11.4610474,11.0249514 11.4265145,11.0339514 11.4077681,11.0459514 C11.3781685,11.0649514 11.368302,11.1099514 11.3357425,11.1209514 C11.3219293,11.0999514 11.3012096,11.0409514 11.2725967,11.0919514 C11.2558236,11.1249514 11.2666768,11.1579514 11.2400372,11.1879514 C11.2133976,11.2159514 11.2153709,11.2499514 11.1966245,11.2809514 C11.1680115,11.3299514 11.1393986,11.3589514 11.0910527,11.3879514 C11.0525732,11.4109514 11.04468,11.4539514 11.0170537,11.4859514 C10.9874541,11.5209514 10.9420681,11.5339514 10.9016154,11.5519514 C10.8730024,11.5639514 10.8256431,11.5979514 10.7930836,11.5789514 C10.7496709,11.5519514 10.80887,11.5039514 10.8295897,11.4869514 C10.8493228,11.4709514 10.9430548,11.4139514 10.9213484,11.3819514 C10.9065486,11.3609514 10.8532694,11.3639514 10.831563,11.3659514 C10.7871637,11.3709514 10.7536175,11.4159514 10.7161247,11.4369514 C10.6736986,11.4609514 10.6371925,11.4809514 10.5908198,11.4969514 C10.5375406,11.5159514 10.533594,11.5659514 10.4911679,11.5959514 C10.4576217,11.6219514 10.414209,11.6419514 10.3707963,11.6419514 C10.3135705,11.6419514 10.3165304,11.5939514 10.2997573,11.5539514 C10.278051,11.5569514 10.2593046,11.5849514 10.2385849,11.5939514 C10.2050387,11.6079514 10.1833323,11.6239514 10.1981321,11.6609514 C10.2119452,11.6989514 10.0590141,11.7339514 10.0323745,11.7529514 C10.0264546,11.7339514 10.0560541,11.7139514 10.067894,11.7029514 C10.0205346,11.6989514 9.96725541,11.7399514 9.91890944,11.7469514 C9.87253677,11.7529514 9.81531092,11.7849514 9.80840435,11.8329514 C9.80347109,11.8709514 9.75315181,11.8699514 9.72157893,11.8829514 C9.66928635,11.9049514 9.6909927,11.9359514 9.68112618,11.9779514 C9.66139313,12.0569514 9.49662215,11.9969514 9.58048762,11.8919514 C9.61008719,11.8549514 9.65448656,11.8309514 9.68112618,11.7929514 C9.71171241,11.7489514 9.71664567,11.6939514 9.74032533,11.6469514 C9.68803274,11.6619514 9.64856664,11.6919514 9.60416728,11.7209514 C9.553848,11.7539514 9.51142194,11.7459514 9.45518275,11.7349514 C9.39006368,11.7209514 9.34467766,11.7539514 9.28449186,11.7689514 C9.24601241,11.7779514 9.16017364,11.7749514 9.15524038,11.8309514 C9.15228042,11.8669514 9.21443953,11.8739514 9.23515923,11.8949514 C9.26574546,11.9269514 9.29929165,11.9739514 9.32494461,12.0099514 C9.34566432,12.0379514 9.42262321,12.0769514 9.41768995,12.1129514 C9.40979673,12.1829514 9.32198465,12.1709514 9.27462533,12.1829514 C9.22726601,12.1949514 9.22035944,12.2379514 9.1858266,12.2639514 C9.1463605,12.2929514 9.09308127,12.2589514 9.04966855,12.2769514 C9.00526919,12.2939514 8.97369631,12.3339514 8.93521686,12.3599514 C8.87009779,12.4049514 8.82767173,12.3559514 8.76057936,12.3529514 C8.70631347,12.3509514 8.65698085,12.3759514 8.60567491,12.3869514 C8.55930224,12.3969514 8.50306305,12.4049514 8.46754356,12.4379514 C8.38959801,12.5079514 8.64020775,12.4889514 8.66388741,12.4869514 C8.65303424,12.5269514 8.64218106,12.5739514 8.60567491,12.5999514 C8.5602889,12.6329514 8.49615648,12.6249514 8.4438639,12.6369514 C8.40341114,12.6469514 8.34717195,12.6919514 8.4063711,12.7239514 C8.45965034,12.7509514 8.52772936,12.7369514 8.5810086,12.7179514 C8.64218106,12.6969514 8.6994069,12.6639514 8.76353932,12.6499514 C8.83063169,12.6349514 8.90068402,12.6419514 8.96777639,12.6299514 C9.03980203,12.6159514 9.10294779,12.5769514 9.17004016,12.5499514 C9.23417258,12.5239514 9.30126495,12.5139514 9.36934398,12.5119514 C9.35553084,12.5369514 9.28843847,12.5349514 9.2627855,12.5409514 C9.21246622,12.5509514 9.17793338,12.5949514 9.1256408,12.5919514 C9.06644165,12.5899514 9.07334822,12.6319514 9.03092216,12.6419514 C9.00329589,12.6489514 8.93817682,12.7129514 8.91745711,12.6729514 C8.90167067,12.6419514 8.87108445,12.6479514 8.86121792,12.6859514 C8.8533247,12.7139514 8.86911114,12.7239514 8.83063169,12.7249514 C8.80103212,12.7249514 8.78721898,12.7129514 8.76057936,12.7059514 C8.70730012,12.6919514 8.68362046,12.7469514 8.64612767,12.7609514 C8.59087513,12.7819514 8.53167597,12.7749514 8.47839674,12.8099514 C8.44781051,12.8299514 8.41426432,12.8359514 8.37775818,12.8469514 C8.31165246,12.8679514 8.24949335,12.8929514 8.18338763,12.9149514 C8.1320817,12.9329514 8.08077576,12.9549514 8.02552322,12.9559514 C8.00283021,12.9559514 7.91205818,12.9399514 7.89725839,12.9669514 C7.86963212,13.0169514 7.95448424,12.9979514 7.97224399,12.9879514 C8.02256327,12.9609514 8.08373572,12.9769514 8.13997492,12.9769514 C8.20904059,12.9769514 8.26626644,12.9629514 8.32842555,12.9309514 C8.34519864,12.9219514 8.45669038,12.8979514 8.4626103,12.9109514 C8.47247682,12.9169514 8.54647576,12.8899514 8.55930224,12.8869514 C8.61948805,12.8729514 8.67967385,12.8599514 8.73887301,12.8449514 C8.92140372,12.7979514 9.10097449,12.7269514 9.27857194,12.6659514 C9.6327802,12.5459514 9.95837554,12.3429514 10.2662111,12.1369514 C10.4053291,12.0439514 10.5187942,11.9219514 10.669752,11.8459514 C10.8216965,11.7699514 10.9578546,11.6689514 11.0969726,11.5739514 C11.2331306,11.4809514 11.3367291,11.3529514 11.4501942,11.2359514 C11.5646459,11.1169514 11.6613378,11.0049514 11.7116571,10.8469514 C11.6830442,10.8399514 11.6534446,10.8989514 11.6297649,10.9099514 C11.5902988,10.9289514 11.5212332,10.9189514 11.4896603,10.9489514 L11.4896603,10.9489514 Z M10.6391658,10.7879514 C10.6736986,10.7409514 10.6440991,10.6769514 10.5829266,10.7139514 C10.5602336,10.7269514 10.5631935,10.7529514 10.5454338,10.7689514 C10.5266874,10.7859514 10.5247141,10.7659514 10.5059677,10.7609514 C10.4793281,10.7549514 10.4359154,10.7909514 10.4270355,10.8149514 C10.3905294,10.8139514 10.3579698,10.8549514 10.3747429,10.8869514 C10.4230889,10.8689514 10.4526885,10.8239514 10.504981,10.8379514 C10.5464205,10.8489514 10.6125262,10.8229514 10.6391658,10.7879514 L10.6391658,10.7879514 Z" /> +</svg> diff --git a/arc-firefox-theme/chrome/browser/identity-secure.svg b/arc-firefox-theme/chrome/browser/identity-secure.svg new file mode 100644 index 0000000..5dad890 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/identity-secure.svg @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" + width="16" height="16" viewBox="0 0 16 16"> + <style> + .icon-default { + fill: #4d9a26; + } + </style> + + <defs> + <rect id="shape-lock-clasp-outer" x="4" y="2" width="8" height="10" rx="4" ry="4" /> + <rect id="shape-lock-clasp-inner" x="6" y="4" width="4" height="6" rx="2" ry="2" /> + <rect id="shape-lock-base" x="3" y="7" width="10" height="7" rx="1" ry="1" /> + + <mask id="mask-clasp-cutout"> + <rect width="16" height="16" fill="#000" /> + <use xlink:href="#shape-lock-clasp-outer" fill="#fff" /> + <use xlink:href="#shape-lock-clasp-inner" fill="#000" /> + </mask> + </defs> + + <use xlink:href="#shape-lock-clasp-outer" mask="url(#mask-clasp-cutout)" class="icon-default" /> + <use xlink:href="#shape-lock-base" class="icon-default" /> +</svg> diff --git a/arc-firefox-theme/chrome/browser/info.svg b/arc-firefox-theme/chrome/browser/info.svg new file mode 100644 index 0000000..f004119 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/info.svg @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> + <circle fill="#00a1f2" cx="8" cy="8" r="8" /> + <circle fill="#fff" cx="8" cy="4" r="1.25" /> + <rect x="7" y="7" width="2" height="6" rx="1" ry="1" fill="#fff" /> +</svg> diff --git a/arc-firefox-theme/chrome/browser/mask.png b/arc-firefox-theme/chrome/browser/mask.png Binary files differdeleted file mode 100644 index f48d176..0000000 --- a/arc-firefox-theme/chrome/browser/mask.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/mask@2x.png b/arc-firefox-theme/chrome/browser/mask@2x.png Binary files differdeleted file mode 100644 index e284af0..0000000 --- a/arc-firefox-theme/chrome/browser/mask@2x.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/newtab/close.png b/arc-firefox-theme/chrome/browser/newtab/close.png Binary files differnew file mode 100644 index 0000000..ea6ada4 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/newtab/close.png diff --git a/arc-firefox-theme/chrome/browser/newtab/newTab.css b/arc-firefox-theme/chrome/browser/newtab/newTab.css index 81042b4..4073cd9 100644 --- a/arc-firefox-theme/chrome/browser/newtab/newTab.css +++ b/arc-firefox-theme/chrome/browser/newtab/newTab.css @@ -12,16 +12,6 @@ background-color: transparent; } -/* SCROLLBOX */ -#newtab-scrollbox:not([page-disabled]) { - color: rgb(0,0,0); - background-color: #f9f9f9; -} - -#newtab-scrollbox:not([page-disabled]) #newtab-margin-bottom { - background: inherit; -} - /* UNDO */ #newtab-undo-container { padding: 4px 3px; @@ -61,8 +51,24 @@ border: none; } -#newtab-undo-close-button:-moz-focusring { - outline: 1px dotted; +#newtab-undo-close-button { + -moz-appearance: none; + padding: 0; + border: none; + height: 16px; + width: 16px; + float: right; + right: 0; + background-image: -moz-image-rect(url(chrome://browser/skin/newtab/close.png), 0, 16, 16, 0); + background-color: transparent; +} + +#newtab-undo-close-button:hover { + background-image: -moz-image-rect(url(chrome://browser/skin/newtab/close.png), 0, 32, 16, 16); +} + +#newtab-undo-close-button:hover:active { + background-image: -moz-image-rect(url(chrome://browser/skin/newtab/close.png), 0, 48, 16, 32); } /* CUSTOMIZE */ @@ -184,7 +190,7 @@ margin-top: 6px; } -.newtab-site[pinned] .newtab-title:-moz-locale-dir(rtl)::before { +.newtab-site[pinned] .newtab-title:-moz-dir(rtl)::before { left: auto; right: 0; } diff --git a/arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css b/arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css index a7eaff1..16d0aee 100644 --- a/arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css +++ b/arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css @@ -112,9 +112,6 @@ .pref-icon[type="plugins"] { list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png); } -.pref-icon[type="fullscreen"] { - list-style-image: url(chrome://global/skin/icons/question-64.png); -} .pref-icon[type="camera"] { list-style-image: url(chrome://global/skin/icons/question-64.png); } diff --git a/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css b/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css index 28f5fc3..c83e0eb 100644 --- a/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css +++ b/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css @@ -194,15 +194,23 @@ treecol { -moz-margin-end: 8px !important; } +/* Privacy pane */ + +#doNotTrackInfo, +#trackingProtectionPBMLearnMore, +#trackingProtectionLearnMore { + -moz-margin-start: 1.5em !important; + margin-top: 0; +} + /* Collapse the non-active vboxes in decks to use only the height the active vbox needs */ #historyPane:not([selectedIndex="1"]) > #historyDontRememberPane, #historyPane:not([selectedIndex="2"]) > #historyCustomPane, #weavePrefsDeck:not([selectedIndex="1"]) > #hasAccount, #weavePrefsDeck:not([selectedIndex="2"]) > #needsUpdate, -#weavePrefsDeck:not([selectedIndex="3"]) > #fxaDeterminingStatus, -#weavePrefsDeck:not([selectedIndex="4"]) > #noFxaAccount, -#weavePrefsDeck:not([selectedIndex="5"]) > #hasFxaAccount, +#weavePrefsDeck:not([selectedIndex="3"]) > #noFxaAccount, +#weavePrefsDeck:not([selectedIndex="4"]) > #hasFxaAccount, #fxaLoginStatus:not([selectedIndex="1"]) > #fxaLoginUnverified, #fxaLoginStatus:not([selectedIndex="2"]) > #fxaLoginRejected { visibility: collapse; @@ -214,28 +222,6 @@ description > html|a { cursor: pointer; } -#fxaProfileImage { - width: 60px; - height: 60px; - border-radius: 50%; - border-width: 5px; - border-color: red; - background-image: url(chrome://browser/skin/fxa/default-profile-image.svg); - background-size: contain; - cursor: pointer; - -moz-margin-end: 15px; -} - -#fxaProfileImage:hover { - border-color: blue; -} - -#noFxaAccount { - /* Overriding the margins from the base preferences.css theme file. - These overrides can be simplified by fixing bug 1027174 */ - margin: 0; -} - #weavePrefsDeck > vbox > label, #weavePrefsDeck > vbox > groupbox, #weavePrefsDeck > vbox > description, @@ -266,16 +252,8 @@ description > html|a { -moz-margin-start: 33px; } -#trackingProtectionImage { - width: 16px; - height: 16px; - list-style-image: url(chrome://browser/skin/bad-content-blocked-16.png); -} - -@media (min-resolution: 2dppx) { - #trackingProtectionImage { - list-style-image: url(chrome://browser/skin/bad-content-blocked-16@2x.png); - } +.text-link { + margin-bottom: 0; } #showUpdateHistory { @@ -392,13 +370,176 @@ description > html|a { * Sync */ +#fxaProfileImage { + max-width: 60px; + border-radius: 50%; + list-style-image: url(chrome://browser/skin/fxa/default-avatar.png); + margin-inline-end: 15px; +} + +#fxaProfileImage.actionable { + cursor: pointer; +} + +#fxaProfileImage.actionable:hover { + box-shadow: 0px 0px 0px 1px #0095DD; +} + +#fxaProfileImage.actionable:hover:active { + box-shadow: 0px 0px 0px 1px #ff9500; +} + +#noFxaAccount { + /* Overriding the margins from the base preferences.css theme file. + These overrides can be simplified by fixing bug 1027174 */ + margin: 0; + padding-top: 15px; +} + +#fxaContentWrapper { + -moz-box-flex: 1; +} + +#noFxaGroup { + -moz-box-flex: 1; + margin: 0; +} + +#fxaContentWrapper { + padding-right: 15px; +} + +#noFxaGroup > vbox, +#fxaGroup { + -moz-box-align: start; +} + +#fxaSyncEngines > vbox:first-child { + margin-right: 80px; +} + +#fxaSyncComputerName { + margin-inline-start: 0px; + -moz-box-flex: 1; +} + +#tosPP-small-ToS { + margin-bottom: 14px; +} + +#noFxaCaption { + font-weight: bold; + margin-bottom: 11px; +} + +.fxaSyncIllustration { + margin-top: 35px; +} + +#syncOptions caption { + margin-bottom: 11px; +} + #fxaDeviceName { - margin: 14px 0px; + margin-bottom: 27.5px; +} + +#noFxaDescription { + margin-bottom: 20px !important; +} + +.separator { + border-bottom: 1px solid var(--in-content-header-border-color); +} + +.fxaAccountBox { + border: 1px solid #D1D2D3; + border-radius: 5px; + padding: 14px 20px 14px 14px; +} + +#signedOutAccountBoxTitle { + margin-inline-start: 6px !important; + font-weight: bold; +} + +.fxaAccountBoxButtons { + margin-bottom: 0 !important; + margin-top: 11px; +} + +.fxaAccountBoxButtons > button { + padding-left: 11px; + padding-right: 11px; } -#fxaSyncComputerName.plain { - background-color: transparent; - opacity: 1; +.fxaSyncIllustration { + width: 231px; + list-style-image: url(chrome://browser/skin/fxa/sync-illustration.png) +} + +#fxaEmailAddress1, +#fxaEmailAddress2, +#fxaEmailAddress3 { + word-break: break-all; +} + +.fxaFirefoxLogo { + list-style-image: url(chrome://browser/skin/fxa/logo.png); + max-width: 64px; + margin-inline-end: 14px; +} + +.fxaMobilePromo { + margin-top: 14px; + margin-bottom: 41px; +} + +#fxaLoginRejectedWarning { + list-style-image: url(chrome://browser/skin/warning.svg); + filter: drop-shadow(0 1px 0 hsla(206, 50%, 10%, .15)); + margin: 4px 8px 0px 0px; +} + +#syncOptions { + margin-bottom: 27.5px; +} + +.androidLogo { + list-style-image: url(chrome://browser/skin/fxa/android.png); + max-width: 24px; + position: relative; + top: 8px; + margin: 0px; + margin-inline-end: 5px; +} + +.androidLink { + margin: 0; +} + +#tosPP-small { + margin-bottom: 20px; +} + +.androidAttribution { + font-size: 12px; + color: #D1D2D3; +} + +@media (min-resolution: 1.1dppx) { + .fxaSyncIllustration { + list-style-image: url(chrome://browser/skin/fxa/sync-illustration@2x.png) + } + .fxaFirefoxLogo { + list-style-image: url(chrome://browser/skin/fxa/logo@2x.png); + } + .androidLogo { + list-style-image: url(chrome://browser/skin/fxa/android@2x.png); + } + #fxaProfileImage { + list-style-image: url(chrome://browser/skin/fxa/default-avatar@2x.png); + } } .treecol-sortdirection { diff --git a/arc-firefox-theme/chrome/browser/privatebrowsing/attention.png b/arc-firefox-theme/chrome/browser/privatebrowsing/attention.png Binary files differnew file mode 100755 index 0000000..8706928 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/privatebrowsing/attention.png diff --git a/arc-firefox-theme/chrome/browser/privatebrowsing/attention@2x.png b/arc-firefox-theme/chrome/browser/privatebrowsing/attention@2x.png Binary files differnew file mode 100755 index 0000000..5b32888 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/privatebrowsing/attention@2x.png diff --git a/arc-firefox-theme/chrome/browser/privatebrowsing/check.png b/arc-firefox-theme/chrome/browser/privatebrowsing/check.png Binary files differnew file mode 100755 index 0000000..59ca51b --- /dev/null +++ b/arc-firefox-theme/chrome/browser/privatebrowsing/check.png diff --git a/arc-firefox-theme/chrome/browser/privatebrowsing/check@2x.png b/arc-firefox-theme/chrome/browser/privatebrowsing/check@2x.png Binary files differnew file mode 100755 index 0000000..031685c --- /dev/null +++ b/arc-firefox-theme/chrome/browser/privatebrowsing/check@2x.png diff --git a/arc-firefox-theme/chrome/browser/privatebrowsing/mask.svg b/arc-firefox-theme/chrome/browser/privatebrowsing/mask.svg new file mode 100755 index 0000000..655445e --- /dev/null +++ b/arc-firefox-theme/chrome/browser/privatebrowsing/mask.svg @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" + width="47.203" height="26.109" viewBox="0 0 94.407 52.219"> + <path fill="#fff" d="M92.657,14.670 C92.270,21.197 93.816,28.994 85.124,40.236 C75.849,52.230 66.639,51.314 64.901,51.495 C54.468,52.578 53.093,43.491 46.999,43.491 C41.664,43.491 37.317,52.520 29.481,51.495 C27.749,51.268 18.533,52.230 9.259,40.236 C0.567,28.994 2.112,21.197 1.726,14.670 C1.340,8.142 -0.012,1.071 -0.012,1.071 C-0.012,1.071 4.176,5.241 9.585,5.604 C14.993,5.967 16.004,3.740 27.416,0.527 C39.755,-2.947 47.191,11.290 47.191,11.290 C47.191,11.290 55.571,-2.737 66.967,0.527 C78.363,3.791 78.836,5.967 84.245,5.604 C89.653,5.241 94.395,1.071 94.395,1.071 C94.395,1.071 93.043,8.142 92.657,14.670 ZM28.858,17.405 C22.113,15.942 19.283,18.441 16.393,19.507 C13.872,20.437 11.577,20.726 11.577,20.726 C11.577,20.726 11.963,24.533 18.724,27.797 C25.484,31.061 39.352,29.377 39.352,29.377 C39.352,29.377 40.824,20.000 28.858,17.405 ZM77.990,19.507 C75.100,18.441 72.270,15.942 65.525,17.405 C53.557,20.000 55.030,29.377 55.030,29.377 C55.030,29.377 68.899,31.061 75.659,27.797 C82.419,24.533 82.805,20.726 82.805,20.726 C82.805,20.726 80.511,20.437 77.990,19.507 Z"/> +</svg> diff --git a/arc-firefox-theme/chrome/browser/privatebrowsing/shield-page.png b/arc-firefox-theme/chrome/browser/privatebrowsing/shield-page.png Binary files differnew file mode 100755 index 0000000..2ddcf34 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/privatebrowsing/shield-page.png diff --git a/arc-firefox-theme/chrome/browser/privatebrowsing/shield-page@2x.png b/arc-firefox-theme/chrome/browser/privatebrowsing/shield-page@2x.png Binary files differnew file mode 100755 index 0000000..72a0b82 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/privatebrowsing/shield-page@2x.png diff --git a/arc-firefox-theme/chrome/browser/readinglist/icons.svg b/arc-firefox-theme/chrome/browser/readinglist/icons.svg deleted file mode 100644 index f6bb404..0000000 --- a/arc-firefox-theme/chrome/browser/readinglist/icons.svg +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- This Source Code Form is subject to the terms of the Mozilla Public - - License, v. 2.0. If a copy of the MPL was not distributed with this - - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 14 14"> - <defs> - <style> - use:not(:target) { - display: none; - } - #addpage, #alreadyadded { - fill: #808080; - } - #addpage-hover, #alreadyadded-hover { - fill: #555; - } - #addpage-active, #alreadyadded-active { - fill: #0095dd; - } - </style> - <mask id="plus-mask"> - <rect width="100%" height="100%" fill="#fff"/> - <rect x="3" y="6" width="8" height="2"/> - <rect x="6" y="3" width="2" height="8"/> - </mask> - <mask id="minus-mask"> - <rect width="100%" height="100%" fill="#fff"/> - <rect x="3" y="6" width="8" height="2"/> - </mask> - <g id="addpage-shape"> - <circle cx="7" cy="7" r="6" mask="url(#plus-mask)"/> - </g> - <g id="removepage-shape"> - <circle cx="7" cy="7" r="6" mask="url(#minus-mask)"/> - </g> - </defs> - <use id="addpage" xlink:href="#addpage-shape"/> - <use id="addpage-hover" xlink:href="#addpage-shape"/> - <use id="addpage-active" xlink:href="#addpage-shape"/> - <use id="alreadyadded" xlink:href="#removepage-shape"/> - <use id="alreadyadded-hover" xlink:href="#removepage-shape"/> - <use id="alreadyadded-active" xlink:href="#removepage-shape"/> -</svg> diff --git a/arc-firefox-theme/chrome/browser/readinglist/readinglist-icon.svg b/arc-firefox-theme/chrome/browser/readinglist/readinglist-icon.svg deleted file mode 100644 index 58b18c9..0000000 --- a/arc-firefox-theme/chrome/browser/readinglist/readinglist-icon.svg +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- This Source Code Form is subject to the terms of the Mozilla Public - - License, v. 2.0. If a copy of the MPL was not distributed with this - - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"> - <rect x="4.8" y="6.4" fill="#808080" width="11.2" height="3.2"/> - <rect x="4.8" y="11.2" fill="#808080" width="11.2" height="3.2"/> - <rect x="4.8" y="1.6" fill="#808080" width="11.2" height="3.2"/> - <circle fill="#808080" cx="1.6" cy="3.2" r="1.6"/> - <circle fill="#808080" cx="1.6" cy="8" r="1.6"/> - <circle fill="#808080" cx="1.6" cy="12.8" r="1.6"/> -</svg> diff --git a/arc-firefox-theme/chrome/browser/readinglist/sidebar.css b/arc-firefox-theme/chrome/browser/readinglist/sidebar.css deleted file mode 100644 index 27fc12b..0000000 --- a/arc-firefox-theme/chrome/browser/readinglist/sidebar.css +++ /dev/null @@ -1,148 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - - -:root, body { - overflow-x: hidden; -} - -body { - margin: 0; - font: message-box; - color: #333333; - -moz-user-select: none; - overflow: hidden; -} - -#emptyListInfo { - cursor: default; - padding: 3em 1em; - text-align: center; -} - -.item { - display: flex; - flex-flow: row; - cursor: pointer; - padding: 6px; - opacity: 0; - max-height: 0; - transition: opacity 150ms ease-in-out, max-height 150ms ease-in-out 150ms; -} - -.item.active { - background: #FEFEFE; -} - -.item.selected { - background: #FDFDFD; -} - -.item-thumb-container { - min-width: 64px; - max-width: 64px; - min-height: 40px; - max-height: 40px; - border: 1px solid white; - box-shadow: 0px 1px 2px rgba(0,0,0,.35); - margin: 5px; - background-color: #ebebeb; - background-size: contain; - background-repeat: no-repeat; - background-position: center; - background-image: url("chrome://branding/content/silhouette-40.svg"); -} - -.item-thumb-container.preview-available { - background-color: #fff; - background-size: cover; -} - -.item-summary-container { - display: flex; - flex-flow: column; - -moz-padding-start: 4px; - overflow: hidden; - flex-grow: 1; -} - -.item-title-lines { - display: flex; -} - -.item-title { - overflow: hidden; - max-height: 2.8em; - line-height: 1.4; - flex-grow: 1; -} - -.item-domain { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - max-height: 1.4em; - color: #0095DD; -} - -.item:hover .item-domain { - color: #008ACB; -} - -.item:not(:hover):not(.selected) .remove-button { - visibility: hidden; -} - -.remove-button { - padding: 0; - width: 16px; - height: 16px; - min-width: 16px; - min-height: 16px; - background-size: contain; - background-color: transparent; - border-width: 0; -} - -.item.visible { - opacity: 1; - max-height: 80px; - transition: max-height 250ms ease-in-out, opacity 250ms ease-in-out 250ms; -} - -html { - border: 1px solid ThreeDShadow; - background-color: -moz-Field; - color: -moz-FieldText; - box-sizing: border-box; -} - -.item { - -moz-padding-end: 0; -} - -.item.active { - background-color: -moz-cellhighlight; - color: -moz-cellhighlighttext; -} - -.item-title { - margin: 1px 0 0; -} - -.item-title, .item-domain { - -moz-margin-end: 6px; -} - -.remove-button { - background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 16, 16, 0); -} - -.remove-button:hover { - background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 32, 16, 16); -} - -.remove-button:hover:active { - background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 48, 16, 32); -} diff --git a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss index 8aac321..3233be1 100644 --- a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss +++ b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss @@ -89,7 +89,8 @@ $darker_asset_path_2: if($darker=='true', 'dark', $asset_path); #TabsToolbar:not([collapsed="true"]) + #nav-bar { border-top: 1px solid $header_border !important; background-clip: padding-box; - margin-top: -1px; /* Move up into the TabsToolbar for the inner highlight at the top of the 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; @@ -132,7 +133,7 @@ $darker_asset_path_2: if($darker=='true', 'dark', $asset_path); /* Places toolbar */ toolbarbutton.bookmark-item:not(.subviewbutton), #personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder { - margin: 1px; + margin: 0; padding: 2px 3px; } @@ -353,7 +354,7 @@ menuitem.bookmark-item { } /* Stock icons for the menu bar items */ -menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { +menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip):not([endimage]) { -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); } @@ -548,11 +549,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); } -#menu_readingList, -#BMB_readingList { - list-style-image: url("chrome://browser/skin/readinglist/readinglist-icon.svg"); -} - #panelMenu_pocket, #menu_pocket, #BMB_pocket { @@ -614,7 +610,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { .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-container, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-badge-stack, :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon { -moz-margin-end: 0; padding: 2px 6px; @@ -625,14 +621,14 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { } :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-icon, -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-badge-container, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-badge-stack, :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { padding: 3px 7px; } /* Help SDK icons fit: */ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon, -toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-container > .toolbarbutton-icon { +toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-stack > .toolbarbutton-icon { width: 16px; } @@ -652,11 +648,12 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba border-image: url("chrome://browser/skin/custom_images/navbar-separator.png") 0 0 0 2 / 0 0 0 2px; } + .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-container, +:-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); border-width: 1px; @@ -665,6 +662,12 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba 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; +//} + #TabsToolbar .toolbarbutton-1[open]:not([disabled=true]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon, #TabsToolbar .toolbarbutton-1:not([disabled=true]):not([open]):hover > .toolbarbutton-menubutton-button > .toolbarbutton-icon, #TabsToolbar .toolbarbutton-1:not([disabled=true]):not([open]):hover > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon, @@ -675,16 +678,10 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba background-clip: padding-box; } -//:-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:not([open="true"]) > .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-container, +:-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); box-shadow: var(--toolbarbutton-active-boxshadow); @@ -696,7 +693,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba #TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):-moz-any(:hover:active, [open="true"]) > .toolbarbutton-icon, #TabsToolbar .toolbarbutton-1[open="true"] > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon, -#TabsToolbar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-container, +#TabsToolbar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-stack, #TabsToolbar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon { background: none; @include button(header-active); @@ -753,30 +750,41 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba } //#back-button > .toolbarbutton-icon { -// border-radius: 2px; +// border-radius: 10000px; // background-clip: padding-box; -// padding: 3px 7px; +// padding: 6px; // border: none; -// box-shadow: none; -// background: none !important; +// box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset, +// 0 0 0 1px hsla(0,0%,100%,.3) inset, +// 0 0 0 1px hsla(210,54%,20%,.25), +// 0 1px 0 hsla(210,54%,20%,.35); +// background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1)); // transition-property: background-color, box-shadow; // transition-duration: 250ms; //} //#back-button:not([disabled="true"]):not([open="true"]):not(:active):hover > .toolbarbutton-icon { -// background-color: transparent; -// box-shadow: none; +// background-color: hsla(210,48%,96%,.75); +// box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset, +// 0 0 0 1px hsla(0,0%,100%,.3) inset, +// 0 0 0 1px hsla(210,54%,20%,.3), +// 0 1px 0 hsla(210,54%,20%,.4), +// 0 0 4px hsla(210,54%,20%,.2); //} //#back-button:not([disabled="true"]):hover:active > .toolbarbutton-icon, //#back-button[open="true"] > .toolbarbutton-icon { -// background-color: red; -// box-shadow: none; +// background-color: hsla(210,54%,20%,.15); +// box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset, +// 0 0 1px hsla(210,54%,20%,.2) inset, +// 0 0 0 1px hsla(210,54%,20%,.4), +// 0 1px 0 hsla(210,54%,20%,.2); // transition: none; //} //#main-window:not([customizing]) #back-button[disabled] > .toolbarbutton-icon { -// box-shadow: none !important; +// box-shadow: 0 0 0 1px hsla(210,54%,20%,.55), +// 0 1px 0 hsla(210,54%,20%,.65) !important; // transition: none; //} @@ -785,26 +793,27 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba } #forward-button { +// -moz-box-align: stretch; /* let the button shape grow vertically with the location bar */ + padding: 0; margin-left: 2px; margin-right: 2px; - //-moz-box-align: stretch; - padding: 0; } -#forward-button > .toolbarbutton-icon { +//#forward-button > .toolbarbutton-icon { // background-clip: padding-box; -// padding: 3px 7px; -// border: 1px solid transparent; +// padding-left: 9px; +// padding-right: 3px; +// border: 1px solid #9a9a9a; // border-left-style: none; // border-radius: 0; -} +//} //window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not([switchingtabs]) > #forward-button { // transition: margin-left 150ms ease-out; //} //window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] { -// margin-left: 5px; +// margin-left: -30px; //} //window:not([chromehidden~="toolbar"]) #urlbar-wrapper:hover:not([switchingtabs]) > #forward-button[disabled] { @@ -814,7 +823,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba //window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-button[disabled] { // /* when not hovered anymore, trigger a new transition to hide the forward button immediately */ -// margin-left: 10px; +// margin-left: -30.01px; //} /* tabview menu item */ @@ -1003,6 +1012,15 @@ toolbar[brighttext] #sync-button[status="active"] { -moz-image-region: rect(0, 486px, 18px, 468px); } +#PanelUI-menu-button.thumburger { + list-style-image: url("chrome://browser/skin/customizableui/thumburger.png") !important; + -moz-image-region: auto !important; +} + +toolbar[brighttext] #PanelUI-menu-button.thumburger { + list-style-image: url("chrome://browser/skin/customizableui/thumburger-inverted.png") !important; +} + #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #cut-button { -moz-image-region: rect(0, 504px, 18px, 486px); } @@ -1059,44 +1077,44 @@ toolbar[brighttext] #sync-button[status="active"] { -moz-image-region: rect(0, 720px, 18px, 702px); } -#loop-button > .toolbarbutton-badge-container { +#loop-button { list-style-image: url("chrome://browser/skin/custom_images/#{$asset_path}/loop-toolbar-icons.svg"); -moz-image-region: rect(0, 18px, 18px, 0); #TabsToolbar & { list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/loop-tabbar-icons.svg"); } } -#loop-button:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-container, -#TabsToolbar #loop-button:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-container { - list-style-image: url("chrome://browser/skin/custom_images/loop-toolbar-icons-active.svg"); +#loop-button:not([disabled=true]):-moz-any([open],[checked],:hover:active), +#TabsToolbar #loop-button:not([disabled=true]):-moz-any([open],[checked],:hover:active) { + list-style-image: url("chrome://browser/skin/custom_images/loop-toolbar-icons-active.svg") !important; } -//toolbar[brighttext] #loop-button > .toolbarbutton-badge-container { +//toolbar[brighttext] #loop-button { // list-style-image: url(chrome://browser/skin/loop/toolbar-inverted.png); //} -#loop-button[state="disabled"] > .toolbarbutton-badge-container, -#loop-button[disabled="true"] > .toolbarbutton-badge-container { +#loop-button[state="disabled"], +#loop-button[disabled="true"] { -moz-image-region: rect(0, 36px, 18px, 18px); } -#loop-button:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="error"] { -moz-image-region: rect(0, 54px, 18px, 36px); } -#loop-button:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="action"] { -moz-image-region: rect(0, 72px, 18px, 54px); } -#loop-button:not([disabled="true"])[state="action"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="action"]:-moz-any(:hover,:hover:active,[open]) { -moz-image-region: rect(0, 90px, 18px, 72px); } -#loop-button:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="active"] { -moz-image-region: rect(0, 108px, 18px, 90px); } -#loop-button:not([disabled="true"])[state="active"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="active"]:-moz-any(:hover,:hover:active,[open]) { -moz-image-region: rect(0, 126px, 18px, 108px); } @@ -1305,39 +1323,39 @@ toolbar[brighttext] #sync-button[status="active"] { -moz-image-region: rect(0, 832px, 32px, 800px); } - #loop-button[cui-areatype="menu-panel"] > .toolbarbutton-badge-container, - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"], + toolbarpaletteitem[place="palette"] > #loop-button { list-style-image: url(chrome://browser/skin/loop/menuPanel.png); -moz-image-region: rect(0, 32px, 32px, 0); } /* Make sure that the state icons are not shown in the customization palette. */ - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + toolbarpaletteitem[place="palette"] > #loop-button { -moz-image-region: rect(0, 32px, 32px, 0) !important; } - #loop-button[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container, - #loop-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"][state="disabled"], + #loop-button[cui-areatype="menu-panel"][disabled="true"] { -moz-image-region: rect(0, 64px, 32px, 32px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { -moz-image-region: rect(0, 96px, 32px, 64px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { -moz-image-region: rect(0, 128px, 32px, 96px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover,:hover:active,[open]) { -moz-image-region: rect(0, 160px, 32px, 128px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { -moz-image-region: rect(0, 192px, 32px, 160px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover,:hover:active,[open]) { -moz-image-region: rect(0, 224px, 32px, 192px); } @@ -1489,39 +1507,39 @@ toolbar[brighttext] #sync-button[status="active"] { -moz-image-region: rect(64px, 1984px, 128px, 1920px); } - #loop-button[cui-areatype="menu-panel"] > .toolbarbutton-badge-container, - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"], + toolbarpaletteitem[place="palette"] > #loop-button { list-style-image: url(chrome://browser/skin/loop/menuPanel@2x.png); -moz-image-region: rect(0, 64px, 64px, 0); } /* Make sure that the state icons are not shown in the customization palette. */ - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + toolbarpaletteitem[place="palette"] > #loop-button { -moz-image-region: rect(0, 64px, 64px, 0) !important; } - #loop-button[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container, - #loop-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"][state="disabled"], + #loop-button[cui-areatype="menu-panel"][disabled="true"] { -moz-image-region: rect(0, 128px, 64px, 64px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { -moz-image-region: rect(0, 192px, 64px, 128px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { -moz-image-region: rect(0, 256px, 64px, 192px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover,:hover:active,[open]) { -moz-image-region: rect(0, 320px, 64px, 256px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { -moz-image-region: rect(0, 384px, 64px, 320px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover,:hover:active,[open]) { -moz-image-region: rect(0, 448px, 64px, 384px); } @@ -1688,7 +1706,7 @@ toolbar[brighttext] #sync-button[status="active"] { #urlbar, .searchbar-textbox { -moz-appearance: none; - padding: 3px; + padding: 2px 3px; border-radius: 3px; margin: 0 3px; @include entry(normal); @@ -1739,7 +1757,7 @@ toolbar[brighttext] #sync-button[status="active"] { //window:not([chromehidden~="toolbar"]) #urlbar-wrapper { // clip-path: url("chrome://browser/content/browser.xul#urlbar-back-button-clip-path"); -// -moz-margin-start: -5px; +// margin-inline-start: calc(-1 * var(--backbutton-urlbar-overlap)); //} //window:not([chromehidden~="toolbar"]) #urlbar-wrapper:-moz-locale-dir(rtl), @@ -1760,6 +1778,29 @@ toolbar[brighttext] #sync-button[status="active"] { // padding: 0 3px; //} +#urlbar-search-footer { + border-top: 1px solid hsla(210,4%,10%,.14); + background-color: hsla(210,4%,10%,.07); +} + +#urlbar-search-settings { + -moz-appearance: none; + -moz-user-focus: ignore; + color: inherit; + margin: 0; + border: 0; + padding: 8px 20px; + background: transparent; +} + +#urlbar-search-settings:hover { + background-color: hsla(210,4%,10%,.07); +} + +#urlbar-search-settings:hover:active { + background-color: hsla(210,4%,10%,.12); +} + #urlbar-search-splitter { -moz-appearance: none; width: 8px; @@ -1784,70 +1825,80 @@ toolbar[brighttext] #sync-button[status="active"] { color: GrayText; } -#search-container { - min-width: calc(54px + 11ch); +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] { + border-bottom: 1px solid hsla(210, 4%, 10%, 0.14); + background-color: hsla(210, 4%, 10%, 0.07); + padding: 6px 0; + -moz-padding-start: 44px; + -moz-padding-end: 6px; + background-image: url("chrome://browser/skin/info.svg"); + background-clip: padding-box; + background-position: 20px center; + background-repeat: no-repeat; + background-size: 16px 16px; } -/* identity box */ - -#identity-box { - padding: 1px; - font-size: .9em; +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"]:-moz-locale-dir(rtl) { + background-position: right 20px center; } -#identity-box:-moz-locale-dir(ltr) { - border-top-left-radius: 1.5px; - border-bottom-left-radius: 1.5px; +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description { + margin: 0; + padding: 0; } -#identity-box:-moz-locale-dir(rtl) { - border-top-right-radius: 1.5px; - border-bottom-right-radius: 1.5px; +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description > label.text-link { + -moz-margin-start: 0; } -#notification-popup-box:not([hidden]) + #identity-box { - //-moz-padding-start: 10px; - border-radius: 0; +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button { + -moz-appearance: none; + -moz-user-focus: ignore; + min-width: 80px; + border-radius: 3px; + padding: 4px 16px; + margin: 0; + -moz-margin-start: 10px; } -window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box { - border-radius: 0; +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"] { + color: hsl(210, 0%, 38%); + background-color: hsl(210, 0%, 88%); + border: 1px solid hsl(210, 0%, 82%); } -//window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not([switchingtabs]) > #urlbar > #identity-box { - //transition: padding-left, padding-right; -//} +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"]:hover { + background-color: hsl(210, 0%, 84%); +} -//window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) { - //padding-left: 5px; -//} +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-enable"] { + color: white; + background-color: hsl(93, 82%, 44%); + border: 1px solid hsl(93, 82%, 44%); +} -//window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) { - //padding-right: 5px; -//} +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-enable"]:hover { + background-color: hsl(93, 82%, 40%); +} -//window:not([chromehidden~="toolbar"]) #urlbar-wrapper:hover:not([switchingtabs]) > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box { - /* forward button hiding is delayed when hovered */ -// transition-delay: 100s; -//} +#search-container { + min-width: calc(54px + 11ch); +} -//window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) { - /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */ - //padding-left: 5.01px; -//} +/* identity box */ -//window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) { - /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */ - //padding-right: 5.01px; -//} +#identity-box:-moz-locale-dir(ltr) { + border-top-left-radius: 1.5px; + border-bottom-left-radius: 1.5px; +} -#urlbar[pageproxystate="valid"] > #identity-box.chromeUI, -#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { - -moz-margin-end: 4px; +#identity-box:-moz-locale-dir(rtl) { + border-top-right-radius: 1.5px; + border-bottom-right-radius: 1.5px; } -#identity-box.verifiedIdentity:not(:-moz-lwtheme) { - background-color: var(--verified-identity-box-backgroundcolor); +#identity-box.verifiedIdentity:not(:-moz-lwtheme):not(:hover):not([open=true]) { + background-color: var(--identity-box-verified-background-color); } #identity-box:-moz-focusring { @@ -1855,141 +1906,137 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box outline-offset: -3px; } -#identity-icon-labels { - -moz-padding-start: 2px; - -moz-padding-end: 5px; -} - -:root { +#identity-box { +// --identity-box-selected-background-color: rgb(231,230,230); --identity-box-verified-color: hsl(92,100%,30%); - --identity-box-verified-background-image: linear-gradient( - transparent 15%, - hsla(92,81%,16%,.2) 15%, - hsla(92,81%,16%,.2) 85%, - transparent 85%); --identity-box-chrome-color: rgb(229,115,0); - --identity-box-chrome-background-image: linear-gradient( - transparent 15%, - rgba(229,114,0,.5) 15%, - rgba(229,114,0,.5) 85%, - transparent 85%); -} -#urlbar[pageproxystate="valid"] > #identity-box.chromeUI, -#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { - background-position: right; - background-size: 1px; - background-repeat: no-repeat; + border-inline-end: 1px solid var(--urlbar-separator-color); + border-image: linear-gradient(transparent 15%, + var(--urlbar-separator-color) 15%, + var(--urlbar-separator-color) 85%, + transparent 85%); + border-image-slice: 1; + font-size: .9em; + padding: 3px 5px 3px 3px; + margin-inline-end: 4px; + overflow: hidden; +// /* The latter two properties have a transition to handle the delayed hiding of +// the forward button when hovered. */ +// transition: background-color 150ms ease, padding-left, padding-right; } -#urlbar[pageproxystate="valid"] > #identity-box.chromeUI:-moz-locale-dir(rtl), -#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity:-moz-locale-dir(rtl) { - background-position: left; -} +//#identity-box:hover, +//#identity-box[open=true] { +// background-color: var(--identity-box-selected-background-color); +// border-image-source: none; +//} #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { color: var(--identity-box-verified-color); - background-image: var(--identity-box-verified-background-image); } #urlbar[pageproxystate="valid"] > #identity-box.chromeUI { color: var(--identity-box-chrome-color); - background-image: var(--identity-box-chrome-background-image); } -/* page proxy icon */ - -#page-proxy-favicon { - width: 16px; - height: 16px; - list-style-image: url(chrome://browser/skin/identity-icons-generic.png); +#identity-icon-labels { + padding-inline-start: 2px; } -.chromeUI > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://branding/content/identity-icons-brand.png); +#notification-popup-box:not([hidden]) + #identity-box { + padding-inline-start: 5px; + border-radius: 0; } -.verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https.png); +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box { + border-radius: 0; } -.verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-ev.png); -} +//window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box { +// padding-inline-start: calc(var(--backbutton-urlbar-overlap) + 4px); +//} -.mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active.png); -} +//window:not([chromehidden~="toolbar"]) #urlbar-wrapper:hover:not([switchingtabs]) > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box { +// /* Forward button hiding is delayed when hovered, so we should use the same +// delay for the identity box. We handle both horizontal paddings (for LTR and +// RTL), the latter two delays here are for padding-left and padding-right. */ +// transition-delay: 0s, 100s, 100s; +//} -.mixedDisplayContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display.png); -} +//window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box { +// /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */ +// padding-inline-start: calc(var(--backbutton-urlbar-overlap) + 4.01px); +//} -.mixedDisplayContentLoadedActiveBlocked > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display.png); -} +/* TRACKING PROTECTION ICON */ -#page-proxy-favicon[pageproxystate="invalid"] { - opacity: 0.3; +#tracking-protection-icon { + width: 16px; + height: 16px; + margin-inline-start: 0; + margin-inline-end: 2px; + list-style-image: url(chrome://browser/skin/tracking-protection-16.svg); + opacity: 1; } -@media not all and (min-resolution: 1.1dppx) { - #page-proxy-favicon { - -moz-image-region: rect(0, 16px, 16px, 0); - } +#tracking-protection-icon[state="loaded-tracking-content"] { + list-style-image: url(chrome://browser/skin/tracking-protection-disabled-16.svg); +} - #identity-box:hover > #page-proxy-favicon { - -moz-image-region: rect(0, 32px, 16px, 16px); - } +#tracking-protection-icon[animate] { + transition: margin-left 200ms ease-out, margin-right 200ms ease-out; +} - #identity-box:hover:active > #page-proxy-favicon, - #identity-box[open=true] > #page-proxy-favicon { - -moz-image-region: rect(0, 48px, 16px, 32px); - } +#tracking-protection-icon:not([state]) { + margin-inline-start: -18px; + pointer-events: none; + opacity: 0; + /* Only animate the shield in, when it disappears hide it immediately. */ + transition: none; } -@media (min-resolution: 1.1dppx) { - #page-proxy-favicon { - list-style-image: url(chrome://browser/skin/identity-icons-generic@2x.png); - -moz-image-region: rect(0, 32px, 32px, 0); - } +#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icons > #tracking-protection-icon { + visibility: collapse; +} - .chromeUI > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://branding/content/identity-icons-brand@2x.png); - } +/* MAIN IDENTITY ICON */ - .verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https@2x.png); - } +#page-proxy-favicon { + width: 16px; + height: 16px; + list-style-image: url(chrome://browser/skin/identity-not-secure.svg); +} - .verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-ev@2x.png); - } +.chromeUI > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://branding/content/identity-icons-brand.svg); +} - .mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active@2x.png); - } +.verifiedDomain > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], +.verifiedIdentity > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-secure.svg); +} - .mixedDisplayContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display@2x.png); - } +.mixedActiveContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); +} - .mixedDisplayContentLoadedActiveBlocked > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display@2x.png); - } +.weakCipher > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], +.mixedDisplayContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], +.mixedDisplayContentLoadedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); +} - #identity-box:hover > #page-proxy-favicon { - -moz-image-region: rect(0, 64px, 32px, 32px); - } +.mixedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg); +} - #identity-box:hover:active > #page-proxy-favicon, - #identity-box[open=true] > #page-proxy-favicon { - -moz-image-region: rect(0, 96px, 32px, 64px); - } +#page-proxy-favicon[pageproxystate="invalid"] { + opacity: 0.3; } -#urlbar[actiontype="searchengine"] > #identity-box > #page-proxy-favicon { +#urlbar[actiontype="searchengine"] > #identity-box > #identity-icons > #page-proxy-favicon { -moz-image-region: inherit; list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); width: 16px; @@ -1997,13 +2044,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box opacity: 1; } -#page-proxy-favicon { - margin-top: 1px; - margin-bottom: 1px; - -moz-margin-start: 3px; - -moz-margin-end: 1px; -} - .popup-notification-icon { width: 64px; @@ -2072,15 +2112,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box list-style-image: url(chrome://global/skin/icons/webapps-64.png); } -.popup-notification-icon[popupid="bad-content"] { - list-style-image: url(chrome://browser/skin/bad-content-blocked-64.png); -} - -.popup-notification-icon[popupid="bad-content"][mixedblockdisabled], -.popup-notification-icon[popupid="bad-content"][trackingblockdisabled] { - list-style-image: url(chrome://browser/skin/bad-content-unblocked-64.png); -} - .popup-notification-icon[popupid="webRTC-sharingDevices"], .popup-notification-icon[popupid="webRTC-shareDevices"] { list-style-image: url(chrome://browser/skin/webRTC-shareDevice-64.png); @@ -2221,16 +2252,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box } } -.bad-content-blocked-notification-icon, -#bad-content-blocked-notification-icon { - list-style-image: url(chrome://browser/skin/bad-content-blocked-16.png); -} - -.bad-content-unblocked-notification-icon, -#bad-content-unblocked-notification-icon { - list-style-image: url(chrome://browser/skin/bad-content-unblocked-16.png); -} - .webRTC-shareDevices-notification-icon, #webRTC-shareDevices-notification-icon { list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16.png); @@ -2382,8 +2403,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box /* Notification icon box */ #notification-popup-box { border-radius: 2.5px 0 0 2.5px; - margin-top: -1px; - margin-bottom: -1px; } .notification-anchor-icon:-moz-focusring { @@ -2601,7 +2620,9 @@ richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-t height: 16px; } -.ac-comment { +.ac-comment, +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description, +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button { font-size: 1.05em; } @@ -2756,41 +2777,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- list-style-image: url("chrome://browser/skin/Info.png"); } -/* Reading List button */ - -#urlbar:not([focused]):not(:hover) #readinglist-addremove-button { - opacity: 0; - width: 0px; -} - -#readinglist-addremove-button { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage"); - -moz-image-region: rect(0, 14px, 14px, 0); - transition: width 150ms ease-in-out, opacity 150ms ease-in-out 150ms; - opacity: 1; - width: 20px; -} - -#readinglist-addremove-button:hover { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-hover"); -} - -#readinglist-addremove-button:active { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-active"); -} - -#readinglist-addremove-button[already-added="true"] { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded"); -} - -#readinglist-addremove-button[already-added="true"]:hover { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded-hover"); -} - -#readinglist-addremove-button[already-added="true"]:active { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded-active"); -} - /* Reader mode button */ #reader-mode-button { @@ -2870,10 +2856,10 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- -moz-box-align: center; } -#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { - //margin-top: 3px; - //margin-bottom: 3px; -} +//#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, @@ -2953,7 +2939,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- background-color: Window; } - /* Findbar */ .browserContainer > findbar { background-color: $bg_color; @@ -3047,12 +3032,11 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- :root { --tab-toolbar-navbar-overlap: 1px; + --navbar-tab-toolbar-highlight-overlap: 1px; --tab-min-height: 31px; } #TabsToolbar { - --tab-separator-image: url(chrome://browser/skin/tabbrowser/tab-separator.png); - --tab-separator-size: 3px 100%; - --tab-separator-opacity: 1; + --tab-stroke-background-size: auto 100%; } @@ -3118,6 +3102,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- .tab-throbber, .tab-icon-image, +.tab-icon-sound, .tab-close-button { margin-top: 1px; } @@ -3136,16 +3121,49 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- .tab-icon-overlay { width: 16px; height: 16px; - margin-top: 10px; + margin-top: -12px; -moz-margin-start: -16px; - display: none; + position: relative; } .tab-icon-overlay[crashed] { - display: -moz-box; list-style-image: url("chrome://browser/skin/tabbrowser/crashed.svg"); } +.tab-icon-overlay[soundplaying], +.tab-icon-overlay[muted]:not([crashed]) { + border-radius: 8px; +} + +.tab-icon-overlay[soundplaying]:hover, +.tab-icon-overlay[muted]:not([crashed]):hover { + background-color: white; +} + +.tab-icon-overlay[soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/tabs/tab-audio-small.svg#tab-audio"); +} + +.tab-icon-overlay[muted]:not([crashed]) { + list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/tabs/tab-audio-small.svg#tab-audio-muted"); +} + +.tabbrowser-tab[visuallyselected=true] .tab-icon-overlay[soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/#{$asset_path}/tabs/tab-audio-small.svg#tab-audio"); +} + +.tabbrowser-tab[visuallyselected=true] .tab-icon-overlay[muted]:not([crashed]) { + list-style-image: url("chrome://browser/skin/custom_images/#{$asset_path}/tabs/tab-audio-small.svg#tab-audio-muted"); +} + +//#TabsToolbar[brighttext] .tab-icon-overlay[soundplaying]:not(:hover) { +// list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white"); +//} + +//#TabsToolbar[brighttext] .tab-icon-overlay[muted]:not([crashed]):not(:hover) { +// list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white-muted"); +//} + .tab-throbber[busy] { list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png"); } @@ -3165,6 +3183,85 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- padding: 0; } +.tab-icon-sound { + -moz-margin-start: 4px; + width: 16px; + height: 16px; + padding: 0; +} + +.tab-icon-sound[soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/tabs/tab-audio.svg#tab-audio-backgroundTab"); +} + +.tab-icon-sound[soundplaying]:hover { + list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/tabs/tab-audio.svg#tab-audio-backgroundTab-hover"); +} + +.tab-icon-sound[soundplaying]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/tabs/tab-audio.svg#tab-audio-backgroundTab-pressed"); +} + +.tab-icon-sound[muted] { + list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/tabs/tab-audio.svg#tab-audio-backgroundTab-muted"); +} + +.tab-icon-sound[muted]:hover { + list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-hover"); +} + +.tab-icon-sound[muted]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-pressed"); +} + +.tab-icon-sound[visuallyselected=true][soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/#{$asset_path}/tabs/tab-audio.svg#tab-audio"); +} + +.tab-icon-sound[visuallyselected=true][soundplaying]:hover { + list-style-image: url("chrome://browser/skin/custom_images/#{$asset_path}/tabs/tab-audio.svg#tab-audio-hover"); +} + +.tab-icon-sound[visuallyselected=true][soundplaying]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/#{$asset_path}/tabs/tab-audio.svg#tab-audio-pressed"); +} + +.tab-icon-sound[visuallyselected=true][muted] { + list-style-image: url("chrome://browser/skin/custom_images/#{$asset_path}/tabs/tab-audio.svg#tab-audio-muted"); +} + +.tab-icon-sound[visuallyselected=true][muted]:hover { + list-style-image: url("chrome://browser/skin/custom_images/#{$asset_path}/tabs/tab-audio.svg#tab-audio-muted-hover"); +} + +.tab-icon-sound[visuallyselected=true][muted]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/#{$asset_path}/tabs/tab-audio.svg#tab-audio-muted-pressed"); +} + +//#TabsToolbar[brighttext] .tab-icon-sound[soundplaying] { +// list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-white"); +//} + +//#TabsToolbar[brighttext] .tab-icon-sound[soundplaying]:hover { +// list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-white-hover"); +//} + +//#TabsToolbar[brighttext] .tab-icon-sound[soundplaying]:hover:active { +// list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-white-pressed"); +//} + +//#TabsToolbar[brighttext] .tab-icon-sound[muted] { +// list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted-white"); +//} + +//#TabsToolbar[brighttext] .tab-icon-sound[muted]:hover { +// list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted-white-hover"); +//} + +//#TabsToolbar[brighttext] .tab-icon-sound[muted]:hover:active { +// list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted-white-pressed"); +//} + .tab-background, .tabs-newtab-button { /* overlap the tab curves */ @@ -3183,7 +3280,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- background-image: url(chrome://browser/skin/custom_images/#{$darker_asset_path_2}/tabs/tab-overflow-indicator.png); background-size: 100% 100%; width: 14px; - margin-bottom: var(--tab-toolbar-navbar-overlap); + margin-bottom: var(--navbar-tab-toolbar-highlight-overlap); pointer-events: none; position: relative; z-index: 3; /* the selected tab's z-index + 1 */ @@ -3301,7 +3398,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- background-color: transparent; background-image: url(chrome://browser/skin/custom_images/#{$darker_asset_path}/tabs/tab-middle.svg); background-repeat: repeat-x; - background-size: auto 100%; + background-size: var(--tab-stroke-background-size); /* The padding-top combined with background-clip: content-box (the bottom-most) ensure the background-color doesn't extend above the top border. */ padding-top: 2px; @@ -3315,7 +3412,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- linear-gradient(transparent 0px, transparent 2px, hsla(0,0%,100%,0.35) 2px, hsla(0,0%,100%,0.35) 3px, hsla(0,0%,100%,0.65) 3px, hsla(0,0%,100%,0.65) 4px, rgba(255,255,255,.3));/*, lwtHeader;*/ /* Don't stretch the LWT header images */ - background-size: auto 100%, auto 100%, auto auto; + background-size: var(--tab-stroke-background-size), auto 100%, auto auto; } /* These LWT styles are normally overridden by browser-lightweightTheme.css */ @@ -3335,10 +3432,9 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- /* new tab button border and gradient on hover */ .tabbrowser-tab:hover > .tab-stack > .tab-background:not([visuallyselected=true]), .tabs-newtab-button:hover { - background-image: - url(chrome://browser/skin/custom_images/#{$darker_asset_path}/tabs/tab-start-hover.svg), - url(chrome://browser/skin/custom_images/#{$darker_asset_path}/tabs/tab-middle-hover.svg), - url(chrome://browser/skin/custom_images/#{$darker_asset_path}/tabs/tab-end-hover.svg); + background-image: url(chrome://browser/skin/custom_images/#{$darker_asset_path}/tabs/tab-start-hover.svg), + url(chrome://browser/skin/custom_images/#{$darker_asset_path}/tabs/tab-middle-hover.svg), + url(chrome://browser/skin/custom_images/#{$darker_asset_path}/tabs/tab-end-hover.svg); background-position: left bottom, 30px bottom, right bottom; background-repeat: no-repeat; background-size: 30px 100%, calc(100% - (2 * 30px)) 100%, 30px 100%; @@ -3351,6 +3447,9 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- .tab-background-middle, .tabs-newtab-button, +.tab-icon-overlay[soundplaying], +.tab-icon-overlay[muted]:not([crashed]), +.tab-icon-sound, .tab-close-button { pointer-events: auto; } @@ -3370,27 +3469,30 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- background-size: 85% 100%; } -///* Background tab separators (3px wide). -// Also show separators beside the selected tab when dragging it. */ +/* Tab separators */ + +//.tabbrowser-tab::after, +//.tabbrowser-tab::before { +// width: 1px; +// -moz-margin-start: -1px; +// background-image: linear-gradient(transparent 5px, +// currentColor 5px, +// currentColor calc(100% - 4px), +// transparent calc(100% - 4px)); +// opacity: 0.2; +//} + +//#TabsToolbar[brighttext] > #tabbrowser-tabs > .tabbrowser-tab::before, +//#TabsToolbar[brighttext] > #tabbrowser-tabs > .tabbrowser-tab::after { +// opacity: 0.4; +//} + +/* Also show separators beside the selected tab when dragging it. */ //#tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after, //.tabbrowser-tab:not([visuallyselected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before, //#tabbrowser-tabs:not([overflow]) > .tabbrowser-tab[last-visible-tab]:not([visuallyselected]):not([beforehovered]):not(:hover)::after { -// -moz-margin-start: -1.5px; -// -moz-margin-end: -1.5px; -// background-image: var(--tab-separator-image); -// background-position: left bottom var(--tab-toolbar-navbar-overlap); -// background-repeat: no-repeat; -// background-size: var(--tab-separator-size); -// opacity: var(--tab-separator-opacity); // content: ""; // display: -moz-box; -// width: 3px; -//} - -//#TabsToolbar[brighttext] { -// --tab-separator-image: linear-gradient(transparent 0%, transparent 15%, currentColor 15%, currentColor 90%, transparent 90%); -// --tab-separator-size: 1px 100%; -// --tab-separator-opacity: 0.4; //} /* New tab button */ @@ -3421,8 +3523,9 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag"); } -.tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label { +.tabbrowser-tab:focus > .tab-stack > .tab-content { outline: 1px dotted; + outline-offset: -6px; } #context_reloadTab { @@ -3697,10 +3800,6 @@ toolbarbutton.chevron > .toolbarbutton-icon { box-shadow: 0 0 2px white; } -#full-screen-warning-container[obscure-browser] { - background-color: rgba(0,0,0,0.3); -} - .full-screen-description { font-size: 150%; } @@ -3709,11 +3808,6 @@ toolbarbutton.chevron > .toolbarbutton-icon { font-size: 300%; } -.full-screen-approval-button, -#full-screen-remember-decision { - font-size: 120%; -} - /* Responsive Mode */ @@ -4357,27 +4451,6 @@ notification.pluginVulnerable { notification.pluginVulnerable .messageImage { list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png"); } -.popup-notification-item-title[popupid="bad-content"] { - font-weight: bold; -} - -.popup-notification-item-message[popupid="bad-content"] { - width: 17em; -} - -.popup-notification-item-message[popupid="bad-content"][mixedblockdisabled]:not(.popup-notification-item-message-critical), -.popup-notification-item-message[popupid="bad-content"][trackingblockdisabled]:not(.popup-notification-item-message-critical) { - color: GrayText; -} - -.popup-notification-item-message-critical[popupid="bad-content"] { - color: #d74345; - font-style: italic; -} - -.popup-notification-footer[popupid="bad-content"] { - padding-top: 1em; -} #notification-popup[popupid="login-fill"] > .panel-arrowcontainer > .panel-arrowcontent { /* Since we display a sliding subview that extends to the border, we cannot * keep the default padding of arrow panels. We use the same padding in the @@ -5184,14 +5257,14 @@ toolbarpaletteitem[notransition][place="panel"] { } toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon, -toolbarpaletteitem > toolbarbutton > .toolbarbutton-badge-container > .toolbarbutton-icon, +toolbarpaletteitem > toolbarbutton > .toolbarbutton-badge-stack > .toolbarbutton-icon, toolbarpaletteitem > toolbaritem.panel-wide-item, toolbarpaletteitem > toolbarbutton[type="menu-button"] { transition: transform .3s cubic-bezier(.6, 2, .75, 1.5) !important; } toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-icon, -toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-badge-container > .toolbarbutton-icon { +toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-badge-stack > .toolbarbutton-icon { transform: scale(1.3); } @@ -5576,10 +5649,12 @@ toolbarpaletteitem[place="toolbar"] { padding: 2em 15px; } +#UITourTooltipButtons > label, #UITourTooltipButtons > button { margin: 0 15px; } +#UITourTooltipButtons > label:first-child, #UITourTooltipButtons > button:first-child { -moz-margin-start: 0; } @@ -5590,6 +5665,7 @@ toolbarpaletteitem[place="toolbar"] { -moz-margin-end: 5px; } +#UITourTooltipButtons > label, #UITourTooltipButtons > button .button-text { font-size: 1.15rem; } @@ -5612,6 +5688,7 @@ toolbarpaletteitem[place="toolbar"] { box-shadow: 0 1px 0 0 hsla(210,4%,10%,.05) inset; } +#UITourTooltipButtons > label, #UITourTooltipButtons > button.button-link { -moz-appearance: none; background: transparent; @@ -5893,3 +5970,7 @@ notification.heartbeat { -moz-padding-end: 0 !important; -moz-margin-end: 0 !important; } + +.browser-action-panel > .panel-arrowcontainer > .panel-arrowcontent { + padding: 0; +} diff --git a/arc-firefox-theme/chrome/browser/sass/browser-dark.css b/arc-firefox-theme/chrome/browser/sass/browser-dark.css index 81db042..756cd34 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-dark.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-dark.css @@ -62,8 +62,8 @@ #TabsToolbar:not([collapsed="true"]) + #nav-bar { border-top: 1px solid rgba(38, 42, 51, 0.97) !important; background-clip: padding-box; - margin-top: -1px; /* 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; } @@ -99,7 +99,7 @@ /* Places toolbar */ toolbarbutton.bookmark-item:not(.subviewbutton), #personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder { - margin: 1px; + margin: 0; padding: 2px 3px; } toolbarbutton.bookmark-item:not(.subviewbutton):not(:hover):not(:active):not([open]) { @@ -283,7 +283,7 @@ menuitem.bookmark-item { opacity: 0.7; } /* Stock icons for the menu bar items */ -menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { +menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip):not([endimage]) { -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); } #placesContext_open\:newwindow, @@ -442,10 +442,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { #panelMenu_unsortedBookmarks { list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); } -#menu_readingList, -#BMB_readingList { - list-style-image: url("chrome://browser/skin/readinglist/readinglist-icon.svg"); } - #panelMenu_pocket, #menu_pocket, #BMB_pocket { @@ -495,7 +491,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { .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-container, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-badge-stack, :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon { -moz-margin-end: 0; padding: 2px 6px; @@ -505,13 +501,13 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { transition-duration: 150ms; } :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-icon, -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-badge-container, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-badge-stack, :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { padding: 3px 7px; } /* Help SDK icons fit: */ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon, -toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-container > .toolbarbutton-icon { +toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-stack > .toolbarbutton-icon { width: 16px; } :-moz-any(#TabsToolbar, #nav-bar) toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon { @@ -531,7 +527,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba :-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-container, +:-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); border-width: 1px; @@ -553,7 +549,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba .findbar-button:not([disabled=true]):-moz-any([checked="true"], :hover:active) > .toolbarbutton-text, :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([open="true"]) > .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-container, +:-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); box-shadow: var(--toolbarbutton-active-boxshadow); @@ -564,7 +560,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba #TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):-moz-any(:hover:active, [open="true"]) > .toolbarbutton-icon, #TabsToolbar .toolbarbutton-1[open="true"] > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon, -#TabsToolbar .toolbarbutton-1:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-badge-container, +#TabsToolbar .toolbarbutton-1:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-badge-stack, #TabsToolbar .toolbarbutton-1:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-icon { background: none; color: #ffffff; @@ -604,9 +600,9 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba transform: scaleX(-1); } #forward-button { + padding: 0; margin-left: 2px; - margin-right: 2px; - padding: 0; } + margin-right: 2px; } /* tabview menu item */ #menu_tabview { @@ -743,6 +739,13 @@ toolbar[brighttext] #sync-button[status="active"] { #PanelUI-menu-button { -moz-image-region: rect(0, 486px, 18px, 468px); } +#PanelUI-menu-button.thumburger { + list-style-image: url("chrome://browser/skin/customizableui/thumburger.png") !important; + -moz-image-region: auto !important; } + +toolbar[brighttext] #PanelUI-menu-button.thumburger { + list-style-image: url("chrome://browser/skin/customizableui/thumburger-inverted.png") !important; } + #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #cut-button { -moz-image-region: rect(0, 504px, 18px, 486px); } @@ -785,33 +788,33 @@ toolbar[brighttext] #sync-button[status="active"] { #web-apps-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 720px, 18px, 702px); } -#loop-button > .toolbarbutton-badge-container { +#loop-button { list-style-image: url("chrome://browser/skin/custom_images/dark/loop-toolbar-icons.svg"); -moz-image-region: rect(0, 18px, 18px, 0); } - #TabsToolbar #loop-button > .toolbarbutton-badge-container { + #TabsToolbar #loop-button { list-style-image: url("chrome://browser/skin/custom_images/dark/loop-tabbar-icons.svg"); } -#loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-badge-container, -#TabsToolbar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-badge-container { - list-style-image: url("chrome://browser/skin/custom_images/loop-toolbar-icons-active.svg"); } +#loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), +#TabsToolbar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) { + list-style-image: url("chrome://browser/skin/custom_images/loop-toolbar-icons-active.svg") !important; } -#loop-button[state="disabled"] > .toolbarbutton-badge-container, -#loop-button[disabled="true"] > .toolbarbutton-badge-container { +#loop-button[state="disabled"], +#loop-button[disabled="true"] { -moz-image-region: rect(0, 36px, 18px, 18px); } -#loop-button:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="error"] { -moz-image-region: rect(0, 54px, 18px, 36px); } -#loop-button:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="action"] { -moz-image-region: rect(0, 72px, 18px, 54px); } -#loop-button:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 90px, 18px, 72px); } -#loop-button:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="active"] { -moz-image-region: rect(0, 108px, 18px, 90px); } -#loop-button:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 126px, 18px, 108px); } #webide-button[cui-areatype="toolbar"] { @@ -975,32 +978,32 @@ toolbar[brighttext] #sync-button[status="active"] { toolbaritem[sdkstylewidget="true"] > toolbarbutton { -moz-image-region: rect(0, 832px, 32px, 800px); } - #loop-button[cui-areatype="menu-panel"] > .toolbarbutton-badge-container, - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"], + toolbarpaletteitem[place="palette"] > #loop-button { list-style-image: url(chrome://browser/skin/loop/menuPanel.png); -moz-image-region: rect(0, 32px, 32px, 0); } /* Make sure that the state icons are not shown in the customization palette. */ - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + toolbarpaletteitem[place="palette"] > #loop-button { -moz-image-region: rect(0, 32px, 32px, 0) !important; } - #loop-button[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container, - #loop-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"][state="disabled"], + #loop-button[cui-areatype="menu-panel"][disabled="true"] { -moz-image-region: rect(0, 64px, 32px, 32px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { -moz-image-region: rect(0, 96px, 32px, 64px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { -moz-image-region: rect(0, 128px, 32px, 96px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 160px, 32px, 128px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { -moz-image-region: rect(0, 192px, 32px, 160px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 224px, 32px, 192px); } /* Wide panel control icons */ @@ -1119,32 +1122,32 @@ toolbar[brighttext] #sync-button[status="active"] { #pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { -moz-image-region: rect(64px, 1984px, 128px, 1920px); } - #loop-button[cui-areatype="menu-panel"] > .toolbarbutton-badge-container, - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"], + toolbarpaletteitem[place="palette"] > #loop-button { list-style-image: url(chrome://browser/skin/loop/menuPanel@2x.png); -moz-image-region: rect(0, 64px, 64px, 0); } /* Make sure that the state icons are not shown in the customization palette. */ - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + toolbarpaletteitem[place="palette"] > #loop-button { -moz-image-region: rect(0, 64px, 64px, 0) !important; } - #loop-button[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container, - #loop-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"][state="disabled"], + #loop-button[cui-areatype="menu-panel"][disabled="true"] { -moz-image-region: rect(0, 128px, 64px, 64px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { -moz-image-region: rect(0, 192px, 64px, 128px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { -moz-image-region: rect(0, 256px, 64px, 192px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 320px, 64px, 256px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { -moz-image-region: rect(0, 384px, 64px, 320px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 448px, 64px, 384px); } #new-tab-button[cui-areatype="menu-panel"], @@ -1282,7 +1285,7 @@ toolbar[brighttext] #sync-button[status="active"] { #urlbar, .searchbar-textbox { -moz-appearance: none; - padding: 3px; + padding: 2px 3px; border-radius: 3px; margin: 0 3px; color: #D3DAE3; @@ -1315,6 +1318,25 @@ toolbar[brighttext] #sync-button[status="active"] { #urlbar-icons { -moz-box-align: center; } +#urlbar-search-footer { + border-top: 1px solid rgba(24, 26, 27, 0.14); + background-color: rgba(24, 26, 27, 0.07); } + +#urlbar-search-settings { + -moz-appearance: none; + -moz-user-focus: ignore; + color: inherit; + margin: 0; + border: 0; + padding: 8px 20px; + background: transparent; } + +#urlbar-search-settings:hover { + background-color: rgba(24, 26, 27, 0.07); } + +#urlbar-search-settings:hover:active { + background-color: rgba(24, 26, 27, 0.12); } + #urlbar-search-splitter { -moz-appearance: none; width: 8px; } @@ -1331,14 +1353,57 @@ toolbar[brighttext] #sync-button[status="active"] { -moz-margin-start: 0; color: GrayText; } +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] { + border-bottom: 1px solid rgba(24, 26, 27, 0.14); + background-color: rgba(24, 26, 27, 0.07); + padding: 6px 0; + -moz-padding-start: 44px; + -moz-padding-end: 6px; + background-image: url("chrome://browser/skin/info.svg"); + background-clip: padding-box; + background-position: 20px center; + background-repeat: no-repeat; + background-size: 16px 16px; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"]:-moz-locale-dir(rtl) { + background-position: right 20px center; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description { + margin: 0; + padding: 0; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description > label.text-link { + -moz-margin-start: 0; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button { + -moz-appearance: none; + -moz-user-focus: ignore; + min-width: 80px; + border-radius: 3px; + padding: 4px 16px; + margin: 0; + -moz-margin-start: 10px; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"] { + color: #616161; + background-color: #e0e0e0; + border: 1px solid #d1d1d1; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"]:hover { + background-color: #d6d6d6; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-enable"] { + color: white; + background-color: #67cc14; + border: 1px solid #67cc14; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-enable"]:hover { + background-color: #5eba12; } + #search-container { min-width: calc(54px + 11ch); } /* identity box */ -#identity-box { - padding: 1px; - font-size: .9em; } - #identity-box:-moz-locale-dir(ltr) { border-top-left-radius: 1.5px; border-bottom-left-radius: 1.5px; } @@ -1347,133 +1412,99 @@ toolbar[brighttext] #sync-button[status="active"] { border-top-right-radius: 1.5px; border-bottom-right-radius: 1.5px; } -#notification-popup-box:not([hidden]) + #identity-box { - border-radius: 0; } - -window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box { - border-radius: 0; } - -/* forward button hiding is delayed when hovered */ -/* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */ -/* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */ -#urlbar[pageproxystate="valid"] > #identity-box.chromeUI, -#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { - -moz-margin-end: 4px; } - -#identity-box.verifiedIdentity:not(:-moz-lwtheme) { - background-color: var(--verified-identity-box-backgroundcolor); } +#identity-box.verifiedIdentity:not(:-moz-lwtheme):not(:hover):not([open=true]) { + background-color: var(--identity-box-verified-background-color); } #identity-box:-moz-focusring { outline: 1px dotted #000; outline-offset: -3px; } -#identity-icon-labels { - -moz-padding-start: 2px; - -moz-padding-end: 5px; } - -:root { +#identity-box { --identity-box-verified-color: #479900; - --identity-box-verified-background-image: linear-gradient(transparent 15%, rgba(39, 74, 8, 0.2) 15%, rgba(39, 74, 8, 0.2) 85%, transparent 85%); --identity-box-chrome-color: #e57300; - --identity-box-chrome-background-image: linear-gradient(transparent 15%, rgba(229, 114, 0, 0.5) 15%, rgba(229, 114, 0, 0.5) 85%, transparent 85%); } - -#urlbar[pageproxystate="valid"] > #identity-box.chromeUI, -#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { - background-position: right; - background-size: 1px; - background-repeat: no-repeat; } - -#urlbar[pageproxystate="valid"] > #identity-box.chromeUI:-moz-locale-dir(rtl), -#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity:-moz-locale-dir(rtl) { - background-position: left; } + border-inline-end: 1px solid var(--urlbar-separator-color); + border-image: linear-gradient(transparent 15%, var(--urlbar-separator-color) 15%, var(--urlbar-separator-color) 85%, transparent 85%); + border-image-slice: 1; + font-size: .9em; + padding: 3px 5px 3px 3px; + margin-inline-end: 4px; + overflow: hidden; } #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { - color: var(--identity-box-verified-color); - background-image: var(--identity-box-verified-background-image); } + color: var(--identity-box-verified-color); } #urlbar[pageproxystate="valid"] > #identity-box.chromeUI { - color: var(--identity-box-chrome-color); - background-image: var(--identity-box-chrome-background-image); } - -/* page proxy icon */ -#page-proxy-favicon { - width: 16px; - height: 16px; - list-style-image: url(chrome://browser/skin/identity-icons-generic.png); } + color: var(--identity-box-chrome-color); } -.chromeUI > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://branding/content/identity-icons-brand.png); } - -.verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https.png); } - -.verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-ev.png); } +#identity-icon-labels { + padding-inline-start: 2px; } -.mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active.png); } +#notification-popup-box:not([hidden]) + #identity-box { + padding-inline-start: 5px; + border-radius: 0; } -.mixedDisplayContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display.png); } +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box { + border-radius: 0; } -.mixedDisplayContentLoadedActiveBlocked > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display.png); } +/* TRACKING PROTECTION ICON */ +#tracking-protection-icon { + width: 16px; + height: 16px; + margin-inline-start: 0; + margin-inline-end: 2px; + list-style-image: url(chrome://browser/skin/tracking-protection-16.svg); + opacity: 1; } -#page-proxy-favicon[pageproxystate="invalid"] { - opacity: 0.3; } +#tracking-protection-icon[state="loaded-tracking-content"] { + list-style-image: url(chrome://browser/skin/tracking-protection-disabled-16.svg); } -@media not all and (min-resolution: 1.1dppx) { - #page-proxy-favicon { - -moz-image-region: rect(0, 16px, 16px, 0); } +#tracking-protection-icon[animate] { + transition: margin-left 200ms ease-out, margin-right 200ms ease-out; } - #identity-box:hover > #page-proxy-favicon { - -moz-image-region: rect(0, 32px, 16px, 16px); } +#tracking-protection-icon:not([state]) { + margin-inline-start: -18px; + pointer-events: none; + opacity: 0; + /* Only animate the shield in, when it disappears hide it immediately. */ + transition: none; } - #identity-box:hover:active > #page-proxy-favicon, - #identity-box[open=true] > #page-proxy-favicon { - -moz-image-region: rect(0, 48px, 16px, 32px); } } -@media (min-resolution: 1.1dppx) { - #page-proxy-favicon { - list-style-image: url(chrome://browser/skin/identity-icons-generic@2x.png); - -moz-image-region: rect(0, 32px, 32px, 0); } +#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icons > #tracking-protection-icon { + visibility: collapse; } - .chromeUI > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://branding/content/identity-icons-brand@2x.png); } +/* MAIN IDENTITY ICON */ +#page-proxy-favicon { + width: 16px; + height: 16px; + list-style-image: url(chrome://browser/skin/identity-not-secure.svg); } - .verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https@2x.png); } +.chromeUI > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://branding/content/identity-icons-brand.svg); } - .verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-ev@2x.png); } +.verifiedDomain > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], +.verifiedIdentity > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-secure.svg); } - .mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active@2x.png); } +.mixedActiveContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); } - .mixedDisplayContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display@2x.png); } +.weakCipher > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], +.mixedDisplayContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], +.mixedDisplayContentLoadedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); } - .mixedDisplayContentLoadedActiveBlocked > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display@2x.png); } +.mixedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg); } - #identity-box:hover > #page-proxy-favicon { - -moz-image-region: rect(0, 64px, 32px, 32px); } +#page-proxy-favicon[pageproxystate="invalid"] { + opacity: 0.3; } - #identity-box:hover:active > #page-proxy-favicon, - #identity-box[open=true] > #page-proxy-favicon { - -moz-image-region: rect(0, 96px, 32px, 64px); } } -#urlbar[actiontype="searchengine"] > #identity-box > #page-proxy-favicon { +#urlbar[actiontype="searchengine"] > #identity-box > #identity-icons > #page-proxy-favicon { -moz-image-region: inherit; list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); width: 16px; height: 16px; opacity: 1; } -#page-proxy-favicon { - margin-top: 1px; - margin-bottom: 1px; - -moz-margin-start: 3px; - -moz-margin-end: 1px; } - .popup-notification-icon { width: 64px; height: 64px; @@ -1526,13 +1557,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box .popup-notification-icon[popupid="webapps-install"] { list-style-image: url(chrome://global/skin/icons/webapps-64.png); } -.popup-notification-icon[popupid="bad-content"] { - list-style-image: url(chrome://browser/skin/bad-content-blocked-64.png); } - -.popup-notification-icon[popupid="bad-content"][mixedblockdisabled], -.popup-notification-icon[popupid="bad-content"][trackingblockdisabled] { - list-style-image: url(chrome://browser/skin/bad-content-unblocked-64.png); } - .popup-notification-icon[popupid="webRTC-sharingDevices"], .popup-notification-icon[popupid="webRTC-shareDevices"] { list-style-image: url(chrome://browser/skin/webRTC-shareDevice-64.png); } @@ -1638,14 +1662,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box opacity: 0; } to { opacity: 1; } } -.bad-content-blocked-notification-icon, -#bad-content-blocked-notification-icon { - list-style-image: url(chrome://browser/skin/bad-content-blocked-16.png); } - -.bad-content-unblocked-notification-icon, -#bad-content-unblocked-notification-icon { - list-style-image: url(chrome://browser/skin/bad-content-unblocked-16.png); } - .webRTC-shareDevices-notification-icon, #webRTC-shareDevices-notification-icon { list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16.png); } @@ -1764,9 +1780,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box /* Notification icon box */ #notification-popup-box { - border-radius: 2.5px 0 0 2.5px; - margin-top: -1px; - margin-bottom: -1px; } + border-radius: 2.5px 0 0 2.5px; } .notification-anchor-icon:-moz-focusring { outline: 1px dotted -moz-DialogText; } @@ -1939,7 +1953,9 @@ richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-t width: 16px; height: 16px; } -.ac-comment { +.ac-comment, +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description, +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button { font-size: 1.05em; } .ac-extra > .ac-comment { @@ -2056,33 +2072,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- #page-report-button { list-style-image: url("chrome://browser/skin/Info.png"); } -/* Reading List button */ -#urlbar:not([focused]):not(:hover) #readinglist-addremove-button { - opacity: 0; - width: 0px; } - -#readinglist-addremove-button { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage"); - -moz-image-region: rect(0, 14px, 14px, 0); - transition: width 150ms ease-in-out, opacity 150ms ease-in-out 150ms; - opacity: 1; - width: 20px; } - -#readinglist-addremove-button:hover { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-hover"); } - -#readinglist-addremove-button:active { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-active"); } - -#readinglist-addremove-button[already-added="true"] { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded"); } - -#readinglist-addremove-button[already-added="true"]:hover { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded-hover"); } - -#readinglist-addremove-button[already-added="true"]:active { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded-active"); } - /* Reader mode button */ #reader-mode-button { list-style-image: url("chrome://browser/skin/readerMode.svg"); @@ -2276,12 +2265,11 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- /* Tabstrip */ :root { --tab-toolbar-navbar-overlap: 1px; + --navbar-tab-toolbar-highlight-overlap: 1px; --tab-min-height: 31px; } #TabsToolbar { - --tab-separator-image: url(chrome://browser/skin/tabbrowser/tab-separator.png); - --tab-separator-size: 3px 100%; - --tab-separator-opacity: 1; } + --tab-stroke-background-size: auto 100%; } /* image preloading hack */ #tabbrowser-tabs::before { @@ -2331,6 +2319,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- .tab-throbber, .tab-icon-image, +.tab-icon-sound, .tab-close-button { margin-top: 1px; } @@ -2346,14 +2335,33 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- .tab-icon-overlay { width: 16px; height: 16px; - margin-top: 10px; + margin-top: -12px; -moz-margin-start: -16px; - display: none; } + position: relative; } .tab-icon-overlay[crashed] { - display: -moz-box; list-style-image: url("chrome://browser/skin/tabbrowser/crashed.svg"); } +.tab-icon-overlay[soundplaying], +.tab-icon-overlay[muted]:not([crashed]) { + border-radius: 8px; } + +.tab-icon-overlay[soundplaying]:hover, +.tab-icon-overlay[muted]:not([crashed]):hover { + background-color: white; } + +.tab-icon-overlay[soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio-small.svg#tab-audio"); } + +.tab-icon-overlay[muted]:not([crashed]) { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio-small.svg#tab-audio-muted"); } + +.tabbrowser-tab[visuallyselected=true] .tab-icon-overlay[soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio-small.svg#tab-audio"); } + +.tabbrowser-tab[visuallyselected=true] .tab-icon-overlay[muted]:not([crashed]) { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio-small.svg#tab-audio-muted"); } + .tab-throbber[busy] { list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png"); } @@ -2369,6 +2377,48 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- -moz-margin-end: -2px; padding: 0; } +.tab-icon-sound { + -moz-margin-start: 4px; + width: 16px; + height: 16px; + padding: 0; } + +.tab-icon-sound[soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab"); } + +.tab-icon-sound[soundplaying]:hover { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-hover"); } + +.tab-icon-sound[soundplaying]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-pressed"); } + +.tab-icon-sound[muted] { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-muted"); } + +.tab-icon-sound[muted]:hover { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-hover"); } + +.tab-icon-sound[muted]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-pressed"); } + +.tab-icon-sound[visuallyselected=true][soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio"); } + +.tab-icon-sound[visuallyselected=true][soundplaying]:hover { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-hover"); } + +.tab-icon-sound[visuallyselected=true][soundplaying]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-pressed"); } + +.tab-icon-sound[visuallyselected=true][muted] { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-muted"); } + +.tab-icon-sound[visuallyselected=true][muted]:hover { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-muted-hover"); } + +.tab-icon-sound[visuallyselected=true][muted]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-muted-pressed"); } + .tab-background, .tabs-newtab-button { /* overlap the tab curves */ @@ -2385,7 +2435,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- background-image: url(chrome://browser/skin/custom_images/dark/tabs/tab-overflow-indicator.png); background-size: 100% 100%; width: 14px; - margin-bottom: var(--tab-toolbar-navbar-overlap); + margin-bottom: var(--navbar-tab-toolbar-highlight-overlap); pointer-events: none; position: relative; z-index: 3; @@ -2476,7 +2526,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- background-color: transparent; background-image: url(chrome://browser/skin/custom_images/dark/tabs/tab-middle.svg); background-repeat: repeat-x; - background-size: auto 100%; + background-size: var(--tab-stroke-background-size); /* The padding-top combined with background-clip: content-box (the bottom-most) ensure the background-color doesn't extend above the top border. */ padding-top: 2px; } @@ -2489,7 +2539,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- /*, lwtHeader;*/ /* Don't stretch the LWT header images */ - background-size: auto 100%, auto 100%, auto auto; } + background-size: var(--tab-stroke-background-size), auto 100%, auto auto; } /* These LWT styles are normally overridden by browser-lightweightTheme.css */ .tab-background-start[visuallyselected=true]:-moz-lwtheme::before, @@ -2516,6 +2566,9 @@ lwtHeader;*/ .tab-background-middle, .tabs-newtab-button, +.tab-icon-overlay[soundplaying], +.tab-icon-overlay[muted]:not([crashed]), +.tab-icon-sound, .tab-close-button { pointer-events: auto; } @@ -2531,6 +2584,8 @@ lwtHeader;*/ background-repeat: no-repeat; background-size: 85% 100%; } +/* Tab separators */ +/* Also show separators beside the selected tab when dragging it. */ /* New tab button */ .tabs-newtab-button { width: calc(36px + 30px); } @@ -2553,8 +2608,9 @@ lwtHeader;*/ #TabsToolbar:not(:-moz-lwtheme):-moz-system-metric(menubar-drag) { -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag"); } -.tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label { - outline: 1px dotted; } +.tabbrowser-tab:focus > .tab-stack > .tab-content { + outline: 1px dotted; + outline-offset: -6px; } #context_reloadTab { list-style-image: url("moz-icon://stock/gtk-refresh?size=menu"); } @@ -2759,19 +2815,12 @@ toolbarbutton.chevron > .toolbarbutton-icon { padding: 30px 50px; box-shadow: 0 0 2px white; } -#full-screen-warning-container[obscure-browser] { - background-color: rgba(0, 0, 0, 0.3); } - .full-screen-description { font-size: 150%; } #full-screen-domain-text { font-size: 300%; } -.full-screen-approval-button, -#full-screen-remember-decision { - font-size: 120%; } - /* Responsive Mode */ .browserContainer[responsivemode] { background-color: #222; @@ -3297,23 +3346,6 @@ notification.pluginVulnerable { notification.pluginVulnerable .messageImage { list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png"); } -.popup-notification-item-title[popupid="bad-content"] { - font-weight: bold; } - -.popup-notification-item-message[popupid="bad-content"] { - width: 17em; } - -.popup-notification-item-message[popupid="bad-content"][mixedblockdisabled]:not(.popup-notification-item-message-critical), -.popup-notification-item-message[popupid="bad-content"][trackingblockdisabled]:not(.popup-notification-item-message-critical) { - color: GrayText; } - -.popup-notification-item-message-critical[popupid="bad-content"] { - color: #d74345; - font-style: italic; } - -.popup-notification-footer[popupid="bad-content"] { - padding-top: 1em; } - #notification-popup[popupid="login-fill"] > .panel-arrowcontainer > .panel-arrowcontent { /* Since we display a sliding subview that extends to the border, we cannot * keep the default padding of arrow panels. We use the same padding in the @@ -3963,13 +3995,13 @@ toolbarpaletteitem[notransition][place="panel"] { transition: none; } toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon, -toolbarpaletteitem > toolbarbutton > .toolbarbutton-badge-container > .toolbarbutton-icon, +toolbarpaletteitem > toolbarbutton > .toolbarbutton-badge-stack > .toolbarbutton-icon, toolbarpaletteitem > toolbaritem.panel-wide-item, toolbarpaletteitem > toolbarbutton[type="menu-button"] { transition: transform 0.3s cubic-bezier(0.6, 2, 0.75, 1.5) !important; } toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-icon, -toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-badge-container > .toolbarbutton-icon { +toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-badge-stack > .toolbarbutton-icon { transform: scale(1.3); } toolbarpaletteitem[mousedown] > toolbaritem.panel-wide-item, @@ -4289,9 +4321,11 @@ toolbarpaletteitem[place="toolbar"] { margin: 24px -16px -16px; padding: 2em 15px; } +#UITourTooltipButtons > label, #UITourTooltipButtons > button { margin: 0 15px; } +#UITourTooltipButtons > label:first-child, #UITourTooltipButtons > button:first-child { -moz-margin-start: 0; } @@ -4300,6 +4334,7 @@ toolbarpaletteitem[place="toolbar"] { height: 16px; -moz-margin-end: 5px; } +#UITourTooltipButtons > label, #UITourTooltipButtons > button .button-text { font-size: 1.15rem; } @@ -4319,6 +4354,7 @@ toolbarpaletteitem[place="toolbar"] { border-color: rgba(24, 26, 27, 0.15); box-shadow: 0 1px 0 0 rgba(24, 26, 27, 0.05) inset; } +#UITourTooltipButtons > label, #UITourTooltipButtons > button.button-link { -moz-appearance: none; background: transparent; @@ -4538,3 +4574,6 @@ notification.heartbeat { /* override toolkit/themes/linux/global/menu.css */ -moz-padding-end: 0 !important; -moz-margin-end: 0 !important; } + +.browser-action-panel > .panel-arrowcontainer > .panel-arrowcontent { + padding: 0; } diff --git a/arc-firefox-theme/chrome/browser/sass/browser-darker.css b/arc-firefox-theme/chrome/browser/sass/browser-darker.css index 2cc34ff..e05de86 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-darker.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-darker.css @@ -62,8 +62,8 @@ #TabsToolbar:not([collapsed="true"]) + #nav-bar { border-top: 1px solid rgba(38, 42, 51, 0.97) !important; background-clip: padding-box; - margin-top: -1px; /* 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; } @@ -99,7 +99,7 @@ /* Places toolbar */ toolbarbutton.bookmark-item:not(.subviewbutton), #personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder { - margin: 1px; + margin: 0; padding: 2px 3px; } toolbarbutton.bookmark-item:not(.subviewbutton):not(:hover):not(:active):not([open]) { @@ -283,7 +283,7 @@ menuitem.bookmark-item { opacity: 0.7; } /* Stock icons for the menu bar items */ -menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { +menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip):not([endimage]) { -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); } #placesContext_open\:newwindow, @@ -442,10 +442,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { #panelMenu_unsortedBookmarks { list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); } -#menu_readingList, -#BMB_readingList { - list-style-image: url("chrome://browser/skin/readinglist/readinglist-icon.svg"); } - #panelMenu_pocket, #menu_pocket, #BMB_pocket { @@ -495,7 +491,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { .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-container, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-badge-stack, :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon { -moz-margin-end: 0; padding: 2px 6px; @@ -505,13 +501,13 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { transition-duration: 150ms; } :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-icon, -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-badge-container, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-badge-stack, :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { padding: 3px 7px; } /* Help SDK icons fit: */ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon, -toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-container > .toolbarbutton-icon { +toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-stack > .toolbarbutton-icon { width: 16px; } :-moz-any(#TabsToolbar, #nav-bar) toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon { @@ -531,7 +527,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba :-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-container, +:-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); border-width: 1px; @@ -553,7 +549,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba .findbar-button:not([disabled=true]):-moz-any([checked="true"], :hover:active) > .toolbarbutton-text, :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([open="true"]) > .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-container, +:-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); box-shadow: var(--toolbarbutton-active-boxshadow); @@ -564,7 +560,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba #TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):-moz-any(:hover:active, [open="true"]) > .toolbarbutton-icon, #TabsToolbar .toolbarbutton-1[open="true"] > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon, -#TabsToolbar .toolbarbutton-1:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-badge-container, +#TabsToolbar .toolbarbutton-1:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-badge-stack, #TabsToolbar .toolbarbutton-1:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-icon { background: none; color: #ffffff; @@ -604,9 +600,9 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba transform: scaleX(-1); } #forward-button { + padding: 0; margin-left: 2px; - margin-right: 2px; - padding: 0; } + margin-right: 2px; } /* tabview menu item */ #menu_tabview { @@ -743,6 +739,13 @@ toolbar[brighttext] #sync-button[status="active"] { #PanelUI-menu-button { -moz-image-region: rect(0, 486px, 18px, 468px); } +#PanelUI-menu-button.thumburger { + list-style-image: url("chrome://browser/skin/customizableui/thumburger.png") !important; + -moz-image-region: auto !important; } + +toolbar[brighttext] #PanelUI-menu-button.thumburger { + list-style-image: url("chrome://browser/skin/customizableui/thumburger-inverted.png") !important; } + #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #cut-button { -moz-image-region: rect(0, 504px, 18px, 486px); } @@ -785,33 +788,33 @@ toolbar[brighttext] #sync-button[status="active"] { #web-apps-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 720px, 18px, 702px); } -#loop-button > .toolbarbutton-badge-container { +#loop-button { list-style-image: url("chrome://browser/skin/custom_images/light/loop-toolbar-icons.svg"); -moz-image-region: rect(0, 18px, 18px, 0); } - #TabsToolbar #loop-button > .toolbarbutton-badge-container { + #TabsToolbar #loop-button { list-style-image: url("chrome://browser/skin/custom_images/dark/loop-tabbar-icons.svg"); } -#loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-badge-container, -#TabsToolbar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-badge-container { - list-style-image: url("chrome://browser/skin/custom_images/loop-toolbar-icons-active.svg"); } +#loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), +#TabsToolbar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) { + list-style-image: url("chrome://browser/skin/custom_images/loop-toolbar-icons-active.svg") !important; } -#loop-button[state="disabled"] > .toolbarbutton-badge-container, -#loop-button[disabled="true"] > .toolbarbutton-badge-container { +#loop-button[state="disabled"], +#loop-button[disabled="true"] { -moz-image-region: rect(0, 36px, 18px, 18px); } -#loop-button:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="error"] { -moz-image-region: rect(0, 54px, 18px, 36px); } -#loop-button:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="action"] { -moz-image-region: rect(0, 72px, 18px, 54px); } -#loop-button:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 90px, 18px, 72px); } -#loop-button:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="active"] { -moz-image-region: rect(0, 108px, 18px, 90px); } -#loop-button:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 126px, 18px, 108px); } #webide-button[cui-areatype="toolbar"] { @@ -975,32 +978,32 @@ toolbar[brighttext] #sync-button[status="active"] { toolbaritem[sdkstylewidget="true"] > toolbarbutton { -moz-image-region: rect(0, 832px, 32px, 800px); } - #loop-button[cui-areatype="menu-panel"] > .toolbarbutton-badge-container, - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"], + toolbarpaletteitem[place="palette"] > #loop-button { list-style-image: url(chrome://browser/skin/loop/menuPanel.png); -moz-image-region: rect(0, 32px, 32px, 0); } /* Make sure that the state icons are not shown in the customization palette. */ - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + toolbarpaletteitem[place="palette"] > #loop-button { -moz-image-region: rect(0, 32px, 32px, 0) !important; } - #loop-button[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container, - #loop-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"][state="disabled"], + #loop-button[cui-areatype="menu-panel"][disabled="true"] { -moz-image-region: rect(0, 64px, 32px, 32px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { -moz-image-region: rect(0, 96px, 32px, 64px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { -moz-image-region: rect(0, 128px, 32px, 96px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 160px, 32px, 128px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { -moz-image-region: rect(0, 192px, 32px, 160px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 224px, 32px, 192px); } /* Wide panel control icons */ @@ -1119,32 +1122,32 @@ toolbar[brighttext] #sync-button[status="active"] { #pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { -moz-image-region: rect(64px, 1984px, 128px, 1920px); } - #loop-button[cui-areatype="menu-panel"] > .toolbarbutton-badge-container, - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"], + toolbarpaletteitem[place="palette"] > #loop-button { list-style-image: url(chrome://browser/skin/loop/menuPanel@2x.png); -moz-image-region: rect(0, 64px, 64px, 0); } /* Make sure that the state icons are not shown in the customization palette. */ - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + toolbarpaletteitem[place="palette"] > #loop-button { -moz-image-region: rect(0, 64px, 64px, 0) !important; } - #loop-button[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container, - #loop-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"][state="disabled"], + #loop-button[cui-areatype="menu-panel"][disabled="true"] { -moz-image-region: rect(0, 128px, 64px, 64px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { -moz-image-region: rect(0, 192px, 64px, 128px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { -moz-image-region: rect(0, 256px, 64px, 192px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 320px, 64px, 256px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { -moz-image-region: rect(0, 384px, 64px, 320px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 448px, 64px, 384px); } #new-tab-button[cui-areatype="menu-panel"], @@ -1282,7 +1285,7 @@ toolbar[brighttext] #sync-button[status="active"] { #urlbar, .searchbar-textbox { -moz-appearance: none; - padding: 3px; + padding: 2px 3px; border-radius: 3px; margin: 0 3px; color: #5c616c; @@ -1314,6 +1317,25 @@ toolbar[brighttext] #sync-button[status="active"] { #urlbar-icons { -moz-box-align: center; } +#urlbar-search-footer { + border-top: 1px solid rgba(24, 26, 27, 0.14); + background-color: rgba(24, 26, 27, 0.07); } + +#urlbar-search-settings { + -moz-appearance: none; + -moz-user-focus: ignore; + color: inherit; + margin: 0; + border: 0; + padding: 8px 20px; + background: transparent; } + +#urlbar-search-settings:hover { + background-color: rgba(24, 26, 27, 0.07); } + +#urlbar-search-settings:hover:active { + background-color: rgba(24, 26, 27, 0.12); } + #urlbar-search-splitter { -moz-appearance: none; width: 8px; } @@ -1330,14 +1352,57 @@ toolbar[brighttext] #sync-button[status="active"] { -moz-margin-start: 0; color: GrayText; } +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] { + border-bottom: 1px solid rgba(24, 26, 27, 0.14); + background-color: rgba(24, 26, 27, 0.07); + padding: 6px 0; + -moz-padding-start: 44px; + -moz-padding-end: 6px; + background-image: url("chrome://browser/skin/info.svg"); + background-clip: padding-box; + background-position: 20px center; + background-repeat: no-repeat; + background-size: 16px 16px; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"]:-moz-locale-dir(rtl) { + background-position: right 20px center; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description { + margin: 0; + padding: 0; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description > label.text-link { + -moz-margin-start: 0; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button { + -moz-appearance: none; + -moz-user-focus: ignore; + min-width: 80px; + border-radius: 3px; + padding: 4px 16px; + margin: 0; + -moz-margin-start: 10px; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"] { + color: #616161; + background-color: #e0e0e0; + border: 1px solid #d1d1d1; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"]:hover { + background-color: #d6d6d6; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-enable"] { + color: white; + background-color: #67cc14; + border: 1px solid #67cc14; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-enable"]:hover { + background-color: #5eba12; } + #search-container { min-width: calc(54px + 11ch); } /* identity box */ -#identity-box { - padding: 1px; - font-size: .9em; } - #identity-box:-moz-locale-dir(ltr) { border-top-left-radius: 1.5px; border-bottom-left-radius: 1.5px; } @@ -1346,133 +1411,99 @@ toolbar[brighttext] #sync-button[status="active"] { border-top-right-radius: 1.5px; border-bottom-right-radius: 1.5px; } -#notification-popup-box:not([hidden]) + #identity-box { - border-radius: 0; } - -window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box { - border-radius: 0; } - -/* forward button hiding is delayed when hovered */ -/* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */ -/* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */ -#urlbar[pageproxystate="valid"] > #identity-box.chromeUI, -#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { - -moz-margin-end: 4px; } - -#identity-box.verifiedIdentity:not(:-moz-lwtheme) { - background-color: var(--verified-identity-box-backgroundcolor); } +#identity-box.verifiedIdentity:not(:-moz-lwtheme):not(:hover):not([open=true]) { + background-color: var(--identity-box-verified-background-color); } #identity-box:-moz-focusring { outline: 1px dotted #000; outline-offset: -3px; } -#identity-icon-labels { - -moz-padding-start: 2px; - -moz-padding-end: 5px; } - -:root { +#identity-box { --identity-box-verified-color: #479900; - --identity-box-verified-background-image: linear-gradient(transparent 15%, rgba(39, 74, 8, 0.2) 15%, rgba(39, 74, 8, 0.2) 85%, transparent 85%); --identity-box-chrome-color: #e57300; - --identity-box-chrome-background-image: linear-gradient(transparent 15%, rgba(229, 114, 0, 0.5) 15%, rgba(229, 114, 0, 0.5) 85%, transparent 85%); } - -#urlbar[pageproxystate="valid"] > #identity-box.chromeUI, -#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { - background-position: right; - background-size: 1px; - background-repeat: no-repeat; } - -#urlbar[pageproxystate="valid"] > #identity-box.chromeUI:-moz-locale-dir(rtl), -#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity:-moz-locale-dir(rtl) { - background-position: left; } + border-inline-end: 1px solid var(--urlbar-separator-color); + border-image: linear-gradient(transparent 15%, var(--urlbar-separator-color) 15%, var(--urlbar-separator-color) 85%, transparent 85%); + border-image-slice: 1; + font-size: .9em; + padding: 3px 5px 3px 3px; + margin-inline-end: 4px; + overflow: hidden; } #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { - color: var(--identity-box-verified-color); - background-image: var(--identity-box-verified-background-image); } + color: var(--identity-box-verified-color); } #urlbar[pageproxystate="valid"] > #identity-box.chromeUI { - color: var(--identity-box-chrome-color); - background-image: var(--identity-box-chrome-background-image); } - -/* page proxy icon */ -#page-proxy-favicon { - width: 16px; - height: 16px; - list-style-image: url(chrome://browser/skin/identity-icons-generic.png); } + color: var(--identity-box-chrome-color); } -.chromeUI > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://branding/content/identity-icons-brand.png); } - -.verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https.png); } - -.verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-ev.png); } +#identity-icon-labels { + padding-inline-start: 2px; } -.mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active.png); } +#notification-popup-box:not([hidden]) + #identity-box { + padding-inline-start: 5px; + border-radius: 0; } -.mixedDisplayContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display.png); } +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box { + border-radius: 0; } -.mixedDisplayContentLoadedActiveBlocked > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display.png); } +/* TRACKING PROTECTION ICON */ +#tracking-protection-icon { + width: 16px; + height: 16px; + margin-inline-start: 0; + margin-inline-end: 2px; + list-style-image: url(chrome://browser/skin/tracking-protection-16.svg); + opacity: 1; } -#page-proxy-favicon[pageproxystate="invalid"] { - opacity: 0.3; } +#tracking-protection-icon[state="loaded-tracking-content"] { + list-style-image: url(chrome://browser/skin/tracking-protection-disabled-16.svg); } -@media not all and (min-resolution: 1.1dppx) { - #page-proxy-favicon { - -moz-image-region: rect(0, 16px, 16px, 0); } +#tracking-protection-icon[animate] { + transition: margin-left 200ms ease-out, margin-right 200ms ease-out; } - #identity-box:hover > #page-proxy-favicon { - -moz-image-region: rect(0, 32px, 16px, 16px); } +#tracking-protection-icon:not([state]) { + margin-inline-start: -18px; + pointer-events: none; + opacity: 0; + /* Only animate the shield in, when it disappears hide it immediately. */ + transition: none; } - #identity-box:hover:active > #page-proxy-favicon, - #identity-box[open=true] > #page-proxy-favicon { - -moz-image-region: rect(0, 48px, 16px, 32px); } } -@media (min-resolution: 1.1dppx) { - #page-proxy-favicon { - list-style-image: url(chrome://browser/skin/identity-icons-generic@2x.png); - -moz-image-region: rect(0, 32px, 32px, 0); } +#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icons > #tracking-protection-icon { + visibility: collapse; } - .chromeUI > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://branding/content/identity-icons-brand@2x.png); } +/* MAIN IDENTITY ICON */ +#page-proxy-favicon { + width: 16px; + height: 16px; + list-style-image: url(chrome://browser/skin/identity-not-secure.svg); } - .verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https@2x.png); } +.chromeUI > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://branding/content/identity-icons-brand.svg); } - .verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-ev@2x.png); } +.verifiedDomain > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], +.verifiedIdentity > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-secure.svg); } - .mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active@2x.png); } +.mixedActiveContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); } - .mixedDisplayContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display@2x.png); } +.weakCipher > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], +.mixedDisplayContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], +.mixedDisplayContentLoadedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); } - .mixedDisplayContentLoadedActiveBlocked > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display@2x.png); } +.mixedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg); } - #identity-box:hover > #page-proxy-favicon { - -moz-image-region: rect(0, 64px, 32px, 32px); } +#page-proxy-favicon[pageproxystate="invalid"] { + opacity: 0.3; } - #identity-box:hover:active > #page-proxy-favicon, - #identity-box[open=true] > #page-proxy-favicon { - -moz-image-region: rect(0, 96px, 32px, 64px); } } -#urlbar[actiontype="searchengine"] > #identity-box > #page-proxy-favicon { +#urlbar[actiontype="searchengine"] > #identity-box > #identity-icons > #page-proxy-favicon { -moz-image-region: inherit; list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); width: 16px; height: 16px; opacity: 1; } -#page-proxy-favicon { - margin-top: 1px; - margin-bottom: 1px; - -moz-margin-start: 3px; - -moz-margin-end: 1px; } - .popup-notification-icon { width: 64px; height: 64px; @@ -1525,13 +1556,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box .popup-notification-icon[popupid="webapps-install"] { list-style-image: url(chrome://global/skin/icons/webapps-64.png); } -.popup-notification-icon[popupid="bad-content"] { - list-style-image: url(chrome://browser/skin/bad-content-blocked-64.png); } - -.popup-notification-icon[popupid="bad-content"][mixedblockdisabled], -.popup-notification-icon[popupid="bad-content"][trackingblockdisabled] { - list-style-image: url(chrome://browser/skin/bad-content-unblocked-64.png); } - .popup-notification-icon[popupid="webRTC-sharingDevices"], .popup-notification-icon[popupid="webRTC-shareDevices"] { list-style-image: url(chrome://browser/skin/webRTC-shareDevice-64.png); } @@ -1637,14 +1661,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box opacity: 0; } to { opacity: 1; } } -.bad-content-blocked-notification-icon, -#bad-content-blocked-notification-icon { - list-style-image: url(chrome://browser/skin/bad-content-blocked-16.png); } - -.bad-content-unblocked-notification-icon, -#bad-content-unblocked-notification-icon { - list-style-image: url(chrome://browser/skin/bad-content-unblocked-16.png); } - .webRTC-shareDevices-notification-icon, #webRTC-shareDevices-notification-icon { list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16.png); } @@ -1763,9 +1779,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box /* Notification icon box */ #notification-popup-box { - border-radius: 2.5px 0 0 2.5px; - margin-top: -1px; - margin-bottom: -1px; } + border-radius: 2.5px 0 0 2.5px; } .notification-anchor-icon:-moz-focusring { outline: 1px dotted -moz-DialogText; } @@ -1938,7 +1952,9 @@ richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-t width: 16px; height: 16px; } -.ac-comment { +.ac-comment, +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description, +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button { font-size: 1.05em; } .ac-extra > .ac-comment { @@ -2055,33 +2071,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- #page-report-button { list-style-image: url("chrome://browser/skin/Info.png"); } -/* Reading List button */ -#urlbar:not([focused]):not(:hover) #readinglist-addremove-button { - opacity: 0; - width: 0px; } - -#readinglist-addremove-button { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage"); - -moz-image-region: rect(0, 14px, 14px, 0); - transition: width 150ms ease-in-out, opacity 150ms ease-in-out 150ms; - opacity: 1; - width: 20px; } - -#readinglist-addremove-button:hover { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-hover"); } - -#readinglist-addremove-button:active { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-active"); } - -#readinglist-addremove-button[already-added="true"] { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded"); } - -#readinglist-addremove-button[already-added="true"]:hover { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded-hover"); } - -#readinglist-addremove-button[already-added="true"]:active { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded-active"); } - /* Reader mode button */ #reader-mode-button { list-style-image: url("chrome://browser/skin/readerMode.svg"); @@ -2276,12 +2265,11 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- /* Tabstrip */ :root { --tab-toolbar-navbar-overlap: 1px; + --navbar-tab-toolbar-highlight-overlap: 1px; --tab-min-height: 31px; } #TabsToolbar { - --tab-separator-image: url(chrome://browser/skin/tabbrowser/tab-separator.png); - --tab-separator-size: 3px 100%; - --tab-separator-opacity: 1; } + --tab-stroke-background-size: auto 100%; } /* image preloading hack */ #tabbrowser-tabs::before { @@ -2331,6 +2319,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- .tab-throbber, .tab-icon-image, +.tab-icon-sound, .tab-close-button { margin-top: 1px; } @@ -2346,14 +2335,33 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- .tab-icon-overlay { width: 16px; height: 16px; - margin-top: 10px; + margin-top: -12px; -moz-margin-start: -16px; - display: none; } + position: relative; } .tab-icon-overlay[crashed] { - display: -moz-box; list-style-image: url("chrome://browser/skin/tabbrowser/crashed.svg"); } +.tab-icon-overlay[soundplaying], +.tab-icon-overlay[muted]:not([crashed]) { + border-radius: 8px; } + +.tab-icon-overlay[soundplaying]:hover, +.tab-icon-overlay[muted]:not([crashed]):hover { + background-color: white; } + +.tab-icon-overlay[soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio-small.svg#tab-audio"); } + +.tab-icon-overlay[muted]:not([crashed]) { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio-small.svg#tab-audio-muted"); } + +.tabbrowser-tab[visuallyselected=true] .tab-icon-overlay[soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio-small.svg#tab-audio"); } + +.tabbrowser-tab[visuallyselected=true] .tab-icon-overlay[muted]:not([crashed]) { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio-small.svg#tab-audio-muted"); } + .tab-throbber[busy] { list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png"); } @@ -2369,6 +2377,48 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- -moz-margin-end: -2px; padding: 0; } +.tab-icon-sound { + -moz-margin-start: 4px; + width: 16px; + height: 16px; + padding: 0; } + +.tab-icon-sound[soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab"); } + +.tab-icon-sound[soundplaying]:hover { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-hover"); } + +.tab-icon-sound[soundplaying]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-pressed"); } + +.tab-icon-sound[muted] { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-muted"); } + +.tab-icon-sound[muted]:hover { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-hover"); } + +.tab-icon-sound[muted]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-pressed"); } + +.tab-icon-sound[visuallyselected=true][soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio"); } + +.tab-icon-sound[visuallyselected=true][soundplaying]:hover { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-hover"); } + +.tab-icon-sound[visuallyselected=true][soundplaying]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-pressed"); } + +.tab-icon-sound[visuallyselected=true][muted] { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-muted"); } + +.tab-icon-sound[visuallyselected=true][muted]:hover { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-muted-hover"); } + +.tab-icon-sound[visuallyselected=true][muted]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-muted-pressed"); } + .tab-background, .tabs-newtab-button { /* overlap the tab curves */ @@ -2385,7 +2435,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- background-image: url(chrome://browser/skin/custom_images/dark/tabs/tab-overflow-indicator.png); background-size: 100% 100%; width: 14px; - margin-bottom: var(--tab-toolbar-navbar-overlap); + margin-bottom: var(--navbar-tab-toolbar-highlight-overlap); pointer-events: none; position: relative; z-index: 3; @@ -2476,7 +2526,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- background-color: transparent; background-image: url(chrome://browser/skin/custom_images/darker/tabs/tab-middle.svg); background-repeat: repeat-x; - background-size: auto 100%; + background-size: var(--tab-stroke-background-size); /* The padding-top combined with background-clip: content-box (the bottom-most) ensure the background-color doesn't extend above the top border. */ padding-top: 2px; } @@ -2489,7 +2539,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- /*, lwtHeader;*/ /* Don't stretch the LWT header images */ - background-size: auto 100%, auto 100%, auto auto; } + background-size: var(--tab-stroke-background-size), auto 100%, auto auto; } /* These LWT styles are normally overridden by browser-lightweightTheme.css */ .tab-background-start[visuallyselected=true]:-moz-lwtheme::before, @@ -2516,6 +2566,9 @@ lwtHeader;*/ .tab-background-middle, .tabs-newtab-button, +.tab-icon-overlay[soundplaying], +.tab-icon-overlay[muted]:not([crashed]), +.tab-icon-sound, .tab-close-button { pointer-events: auto; } @@ -2531,6 +2584,8 @@ lwtHeader;*/ background-repeat: no-repeat; background-size: 85% 100%; } +/* Tab separators */ +/* Also show separators beside the selected tab when dragging it. */ /* New tab button */ .tabs-newtab-button { width: calc(36px + 30px); } @@ -2553,8 +2608,9 @@ lwtHeader;*/ #TabsToolbar:not(:-moz-lwtheme):-moz-system-metric(menubar-drag) { -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag"); } -.tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label { - outline: 1px dotted; } +.tabbrowser-tab:focus > .tab-stack > .tab-content { + outline: 1px dotted; + outline-offset: -6px; } #context_reloadTab { list-style-image: url("moz-icon://stock/gtk-refresh?size=menu"); } @@ -2759,19 +2815,12 @@ toolbarbutton.chevron > .toolbarbutton-icon { padding: 30px 50px; box-shadow: 0 0 2px white; } -#full-screen-warning-container[obscure-browser] { - background-color: rgba(0, 0, 0, 0.3); } - .full-screen-description { font-size: 150%; } #full-screen-domain-text { font-size: 300%; } -.full-screen-approval-button, -#full-screen-remember-decision { - font-size: 120%; } - /* Responsive Mode */ .browserContainer[responsivemode] { background-color: #222; @@ -3297,23 +3346,6 @@ notification.pluginVulnerable { notification.pluginVulnerable .messageImage { list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png"); } -.popup-notification-item-title[popupid="bad-content"] { - font-weight: bold; } - -.popup-notification-item-message[popupid="bad-content"] { - width: 17em; } - -.popup-notification-item-message[popupid="bad-content"][mixedblockdisabled]:not(.popup-notification-item-message-critical), -.popup-notification-item-message[popupid="bad-content"][trackingblockdisabled]:not(.popup-notification-item-message-critical) { - color: GrayText; } - -.popup-notification-item-message-critical[popupid="bad-content"] { - color: #d74345; - font-style: italic; } - -.popup-notification-footer[popupid="bad-content"] { - padding-top: 1em; } - #notification-popup[popupid="login-fill"] > .panel-arrowcontainer > .panel-arrowcontent { /* Since we display a sliding subview that extends to the border, we cannot * keep the default padding of arrow panels. We use the same padding in the @@ -3963,13 +3995,13 @@ toolbarpaletteitem[notransition][place="panel"] { transition: none; } toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon, -toolbarpaletteitem > toolbarbutton > .toolbarbutton-badge-container > .toolbarbutton-icon, +toolbarpaletteitem > toolbarbutton > .toolbarbutton-badge-stack > .toolbarbutton-icon, toolbarpaletteitem > toolbaritem.panel-wide-item, toolbarpaletteitem > toolbarbutton[type="menu-button"] { transition: transform 0.3s cubic-bezier(0.6, 2, 0.75, 1.5) !important; } toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-icon, -toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-badge-container > .toolbarbutton-icon { +toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-badge-stack > .toolbarbutton-icon { transform: scale(1.3); } toolbarpaletteitem[mousedown] > toolbaritem.panel-wide-item, @@ -4289,9 +4321,11 @@ toolbarpaletteitem[place="toolbar"] { margin: 24px -16px -16px; padding: 2em 15px; } +#UITourTooltipButtons > label, #UITourTooltipButtons > button { margin: 0 15px; } +#UITourTooltipButtons > label:first-child, #UITourTooltipButtons > button:first-child { -moz-margin-start: 0; } @@ -4300,6 +4334,7 @@ toolbarpaletteitem[place="toolbar"] { height: 16px; -moz-margin-end: 5px; } +#UITourTooltipButtons > label, #UITourTooltipButtons > button .button-text { font-size: 1.15rem; } @@ -4319,6 +4354,7 @@ toolbarpaletteitem[place="toolbar"] { border-color: rgba(24, 26, 27, 0.15); box-shadow: 0 1px 0 0 rgba(24, 26, 27, 0.05) inset; } +#UITourTooltipButtons > label, #UITourTooltipButtons > button.button-link { -moz-appearance: none; background: transparent; @@ -4538,3 +4574,6 @@ notification.heartbeat { /* override toolkit/themes/linux/global/menu.css */ -moz-padding-end: 0 !important; -moz-margin-end: 0 !important; } + +.browser-action-panel > .panel-arrowcontainer > .panel-arrowcontent { + padding: 0; } diff --git a/arc-firefox-theme/chrome/browser/sass/browser-light.css b/arc-firefox-theme/chrome/browser/sass/browser-light.css index 74f5abd..95b4df1 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-light.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-light.css @@ -62,8 +62,8 @@ #TabsToolbar:not([collapsed="true"]) + #nav-bar { border-top: 1px solid rgba(212, 213, 219, 0.95) !important; background-clip: padding-box; - margin-top: -1px; /* 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; } @@ -99,7 +99,7 @@ /* Places toolbar */ toolbarbutton.bookmark-item:not(.subviewbutton), #personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder { - margin: 1px; + margin: 0; padding: 2px 3px; } toolbarbutton.bookmark-item:not(.subviewbutton):not(:hover):not(:active):not([open]) { @@ -283,7 +283,7 @@ menuitem.bookmark-item { opacity: 0.7; } /* Stock icons for the menu bar items */ -menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { +menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip):not([endimage]) { -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); } #placesContext_open\:newwindow, @@ -442,10 +442,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { #panelMenu_unsortedBookmarks { list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); } -#menu_readingList, -#BMB_readingList { - list-style-image: url("chrome://browser/skin/readinglist/readinglist-icon.svg"); } - #panelMenu_pocket, #menu_pocket, #BMB_pocket { @@ -495,7 +491,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { .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-container, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-badge-stack, :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon { -moz-margin-end: 0; padding: 2px 6px; @@ -505,13 +501,13 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { transition-duration: 150ms; } :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-icon, -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-badge-container, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-badge-stack, :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { padding: 3px 7px; } /* Help SDK icons fit: */ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon, -toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-container > .toolbarbutton-icon { +toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-stack > .toolbarbutton-icon { width: 16px; } :-moz-any(#TabsToolbar, #nav-bar) toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon { @@ -531,7 +527,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba :-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-container, +:-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); border-width: 1px; @@ -553,7 +549,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba .findbar-button:not([disabled=true]):-moz-any([checked="true"], :hover:active) > .toolbarbutton-text, :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([open="true"]) > .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-container, +:-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); box-shadow: var(--toolbarbutton-active-boxshadow); @@ -564,7 +560,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba #TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):-moz-any(:hover:active, [open="true"]) > .toolbarbutton-icon, #TabsToolbar .toolbarbutton-1[open="true"] > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon, -#TabsToolbar .toolbarbutton-1:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-badge-container, +#TabsToolbar .toolbarbutton-1:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-badge-stack, #TabsToolbar .toolbarbutton-1:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-icon { background: none; color: #ffffff; @@ -604,9 +600,9 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba transform: scaleX(-1); } #forward-button { + padding: 0; margin-left: 2px; - margin-right: 2px; - padding: 0; } + margin-right: 2px; } /* tabview menu item */ #menu_tabview { @@ -743,6 +739,13 @@ toolbar[brighttext] #sync-button[status="active"] { #PanelUI-menu-button { -moz-image-region: rect(0, 486px, 18px, 468px); } +#PanelUI-menu-button.thumburger { + list-style-image: url("chrome://browser/skin/customizableui/thumburger.png") !important; + -moz-image-region: auto !important; } + +toolbar[brighttext] #PanelUI-menu-button.thumburger { + list-style-image: url("chrome://browser/skin/customizableui/thumburger-inverted.png") !important; } + #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #cut-button { -moz-image-region: rect(0, 504px, 18px, 486px); } @@ -785,33 +788,33 @@ toolbar[brighttext] #sync-button[status="active"] { #web-apps-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 720px, 18px, 702px); } -#loop-button > .toolbarbutton-badge-container { +#loop-button { list-style-image: url("chrome://browser/skin/custom_images/light/loop-toolbar-icons.svg"); -moz-image-region: rect(0, 18px, 18px, 0); } - #TabsToolbar #loop-button > .toolbarbutton-badge-container { + #TabsToolbar #loop-button { list-style-image: url("chrome://browser/skin/custom_images/light/loop-tabbar-icons.svg"); } -#loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-badge-container, -#TabsToolbar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .toolbarbutton-badge-container { - list-style-image: url("chrome://browser/skin/custom_images/loop-toolbar-icons-active.svg"); } +#loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), +#TabsToolbar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) { + list-style-image: url("chrome://browser/skin/custom_images/loop-toolbar-icons-active.svg") !important; } -#loop-button[state="disabled"] > .toolbarbutton-badge-container, -#loop-button[disabled="true"] > .toolbarbutton-badge-container { +#loop-button[state="disabled"], +#loop-button[disabled="true"] { -moz-image-region: rect(0, 36px, 18px, 18px); } -#loop-button:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="error"] { -moz-image-region: rect(0, 54px, 18px, 36px); } -#loop-button:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="action"] { -moz-image-region: rect(0, 72px, 18px, 54px); } -#loop-button:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 90px, 18px, 72px); } -#loop-button:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="active"] { -moz-image-region: rect(0, 108px, 18px, 90px); } -#loop-button:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 126px, 18px, 108px); } #webide-button[cui-areatype="toolbar"] { @@ -975,32 +978,32 @@ toolbar[brighttext] #sync-button[status="active"] { toolbaritem[sdkstylewidget="true"] > toolbarbutton { -moz-image-region: rect(0, 832px, 32px, 800px); } - #loop-button[cui-areatype="menu-panel"] > .toolbarbutton-badge-container, - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"], + toolbarpaletteitem[place="palette"] > #loop-button { list-style-image: url(chrome://browser/skin/loop/menuPanel.png); -moz-image-region: rect(0, 32px, 32px, 0); } /* Make sure that the state icons are not shown in the customization palette. */ - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + toolbarpaletteitem[place="palette"] > #loop-button { -moz-image-region: rect(0, 32px, 32px, 0) !important; } - #loop-button[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container, - #loop-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"][state="disabled"], + #loop-button[cui-areatype="menu-panel"][disabled="true"] { -moz-image-region: rect(0, 64px, 32px, 32px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { -moz-image-region: rect(0, 96px, 32px, 64px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { -moz-image-region: rect(0, 128px, 32px, 96px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 160px, 32px, 128px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { -moz-image-region: rect(0, 192px, 32px, 160px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 224px, 32px, 192px); } /* Wide panel control icons */ @@ -1119,32 +1122,32 @@ toolbar[brighttext] #sync-button[status="active"] { #pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { -moz-image-region: rect(64px, 1984px, 128px, 1920px); } - #loop-button[cui-areatype="menu-panel"] > .toolbarbutton-badge-container, - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"], + toolbarpaletteitem[place="palette"] > #loop-button { list-style-image: url(chrome://browser/skin/loop/menuPanel@2x.png); -moz-image-region: rect(0, 64px, 64px, 0); } /* Make sure that the state icons are not shown in the customization palette. */ - toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + toolbarpaletteitem[place="palette"] > #loop-button { -moz-image-region: rect(0, 64px, 64px, 0) !important; } - #loop-button[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container, - #loop-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"][state="disabled"], + #loop-button[cui-areatype="menu-panel"][disabled="true"] { -moz-image-region: rect(0, 128px, 64px, 64px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { -moz-image-region: rect(0, 192px, 64px, 128px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { -moz-image-region: rect(0, 256px, 64px, 192px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 320px, 64px, 256px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { -moz-image-region: rect(0, 384px, 64px, 320px); } - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) > .toolbarbutton-badge-container { + #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { -moz-image-region: rect(0, 448px, 64px, 384px); } #new-tab-button[cui-areatype="menu-panel"], @@ -1282,7 +1285,7 @@ toolbar[brighttext] #sync-button[status="active"] { #urlbar, .searchbar-textbox { -moz-appearance: none; - padding: 3px; + padding: 2px 3px; border-radius: 3px; margin: 0 3px; color: #5c616c; @@ -1314,6 +1317,25 @@ toolbar[brighttext] #sync-button[status="active"] { #urlbar-icons { -moz-box-align: center; } +#urlbar-search-footer { + border-top: 1px solid rgba(24, 26, 27, 0.14); + background-color: rgba(24, 26, 27, 0.07); } + +#urlbar-search-settings { + -moz-appearance: none; + -moz-user-focus: ignore; + color: inherit; + margin: 0; + border: 0; + padding: 8px 20px; + background: transparent; } + +#urlbar-search-settings:hover { + background-color: rgba(24, 26, 27, 0.07); } + +#urlbar-search-settings:hover:active { + background-color: rgba(24, 26, 27, 0.12); } + #urlbar-search-splitter { -moz-appearance: none; width: 8px; } @@ -1330,14 +1352,57 @@ toolbar[brighttext] #sync-button[status="active"] { -moz-margin-start: 0; color: GrayText; } +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] { + border-bottom: 1px solid rgba(24, 26, 27, 0.14); + background-color: rgba(24, 26, 27, 0.07); + padding: 6px 0; + -moz-padding-start: 44px; + -moz-padding-end: 6px; + background-image: url("chrome://browser/skin/info.svg"); + background-clip: padding-box; + background-position: 20px center; + background-repeat: no-repeat; + background-size: 16px 16px; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"]:-moz-locale-dir(rtl) { + background-position: right 20px center; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description { + margin: 0; + padding: 0; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description > label.text-link { + -moz-margin-start: 0; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button { + -moz-appearance: none; + -moz-user-focus: ignore; + min-width: 80px; + border-radius: 3px; + padding: 4px 16px; + margin: 0; + -moz-margin-start: 10px; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"] { + color: #616161; + background-color: #e0e0e0; + border: 1px solid #d1d1d1; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"]:hover { + background-color: #d6d6d6; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-enable"] { + color: white; + background-color: #67cc14; + border: 1px solid #67cc14; } + +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-enable"]:hover { + background-color: #5eba12; } + #search-container { min-width: calc(54px + 11ch); } /* identity box */ -#identity-box { - padding: 1px; - font-size: .9em; } - #identity-box:-moz-locale-dir(ltr) { border-top-left-radius: 1.5px; border-bottom-left-radius: 1.5px; } @@ -1346,133 +1411,99 @@ toolbar[brighttext] #sync-button[status="active"] { border-top-right-radius: 1.5px; border-bottom-right-radius: 1.5px; } -#notification-popup-box:not([hidden]) + #identity-box { - border-radius: 0; } - -window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box { - border-radius: 0; } - -/* forward button hiding is delayed when hovered */ -/* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */ -/* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */ -#urlbar[pageproxystate="valid"] > #identity-box.chromeUI, -#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { - -moz-margin-end: 4px; } - -#identity-box.verifiedIdentity:not(:-moz-lwtheme) { - background-color: var(--verified-identity-box-backgroundcolor); } +#identity-box.verifiedIdentity:not(:-moz-lwtheme):not(:hover):not([open=true]) { + background-color: var(--identity-box-verified-background-color); } #identity-box:-moz-focusring { outline: 1px dotted #000; outline-offset: -3px; } -#identity-icon-labels { - -moz-padding-start: 2px; - -moz-padding-end: 5px; } - -:root { +#identity-box { --identity-box-verified-color: #479900; - --identity-box-verified-background-image: linear-gradient(transparent 15%, rgba(39, 74, 8, 0.2) 15%, rgba(39, 74, 8, 0.2) 85%, transparent 85%); --identity-box-chrome-color: #e57300; - --identity-box-chrome-background-image: linear-gradient(transparent 15%, rgba(229, 114, 0, 0.5) 15%, rgba(229, 114, 0, 0.5) 85%, transparent 85%); } - -#urlbar[pageproxystate="valid"] > #identity-box.chromeUI, -#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { - background-position: right; - background-size: 1px; - background-repeat: no-repeat; } - -#urlbar[pageproxystate="valid"] > #identity-box.chromeUI:-moz-locale-dir(rtl), -#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity:-moz-locale-dir(rtl) { - background-position: left; } + border-inline-end: 1px solid var(--urlbar-separator-color); + border-image: linear-gradient(transparent 15%, var(--urlbar-separator-color) 15%, var(--urlbar-separator-color) 85%, transparent 85%); + border-image-slice: 1; + font-size: .9em; + padding: 3px 5px 3px 3px; + margin-inline-end: 4px; + overflow: hidden; } #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { - color: var(--identity-box-verified-color); - background-image: var(--identity-box-verified-background-image); } + color: var(--identity-box-verified-color); } #urlbar[pageproxystate="valid"] > #identity-box.chromeUI { - color: var(--identity-box-chrome-color); - background-image: var(--identity-box-chrome-background-image); } - -/* page proxy icon */ -#page-proxy-favicon { - width: 16px; - height: 16px; - list-style-image: url(chrome://browser/skin/identity-icons-generic.png); } + color: var(--identity-box-chrome-color); } -.chromeUI > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://branding/content/identity-icons-brand.png); } - -.verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https.png); } - -.verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-ev.png); } +#identity-icon-labels { + padding-inline-start: 2px; } -.mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active.png); } +#notification-popup-box:not([hidden]) + #identity-box { + padding-inline-start: 5px; + border-radius: 0; } -.mixedDisplayContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display.png); } +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box { + border-radius: 0; } -.mixedDisplayContentLoadedActiveBlocked > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display.png); } +/* TRACKING PROTECTION ICON */ +#tracking-protection-icon { + width: 16px; + height: 16px; + margin-inline-start: 0; + margin-inline-end: 2px; + list-style-image: url(chrome://browser/skin/tracking-protection-16.svg); + opacity: 1; } -#page-proxy-favicon[pageproxystate="invalid"] { - opacity: 0.3; } +#tracking-protection-icon[state="loaded-tracking-content"] { + list-style-image: url(chrome://browser/skin/tracking-protection-disabled-16.svg); } -@media not all and (min-resolution: 1.1dppx) { - #page-proxy-favicon { - -moz-image-region: rect(0, 16px, 16px, 0); } +#tracking-protection-icon[animate] { + transition: margin-left 200ms ease-out, margin-right 200ms ease-out; } - #identity-box:hover > #page-proxy-favicon { - -moz-image-region: rect(0, 32px, 16px, 16px); } +#tracking-protection-icon:not([state]) { + margin-inline-start: -18px; + pointer-events: none; + opacity: 0; + /* Only animate the shield in, when it disappears hide it immediately. */ + transition: none; } - #identity-box:hover:active > #page-proxy-favicon, - #identity-box[open=true] > #page-proxy-favicon { - -moz-image-region: rect(0, 48px, 16px, 32px); } } -@media (min-resolution: 1.1dppx) { - #page-proxy-favicon { - list-style-image: url(chrome://browser/skin/identity-icons-generic@2x.png); - -moz-image-region: rect(0, 32px, 32px, 0); } +#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icons > #tracking-protection-icon { + visibility: collapse; } - .chromeUI > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://branding/content/identity-icons-brand@2x.png); } +/* MAIN IDENTITY ICON */ +#page-proxy-favicon { + width: 16px; + height: 16px; + list-style-image: url(chrome://browser/skin/identity-not-secure.svg); } - .verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https@2x.png); } +.chromeUI > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://branding/content/identity-icons-brand.svg); } - .verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-ev@2x.png); } +.verifiedDomain > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], +.verifiedIdentity > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-secure.svg); } - .mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active@2x.png); } +.mixedActiveContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); } - .mixedDisplayContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display@2x.png); } +.weakCipher > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], +.mixedDisplayContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], +.mixedDisplayContentLoadedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); } - .mixedDisplayContentLoadedActiveBlocked > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display@2x.png); } +.mixedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { + list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg); } - #identity-box:hover > #page-proxy-favicon { - -moz-image-region: rect(0, 64px, 32px, 32px); } +#page-proxy-favicon[pageproxystate="invalid"] { + opacity: 0.3; } - #identity-box:hover:active > #page-proxy-favicon, - #identity-box[open=true] > #page-proxy-favicon { - -moz-image-region: rect(0, 96px, 32px, 64px); } } -#urlbar[actiontype="searchengine"] > #identity-box > #page-proxy-favicon { +#urlbar[actiontype="searchengine"] > #identity-box > #identity-icons > #page-proxy-favicon { -moz-image-region: inherit; list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); width: 16px; height: 16px; opacity: 1; } -#page-proxy-favicon { - margin-top: 1px; - margin-bottom: 1px; - -moz-margin-start: 3px; - -moz-margin-end: 1px; } - .popup-notification-icon { width: 64px; height: 64px; @@ -1525,13 +1556,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box .popup-notification-icon[popupid="webapps-install"] { list-style-image: url(chrome://global/skin/icons/webapps-64.png); } -.popup-notification-icon[popupid="bad-content"] { - list-style-image: url(chrome://browser/skin/bad-content-blocked-64.png); } - -.popup-notification-icon[popupid="bad-content"][mixedblockdisabled], -.popup-notification-icon[popupid="bad-content"][trackingblockdisabled] { - list-style-image: url(chrome://browser/skin/bad-content-unblocked-64.png); } - .popup-notification-icon[popupid="webRTC-sharingDevices"], .popup-notification-icon[popupid="webRTC-shareDevices"] { list-style-image: url(chrome://browser/skin/webRTC-shareDevice-64.png); } @@ -1637,14 +1661,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box opacity: 0; } to { opacity: 1; } } -.bad-content-blocked-notification-icon, -#bad-content-blocked-notification-icon { - list-style-image: url(chrome://browser/skin/bad-content-blocked-16.png); } - -.bad-content-unblocked-notification-icon, -#bad-content-unblocked-notification-icon { - list-style-image: url(chrome://browser/skin/bad-content-unblocked-16.png); } - .webRTC-shareDevices-notification-icon, #webRTC-shareDevices-notification-icon { list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16.png); } @@ -1763,9 +1779,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box /* Notification icon box */ #notification-popup-box { - border-radius: 2.5px 0 0 2.5px; - margin-top: -1px; - margin-bottom: -1px; } + border-radius: 2.5px 0 0 2.5px; } .notification-anchor-icon:-moz-focusring { outline: 1px dotted -moz-DialogText; } @@ -1938,7 +1952,9 @@ richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-t width: 16px; height: 16px; } -.ac-comment { +.ac-comment, +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description, +#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button { font-size: 1.05em; } .ac-extra > .ac-comment { @@ -2055,33 +2071,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- #page-report-button { list-style-image: url("chrome://browser/skin/Info.png"); } -/* Reading List button */ -#urlbar:not([focused]):not(:hover) #readinglist-addremove-button { - opacity: 0; - width: 0px; } - -#readinglist-addremove-button { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage"); - -moz-image-region: rect(0, 14px, 14px, 0); - transition: width 150ms ease-in-out, opacity 150ms ease-in-out 150ms; - opacity: 1; - width: 20px; } - -#readinglist-addremove-button:hover { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-hover"); } - -#readinglist-addremove-button:active { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-active"); } - -#readinglist-addremove-button[already-added="true"] { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded"); } - -#readinglist-addremove-button[already-added="true"]:hover { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded-hover"); } - -#readinglist-addremove-button[already-added="true"]:active { - list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded-active"); } - /* Reader mode button */ #reader-mode-button { list-style-image: url("chrome://browser/skin/readerMode.svg"); @@ -2276,12 +2265,11 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- /* Tabstrip */ :root { --tab-toolbar-navbar-overlap: 1px; + --navbar-tab-toolbar-highlight-overlap: 1px; --tab-min-height: 31px; } #TabsToolbar { - --tab-separator-image: url(chrome://browser/skin/tabbrowser/tab-separator.png); - --tab-separator-size: 3px 100%; - --tab-separator-opacity: 1; } + --tab-stroke-background-size: auto 100%; } /* image preloading hack */ #tabbrowser-tabs::before { @@ -2331,6 +2319,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- .tab-throbber, .tab-icon-image, +.tab-icon-sound, .tab-close-button { margin-top: 1px; } @@ -2346,14 +2335,33 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- .tab-icon-overlay { width: 16px; height: 16px; - margin-top: 10px; + margin-top: -12px; -moz-margin-start: -16px; - display: none; } + position: relative; } .tab-icon-overlay[crashed] { - display: -moz-box; list-style-image: url("chrome://browser/skin/tabbrowser/crashed.svg"); } +.tab-icon-overlay[soundplaying], +.tab-icon-overlay[muted]:not([crashed]) { + border-radius: 8px; } + +.tab-icon-overlay[soundplaying]:hover, +.tab-icon-overlay[muted]:not([crashed]):hover { + background-color: white; } + +.tab-icon-overlay[soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio-small.svg#tab-audio"); } + +.tab-icon-overlay[muted]:not([crashed]) { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio-small.svg#tab-audio-muted"); } + +.tabbrowser-tab[visuallyselected=true] .tab-icon-overlay[soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio-small.svg#tab-audio"); } + +.tabbrowser-tab[visuallyselected=true] .tab-icon-overlay[muted]:not([crashed]) { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio-small.svg#tab-audio-muted"); } + .tab-throbber[busy] { list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png"); } @@ -2369,6 +2377,48 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- -moz-margin-end: -2px; padding: 0; } +.tab-icon-sound { + -moz-margin-start: 4px; + width: 16px; + height: 16px; + padding: 0; } + +.tab-icon-sound[soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab"); } + +.tab-icon-sound[soundplaying]:hover { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-hover"); } + +.tab-icon-sound[soundplaying]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-pressed"); } + +.tab-icon-sound[muted] { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-muted"); } + +.tab-icon-sound[muted]:hover { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-hover"); } + +.tab-icon-sound[muted]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-pressed"); } + +.tab-icon-sound[visuallyselected=true][soundplaying] { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio"); } + +.tab-icon-sound[visuallyselected=true][soundplaying]:hover { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-hover"); } + +.tab-icon-sound[visuallyselected=true][soundplaying]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-pressed"); } + +.tab-icon-sound[visuallyselected=true][muted] { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-muted"); } + +.tab-icon-sound[visuallyselected=true][muted]:hover { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-muted-hover"); } + +.tab-icon-sound[visuallyselected=true][muted]:hover:active { + list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-muted-pressed"); } + .tab-background, .tabs-newtab-button { /* overlap the tab curves */ @@ -2385,7 +2435,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- background-image: url(chrome://browser/skin/custom_images/light/tabs/tab-overflow-indicator.png); background-size: 100% 100%; width: 14px; - margin-bottom: var(--tab-toolbar-navbar-overlap); + margin-bottom: var(--navbar-tab-toolbar-highlight-overlap); pointer-events: none; position: relative; z-index: 3; @@ -2476,7 +2526,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- background-color: transparent; background-image: url(chrome://browser/skin/custom_images/light/tabs/tab-middle.svg); background-repeat: repeat-x; - background-size: auto 100%; + background-size: var(--tab-stroke-background-size); /* The padding-top combined with background-clip: content-box (the bottom-most) ensure the background-color doesn't extend above the top border. */ padding-top: 2px; } @@ -2489,7 +2539,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- /*, lwtHeader;*/ /* Don't stretch the LWT header images */ - background-size: auto 100%, auto 100%, auto auto; } + background-size: var(--tab-stroke-background-size), auto 100%, auto auto; } /* These LWT styles are normally overridden by browser-lightweightTheme.css */ .tab-background-start[visuallyselected=true]:-moz-lwtheme::before, @@ -2516,6 +2566,9 @@ lwtHeader;*/ .tab-background-middle, .tabs-newtab-button, +.tab-icon-overlay[soundplaying], +.tab-icon-overlay[muted]:not([crashed]), +.tab-icon-sound, .tab-close-button { pointer-events: auto; } @@ -2531,6 +2584,8 @@ lwtHeader;*/ background-repeat: no-repeat; background-size: 85% 100%; } +/* Tab separators */ +/* Also show separators beside the selected tab when dragging it. */ /* New tab button */ .tabs-newtab-button { width: calc(36px + 30px); } @@ -2553,8 +2608,9 @@ lwtHeader;*/ #TabsToolbar:not(:-moz-lwtheme):-moz-system-metric(menubar-drag) { -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag"); } -.tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label { - outline: 1px dotted; } +.tabbrowser-tab:focus > .tab-stack > .tab-content { + outline: 1px dotted; + outline-offset: -6px; } #context_reloadTab { list-style-image: url("moz-icon://stock/gtk-refresh?size=menu"); } @@ -2759,19 +2815,12 @@ toolbarbutton.chevron > .toolbarbutton-icon { padding: 30px 50px; box-shadow: 0 0 2px white; } -#full-screen-warning-container[obscure-browser] { - background-color: rgba(0, 0, 0, 0.3); } - .full-screen-description { font-size: 150%; } #full-screen-domain-text { font-size: 300%; } -.full-screen-approval-button, -#full-screen-remember-decision { - font-size: 120%; } - /* Responsive Mode */ .browserContainer[responsivemode] { background-color: #222; @@ -3297,23 +3346,6 @@ notification.pluginVulnerable { notification.pluginVulnerable .messageImage { list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png"); } -.popup-notification-item-title[popupid="bad-content"] { - font-weight: bold; } - -.popup-notification-item-message[popupid="bad-content"] { - width: 17em; } - -.popup-notification-item-message[popupid="bad-content"][mixedblockdisabled]:not(.popup-notification-item-message-critical), -.popup-notification-item-message[popupid="bad-content"][trackingblockdisabled]:not(.popup-notification-item-message-critical) { - color: GrayText; } - -.popup-notification-item-message-critical[popupid="bad-content"] { - color: #d74345; - font-style: italic; } - -.popup-notification-footer[popupid="bad-content"] { - padding-top: 1em; } - #notification-popup[popupid="login-fill"] > .panel-arrowcontainer > .panel-arrowcontent { /* Since we display a sliding subview that extends to the border, we cannot * keep the default padding of arrow panels. We use the same padding in the @@ -3963,13 +3995,13 @@ toolbarpaletteitem[notransition][place="panel"] { transition: none; } toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon, -toolbarpaletteitem > toolbarbutton > .toolbarbutton-badge-container > .toolbarbutton-icon, +toolbarpaletteitem > toolbarbutton > .toolbarbutton-badge-stack > .toolbarbutton-icon, toolbarpaletteitem > toolbaritem.panel-wide-item, toolbarpaletteitem > toolbarbutton[type="menu-button"] { transition: transform 0.3s cubic-bezier(0.6, 2, 0.75, 1.5) !important; } toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-icon, -toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-badge-container > .toolbarbutton-icon { +toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-badge-stack > .toolbarbutton-icon { transform: scale(1.3); } toolbarpaletteitem[mousedown] > toolbaritem.panel-wide-item, @@ -4289,9 +4321,11 @@ toolbarpaletteitem[place="toolbar"] { margin: 24px -16px -16px; padding: 2em 15px; } +#UITourTooltipButtons > label, #UITourTooltipButtons > button { margin: 0 15px; } +#UITourTooltipButtons > label:first-child, #UITourTooltipButtons > button:first-child { -moz-margin-start: 0; } @@ -4300,6 +4334,7 @@ toolbarpaletteitem[place="toolbar"] { height: 16px; -moz-margin-end: 5px; } +#UITourTooltipButtons > label, #UITourTooltipButtons > button .button-text { font-size: 1.15rem; } @@ -4319,6 +4354,7 @@ toolbarpaletteitem[place="toolbar"] { border-color: rgba(24, 26, 27, 0.15); box-shadow: 0 1px 0 0 rgba(24, 26, 27, 0.05) inset; } +#UITourTooltipButtons > label, #UITourTooltipButtons > button.button-link { -moz-appearance: none; background: transparent; @@ -4538,3 +4574,6 @@ notification.heartbeat { /* override toolkit/themes/linux/global/menu.css */ -moz-padding-end: 0 !important; -moz-margin-end: 0 !important; } + +.browser-action-panel > .panel-arrowcontainer > .panel-arrowcontent { + padding: 0; } diff --git a/arc-firefox-theme/chrome/browser/search-arrow-go.svg b/arc-firefox-theme/chrome/browser/search-arrow-go.svg new file mode 100644 index 0000000..ddddff1 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/search-arrow-go.svg @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16"> + <style> + use:not(:target) { + display: none; + } + use { + fill: #616366; + } + use[id$="-inverted"] { + fill: #fff; + } + </style> + <defs> + <path id="search-arrow-go-glyph" d="M1,7v2.2C1,9.8,1.4,10,2,10h7.5l-3,3.1c-0.4,0.3-0.4,1,0,1.4l0.8,0.8 c0.4,0.4,1,0.4,1.4,0l6.6-6.6c0.4-0.4,0.4-1,0-1.4L8.7,0.7c-0.4-0.4-1-0.4-1.4,0L6.5,1.6C6.1,2,6.1,2.6,6.5,3l3,3H2C1.4,6,1,6.4,1,7z"/> + </defs> + <use id="search-arrow-go" xlink:href="#search-arrow-go-glyph"/> + <use id="search-arrow-go-inverted" xlink:href="#search-arrow-go-glyph"/> +</svg> diff --git a/arc-firefox-theme/chrome/browser/search-indicator-magnifying-glass.svg b/arc-firefox-theme/chrome/browser/search-indicator-magnifying-glass.svg new file mode 100644 index 0000000..15bddfb --- /dev/null +++ b/arc-firefox-theme/chrome/browser/search-indicator-magnifying-glass.svg @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"> + <path fill="#808080" d="M21.7,20.3l-1.4,1.4l-5.4-5.4c-1.3,1-3,1.7-4.9,1.7 c-4.4,0-8-3.6-8-8c0-4.4,3.6-8,8-8c4.4,0,8,3.6,8,8c0,1.8-0.6,3.5-1.7,4.9L21.7,20.3z M10,4c-3.3,0-6,2.7-6,6s2.7,6,6,6s6-2.7,6-6 S13.3,4,10,4z"/> +</svg> diff --git a/arc-firefox-theme/chrome/browser/searchbar.css b/arc-firefox-theme/chrome/browser/searchbar.css index 4627bba..08fd9dd 100644 --- a/arc-firefox-theme/chrome/browser/searchbar.css +++ b/arc-firefox-theme/chrome/browser/searchbar.css @@ -7,11 +7,6 @@ padding: 1px; } -.searchbar-textbox { - min-height: 22px; - background-color: -moz-field; -} - .autocomplete-textbox-container { -moz-box-align: stretch; } @@ -81,6 +76,8 @@ menuitem[cmd="cmd_clearhistory"][disabled] { .searchbar-search-button { list-style-image: url("chrome://browser/skin/search-indicator.png"); -moz-image-region: rect(0, 20px, 20px, 0); + margin-top: 1px; + margin-bottom: 1px; -moz-margin-start: 2px; } diff --git a/arc-firefox-theme/chrome/browser/tabbrowser/pendingpaint.png b/arc-firefox-theme/chrome/browser/tabbrowser/pendingpaint.png Binary files differindex 82bac53..512b525 100644 --- a/arc-firefox-theme/chrome/browser/tabbrowser/pendingpaint.png +++ b/arc-firefox-theme/chrome/browser/tabbrowser/pendingpaint.png diff --git a/arc-firefox-theme/chrome/browser/tabbrowser/tab-audio-small.svg b/arc-firefox-theme/chrome/browser/tabbrowser/tab-audio-small.svg new file mode 100644 index 0000000..27a36c4 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/tabbrowser/tab-audio-small.svg @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16"> + <style> + .icon:not(:target) { + display: none; + } + + .icon { + fill: #262626; + } + .icon > .outline { + fill: #fff; + } + + .icon.white { + fill: #fff; + } + .icon.white > .outline { + fill: #000; + fill-opacity: .5; + } + </style> + + <g id="tab-audio" class="icon"> + <path class="outline" d="M12.4,3.6l-1-0.6l-0.9,2.5H10V1.8c0-0.4-0.5-0.7-0.9-0.4L5.6,5H4C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.6l3.6,3.6 c0.3,0.3,0.9,0.1,0.9-0.4v-3.7h0.5l0.9,2.5l1-0.6C14,11.5,15,9.8,15,8S14,4.5,12.4,3.6z M9,13l-3-3H4c-0.6,0-1-0.4-1-1V7 c0-0.6,0.4-1,1-1h2l3-3V13z M10,9.5v-3c0.8,0,1.5,0.7,1.5,1.5S10.8,9.5,10,9.5z M11.9,11.5l-0.4-0.9C12.4,10,13,9.1,13,8 s-0.6-2-1.4-2.5l0.3-1C13.2,5.2,14,6.5,14,8S13.2,10.8,11.9,11.5z"/> + <path d="M4,6C3.4,6,3,6.4,3,7v2c0,0.6,0.4,1,1,1h2l3,3V3L6,6H4z M10,6.5v3c0.8,0,1.5-0.7,1.5-1.5S10.8,6.5,10,6.5z M11.9,4.5 l-0.4,0.9C12.4,6,13,6.9,13,8s-0.6,2-1.4,2.5l0.4,0.9c1.2-0.7,2.1-2,2.1-3.5S13.2,5.2,11.9,4.5z"/> + </g> + <g id="tab-audio-muted" class="icon"> + <path class="outline" d="M5.6,5H4C2.9,5,2,5.9,2,7v2c0,0.7,0.3,1.3,0.9,1.7l-1.8,1.8l2.5,2.5l3-3l2.6,2.6c0.3,0.3,0.9,0.1,0.9-0.4V8.5l3.9-3.9 l-2.5-2.5L10,3.5V1.8c0-0.4-0.5-0.7-0.9-0.4L5.6,5z"/> + <path d="M11.5,3.5L9,5.9V3L6,6H4C3.4,6,3,6.4,3,7v2c0,0.6,0.4,1,1,1h0.9l-2.5,2.5l1.1,1.1l9-9L11.5,3.5z M9,13V9.7l-1.7,1.7L9,13z"/> + </g> + + <g id="tab-audio-white" class="icon white"> + <path class="outline" d="M12.4,3.6l-1-0.6l-0.9,2.5H10V1.8c0-0.4-0.5-0.7-0.9-0.4L5.6,5H4C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.6l3.6,3.6 c0.3,0.3,0.9,0.1,0.9-0.4v-3.7h0.5l0.9,2.5l1-0.6C14,11.5,15,9.8,15,8S14,4.5,12.4,3.6z M9,13l-3-3H4c-0.6,0-1-0.4-1-1V7 c0-0.6,0.4-1,1-1h2l3-3V13z M10,9.5v-3c0.8,0,1.5,0.7,1.5,1.5S10.8,9.5,10,9.5z M11.9,11.5l-0.4-0.9C12.4,10,13,9.1,13,8 s-0.6-2-1.4-2.5l0.3-1C13.2,5.2,14,6.5,14,8S13.2,10.8,11.9,11.5z"/> + <path d="M4,6C3.4,6,3,6.4,3,7v2c0,0.6,0.4,1,1,1h2l3,3V3L6,6H4z M10,6.5v3c0.8,0,1.5-0.7,1.5-1.5S10.8,6.5,10,6.5z M11.9,4.5 l-0.4,0.9C12.4,6,13,6.9,13,8s-0.6,2-1.4,2.5l0.4,0.9c1.2-0.7,2.1-2,2.1-3.5S13.2,5.2,11.9,4.5z"/> + </g> + <g id="tab-audio-white-muted" class="icon white"> + <path class="outline" d="M5.6,5H4C2.9,5,2,5.9,2,7v2c0,0.7,0.3,1.3,0.9,1.7l-1.8,1.8l2.5,2.5l3-3l2.6,2.6c0.3,0.3,0.9,0.1,0.9-0.4V8.5l3.9-3.9 l-2.5-2.5L10,3.5V1.8c0-0.4-0.5-0.7-0.9-0.4L5.6,5z"/> + <path d="M11.5,3.5L9,5.9V3L6,6H4C3.4,6,3,6.4,3,7v2c0,0.6,0.4,1,1,1h0.9l-2.5,2.5l1.1,1.1l9-9L11.5,3.5z M9,13V9.7l-1.7,1.7L9,13z"/> + </g> +</svg> diff --git a/arc-firefox-theme/chrome/browser/tabbrowser/tab-audio.svg b/arc-firefox-theme/chrome/browser/tabbrowser/tab-audio.svg new file mode 100644 index 0000000..e62a69f --- /dev/null +++ b/arc-firefox-theme/chrome/browser/tabbrowser/tab-audio.svg @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16"> + <style> + .icon:not(:target) { + display: none; + } + + .icon { + fill: #333; + opacity: .75; + } + .icon.hover { + fill: #1a1a1a; + opacity: .85; + } + .icon.pressed { + fill: #0d0d0d; + opacity: .95; + } + + .icon.white { + fill: #fff; + } + .icon.white.hover { + opacity: .9; + } + .icon.white.pressed { + opacity: 1; + } + .icon.white > .outline { + fill: #000; + fill-opacity: .5; + } + + .icon.backgroundTab, + .icon.backgroundTab.hover, + .icon.backgroundTab.pressed { + fill: -moz-MenuBarText; + } + </style> + + <path id="tab-audio" class="icon" d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z"/> + <path id="tab-audio-hover" class="icon hover" d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z"/> + <path id="tab-audio-pressed" class="icon pressed" d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z"/> + + <path id="tab-audio-muted" class="icon" d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z"/> + <path id="tab-audio-muted-hover" class="icon hover" d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z"/> + <path id="tab-audio-muted-pressed" class="icon pressed" d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z"/> + + <path id="tab-audio-backgroundTab" class="icon backgroundTab" d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z"/> + <path id="tab-audio-backgroundTab-hover" class="icon backgroundTab hover" d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z"/> + <path id="tab-audio-backgroundTab-pressed" class="icon backgroundTab pressed" d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z"/> + + <path id="tab-audio-backgroundTab-muted" class="icon backgroundTab" d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z"/> + <path id="tab-audio-backgroundTab-muted-hover" class="icon backgroundTab hover" d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z"/> + <path id="tab-audio-backgroundTab-muted-pressed" class="icon backgroundTab pressed" d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z"/> + + <g id="tab-audio-white" class="icon white"> + <path class="outline" d="M9,2v12l-3.8-3H4c-1.1,0-2-0.9-2-2V7c0-1.1,0.9-2,2-2h1.2L9,2 M11.4,3.2C13.5,3.8,15,5.7,15,8 s-1.5,4.2-3.5,4.7l-0.4-0.9c1.7-0.4,2.9-2,2.9-3.8s-1.2-3.4-3-3.9L11.4,3.2 M10.7,5.1C12,5.4,13,6.6,13,8s-1,2.6-2.2,2.9L10.4,10 C11.3,9.8,12,9,12,8s-0.7-1.8-1.6-2L10.7,5.1 M10,7c0.6,0,1,0.4,1,1s-0.4,1-1,1V7 M10-0.1L8.4,1.2L4.9,4H4C2.3,4,1,5.3,1,7v2 c0,1.7,1.3,3,3,3h0.9l3.5,2.8l1.6,1.3V14v-2.2l0.2,0.4l0.4,0.9l0.3,0.8l0.8-0.2C14.2,13,16,10.7,16,8c0-2.7-1.7-5-4.3-5.8L10.8,2 l-0.4,0.8l-0.4,0.9L10,3.9V2V-0.1L10-0.1z"/> + <path d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z"/> + </g> + <g id="tab-audio-white-hover" class="icon white hover"> + <path class="outline" d="M9,2v12l-3.8-3H4c-1.1,0-2-0.9-2-2V7c0-1.1,0.9-2,2-2h1.2L9,2 M11.4,3.2C13.5,3.8,15,5.7,15,8 s-1.5,4.2-3.5,4.7l-0.4-0.9c1.7-0.4,2.9-2,2.9-3.8s-1.2-3.4-3-3.9L11.4,3.2 M10.7,5.1C12,5.4,13,6.6,13,8s-1,2.6-2.2,2.9L10.4,10 C11.3,9.8,12,9,12,8s-0.7-1.8-1.6-2L10.7,5.1 M10,7c0.6,0,1,0.4,1,1s-0.4,1-1,1V7 M10-0.1L8.4,1.2L4.9,4H4C2.3,4,1,5.3,1,7v2 c0,1.7,1.3,3,3,3h0.9l3.5,2.8l1.6,1.3V14v-2.2l0.2,0.4l0.4,0.9l0.3,0.8l0.8-0.2C14.2,13,16,10.7,16,8c0-2.7-1.7-5-4.3-5.8L10.8,2 l-0.4,0.8l-0.4,0.9L10,3.9V2V-0.1L10-0.1z"/> + <path d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z"/> + </g> + <g id="tab-audio-white-pressed" class="icon white pressed"> + <path class="outline" d="M9,2v12l-3.8-3H4c-1.1,0-2-0.9-2-2V7c0-1.1,0.9-2,2-2h1.2L9,2 M11.4,3.2C13.5,3.8,15,5.7,15,8 s-1.5,4.2-3.5,4.7l-0.4-0.9c1.7-0.4,2.9-2,2.9-3.8s-1.2-3.4-3-3.9L11.4,3.2 M10.7,5.1C12,5.4,13,6.6,13,8s-1,2.6-2.2,2.9L10.4,10 C11.3,9.8,12,9,12,8s-0.7-1.8-1.6-2L10.7,5.1 M10,7c0.6,0,1,0.4,1,1s-0.4,1-1,1V7 M10-0.1L8.4,1.2L4.9,4H4C2.3,4,1,5.3,1,7v2 c0,1.7,1.3,3,3,3h0.9l3.5,2.8l1.6,1.3V14v-2.2l0.2,0.4l0.4,0.9l0.3,0.8l0.8-0.2C14.2,13,16,10.7,16,8c0-2.7-1.7-5-4.3-5.8L10.8,2 l-0.4,0.8l-0.4,0.9L10,3.9V2V-0.1L10-0.1z"/> + <path d="M4,5C2.9,5,2,5.9,2,7v2c0,1.1,0.9,2,2,2h1.2L9,14V2L5.2,5H4z M11,8c0-0.6-0.4-1-1-1v2C10.6,9,11,8.6,11,8z M13,8 c0-1.4-1-2.6-2.3-2.9L10.4,6C11.3,6.2,12,7,12,8s-0.7,1.8-1.6,2l0.4,0.9C12,10.6,13,9.4,13,8z M11.4,3.2l-0.4,0.9 C12.8,4.6,14,6.2,14,8s-1.2,3.4-2.9,3.8l0.4,0.9C13.5,12.2,15,10.3,15,8S13.5,3.8,11.4,3.2z"/> + </g> + + <g id="tab-audio-muted-white" class="icon muted white"> + <path class="outline" d="M9,2v4.3l3.5-2.9l0.9,1.2l-11,9l-1-1.2l1.9-1.5C2.6,10.6,2,9.9,2,9V7c0-1.1,0.9-2,2-2h1.2L9,2 M9,10v4l-2.5-2L9,10 M10-0.1 L8.4,1.2L4.9,4H4C2.3,4,1,5.3,1,7v2c0,0.7,0.3,1.4,0.7,2l-0.8,0.7l-0.8,0.6l0.6,0.8l1,1.2L2.3,15l0.8-0.6l2.3-1.9l0.4,0.3l2.5,2 l1.6,1.3V14v-4V8.7l4.1-3.4l0.8-0.6l-0.6-0.8l-0.9-1.2L12.7,2l-0.8,0.6L10,4.2V2V-0.1L10-0.1z"/> + <path d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z"/> + </g> + <g id="tab-audio-muted-white-hover" class="icon muted white hover"> + <path class="outline" d="M9,2v4.3l3.5-2.9l0.9,1.2l-11,9l-1-1.2l1.9-1.5C2.6,10.6,2,9.9,2,9V7c0-1.1,0.9-2,2-2h1.2L9,2 M9,10v4l-2.5-2L9,10 M10-0.1 L8.4,1.2L4.9,4H4C2.3,4,1,5.3,1,7v2c0,0.7,0.3,1.4,0.7,2l-0.8,0.7l-0.8,0.6l0.6,0.8l1,1.2L2.3,15l0.8-0.6l2.3-1.9l0.4,0.3l2.5,2 l1.6,1.3V14v-4V8.7l4.1-3.4l0.8-0.6l-0.6-0.8l-0.9-1.2L12.7,2l-0.8,0.6L10,4.2V2V-0.1L10-0.1z"/> + <path d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z"/> + </g> + <g id="tab-audio-muted-white-pressed" class="icon muted white pressed"> + <path class="outline" d="M9,2v4.3l3.5-2.9l0.9,1.2l-11,9l-1-1.2l1.9-1.5C2.6,10.6,2,9.9,2,9V7c0-1.1,0.9-2,2-2h1.2L9,2 M9,10v4l-2.5-2L9,10 M10-0.1 L8.4,1.2L4.9,4H4C2.3,4,1,5.3,1,7v2c0,0.7,0.3,1.4,0.7,2l-0.8,0.7l-0.8,0.6l0.6,0.8l1,1.2L2.3,15l0.8-0.6l2.3-1.9l0.4,0.3l2.5,2 l1.6,1.3V14v-4V8.7l4.1-3.4l0.8-0.6l-0.6-0.8l-0.9-1.2L12.7,2l-0.8,0.6L10,4.2V2V-0.1L10-0.1z"/> + <path d="M12.5,3.4L9,6.3V2L5.2,5H4C2.9,5,2,5.9,2,7v2c0,0.9,0.6,1.6,1.4,1.9l-1.9,1.5l1,1.2l11-9L12.5,3.4z M9,14v-4l-2.5,2L9,14z"/> + </g> + +</svg> diff --git a/arc-firefox-theme/chrome/browser/tracking-protection-16.svg b/arc-firefox-theme/chrome/browser/tracking-protection-16.svg new file mode 100755 index 0000000..ebe6b5f --- /dev/null +++ b/arc-firefox-theme/chrome/browser/tracking-protection-16.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="16" height="16" viewBox="0 0 16 16">
+ <defs>
+ <path id="shape-shield-outer" d="M8,1L2.8,1.9C2.4,1.9,2,2.4,2,2.8C2,4,2,6.1,2.1,7.1c0.3,2.7,0.8,4,1.9,5.6C5.6,14.7,8,15,8,15s2.4-0.3,4-2.4 c1.2-1.5,1.7-2.9,1.9-5.6C14,6.1,14,4,14,2.8c0-0.5-0.4-0.9-0.8-1L8,1L8,1z"/>
+ <path id="shape-shield-inner" d="M8,2l5,0.8c0,2,0,3.5-0.1,4.1c-0.3,2.7-0.8,3.8-1.7,5.1c-1.1,1.5-2.7,1.9-3.2,2c-0.4-0.1-2.1-0.5-3.2-2 c-1-1.3-1.5-2.4-1.7-5.1C3,6.3,3,4.8,3,2.8L8,2"/>
+ <path id="shape-shield-detail" d="M8,13c-0.5-0.1-1.6-0.5-2.4-1.5c-0.9-1.2-1.3-2.1-1.5-4.6C4,6.3,4,5.2,4,3.7L8,3 V13z"/>
+
+ <mask id="mask-shield-cutout">
+ <rect width="16" height="16" fill="#000" />
+ <use xlink:href="#shape-shield-outer" fill="#fff" />
+ <use xlink:href="#shape-shield-inner" fill="#000" />
+ <use xlink:href="#shape-shield-detail" fill="#fff" />
+ </mask>
+ </defs>
+
+ <use xlink:href="#shape-shield-outer" mask="url(#mask-shield-cutout)" fill="#808080" />
+</svg>
diff --git a/arc-firefox-theme/chrome/browser/tracking-protection-disabled-16.svg b/arc-firefox-theme/chrome/browser/tracking-protection-disabled-16.svg new file mode 100755 index 0000000..b0c68d2 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/tracking-protection-disabled-16.svg @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="16" height="16" viewBox="0 0 16 16">
+ <defs>
+ <path id="shape-shield-outer" d="M8,1L2.8,1.9C2.4,1.9,2,2.4,2,2.8C2,4,2,6.1,2.1,7.1c0.3,2.7,0.8,4,1.9,5.6C5.6,14.7,8,15,8,15s2.4-0.3,4-2.4 c1.2-1.5,1.7-2.9,1.9-5.6C14,6.1,14,4,14,2.8c0-0.5-0.4-0.9-0.8-1L8,1L8,1z"/>
+ <path id="shape-shield-inner" d="M8,2l5,0.8c0,2,0,3.5-0.1,4.1c-0.3,2.7-0.8,3.8-1.7,5.1c-1.1,1.5-2.7,1.9-3.2,2c-0.4-0.1-2.1-0.5-3.2-2 c-1-1.3-1.5-2.4-1.7-5.1C3,6.3,3,4.8,3,2.8L8,2"/>
+ <path id="shape-shield-detail" d="M8,13c-0.5-0.1-1.6-0.5-2.4-1.5c-0.9-1.2-1.3-2.1-1.5-4.6C4,6.3,4,5.2,4,3.7L8,3 V13z"/>
+
+ <mask id="mask-shield-cutout">
+ <rect width="16" height="16" fill="#000" />
+ <use xlink:href="#shape-shield-outer" fill="#fff" />
+ <use xlink:href="#shape-shield-inner" fill="#000" />
+ <use xlink:href="#shape-shield-detail" fill="#fff" />
+ <line x1="3" y1="15" x2="15" y2="3" stroke="#000" stroke-width="2" />
+ </mask>
+ </defs>
+
+ <use xlink:href="#shape-shield-outer" mask="url(#mask-shield-cutout)" fill="#808080" />
+ <line x1="3" y1="14" x2="15" y2="2" stroke="#d92d21" stroke-width="2" />
+</svg>
diff --git a/arc-firefox-theme/chrome/browser/update-badge-failed.svg b/arc-firefox-theme/chrome/browser/update-badge-failed.svg new file mode 100644 index 0000000..e31e6ec --- /dev/null +++ b/arc-firefox-theme/chrome/browser/update-badge-failed.svg @@ -0,0 +1,6 @@ +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" width="10px" height="10px"> + <path d="M5,6C4.2,6,3.5,6.7,3.5,7.5S4.2,9,5,9s1.5-0.7,1.5-1.5S5.8,6,5,6z M5,5L5,5c0.6,0,1-0.4,1-1l0.2-2.8 C6.2,0.5,5.7,0,5,0S3.8,0.5,3.8,1.2L4,4C4,4.6,4.4,5,5,5z" fill="#fff"/> +</svg> diff --git a/arc-firefox-theme/chrome/browser/urlbar-arrow.png b/arc-firefox-theme/chrome/browser/urlbar-arrow.png Binary files differindex fcab253..ed83d8a 100644 --- a/arc-firefox-theme/chrome/browser/urlbar-arrow.png +++ b/arc-firefox-theme/chrome/browser/urlbar-arrow.png diff --git a/arc-firefox-theme/chrome/browser/warning.svg b/arc-firefox-theme/chrome/browser/warning.svg new file mode 100644 index 0000000..7befd73 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/warning.svg @@ -0,0 +1,7 @@ +<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+ <path fill="#ffbf00" d="M14.8,12.5L9.3,1.9C9,1.3,8.5,1,8,1C7.5,1,7,1.3,6.7,1.9L1.2,12.5c-0.3,0.6-0.3,1.2,0,1.7C1.5,14.7,2,15,2.6,15h10.8 c0.6,0,1.1-0.3,1.4-0.8C15.1,13.7,15.1,13.1,14.8,12.5z"/>
+ <path fill="#fff" d="M8,11c-0.8,0-1.5,0.7-1.5,1.5C6.5,13.3,7.2,14,8,14 c0.8,0,1.5-0.7,1.5-1.5C9.5,11.7,8.8,11,8,11z M8,10L8,10C8.6,10,9,9.6,9,9l0.2-4.2c0-0.7-0.5-1.2-1.2-1.2S6.8,4.1,6.8,4.8L7,9 C7,9.6,7.4,10,8,10z"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/browser/warning16.png b/arc-firefox-theme/chrome/browser/warning16.png Binary files differdeleted file mode 100644 index 46200ce..0000000 --- a/arc-firefox-theme/chrome/browser/warning16.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/warning16@2x.png b/arc-firefox-theme/chrome/browser/warning16@2x.png Binary files differdeleted file mode 100644 index d1426d3..0000000 --- a/arc-firefox-theme/chrome/browser/warning16@2x.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/global/menu.css b/arc-firefox-theme/chrome/global/menu.css index 61de49d..c2c779b 100644 --- a/arc-firefox-theme/chrome/global/menu.css +++ b/arc-firefox-theme/chrome/global/menu.css @@ -80,6 +80,7 @@ menulist > menupopup > menu { .menu-text, .menu-iconic-left, +.menu-iconic-right, .menu-iconic-text { margin-top: 0px !important; margin-bottom: 0px !important; @@ -118,7 +119,8 @@ menucaption > .menu-iconic-text { -moz-box-pack: end; } -.menu-iconic-left { +.menu-iconic-left, +.menu-iconic-right { width: 16px; /* We can only hardcode this, to make the default GTK icon<->label spacing */ -moz-padding-end: 3px !important; @@ -158,7 +160,10 @@ menucaption > .menu-iconic-text { menulist > menupopup > menuitem > .menu-iconic-left, menulist > menupopup > menucaption > .menu-iconic-left, -menulist > menupopup > menu > .menu-iconic-left { +menulist > menupopup > menu > .menu-iconic-left, +menulist > menupopup > menuitem > .menu-iconic-right, +menulist > menupopup > menucaption > .menu-iconic-right, +menulist > menupopup > menu > .menu-iconic-right { display: none; } diff --git a/arc-firefox-theme/chrome/global/notification.css b/arc-firefox-theme/chrome/global/notification.css index 4c5d27e..079f408 100644 --- a/arc-firefox-theme/chrome/global/notification.css +++ b/arc-firefox-theme/chrome/global/notification.css @@ -5,14 +5,16 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); notification { - color: InfoText; + color: -moz-gtk-info-bar-text; background-color: InfoBackground; + -moz-appearance: -moz-gtk-info-bar; text-shadow: none; } notification[type="info"] { color: -moz-DialogText; background-color: -moz-Dialog; + -moz-appearance: none; } notification[type="critical"] { diff --git a/arc-firefox-theme/chrome/global/toolbarbutton.css b/arc-firefox-theme/chrome/global/toolbarbutton.css index 4a11f72..a62e173 100644 --- a/arc-firefox-theme/chrome/global/toolbarbutton.css +++ b/arc-firefox-theme/chrome/global/toolbarbutton.css @@ -106,37 +106,25 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active { } /* ::::: toolbarbutton badged ::::: */ +.toolbarbutton-badge-stack > .toolbarbutton-icon[label]:not([label=""]) { + -moz-margin-end: 0; +} .toolbarbutton-badge { background-color: #d90000; -} - -.toolbarbutton-badge::after { - /* The |content| property is set in the content stylesheet. */ font-size: 10px; - font-weight: bold; - padding: 1px 2px 2px; + padding: 0 2px 1px; color: #fff; - background-color: inherit; border-radius: 2px; box-shadow: 0 1px 0 hsla(0, 100%, 100%, .2) inset, 0 -1px 0 hsla(0, 0%, 0%, .1) inset, 0 1px 0 hsla(206, 50%, 10%, .2); - position: absolute; - top: -4px; - right: -2px; - min-width: 10px; + margin: -6px 0 0 !important; + -moz-margin-end: -8px !important; + min-width: 14px; line-height: 10px; text-align: center; -} - -.toolbarbutton-badge:-moz-locale-dir(rtl)::after { - left: -2px; - right: auto; -} - -.toolbarbutton-badge-container { - position: relative; + -moz-stack-sizing: ignore; } /* .......... dropmarker .......... */ diff --git a/arc-firefox-theme/chrome/mozapps/extensions/extensions.css b/arc-firefox-theme/chrome/mozapps/extensions/extensions.css index 30b1ab6..e3e5a63 100644 --- a/arc-firefox-theme/chrome/mozapps/extensions/extensions.css +++ b/arc-firefox-theme/chrome/mozapps/extensions/extensions.css @@ -675,14 +675,13 @@ #detail-screenshot-box { -moz-margin-end: 2em; - padding: 10px; - background-color: white; - box-shadow: 0 1px 2px #666; } #detail-screenshot { max-width: 300px; max-height: 300px; + background-color: white; + box-shadow: 0 1px 2px #666; } #detail-screenshot[loading] { @@ -1041,6 +1040,11 @@ button.button-link:not([disabled="true"]):active:hover { font-style: italic; } +#detail-findUpdates-btn[hidden] { + display: -moz-box; + visibility: hidden; +} + #header-utils-btn .toolbarbutton-icon { list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities-native"); } |
