diff options
68 files changed, 1371 insertions, 981 deletions
diff --git a/arc-firefox-theme/chrome/browser/aboutNetError_alert.svg b/arc-firefox-theme/chrome/browser/aboutNetError_alert.svg index 66215d4..b19c1c7 100644 --- a/arc-firefox-theme/chrome/browser/aboutNetError_alert.svg +++ b/arc-firefox-theme/chrome/browser/aboutNetError_alert.svg @@ -5,12 +5,12 @@ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40"> <defs> <linearGradient id="gradient1" gradientUnits="userSpaceOnUse" x1="20" y1="4" x2="20" y2="36"> - <stop offset="0" style="stop-color:#e63b2e"/> - <stop offset="1" style="stop-color:#c33931"/> + <stop offset="0" style="stop-color: #e63b2e"/> + <stop offset="1" style="stop-color: #c33931"/> </linearGradient> <linearGradient id="gradient2" gradientUnits="userSpaceOnUse" x1="20" y1="0" x2="20" y2="40"> - <stop offset="0" style="stop-color:#e63b2e"/> - <stop offset="1" style="stop-color:#c33931"/> + <stop offset="0" style="stop-color: #e63b2e"/> + <stop offset="1" style="stop-color: #c33931"/> </linearGradient> </defs> <path fill="url(#gradient1)" d="M13.373,4L4,13.372v13.256L13.373,36h13.255L36,26.628V13.372L26.627,4H13.373z M22.176,8.704 l-0.48,14.304h-3.424L17.76,8.704H22.176z M20,31.296c-1.44,0-2.592-1.184-2.592-2.592c0-1.44,1.152-2.592,2.592-2.592 c1.472,0,2.592,1.152,2.592,2.592C22.592,30.112,21.472,31.296,20,31.296z"/> diff --git a/arc-firefox-theme/chrome/browser/browser.css b/arc-firefox-theme/chrome/browser/browser.css index f7ed613..3752502 100644 --- a/arc-firefox-theme/chrome/browser/browser.css +++ b/arc-firefox-theme/chrome/browser/browser.css @@ -40,6 +40,9 @@ height: 1px; background-color: #dcdfe3; } +#navigator-toolbox:-moz-lwtheme::after { + background-color: rgba(0, 0, 0, 0.3); } + #navigator-toolbox > toolbar:not(:-moz-lwtheme):not(#toolbar-menubar):not(#TabsToolbar) { -moz-appearance: none; border-style: none; @@ -105,7 +108,7 @@ toolbarbutton.bookmark-item:not(.subviewbutton), toolbarbutton.bookmark-item:not(.subviewbutton):not(:hover):not(:active):not([open]) { color: inherit; } -.bookmark-item:not(#home-button) > .toolbarbutton-icon, +.bookmark-item > .toolbarbutton-icon, #personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon { width: 16px; height: 16px; } @@ -283,7 +286,7 @@ menuitem.bookmark-item { opacity: 0.7; } /* Stock icons for the menu bar items */ -menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip):not([endimage]) { +menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); } #placesContext_open\:newwindow, @@ -794,7 +797,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #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), +#nav-bar #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; } @@ -1309,7 +1312,11 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { -moz-margin-start: 0; } .urlbar-history-dropmarker { - -moz-appearance: toolbarbutton-dropdown; } + -moz-appearance: toolbarbutton-dropdown; + transition: opacity 0.15s ease; } + +#urlbar:not(:hover) > .urlbar-textbox-container > .urlbar-history-dropmarker { + opacity: 0; } #urlbar-container { -moz-box-align: center; } @@ -1376,7 +1383,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button { -moz-appearance: none; - -moz-user-focus: ignore; min-width: 80px; border-radius: 3px; padding: 4px 16px; @@ -1582,10 +1588,16 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box border-style: solid; border-color: #dcdfe3; } +/* This changes the direction of the main notification box on the url bar. */ #notification-popup-box:-moz-locale-dir(rtl), .notification-anchor-icon:-moz-locale-dir(rtl) { transform: scaleX(-1); } +/* For the anchor icons in the chat window, we don't have the notification popup box, + so we need to cancel the RTL transform. */ +.notification-anchor-icon.chat-toolbarbutton:-moz-locale-dir(rtl) { + transform: none; } + .notification-anchor-icon { list-style-image: url(moz-icon://stock/gtk-dialog-info?size=16); width: 16px; @@ -1929,8 +1941,7 @@ notification[value="loop-sharing-notification"] .messageImage { .ac-result-type-bookmark, .autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/star-icons.png"); - -moz-image-region: rect(0px 32px 16px 16px); + list-style-image: url("chrome://browser/skin/places/autocomplete-star.png"); width: 16px; height: 16px; } @@ -2712,6 +2723,12 @@ lwtHeader;*/ /* box-shadow instead of background-color to work around native styling */ box-shadow: inset -5px 0 ThreeDShadow; } +.alltabs-endimage[muted] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted); } + +.alltabs-endimage[soundplaying] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); } + /* Sidebar */ #sidebar-throbber[loading="true"] { list-style-image: url("chrome://global/skin/icons/loading_16.png"); @@ -2775,14 +2792,12 @@ toolbarbutton.chevron > .toolbarbutton-icon { .sync-panel-button-box { margin-top: 1em; } -#sync-error-panel-title, #sync-start-panel-title { font-size: 120%; font-weight: bold; margin-bottom: 5px; } -#sync-start-panel-subtitle, -#sync-error-panel-subtitle { +#sync-start-panel-subtitle { margin: 0; } /* Status panel */ @@ -2807,19 +2822,45 @@ toolbarbutton.chevron > .toolbarbutton-icon { border-top-left-radius: .3em; margin-left: 1em; } -#full-screen-warning-message { - background-image: url("chrome://browser/skin/fullscreen-darknoise.png"); - color: white; - border-radius: 4px; - margin-top: 30px; - padding: 30px 50px; - box-shadow: 0 0 2px white; } +html|*#fullscreen-warning { + align-items: center; + background: rgba(45, 62, 72, 0.9); + border: 2px solid #fafafa; + box-shadow: 0px 0px 5px 2px rgba(0, 0, 0, 0.5); + border-radius: 8px; + padding: 24px 16px; + font: message-box; } + +html|*#fullscreen-warning::before { + margin: 0; + width: 24px; + height: 24px; } + +html|*#fullscreen-warning.verifiedIdentity::before, +html|*#fullscreen-warning.verifiedDomain::before { + content: url("chrome://browser/skin/fullscreen/secure.svg"); } -.full-screen-description { - font-size: 150%; } +html|*#fullscreen-warning.unknownIdentity::before { + content: url("chrome://browser/skin/fullscreen/insecure.svg"); } + +html|*#fullscreen-domain-text, +html|*#fullscreen-generic-text { + font-size: 21px; + font-weight: lighter; + color: #fafafa; + margin: 0 16px; } + +html|*#fullscreen-domain { + font-weight: bold; + margin: 0; } -#full-screen-domain-text { - font-size: 300%; } +html|*#fullscreen-exit-button { + padding: 5px 30px; + font: message-box; + font-size: 14px; + font-weight: lighter; + margin: 0; + box-sizing: content-box; } /* Responsive Mode */ .browserContainer[responsivemode] { @@ -2946,7 +2987,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-rotate { list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate.png"); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-close { list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); } @@ -2959,7 +3000,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-touch[checked] { -moz-image-region: rect(0px, 32px, 16px, 16px); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-touch { list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch@2x.png"); -moz-image-region: rect(0px, 32px, 32px, 0px); } @@ -2969,7 +3010,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-screenshot { list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot.png"); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-screenshot { list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot@2x.png"); } } .devtools-responsiveui-resizebarV { @@ -3027,11 +3068,13 @@ toolbarbutton.chevron > .toolbarbutton-icon { background-image: linear-gradient(to right, #111 11%, #333 56%); } .devtools-responsiveui-home-button { + -moz-user-focus: ignore; width: 40px; height: 30px; list-style-image: url("chrome://browser/skin/devtools/responsiveui-home.png"); } .devtools-responsiveui-sleep-button { + -moz-user-focus: ignore; -moz-appearance: none; /* compensate browserStack top padding */ margin-top: -67px; @@ -3053,6 +3096,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-volume-up-button, .devtools-responsiveui-volume-down-button { + -moz-user-focus: ignore; -moz-appearance: none; border: 1px solid red; min-width: 8px; @@ -3071,7 +3115,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-volume-down-button { border-bottom-left-radius: 12px; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-resizebarV { background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer@2x.png"); } @@ -3159,7 +3203,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { #developer-toolbar-toolbox-button[checked=true] { -moz-image-region: rect(0px, 64px, 16px, 48px); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #developer-toolbar-toolbox-button { list-style-image: url("chrome://browser/skin/devtools/toggle-tools@2x.png"); -moz-image-region: rect(0px, 32px, 32px, 0px); } @@ -3181,7 +3225,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { width: 16px; opacity: 0.6; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #developer-toolbar-closebutton { list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); } } #developer-toolbar-closebutton > .toolbarbutton-icon { @@ -3252,7 +3296,7 @@ html|*#gcli-output-frame { .gclitoolbar-input-node[focused="true"]::before { background-position: -16px center; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .gclitoolbar-input-node::before { background-image: url("chrome://browser/skin/devtools/commandline-icon@2x.png"); } } .gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection { @@ -3652,12 +3696,6 @@ toolbar[brighttext] #downloads-indicator-counter { margin: 0; background: none; } -.chat-toolbarbutton:hover { - background-color: rgba(255, 255, 255, 0.35); } - -.chat-toolbarbutton:hover:active { - background-color: rgba(255, 255, 255, 0.5); } - .chat-toolbarbutton > .toolbarbutton-text { display: none; } @@ -3668,40 +3706,70 @@ toolbar[brighttext] #downloads-indicator-counter { .chat-close-button { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close"); } -.chat-close-button:-moz-any(:hover, :hover:active) { +.chat-close-button:hover { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-hover"); } + +.chat-close-button:hover:active { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-active"); } .chat-minimize-button { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize"); } -.chat-minimize-button:-moz-any(:hover, :hover:active) { +.chat-minimize-button:hover { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-hover"); } + +.chat-minimize-button:hover:active { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-active"); } .chat-swap-button { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand"); transform: rotate(180deg); } -.chat-swap-button:-moz-any(:hover, :hover:active) { +.chat-swap-button:hover { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-hover"); } + +.chat-swap-button:hover:active { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-active"); } chatbar > chatbox > .chat-titlebar > .chat-swap-button { transform: none; } +.chat-loop-hangup { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#exit-white"); + background-color: #d13f1a; + border: 1px solid #d13f1a; + border-top-right-radius: 4px; + width: 32px; + height: 26px; + margin-top: -6px; + margin-bottom: -5px; + -moz-margin-start: 6px; + -moz-margin-end: -5px; } + +.chat-toolbarbutton.chat-loop-hangup:-moz-any(:hover, :hover:active) { + background-color: #ef6745; + border-color: #ef6745; } + .chat-title { - font-weight: bold; - color: black; + color: #666; text-shadow: none; cursor: inherit; } .chat-titlebar { - height: 30px; - min-height: 30px; + height: 26px; + min-height: 26px; width: 100%; margin: 0; - padding: 7px 6px; - border: none; - border-bottom: 1px solid #ccc; - cursor: pointer; } + padding: 5px 4px; + border: 1px solid #ebebeb; + border-bottom: 0; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + cursor: pointer; + background-color: #ebebeb; } + +.chat-titlebar[selected] { + background-color: #f0f0f0; } .chat-titlebar > .notification-anchor-icon { margin-left: 2px; @@ -3716,16 +3784,6 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button { background-size: 100% 20px; background-position: 0 -10px; } -chatbox[dark=true] > .chat-titlebar, -chatbox[dark=true] > .chat-titlebar[selected] { - border-bottom: none; - background-color: #000; - background-image: none; } - -chatbox[dark=true] > .chat-titlebar > hbox > .chat-title { - font-weight: normal; - color: #c1c1c1; } - .chat-frame { padding: 0; margin: 0; @@ -3738,11 +3796,22 @@ chatbox[dark=true] > .chat-titlebar > hbox > .chat-title { height: 21px; width: 21px; border: 1px solid #ccc; - border-bottom: none; } + border-bottom: none; + background-color: #d9d9d9; + background-image: linear-gradient(rgba(255, 255, 255, 0.43), transparent); + border-top-left-radius: 3px; + border-top-right-radius: 3px; } @media (min-resolution: 2dppx) { .chatbar-button { list-style-image: url("chrome://browser/skin/social/services-16@2x.png"); } } +.chatbar-button:hover, +.chatbar-button[open="true"] { + background-color: #f0f0f0; } + +.chatbar-button[activity]:not([open]) { + background-image: radial-gradient(circle farthest-corner at center 2px, #fefeff 3%, rgba(210, 235, 255, 0.9) 12%, rgba(148, 205, 253, 0.6) 30%, rgba(148, 205, 253, 0.2) 70%); } + .chatbar-button > .toolbarbutton-icon { width: 16px; } @@ -3771,41 +3840,24 @@ chatbar { chatbox { -moz-margin-start: 4px; - background-color: white; - border: 1px solid #ccc; - border-bottom: none; } + background-color: transparent; } + +chatbar > chatbox { + /* Apply the same border-radius as the .chat-titlebar to make the box-shadow + go round nicely. */ + border-top-left-radius: 4px; + border-top-right-radius: 4px; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); + /* Offset the chatbox the same amount as the box-shadows' spread, to make it + visible. */ + -moz-margin-end: 5px; } window > chatbox { -moz-margin-start: 0px; margin: 0px; border: none; - padding: 0px; } - -.chat-titlebar { - background-color: #d9d9d9; - background-image: linear-gradient(rgba(255, 255, 255, 0.3), transparent); } - -.chat-titlebar[selected] { - background-color: #f0f0f0; } - -.chatbar-button { - -moz-appearance: none; - background-color: #d9d9d9; - background-image: linear-gradient(rgba(255, 255, 255, 0.3), transparent); } - -.chatbar-button > .toolbarbutton-icon { - -moz-margin-end: 0; } - -.chatbar-button:hover, -.chatbar-button[open="true"] { - background-color: #f0f0f0; } - -.chatbar-button[activity] { - background-image: radial-gradient(circle farthest-corner at center 3px, #e9f2fc 3%, rgba(172, 206, 255, 0.75) 40%, rgba(87, 151, 201, 0.5) 80%, transparent); } - -chatbox { - border-top-left-radius: 2.5px; - border-top-right-radius: 2.5px; } + padding: 0px; + border-radius: 4px; } /* Customization mode */ /* This Source Code Form is subject to the terms of the Mozilla Public diff --git a/arc-firefox-theme/chrome/browser/controlcenter/panel.css b/arc-firefox-theme/chrome/browser/controlcenter/panel.css index 27c2258..e3a4d14 100644 --- a/arc-firefox-theme/chrome/browser/controlcenter/panel.css +++ b/arc-firefox-theme/chrome/browser/controlcenter/panel.css @@ -158,6 +158,7 @@ #identity-popup-security-descriptions > description, #identity-popup-securityView-header > description, #identity-popup-securityView-body > description, +#identity-popup-permissions-content > description, #tracking-protection-content > label { white-space: pre-wrap; font-size: 110%; @@ -296,10 +297,14 @@ description#identity-popup-content-verifier, min-width: 60px; } -#identity-popup-permission-list { +#identity-popup-permission-list:not(:empty) { margin-top: 5px; } +#identity-popup-permission-list:not(:empty) + description { + display: none; +} + .identity-popup-permission-label { -moz-margin-start: 0; word-wrap: break-word; diff --git a/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css b/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css index c96ee12..367bf27 100644 --- a/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css +++ b/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css @@ -1210,19 +1210,9 @@ toolbarpaletteitem[haswideitem][place="panel"] + toolbarpaletteitem[haswideitem] border-bottom-left-radius: 0; } -.toolbaritem-combined-buttons > separator { +.toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > separator { -moz-appearance: none; - width: 3px; -moz-box-align: stretch; - background-image: linear-gradient(to bottom, transparent, hsla(0,0%,100%,.3) 40%, hsla(0,0%,100%,.3) 60%, transparent), - linear-gradient(to bottom, transparent, hsla(210,54%,20%,.15) 40%, hsla(210,54%,20%,.15) 60%, transparent), - linear-gradient(to bottom, transparent, hsla(0,0%,100%,.3) 40%, hsla(0,0%,100%,.3) 60%, transparent); - background-size: 1px, 1px, 1px; - background-position: 0 0, 1px 0, 2px 0; - background-repeat: no-repeat; -} - -.toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > separator { margin: .5em 0; width: 1px; height: auto; diff --git a/arc-firefox-theme/chrome/browser/devedition.css b/arc-firefox-theme/chrome/browser/devedition.css index d1ddeca..eb2234b 100644 --- a/arc-firefox-theme/chrome/browser/devedition.css +++ b/arc-firefox-theme/chrome/browser/devedition.css @@ -44,8 +44,6 @@ --toolbarbutton-active-boxshadow: none; --toolbarbutton-active-bordercolor: rgba(25,33,38,.8); --toolbarbutton-checkedhover-backgroundcolor: #1D4F73; - --toolbarbutton-combined-boxshadow: none; - --toolbarbutton-combined-backgroundimage: linear-gradient(#5F6670 0, #5F6670 18px); /* Url and search bars */ --url-and-searchbar-background-color: #171B1F; @@ -59,7 +57,6 @@ --urlbar-dropmarker-2x-region: rect(0px, 11px, 14px, 0px); --urlbar-dropmarker-hover-2x-region: rect(0, 22px, 14px, 11px); --urlbar-dropmarker-active-2x-region: rect(0px, 33px, 14px, 22px); - --search-button-image: url("chrome://browser/skin/devedition/search.svg#search-icon-inverted"); } :root[devtoolstheme="dark"] #identity-box { @@ -68,11 +65,6 @@ --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"); -} - :root[devtoolstheme="light"] { --url-and-searchbar-background-color: #fff; @@ -105,11 +97,6 @@ --toolbarbutton-active-boxshadow: none; --toolbarbutton-active-bordercolor: rgba(0,0,0,0.15); --toolbarbutton-checkedhover-backgroundcolor: #d7d7d8; - --toolbarbutton-combined-boxshadow: none; - --toolbarbutton-combined-backgroundimage: linear-gradient(rgba(0,0,0,0.1) 0, rgba(0,0,0,0.1) 18px); - - /* Url and search bars */ - --search-button-image: url("chrome://browser/skin/devedition/search.svg#search-icon"); } /* Give some space to drag the window around while customizing @@ -271,12 +258,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper { -moz-image-region: rect(0, 54px, 18px, 36px); } -searchbar:not([oneoffui]) .search-go-button { - /* !important is needed because searchbar.css is loaded after this */ - -moz-image-region: auto !important; - list-style-image: var(--search-button-image); -} - .tab-background { visibility: hidden; } diff --git a/arc-firefox-theme/chrome/browser/devedition/search.svg b/arc-firefox-theme/chrome/browser/devedition/search.svg deleted file mode 100644 index 6bacdc0..0000000 --- a/arc-firefox-theme/chrome/browser/devedition/search.svg +++ /dev/null @@ -1,27 +0,0 @@ -<?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" viewBox="0 0 16 16" width="16" height="16"> - <style> - use:not(:target) { - display: none; - } - use { - fill: #797c80; - } - use[id*="-inverted"] { - fill: #b6babf; - } - use[id*="-mac"] { - transform: translate(16px) scaleX(-1); - } - </style> - <defs> - <path id="search" fill-rule="evenodd" d="M9.356,1.178c-3.014,0-5.458,2.45-5.458,5.472c0,1.086,0.32,2.096,0.864,2.947 l-3.279,3.287c-0.396,0.397-0.396,1.041,0,1.438l0.202,0.202c0.396,0.397,1.039,0.397,1.435,0l3.275-3.283 c0.854,0.554,1.869,0.88,2.962,0.88c3.014,0,5.458-2.45,5.458-5.471C14.814,3.627,12.371,1.178,9.356,1.178z M9.356,10.001 c-1.847,0-3.344-1.501-3.344-3.352c0-1.851,1.497-3.352,3.344-3.352c1.846,0,3.344,1.501,3.344,3.352 C12.7,8.501,11.203,10.001,9.356,10.001z"/> - </defs> - <use id="search-icon" xlink:href="#search"/> - <use id="search-icon-inverted" xlink:href="#search"/> - <use id="search-icon-mac" xlink:href="#search"/> - <use id="search-icon-mac-inverted" xlink:href="#search"/> -</svg> diff --git a/arc-firefox-theme/chrome/browser/devtools/animationinspector.css b/arc-firefox-theme/chrome/browser/devtools/animationinspector.css index 40efab7..dfd1b3d 100644 --- a/arc-firefox-theme/chrome/browser/devtools/animationinspector.css +++ b/arc-firefox-theme/chrome/browser/devtools/animationinspector.css @@ -12,6 +12,15 @@ --even-animation-timeline-background-color: rgba(128,128,128,0.03); } +:root { + /* How high should toolbars be */ + --toolbar-height: 20px; + /* How wide should the sidebar be */ + --timeline-sidebar-width: 150px; + /* How high should animations displayed in the timeline be */ + --timeline-animation-height: 20px; +} + html { height: 100%; } @@ -26,33 +35,47 @@ body { color: var(--theme-content-color3); } -/* The top toolbar, containing the toggle-all button */ +/* The top toolbar, containing the toggle-all button. And the timeline toolbar, + containing playback control buttons, shown only when there are animations + displayed in the timeline */ -#toolbar { +#global-toolbar, +#timeline-toolbar { border-bottom: 1px solid var(--theme-splitter-color); display: flex; flex-direction: row; align-items: center; justify-content: flex-end; - height: 20px; + height: var(--toolbar-height); } -#toolbar .label { - padding: 1px 4px; +#timeline-toolbar { + display: none; } -#toggle-all { - border-width: 0 0 0 1px; - min-height: 20px; +[timeline] #global-toolbar { + display: none; +} + +[timeline] #timeline-toolbar { + display: flex; +} + +#global-toolbar .label { + padding: 1px 4px; } /* The main animations container */ #players { - height: calc(100% - 20px); + height: calc(100% - var(--toolbar-height)); overflow: auto; } +[empty] #players { + display: none; +} + /* The error message, shown when an invalid/unanimated element is selected */ #error-message { @@ -65,16 +88,23 @@ body { display: none; } +[empty] #error-message { + display: block; +} -/* Element picker and toggle-all buttons */ +/* Element picker, toggle-all buttons, timeline pause button, ... */ -#element-picker, -#toggle-all { +#global-toolbar .devtools-button, +#timeline-toolbar .devtools-button { + border-width: 0 0 0 1px; + min-height: var(--toolbar-height); +} + +.devtools-button { position: relative; } -#element-picker::before, -#toggle-all::before { +.devtools-button::before { content: ""; display: block; width: 16px; @@ -83,10 +113,13 @@ body { left: 50%; top: 50%; margin: -8px 0 0 -8px; +} + +#element-picker::before { background-image: url("chrome://browser/skin/devtools/command-pick.png"); } -#toggle-all::before { +.pause-button::before { background-image: url("debugger-pause.png"); } @@ -95,21 +128,21 @@ body { filter: none; /* Icon is blue when checked, don't invert for light theme */ } -#toggle-all.paused::before { +.pause-button.paused::before { background-image: url("debugger-play.png"); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #element-picker::before { background-image: url("chrome://browser/skin/devtools/command-pick@2x.png"); background-size: 64px; } - #toggle-all::before { + .pause-button::before { background-image: url("debugger-pause@2x.png"); } - #toggle-all.paused::before { + .pause-button.paused::before { background-image: url("debugger-play@2x.png"); } } @@ -119,6 +152,7 @@ body { .animation-timeline { height: 100%; overflow: hidden; + position: relative; /* The timeline gets its background-image from a canvas element created in /browser/devtools/animationinspector/utils.js drawGraphElementBackground thanks to document.mozSetImageElement("time-graduations", canvas) @@ -127,17 +161,42 @@ body { background-repeat: repeat-y; /* The animations are drawn 150px from the left edge so that animated nodes can be displayed in a sidebar */ - background-position: 150px 0; + background-position: var(--timeline-sidebar-width) 0; display: flex; flex-direction: column; } +.animation-timeline .scrubber { + position: absolute; + height: 100%; + width: var(--timeline-sidebar-width); + border-right: 1px solid red; + box-sizing: border-box; + z-index: 1; + pointer-events: none; +} + +.animation-timeline .scrubber::before { + content: ""; + position: absolute; + top: 0; + width: 1px; + right: -6px; + border-top: 5px solid red; + border-left: 5px solid transparent; + border-right: 5px solid transparent; +} + .animation-timeline .time-header { - margin-left: 150px; - height: 20px; + margin-left: var(--timeline-sidebar-width); + min-height: var(--toolbar-height); overflow: hidden; position: relative; - border-bottom: 1px solid var(--theme-splitter-color); + /* This is the same color as the time graduations in + browser/devtools/animationinspector/utils.js */ + border-bottom: 1px solid rgba(128, 136, 144, .5); + cursor: col-resize; + -moz-user-select: none; } .animation-timeline .time-header .time-tick { @@ -158,7 +217,7 @@ body { .animation-timeline .animation { margin: 4px 0; - height: 20px; + height: var(--timeline-animation-height); position: relative; } @@ -167,7 +226,7 @@ body { } .animation-timeline .animation .target { - width: 150px; + width: var(--timeline-sidebar-width); overflow: hidden; height: 100%; } @@ -179,7 +238,7 @@ body { .animation-timeline .animation .time-block { position: absolute; top: 0; - left: 150px; + left: var(--timeline-sidebar-width); right: 0; height: 100%; } @@ -189,19 +248,37 @@ body { .animation-timeline .animation .iterations { position: relative; height: 100%; - border: 1px solid var(--theme-highlight-lightorange); box-sizing: border-box; - background: var(--theme-contrast-background); - /* Iterations are displayed with a repeating linear-gradient which size is - dynamically changed from JS */ + + --timelime-border-color: var(--theme-body-color); + --timeline-background-color: var(--theme-splitter-color); + + /* Iterations of the animation are displayed with a repeating linear-gradient + which size is dynamically changed from JS. The gradient only draws 1px + borders between each iteration. These borders must have the same color as + the border of this element */ background-image: linear-gradient(to right, - var(--theme-highlight-lightorange) 0, - var(--theme-highlight-lightorange) 1px, + var(--timelime-border-color) 0, + var(--timelime-border-color) 1px, transparent 1px, transparent 2px); background-repeat: repeat-x; background-position: -1px 0; + border: 1px solid var(--timelime-border-color); + + /* The background color is set independently */ + background-color: var(--timeline-background-color); +} + +.animation-timeline .animation .cssanimation { + --timelime-border-color: var(--theme-highlight-lightorange); + --timeline-background-color: var(--theme-contrast-background); +} + +.animation-timeline .animation .csstransition { + --timelime-border-color: var(--theme-highlight-bluegrey); + --timeline-background-color: var(--theme-highlight-blue); } .animation-timeline .animation .iterations.infinite { @@ -226,42 +303,41 @@ body { top: unset; } -.animation-timeline .animation .animation-title { - height: 1.5em; +.animation-timeline .animation .name { + color: var(--theme-selection-color); + height: 100%; width: 100%; - box-sizing: border-box; overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + line-height: 150%; + padding: 0 2px; } .animation-timeline .animation .delay { position: absolute; top: 0; - height: 100%; - background-image: linear-gradient(to bottom, - transparent, - transparent 9px, - var(--theme-highlight-lightorange) 9px, - var(--theme-highlight-lightorange) 11px, - transparent 11px, - transparent); -} + /* Make sure the delay covers up the animation border */ + transform: translate(-1px, -1px); + box-sizing: border-box; + height: calc(100% + 2px); -.animation-timeline .animation .delay::before { - position: absolute; - content: ""; - left: 0; - width: 2px; - height: 8px; - top: 50%; - margin-top: -4px; - background: var(--theme-highlight-lightorange); + border: 1px solid var(--timelime-border-color); + border-width: 1px 0 1px 1px; + background-image: repeating-linear-gradient(45deg, + transparent, + transparent 1px, + var(--theme-selection-color) 1px, + var(--theme-selection-color) 4px); + background-color: var(--timelime-border-color); } -.animation-timeline .animation .name { - position: absolute; - z-index: 1; - padding: 2px; - white-space: nowrap; +.animation-timeline .animation .delay.negative { + /* Negative delays are displayed on top of the animation, so they need a + right border. Whereas normal delays are displayed just before the + animation, so there's already the animation's left border that serves as + a separation. */ + border-width: 1px; } /* Animation target node gutter, contains a preview of the dom node */ @@ -326,7 +402,7 @@ body { /* Timeline wiget */ .timeline { - height: 20px; + height: var(--timeline-animation-height); width: 100%; display: flex; flex-direction: row; @@ -362,7 +438,7 @@ body { background-image: url(rewind.png); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .timeline .toggle::before { background-image: url(debugger-pause@2x.png); } diff --git a/arc-firefox-theme/chrome/browser/devtools/canvasdebugger.css b/arc-firefox-theme/chrome/browser/devtools/canvasdebugger.css index a749260..efeac51 100644 --- a/arc-firefox-theme/chrome/browser/devtools/canvasdebugger.css +++ b/arc-firefox-theme/chrome/browser/devtools/canvasdebugger.css @@ -138,7 +138,7 @@ list-style-image: url(debugger-step-out.png); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #resume { list-style-image: url(debugger-play@2x.png); -moz-image-region: rect(0px,64px,32px,32px); @@ -243,7 +243,7 @@ background-size: 12px; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .selected .call-item-gutter { background-image: url("editor-debug-location@2x.png"); } diff --git a/arc-firefox-theme/chrome/browser/devtools/computedview.css b/arc-firefox-theme/chrome/browser/devtools/computedview.css index f770681..a4eff43 100644 --- a/arc-firefox-theme/chrome/browser/devtools/computedview.css +++ b/arc-firefox-theme/chrome/browser/devtools/computedview.css @@ -61,7 +61,7 @@ body { background-size: 5px 8px; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .property-value, .other-property-value { background-image: url(arrow-e@2x.png); } diff --git a/arc-firefox-theme/chrome/browser/devtools/dark-theme.css b/arc-firefox-theme/chrome/browser/devtools/dark-theme.css index 53a868f..22480b2 100644 --- a/arc-firefox-theme/chrome/browser/devtools/dark-theme.css +++ b/arc-firefox-theme/chrome/browser/devtools/dark-theme.css @@ -38,6 +38,7 @@ /* Colors used in Graphs, like performance tools. Mostly similar to some "highlight-*" colors. */ --theme-graphs-green: #70bf53; --theme-graphs-blue: #46afe3; + --theme-graphs-bluegrey: #5e88b0; --theme-graphs-purple: #df80ff; --theme-graphs-yellow: #d99b28; --theme-graphs-red: #eb5368; @@ -334,7 +335,7 @@ div.CodeMirror span.eval-text { background-position: -42px 0; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .theme-twisty, .theme-checkbox { background-image: url("chrome://browser/skin/devtools/controls@2x.png"); } @@ -372,7 +373,7 @@ div.CodeMirror span.eval-text { margin-left: -4px; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .theme-tooltip-panel .panel-arrow[side="top"], .theme-tooltip-panel .panel-arrow[side="bottom"] { list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-vertical-dark@2x.png"); @@ -725,7 +726,7 @@ div.CodeMirror span.eval-text { opacity: 0.5; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-button::before { background-size: 32px; } @@ -842,7 +843,7 @@ div.CodeMirror span.eval-text { -moz-image-region: rect(0, 32px, 16px, 16px); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .theme-dark .devtools-searchinput { background-image: url(magnifying-glass@2x.png); } @@ -1172,7 +1173,7 @@ div.CodeMirror span.eval-text { background-image: url("chrome://browser/skin/devtools/command-rulers.png"); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #command-button-paintflashing > image { background-image: url("chrome://browser/skin/devtools/command-paintflashing@2x.png"); } diff --git a/arc-firefox-theme/chrome/browser/devtools/debugger.css b/arc-firefox-theme/chrome/browser/devtools/debugger.css index 97eb3b0..e16cdb8 100644 --- a/arc-firefox-theme/chrome/browser/devtools/debugger.css +++ b/arc-firefox-theme/chrome/browser/devtools/debugger.css @@ -66,7 +66,7 @@ list-style-image: url(debugger-blackbox.png); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #black-box { list-style-image: url(debugger-blackbox@2x.png); } @@ -76,7 +76,7 @@ list-style-image: url(debugger-prettyprint.png); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #pretty-print { list-style-image: url(debugger-prettyprint@2x.png); } @@ -86,7 +86,7 @@ list-style-image: url(debugger-toggleBreakpoints.png); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #toggle-breakpoints { list-style-image: url(debugger-toggleBreakpoints@2x.png); } @@ -104,7 +104,7 @@ -moz-image-region: rect(0px,32px,16px,16px); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #sources-toolbar .devtools-toolbarbutton:not([label]) { -moz-image-region: rect(0px,32px,32px,0px); } @@ -138,7 +138,7 @@ -moz-margin-end: 5px; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #black-boxed-message-button > .button-box > .button-icon { background-image: url(debugger-blackbox@2x.png); } @@ -226,7 +226,7 @@ -moz-image-region: rect(0px,32px,16px,16px); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #trace { list-style-image: url(tracer-icon@2x.png); -moz-image-region: rect(0px,32px,32px,0px); @@ -328,7 +328,7 @@ margin: 2px; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .dbg-expression-arrow { background-image: url(commandline-icon@2x.png); } @@ -564,7 +564,7 @@ list-style-image: url(debugger-play.png); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #resume { list-style-image: url(debugger-pause@2x.png); -moz-image-region: rect(0px,32px,32px,0px); @@ -581,7 +581,12 @@ } #debugger-controls toolbarbutton[disabled] { - opacity: .5; + opacity: .5; + transition: none; +} + +#resume[break-on-next] { + background: var(--theme-highlight-lightorange); } #step-over { @@ -596,7 +601,7 @@ list-style-image: url(debugger-step-out.png); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #step-over { list-style-image: url(debugger-step-over@2x.png); } @@ -626,7 +631,7 @@ -moz-image-region: rect(0px,32px,16px,16px); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #instruments-pane-toggle { list-style-image: url(debugger-collapse@2x.png); -moz-image-region: rect(0px,32px,32px,0px); diff --git a/arc-firefox-theme/chrome/browser/devtools/editor-breakpoint@2x.png b/arc-firefox-theme/chrome/browser/devtools/editor-breakpoint@2x.png Binary files differnew file mode 100644 index 0000000..7253aee --- /dev/null +++ b/arc-firefox-theme/chrome/browser/devtools/editor-breakpoint@2x.png diff --git a/arc-firefox-theme/chrome/browser/devtools/floating-scrollbars-light.css b/arc-firefox-theme/chrome/browser/devtools/floating-scrollbars-light.css index 7e38611..01b622f 100644 --- a/arc-firefox-theme/chrome/browser/devtools/floating-scrollbars-light.css +++ b/arc-firefox-theme/chrome/browser/devtools/floating-scrollbars-light.css @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -@import url("floating-scrollbars.css"); +@import url("chrome://browser/skin/devtools/floating-scrollbars.css"); scrollbar thumb { background-color: rgba(170,170,170,0.2) !important; diff --git a/arc-firefox-theme/chrome/browser/devtools/floating-scrollbars.css b/arc-firefox-theme/chrome/browser/devtools/floating-scrollbars.css index 934a38e..61c66c8 100644 --- a/arc-firefox-theme/chrome/browser/devtools/floating-scrollbars.css +++ b/arc-firefox-theme/chrome/browser/devtools/floating-scrollbars.css @@ -29,7 +29,6 @@ scrollbar thumb { background-color: rgba(170,170,170,0.2) !important; border-radius: 3px !important; } - scrollbar scrollbarbutton, scrollbar gripper { display: none; } diff --git a/arc-firefox-theme/chrome/browser/devtools/inspector.css b/arc-firefox-theme/chrome/browser/devtools/inspector.css index cab78e7..a892ec3 100644 --- a/arc-firefox-theme/chrome/browser/devtools/inspector.css +++ b/arc-firefox-theme/chrome/browser/devtools/inspector.css @@ -49,7 +49,7 @@ -moz-image-region: rect(0px,32px,16px,16px); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #inspector-pane-toggle { list-style-image: url(debugger-collapse@2x.png); -moz-image-region: rect(0px,32px,32px,0px); diff --git a/arc-firefox-theme/chrome/browser/devtools/light-theme.css b/arc-firefox-theme/chrome/browser/devtools/light-theme.css index 92515ff..276b34a 100644 --- a/arc-firefox-theme/chrome/browser/devtools/light-theme.css +++ b/arc-firefox-theme/chrome/browser/devtools/light-theme.css @@ -38,6 +38,7 @@ /* Colors used in Graphs, like performance tools. Similar colors to Chrome's timeline. */ --theme-graphs-green: #85d175; --theme-graphs-blue: #83b7f6; + --theme-graphs-bluegrey: #0072ab; --theme-graphs-purple: #b693eb; --theme-graphs-yellow: #efc052; --theme-graphs-red: #e57180; @@ -343,7 +344,7 @@ div.CodeMirror span.eval-text { background-position: -14px 0; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .theme-twisty, .theme-checkbox { background-image: url("chrome://browser/skin/devtools/controls@2x.png"); } @@ -381,7 +382,7 @@ div.CodeMirror span.eval-text { margin-left: -4px; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .theme-tooltip-panel .panel-arrow[side="top"], .theme-tooltip-panel .panel-arrow[side="bottom"] { list-style-image: url("chrome://browser/skin/devtools/tooltip/arrow-vertical-light@2x.png"); @@ -723,7 +724,7 @@ div.CodeMirror span.eval-text { opacity: 0.5; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-button::before { background-size: 32px; } @@ -840,7 +841,7 @@ div.CodeMirror span.eval-text { -moz-image-region: rect(0, 32px, 16px, 16px); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .theme-dark .devtools-searchinput { background-image: url(magnifying-glass@2x.png); } @@ -1170,7 +1171,7 @@ div.CodeMirror span.eval-text { background-image: url("chrome://browser/skin/devtools/command-rulers.png"); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #command-button-paintflashing > image { background-image: url("chrome://browser/skin/devtools/command-paintflashing@2x.png"); } diff --git a/arc-firefox-theme/chrome/browser/devtools/markup-view.css b/arc-firefox-theme/chrome/browser/devtools/markup-view.css index e1912d8..fb3d958 100644 --- a/arc-firefox-theme/chrome/browser/devtools/markup-view.css +++ b/arc-firefox-theme/chrome/browser/devtools/markup-view.css @@ -15,6 +15,18 @@ border: 1px solid #CCC; } +/* Draw a circle next to nodes that have a pseudo class lock. + Center vertically with the 1.4em line height on .tag-line */ +.child.pseudoclass-locked::before { + content: ""; + background: var(--theme-highlight-lightorange); + border-radius: 50%; + width: .8em; + height: .8em; + margin-top: .3em; + left: 1px; + position: absolute; +} /* Selected nodes in the tree should have light selected text. theme-selected doesn't work in this case since the text is a diff --git a/arc-firefox-theme/chrome/browser/devtools/memory.css b/arc-firefox-theme/chrome/browser/devtools/memory.css new file mode 100644 index 0000000..78f8f1f --- /dev/null +++ b/arc-firefox-theme/chrome/browser/devtools/memory.css @@ -0,0 +1,81 @@ +/* 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, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +/* CSS Variables specific to this panel that aren't defined by the themes */ +.theme-dark { + --cell-border-color: rgba(255,255,255,0.15); + --cell-border-color-light: rgba(255,255,255,0.1); + --focus-cell-border-color: rgba(255,255,255,0.5); + --row-alt-background-color: rgba(29,79,115,0.15); + --row-hover-background-color: rgba(29,79,115,0.25); +} + +.theme-light { + --cell-border-color: rgba(0,0,0,0.15); + --cell-border-color-light: rgba(0,0,0,0.1); + --focus-cell-border-color: rgba(0,0,0,0.3); + --row-alt-background-color: rgba(76,158,217,0.1); + --row-hover-background-color: rgba(76,158,217,0.2); +} + +.heap-view { + position: relative; +} + +.heap-view .theme-twisty { + text-align: end; +} + +.heap-tree-item { + list-style-type: none; + /* display: none; */ +} + +.heap-tree-item[expanded] { + display: block; +} + +.heap-tree-item:nth-child(2n) { + background-color: var(--row-alt-background-color); +} + +.heap-tree-item:hover { + background-color: var(--row-hover-background-color); +} + +.heap-tree-item:focus { + background-color: var(--theme-selection-background); +} + +.heap-tree-item:focus description { + color: var(--theme-selection-color) !important; +} + +.heap-tree-item:focus .call-tree-cell { + -moz-border-end-color: var(--focus-cell-border-color); +} + + +.heap-tree-cell[type="bytes"], .heap-tree-cell[type="count"] { + position: absolute; + text-align: right; + width: 40px; +} + +.heap-tree-cell[type="name"] { + width: 150px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + display: block; +} + +.heap-tree-cell[type="count"] { + left: 300px; +} + +.heap-tree-cell[type="bytes"] { + left: 250px; +} diff --git a/arc-firefox-theme/chrome/browser/devtools/netmonitor.css b/arc-firefox-theme/chrome/browser/devtools/netmonitor.css index 9448a39..d47f112 100644 --- a/arc-firefox-theme/chrome/browser/devtools/netmonitor.css +++ b/arc-firefox-theme/chrome/browser/devtools/netmonitor.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 @@ -146,25 +142,27 @@ width: 16px; height: 16px; -moz-margin-end: 4px; + cursor: pointer; } .security-state-insecure { - list-style-image: url(chrome://browser/skin/identity-not-secure.svg); + list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); } .security-state-secure { - cursor: pointer; list-style-image: url(chrome://browser/skin/identity-secure.svg); } .security-state-weak { - cursor: pointer; 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-mixed-active-loaded.svg); + list-style-image: url(chrome://browser/skin/controlcenter/warning-gray.svg); +} + +.security-state-local { + list-style-image: url(chrome://browser/skin/identity-not-secure.svg); } .requests-menu-type { @@ -200,7 +198,8 @@ label.requests-menu-status-code { } box.requests-menu-status:not([code]) { - background-color: var(--theme-content-color2); + background-color: var(--theme-highlight-red); + border-radius: 0; /* squares */ } box.requests-menu-status[code="cached"] { @@ -420,7 +419,7 @@ box.requests-menu-status[code^="5"] { -moz-image-region: rect(0px,32px,16px,16px); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #details-pane-toggle { list-style-image: url("chrome://browser/skin/devtools/debugger-collapse@2x.png"); -moz-image-region: rect(0px,32px,32px,0px); @@ -547,6 +546,10 @@ box.requests-menu-status[code^="5"] { -moz-padding-start: 1em; } +.theme-dark #security-error-message { + color: var(--theme-selection-color); +} + #security-tabpanel { overflow: auto; } @@ -560,7 +563,7 @@ box.requests-menu-status[code^="5"] { height: 12px; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .security-warning-icon { background-image: url(alerticon-warning@2x.png); } @@ -832,6 +835,7 @@ box.requests-menu-status[code^="5"] { } } +/* Platform overrides (copied in from the old platform specific files) */ #headers-summary-resend { padding: 4px; } diff --git a/arc-firefox-theme/chrome/browser/devtools/performance.css b/arc-firefox-theme/chrome/browser/devtools/performance.css index 8eafa36..4279a16 100644 --- a/arc-firefox-theme/chrome/browser/devtools/performance.css +++ b/arc-firefox-theme/chrome/browser/devtools/performance.css @@ -20,6 +20,16 @@ --row-hover-background-color: rgba(76,158,217,0.2); } +/** + * A generic class to hide elements, replacing the `element.hidden` attribute + * that we use to hide elements that can later be active + */ +.hidden { + display: none; + width: 0px; + height: 0px; +} + /* Toolbar */ #performance-toolbar-control-other { @@ -224,8 +234,20 @@ .call-tree-header[type="count"], .call-tree-cell[type="count"], .call-tree-header[type="self-count"], -.call-tree-cell[type="self-count"] { - width: 9vw; +.call-tree-cell[type="self-count"], +.call-tree-header[type="size"], +.call-tree-cell[type="size"], +.call-tree-header[type="self-size"], +.call-tree-cell[type="self-size"], +.call-tree-header[type="count-percentage"], +.call-tree-cell[type="count-percentage"], +.call-tree-header[type="self-count-percentage"], +.call-tree-cell[type="self-count-percentage"], +.call-tree-header[type="size-percentage"], +.call-tree-cell[type="size-percentage"], +.call-tree-header[type="self-size-percentage"], +.call-tree-cell[type="self-size-percentage"] { + width: 6vw; } .call-tree-header[type="function"], @@ -518,22 +540,31 @@ font-weight: bold; } +.marker-details-customcontainer .custom-button { + padding: 2px 5px; + border-width: 1px; +} + /** * Marker colors */ -menuitem.marker-color-graphs-purple:before, -.marker-color-graphs-purple { - background-color: var(--theme-graphs-purple); -} -menuitem.marker-color-graphs-grey:before, -.marker-color-graphs-grey{ - background-color: var(--theme-graphs-grey); -} menuitem.marker-color-graphs-green:before, .marker-color-graphs-green { background-color: var(--theme-graphs-green); } +menuitem.marker-color-graphs-blue:before, +.marker-color-graphs-blue { + background-color: var(--theme-graphs-blue); +} +menuitem.marker-color-graphs-bluegrey:before, +.marker-color-graphs-bluegrey { + background-color: var(--theme-graphs-bluegrey); +} +menuitem.marker-color-graphs-purple:before, +.marker-color-graphs-purple { + background-color: var(--theme-graphs-purple); +} menuitem.marker-color-graphs-yellow:before, .marker-color-graphs-yellow { background-color: var(--theme-graphs-yellow); @@ -542,9 +573,9 @@ menuitem.marker-color-graphs-red:before, .marker-color-graphs-red { background-color: var(--theme-graphs-red); } -menuitem.marker-color-graphs-blue:before, -.marker-color-graphs-blue { - background-color: var(--theme-graphs-blue); +menuitem.marker-color-graphs-grey:before, +.marker-color-graphs-grey{ + background-color: var(--theme-graphs-grey); } /** @@ -558,6 +589,14 @@ menuitem.marker-color-graphs-blue:before, min-width: 200px; } +#optimizations-graph { + height: 30px; +} + +#jit-optimizations-view.empty #optimizations-graph { + display: none !important; +} + /* override default styles for tree widget */ #jit-optimizations-view .tree-widget-empty-text { font-size: inherit; @@ -670,9 +709,6 @@ description.opt-icon::before { .opt-icon[severity=warning]::before { background-position: -24px -24px; } -.opt-icon[type=linkable]::before { - cursor: pointer; -} ul.frames-list { list-style-type: none; diff --git a/arc-firefox-theme/chrome/browser/devtools/ruleview.css b/arc-firefox-theme/chrome/browser/devtools/ruleview.css index 8fad666..e9ae604 100644 --- a/arc-firefox-theme/chrome/browser/devtools/ruleview.css +++ b/arc-firefox-theme/chrome/browser/devtools/ruleview.css @@ -5,10 +5,12 @@ /* CSS Variables specific to this panel that aren't defined by the themes */ .theme-light { --rule-highlight-background-color: #ffee99; + --rule-filter-icon: url(magnifying-glass-light.png); } .theme-dark { --rule-highlight-background-color: #594724; + --rule-filter-icon: url(magnifying-glass.png); } .ruleview { @@ -103,18 +105,25 @@ background-size: 13px 12px; -moz-margin-start: 5px; display: inline-block; - vertical-align: top; width: 13px; height: 12px; } - -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .ruleview-warning { background-image: url(alerticon-warning@2x.png); } } +.ruleview-overridden-rule-filter { + background-image: var(--rule-filter-icon); + background-size: 11px 11px; + -moz-margin-start: 5px; + display: inline-block; + width: 11px; + height: 11px; +} + .ruleview-ruleopen { -moz-padding-end: 5px; } @@ -196,7 +205,7 @@ background-size: 1em; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .ruleview-bezierswatch { background: url("chrome://browser/skin/devtools/cubic-bezier-swatch@2x.png"); background-size: 1em; @@ -300,13 +309,15 @@ * the state */ #ruleview-add-rule-button, -#pseudo-class-panel-toggle { +#pseudo-class-panel-toggle, +.ruleview-overridden-rule-filter { opacity: 0.8; } #ruleview-add-rule-button:not([disabled]):hover, #pseudo-class-panel-toggle:hover, -#pseudo-class-panel-toggle[checked] { +#pseudo-class-panel-toggle[checked], +.ruleview-overridden-rule-filter:hover { opacity: 1; } diff --git a/arc-firefox-theme/chrome/browser/devtools/shadereditor.css b/arc-firefox-theme/chrome/browser/devtools/shadereditor.css index 9ba9ff8..4626a38 100644 --- a/arc-firefox-theme/chrome/browser/devtools/shadereditor.css +++ b/arc-firefox-theme/chrome/browser/devtools/shadereditor.css @@ -60,7 +60,7 @@ border: 0; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .side-menu-widget-item-checkbox .checkbox-check { background-image: url(itemToggle@2x.png); } diff --git a/arc-firefox-theme/chrome/browser/devtools/styleeditor.css b/arc-firefox-theme/chrome/browser/devtools/styleeditor.css index a4a300f..0cc2fca 100644 --- a/arc-firefox-theme/chrome/browser/devtools/styleeditor.css +++ b/arc-firefox-theme/chrome/browser/devtools/styleeditor.css @@ -115,7 +115,7 @@ height: 40px; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .stylesheet-enabled { background-image: url(itemToggle@2x.png); } diff --git a/arc-firefox-theme/chrome/browser/devtools/webaudioeditor.css b/arc-firefox-theme/chrome/browser/devtools/webaudioeditor.css index 0d66638..3be55bd 100644 --- a/arc-firefox-theme/chrome/browser/devtools/webaudioeditor.css +++ b/arc-firefox-theme/chrome/browser/devtools/webaudioeditor.css @@ -187,7 +187,7 @@ text { -moz-box-flex: 1; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #inspector-pane-toggle { list-style-image: url(debugger-collapse@2x.png); -moz-image-region: rect(0px,32px,32px,0px); diff --git a/arc-firefox-theme/chrome/browser/devtools/webconsole.css b/arc-firefox-theme/chrome/browser/devtools/webconsole.css index d875c23..d17690e 100644 --- a/arc-firefox-theme/chrome/browser/devtools/webconsole.css +++ b/arc-firefox-theme/chrome/browser/devtools/webconsole.css @@ -2,10 +2,6 @@ * 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/. */ - /* General output styles */ a { @@ -323,18 +319,32 @@ a { } .message[category=console][severity=error] > .icon::before, -.message[category=output][severity=error] > .icon::before { +.message[category=output][severity=error] > .icon::before, +.message[category=server][severity=error] > .icon::before { background-position: -12px -36px; } -.message[category=console][severity=warn] > .icon::before { +.message[category=console][severity=warn] > .icon::before, +.message[category=server][severity=warn] > .icon::before { background-position: -24px -36px; } -.message[category=console][severity=info] > .icon::before { +.message[category=console][severity=info] > .icon::before, +.message[category=server][severity=info] > .icon::before { background-position: -36px -36px; } +/* Server Logging Styles */ + +.webconsole-filter-button[category="server"] > .toolbarbutton-menubutton-button:before { + background-image: linear-gradient(rgb(144, 176, 144), rgb(99, 151, 99)); + border-color: rgb(76, 143, 76); +} + +.message[category=server] > .indent { + -moz-border-end: solid #90B090 6px; +} + /* Input and output styles */ .message[category=input] > .indent, .message[category=output] > .indent { @@ -364,7 +374,7 @@ a { background-size: 16px 16px; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .jsterm-input-node { background-image: -moz-image-rect(url('chrome://browser/skin/devtools/commandline-icon@2x.png'), 0, 64, 32, 32); } @@ -586,6 +596,3 @@ a { } } -.jsterm-input-node { - width: 98%; -} diff --git a/arc-firefox-theme/chrome/browser/devtools/webconsole_networkpanel.css b/arc-firefox-theme/chrome/browser/devtools/webconsole_networkpanel.css deleted file mode 100644 index 3803fe3..0000000 --- a/arc-firefox-theme/chrome/browser/devtools/webconsole_networkpanel.css +++ /dev/null @@ -1,99 +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/. */ - -body { - font-family: sans-serif; - font-size: 11px; - background: #EEE; - color: #000; -} - -#header { - padding: 5px; - overflow-x:auto; - display: block; -} - -h1 { - font-size: 13px; - line-height: 15px; - padding: 3px 10px; - vertical-align: bottom; - margin: 0px; - background: linear-gradient(#BBB, #999); - border-radius: 2px; - text-shadow: #FFF 0px 1px 0px; -} - -h1 .info { - font-size: 11px; - line-height: 15px; - vertical-align: bottom; - float: right; - color: #333; - padding-right: 3px; -} - -.property-table { - padding: 2px 5px; - background: linear-gradient(#FFF, #F8F8F8); - color: #333; - width: 100%; - max-height: 330px; - overflow: auto; - display: block; -} - -.property-name { - font-size: 11px; - font-weight: bold; - color: #000; - white-space: nowrap; - text-align: end; - vertical-align: top; - width: 10%; -} - -.property-value { - padding-right: 5px; - font-size: 11px; - word-wrap: break-word; - width: 90%; -} - -div.group { - margin-top: 10px; -} - -div.group, -#header { - background: #FFF; - border-color: #E1E1E1; - border-style: solid; - border-width: 1px; - box-shadow: 0 1px 1.5px rgba(0, 0, 0, 0.2); - border-radius: 4px 4px 4px 4px; -} - -img#responseImageNode { - box-shadow: rgba(0,0,0,0.2) 0px 3px 3.5px; - max-width: 100%; -} - -#responseImageNodeDiv { - padding: 5px; -} - -#responseBodyFetchLink, #requestBodyFetchLink { - padding: 5px; - margin: 0; - cursor: pointer; - font-weight: bold; - font-size: 1.1em; - text-decoration: underline; -} - -.longStringEllipsis { - margin-left: 0.6em; -} diff --git a/arc-firefox-theme/chrome/browser/devtools/widgets.css b/arc-firefox-theme/chrome/browser/devtools/widgets.css index 18a6757..a23f0f5 100644 --- a/arc-firefox-theme/chrome/browser/devtools/widgets.css +++ b/arc-firefox-theme/chrome/browser/devtools/widgets.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 @@ -108,7 +104,7 @@ padding: 0; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .scrollbutton-up > .toolbarbutton-icon, .scrollbutton-down > .toolbarbutton-icon { background-image: url("breadcrumbs-scrollbutton@2x.png"); @@ -217,6 +213,7 @@ padding-bottom: 0; } + .breadcrumbs-widget-item:not([checked]) { background: -moz-element(#breadcrumb-separator-normal) no-repeat center left; } @@ -638,7 +635,7 @@ height: 16px; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .variable-or-property-non-writable-icon { background-image: url("chrome://browser/skin/devtools/vview-lock@2x.png"); } @@ -738,7 +735,7 @@ height: 16px; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .variables-view-delete { background-image: url("chrome://browser/skin/devtools/vview-delete@2x.png"); } @@ -764,7 +761,7 @@ cursor: pointer; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .variables-view-edit { background-image: url("chrome://browser/skin/devtools/vview-edit@2x.png"); } @@ -790,7 +787,7 @@ cursor: pointer; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .variables-view-open-inspector { background-image: url("chrome://browser/skin/devtools/vview-open-inspector@2x.png"); } @@ -1421,7 +1418,7 @@ } } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .tree-widget-item:before { background-image: url("chrome://browser/skin/devtools/controls@2x.png"); } @@ -1591,9 +1588,3 @@ background-image: url("app-manager/add.svg"); -moz-margin-end: 2px; } - -.side-menu-widget-group-checkbox .checkbox-spacer-box, -.side-menu-widget-item-checkbox .checkbox-spacer-box { - margin: 0; - border: none; -} diff --git a/arc-firefox-theme/chrome/browser/drm-icon.svg b/arc-firefox-theme/chrome/browser/drm-icon.svg index bd7c7ba..db2b36d 100644 --- a/arc-firefox-theme/chrome/browser/drm-icon.svg +++ b/arc-firefox-theme/chrome/browser/drm-icon.svg @@ -2,47 +2,37 @@ <!-- 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 16 16"> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16"> <style> - #chains > use > path { + #chains { fill: url(#baseGradient); } - #chains-pressed > use > path { + #chains-pressed { fill: url(#pressedGradient); } - #chains-black > use > path { - fill: black; + #chains-black { + fill: #000; } - g:not(:target) { + use:not(:target) { display: none; } </style> <defs> <linearGradient id="baseGradient" gradientUnits="userSpaceOnUse" x1="8" x2="8" y1="16" y2="0"> - <stop offset="0" style="stop-color:#808080"/> - <stop offset="1" style="stop-color:#999"/> + <stop offset="0" style="stop-color: #808080"/> + <stop offset="1" style="stop-color: #999"/> </linearGradient> <linearGradient id="pressedGradient" gradientUnits="userSpaceOnUse" x1="8" x2="8" y1="16" y2="0"> - <stop offset="0" style="stop-color:#4d4d4d"/> - <stop offset="1" style="stop-color:#808080"/> + <stop offset="0" style="stop-color: #4d4d4d"/> + <stop offset="1" style="stop-color: #808080"/> </linearGradient> - <path id="path1" d="M7.058,9.72c-0.245,0.245-0.62,0.27-0.834,0.056C6.01,9.562,6.035,9.186,6.28,8.942l0.218-0.218 c-0.245-0.245-0.645-0.245-0.89,0L4.496,9.836c-0.245,0.245-0.245,0.645,0,0.89l0.779,0.779c0.245,0.245,0.645,0.245,0.89,0 l1.112-1.112c0.245-0.245,0.245-0.645,0-0.89L7.058,9.72z"/> - <path id="path2" d="M10.726,4.496c-0.245-0.245-0.645-0.245-0.89,0L8.723,5.608c-0.245,0.245-0.245,0.645,0,0.89 L8.95,6.272c0.245-0.245,0.62-0.27,0.834-0.056s0.189,0.59-0.056,0.834L9.502,7.277c0.245,0.245,0.645,0.245,0.89,0l1.112-1.112 c0.245-0.245,0.245-0.645,0-0.89L10.726,4.496z"/> - <path id="path3" d="M8,0C3.582,0,0,3.582,0,8s3.582,8,8,8s8-3.582,8-8S12.418,0,8,0z M12.527,6.81l-1.489,1.489 c-0.631,0.631-1.663,0.631-2.293,0L8.612,8.167L8.167,8.612l0.133,0.133c0.631,0.631,0.631,1.663,0,2.293L6.81,12.527 c-0.631,0.631-1.663,0.631-2.293,0l-1.044-1.044c-0.631-0.631-0.631-1.663,0-2.293l1.489-1.489c0.631-0.631,1.663-0.631,2.293,0 l0.133,0.133l0.445-0.445L7.701,7.255c-0.631-0.631-0.631-1.663,0-2.293L9.19,3.473c0.631-0.631,1.663-0.631,2.293,0l1.044,1.044 C13.158,5.148,13.158,6.18,12.527,6.81z"/> + <g id="path"> + <path d="M7.058,9.72c-0.245,0.245-0.62,0.27-0.834,0.056C6.01,9.562,6.035,9.186,6.28,8.942l0.218-0.218 c-0.245-0.245-0.645-0.245-0.89,0L4.496,9.836c-0.245,0.245-0.245,0.645,0,0.89l0.779,0.779c0.245,0.245,0.645,0.245,0.89,0 l1.112-1.112c0.245-0.245,0.245-0.645,0-0.89L7.058,9.72z"/> + <path d="M10.726,4.496c-0.245-0.245-0.645-0.245-0.89,0L8.723,5.608c-0.245,0.245-0.245,0.645,0,0.89 L8.95,6.272c0.245-0.245,0.62-0.27,0.834-0.056s0.189,0.59-0.056,0.834L9.502,7.277c0.245,0.245,0.645,0.245,0.89,0l1.112-1.112 c0.245-0.245,0.245-0.645,0-0.89L10.726,4.496z"/> + <path d="M8,0C3.582,0,0,3.582,0,8s3.582,8,8,8s8-3.582,8-8S12.418,0,8,0z M12.527,6.81l-1.489,1.489 c-0.631,0.631-1.663,0.631-2.293,0L8.612,8.167L8.167,8.612l0.133,0.133c0.631,0.631,0.631,1.663,0,2.293L6.81,12.527 c-0.631,0.631-1.663,0.631-2.293,0l-1.044-1.044c-0.631-0.631-0.631-1.663,0-2.293l1.489-1.489c0.631-0.631,1.663-0.631,2.293,0 l0.133,0.133l0.445-0.445L7.701,7.255c-0.631-0.631-0.631-1.663,0-2.293L9.19,3.473c0.631-0.631,1.663-0.631,2.293,0l1.044,1.044 C13.158,5.148,13.158,6.18,12.527,6.81z"/> + </g> </defs> - <g id="chains"> - <use xlink:href="#path1"/> - <use xlink:href="#path2"/> - <use xlink:href="#path3"/> - </g> - <g id="chains-pressed"> - <use xlink:href="#path1"/> - <use xlink:href="#path2"/> - <use xlink:href="#path3"/> - </g> - <g id="chains-black"> - <use xlink:href="#path1"/> - <use xlink:href="#path2"/> - <use xlink:href="#path3"/> - </g> + <use xlink:href="#path" id="chains"/> + <use xlink:href="#path" id="chains-pressed"/> + <use xlink:href="#path" id="chains-black"/> </svg> diff --git a/arc-firefox-theme/chrome/browser/engineManager.css b/arc-firefox-theme/chrome/browser/engineManager.css deleted file mode 100644 index 6a1076e..0000000 --- a/arc-firefox-theme/chrome/browser/engineManager.css +++ /dev/null @@ -1,11 +0,0 @@ - -#engineList treechildren::-moz-tree-image(engineName) { - -moz-margin-end: 4px; - -moz-margin-start: 1px; - width: 16px; - height: 16px; -} - -#engineList treechildren::-moz-tree-row { - height: 20px; -} diff --git a/arc-firefox-theme/chrome/browser/fullscreen-darknoise.png b/arc-firefox-theme/chrome/browser/fullscreen-darknoise.png Binary files differdeleted file mode 100644 index 5c33e24..0000000 --- a/arc-firefox-theme/chrome/browser/fullscreen-darknoise.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/fullscreen/insecure.svg b/arc-firefox-theme/chrome/browser/fullscreen/insecure.svg new file mode 100644 index 0000000..eec272f --- /dev/null +++ b/arc-firefox-theme/chrome/browser/fullscreen/insecure.svg @@ -0,0 +1,39 @@ +<?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: #fafafa; + } + </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" /> + <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)" class="icon-default" /> + <use xlink:href="#shape-lock-base" mask="url(#mask-base-cutout)" class="icon-default" /> + + <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/fullscreen/secure.svg b/arc-firefox-theme/chrome/browser/fullscreen/secure.svg new file mode 100644 index 0000000..960fc1d --- /dev/null +++ b/arc-firefox-theme/chrome/browser/fullscreen/secure.svg @@ -0,0 +1,26 @@ +<?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: #fafafa; + } + </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/fxa/android.png b/arc-firefox-theme/chrome/browser/fxa/android.png Binary files differindex bb1ada8..b014c42 100644 --- a/arc-firefox-theme/chrome/browser/fxa/android.png +++ 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 differindex 957b907..bbd602f 100644 --- a/arc-firefox-theme/chrome/browser/fxa/android@2x.png +++ 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 differindex 6ed0e7a..8faca35 100644 --- a/arc-firefox-theme/chrome/browser/fxa/default-avatar.png +++ 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 differindex 0bda852..1428e23 100644 --- a/arc-firefox-theme/chrome/browser/fxa/default-avatar@2x.png +++ b/arc-firefox-theme/chrome/browser/fxa/default-avatar@2x.png diff --git a/arc-firefox-theme/chrome/browser/fxa/logo.png b/arc-firefox-theme/chrome/browser/fxa/logo.png Binary files differindex b54b392..63c006c 100644 --- a/arc-firefox-theme/chrome/browser/fxa/logo.png +++ 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 differindex 5d25f05..283b091 100644 --- a/arc-firefox-theme/chrome/browser/fxa/logo@2x.png +++ 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 differindex c6de26c..3d37308 100644 --- a/arc-firefox-theme/chrome/browser/fxa/sync-illustration.png +++ 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 differindex bc13da3..23a3858 100644 --- a/arc-firefox-theme/chrome/browser/fxa/sync-illustration@2x.png +++ b/arc-firefox-theme/chrome/browser/fxa/sync-illustration@2x.png diff --git a/arc-firefox-theme/chrome/browser/heartbeat-icon.svg b/arc-firefox-theme/chrome/browser/heartbeat-icon.svg index bb1fc5c..db2cb5f 100644 --- a/arc-firefox-theme/chrome/browser/heartbeat-icon.svg +++ b/arc-firefox-theme/chrome/browser/heartbeat-icon.svg @@ -1,19 +1,13 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?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 width="288px" height="248px" viewBox="0 0 288 248" xmlns="http://www.w3.org/2000/svg"> - <g stroke="none" fill="none" fill-rule="evenodd"> - <g transform="translate(0,-1)"> - <path fill="#d74345" d="M144,248.571429 C141.214272,248.571429 138.857152,247.607152 136.928571,245.678571 L36.6428571,148.928571 C35.5714232,148.071424 34.0982237,146.678581 32.2232143,144.75 C30.3482049,142.821419 27.3750204,139.312525 23.3035714,134.223214 C19.2321225,129.133903 15.5893018,123.910741 12.375,118.553571 C9.16069821,113.196402 6.29465545,106.714324 3.77678571,99.1071429 C1.25891598,91.499962 0,84.1071788 0,76.9285714 C0,53.357025 6.80350339,34.9286379 20.4107143,21.6428571 C34.0179252,8.35707643 52.8213086,1.71428571 76.8214286,1.71428571 C83.4643189,1.71428571 90.2410369,2.86605991 97.1517857,5.16964286 C104.062535,7.4732258 110.491042,10.5803376 116.4375,14.4910714 C122.383958,18.4018053 127.499979,22.0714114 131.785714,25.5 C136.07145,28.9285886 140.142838,32.5714093 144,36.4285714 C147.857162,32.5714093 151.92855,28.9285886 156.214286,25.5 C160.500021,22.0714114 165.616042,18.4018053 171.5625,14.4910714 C177.508958,10.5803376 183.937465,7.4732258 190.848214,5.16964286 C197.758963,2.86605991 204.535681,1.71428571 211.178571,1.71428571 C235.178691,1.71428571 253.982075,8.35707643 267.589286,21.6428571 C281.196497,34.9286379 288,53.357025 288,76.9285714 C288,100.607261 275.732266,124.714163 251.196429,149.25 L151.071429,245.678571 C149.142847,247.607152 146.785728,248.571429 144,248.571429 L144,248.571429 Z"/> - <g transform="translate(0,0.71)"> - <mask id="mask1" fill="#fff"> - <path d="M144,246.857143 C141.214272,246.857143 138.857152,245.892867 136.928571,243.964286 L36.6428571,147.214286 C35.5714232,146.357139 34.0982237,144.964295 32.2232143,143.035714 C30.3482049,141.107133 27.3750204,137.59824 23.3035714,132.508929 C19.2321225,127.419617 15.5893018,122.196455 12.375,116.839286 C9.16069821,111.482116 6.29465545,105.000038 3.77678571,97.3928571 C1.25891598,89.7856763 0,82.392893 0,75.2142857 C0,51.6427393 6.80350339,33.2143521 20.4107143,19.9285714 C34.0179252,6.64279071 52.8213086,0 76.8214286,0 C83.4643189,0 90.2410369,1.1517742 97.1517857,3.45535714 C104.062535,5.75894009 110.491042,8.86605187 116.4375,12.7767857 C122.383958,16.6875196 127.499979,20.3571257 131.785714,23.7857143 C136.07145,27.2143029 140.142838,30.8571236 144,34.7142857 C147.857162,30.8571236 151.92855,27.2143029 156.214286,23.7857143 C160.500021,20.3571257 165.616042,16.6875196 171.5625,12.7767857 C177.508958,8.86605187 183.937465,5.75894009 190.848214,3.45535714 C197.758963,1.1517742 204.535681,0 211.178571,0 C235.178691,0 253.982075,6.64279071 267.589286,19.9285714 C281.196497,33.2143521 288,51.6427393 288,75.2142857 C288,98.8929755 275.732266,122.999877 251.196429,147.535714 L151.071429,243.964286 C149.142847,245.892867 146.785728,246.857143 144,246.857143 L144,246.857143 Z"/> - </mask> - <path stroke="#fff" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" mask="url(#mask1)" d="M-166,115.135254 C-166,115.135254 0.595052083,115.135254 2.9765625,115.135254 L91.9101562,115.135254 L97.9638977,100.101562 L105.430695,115.135254 L114.893585,115.135254 L131.129913,189.53125 L148.161163,57 L165.348663,131.027344 L172.272491,115.135254 L250.84967,115.135254 L428.259813,115.135254"> - <g transform="translate(131.13,123.27) scale(1,-1) translate(-131.13,-123.27) "/> - </path> - </g> - </g> + <path fill="#d74345" d="M144,248.571429 C141.214272,248.571429 138.857152,247.607152 136.928571,245.678571 L36.6428571,148.928571 C35.5714232,148.071424 34.0982237,146.678581 32.2232143,144.75 C30.3482049,142.821419 27.3750204,139.312525 23.3035714,134.223214 C19.2321225,129.133903 15.5893018,123.910741 12.375,118.553571 C9.16069821,113.196402 6.29465545,106.714324 3.77678571,99.1071429 C1.25891598,91.499962 0,84.1071788 0,76.9285714 C0,53.357025 6.80350339,34.9286379 20.4107143,21.6428571 C34.0179252,8.35707643 52.8213086,1.71428571 76.8214286,1.71428571 C83.4643189,1.71428571 90.2410369,2.86605991 97.1517857,5.16964286 C104.062535,7.4732258 110.491042,10.5803376 116.4375,14.4910714 C122.383958,18.4018053 127.499979,22.0714114 131.785714,25.5 C136.07145,28.9285886 140.142838,32.5714093 144,36.4285714 C147.857162,32.5714093 151.92855,28.9285886 156.214286,25.5 C160.500021,22.0714114 165.616042,18.4018053 171.5625,14.4910714 C177.508958,10.5803376 183.937465,7.4732258 190.848214,5.16964286 C197.758963,2.86605991 204.535681,1.71428571 211.178571,1.71428571 C235.178691,1.71428571 253.982075,8.35707643 267.589286,21.6428571 C281.196497,34.9286379 288,53.357025 288,76.9285714 C288,100.607261 275.732266,124.714163 251.196429,149.25 L151.071429,245.678571 C149.142847,247.607152 146.785728,248.571429 144,248.571429 L144,248.571429 Z" transform="translate(0,-1)"/> + <g transform="translate(0,-0.29)"> + <mask id="mask" fill="#fff"> + <path d="M144,246.857143 C141.214272,246.857143 138.857152,245.892867 136.928571,243.964286 L36.6428571,147.214286 C35.5714232,146.357139 34.0982237,144.964295 32.2232143,143.035714 C30.3482049,141.107133 27.3750204,137.59824 23.3035714,132.508929 C19.2321225,127.419617 15.5893018,122.196455 12.375,116.839286 C9.16069821,111.482116 6.29465545,105.000038 3.77678571,97.3928571 C1.25891598,89.7856763 0,82.392893 0,75.2142857 C0,51.6427393 6.80350339,33.2143521 20.4107143,19.9285714 C34.0179252,6.64279071 52.8213086,0 76.8214286,0 C83.4643189,0 90.2410369,1.1517742 97.1517857,3.45535714 C104.062535,5.75894009 110.491042,8.86605187 116.4375,12.7767857 C122.383958,16.6875196 127.499979,20.3571257 131.785714,23.7857143 C136.07145,27.2143029 140.142838,30.8571236 144,34.7142857 C147.857162,30.8571236 151.92855,27.2143029 156.214286,23.7857143 C160.500021,20.3571257 165.616042,16.6875196 171.5625,12.7767857 C177.508958,8.86605187 183.937465,5.75894009 190.848214,3.45535714 C197.758963,1.1517742 204.535681,0 211.178571,0 C235.178691,0 253.982075,6.64279071 267.589286,19.9285714 C281.196497,33.2143521 288,51.6427393 288,75.2142857 C288,98.8929755 275.732266,122.999877 251.196429,147.535714 L151.071429,243.964286 C149.142847,245.892867 146.785728,246.857143 144,246.857143 L144,246.857143 Z"/> + </mask> + <path fill="none" stroke="#fff" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" mask="url(#mask)" d="M-166,115.135254 C-166,115.135254 0.595052083,115.135254 2.9765625,115.135254 L91.9101562,115.135254 L97.9638977,100.101562 L105.430695,115.135254 L114.893585,115.135254 L131.129913,189.53125 L148.161163,57 L165.348663,131.027344 L172.272491,115.135254 L250.84967,115.135254 L428.259813,115.135254"/> </g> </svg> diff --git a/arc-firefox-theme/chrome/browser/heartbeat-star-lit.svg b/arc-firefox-theme/chrome/browser/heartbeat-star-lit.svg index 921354a..3f59099 100644 --- a/arc-firefox-theme/chrome/browser/heartbeat-star-lit.svg +++ b/arc-firefox-theme/chrome/browser/heartbeat-star-lit.svg @@ -1,50 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?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" width="100%" height="100%"> - <path fill-rule="evenodd" fill="#00a3f2" d="M-238.2,6h-6.1l2.7-2.7c0.4-0.4,0.5-1.1,0.2-1.4l-1.2-1.2 c-0.3-0.3-1-0.3-1.4,0.2l-6.4,6.4c-0.1,0.1-0.1,0.2-0.2,0.2l0,0c0,0,0,0,0,0c0,0.1-0.1,0.1-0.1,0.1c0,0.1-0.1,0.2-0.1,0.3 c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0.1,0,0.2,0.1,0.3c0,0.1,0.1,0.1,0.1,0.1c0,0,0,0,0,0l0,0c0.1,0.1,0.1,0.2,0.2,0.2l6.4,6.4 c0.4,0.4,1.1,0.5,1.4,0.2l1.2-1.2c0.3-0.3,0.3-1-0.2-1.4l-2.8-2.8h6.2c0.6,0,1-0.4,1-1V7C-237.2,6.4-237.6,6-238.2,6z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M-212.7,6.3l-1,1c-0.2,0.2-0.2,0.4-0.2,0.7c0,0.3,0,0.5,0.2,0.7 l0.8,0.9l4.5,4.5c0.5,0.5,1.2,0.6,1.6,0.2l0.8-0.9c0.4-0.4,0.3-1.1-0.2-1.6l-1.8-1.8h4.7c0.6,0,1-0.5,1-1V7c0-0.6-0.5-1-1-1h-4.8 l1.9-1.9c0.5-0.5,0.6-1.3,0.2-1.6l-0.8-0.9c-0.4-0.4-1.1-0.3-1.6,0.2L-212.7,6.3z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M-167.3,9.7l1-1c0.2-0.2,0.2-0.4,0.2-0.7c0-0.3,0-0.5-0.2-0.7 l-0.8-0.9l-4.5-4.5c-0.5-0.5-1.2-0.6-1.6-0.2l-0.8,0.9c-0.4,0.4-0.3,1.1,0.2,1.6l1.8,1.8h-4.7c-0.6,0-1,0.5-1,1v2c0,0.6,0.5,1,1,1 h4.8l-1.9,1.9c-0.5,0.5-0.6,1.3-0.2,1.6l0.8,0.9c0.4,0.4,1.1,0.3,1.6-0.2L-167.3,9.7z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M-129.5,8h-7l2.8-2.8c-0.7-0.5-1.4-0.7-2.3-0.7c-2.2,0-4,1.8-4,4 c0,2.2,1.8,4,4,4c1.4,0,2.7-0.7,3.4-1.9l2.3,1c-1.1,2-3.2,3.4-5.7,3.4c-3.6,0-6.5-2.9-6.5-6.5c0-3.6,2.9-6.5,6.5-6.5 c1.5,0,2.9,0.5,4.1,1.4l2.4-2.4V8z"/> - <polygon fill="#00a3f2" points="-93.6,3.8 -95.8,1.7 -100,5.9 -104.3,1.6 -106.4,3.8 -102.1,8 -106.3,12.2 -104.1,14.3 -99.9,10.2 -95.7,14.4 -93.6,12.2 -97.8,8.1 "/> - <path fill-rule="evenodd" fill="#00a3f2" d="M-64,1l-8,7h2l6-5l6,5h2L-64,1z M-69,8v7h4v-5h2v5h4V8l-5-4L-69,8 z"/> - <path fill="#00a3f2" d="M-28,3.6l1,2l0.5,0.9l1,0.2l2.3,0.4l-1.7,1.8l-0.7,0.7l0.1,1l0.4,2.4l-2-1l-0.9-0.5l-0.9,0.5l-2,1l0.4-2.4 l0.1-1l-0.7-0.7l-1.7-1.8l2.4-0.4l1-0.2l0.5-0.9L-28,3.6 M-28,0c-0.3,0-0.6,0.2-0.8,0.7l-2,4.1l-4.3,0.7c-1,0.2-1.2,0.9-0.5,1.6 l3.1,3.3l-0.7,4.6c-0.1,0.7,0.2,1.1,0.7,1.1c0.2,0,0.4-0.1,0.6-0.2l3.9-2.1l3.9,2.1c0.2,0.1,0.5,0.2,0.6,0.2c0.5,0,0.8-0.4,0.7-1.1 l-0.7-4.6l3.1-3.3c0.7-0.7,0.4-1.4-0.5-1.6l-4.3-0.7l-2-4.1C-27.4,0.2-27.7,0-28,0L-28,0z"/> - <path fill="#00a3f2" style="fill:#0095dd;fill-opacity:1" d="M8,0C7.7,0,7.4,0.2,7.2,0.7l-2,4.1L0.9,5.5c-1,0.2-1.2,0.9-0.5,1.6l3.1,3.3l-0.7,4.6C2.7,15.6,3,16,3.4,16 c0.2,0,0.4-0.1,0.6-0.2L8,13.7l3.9,2.1c0.2,0.1,0.5,0.2,0.6,0.2c0.5,0,0.8-0.4,0.7-1.1l-0.7-4.6l3.1-3.3c0.7-0.7,0.4-1.4-0.5-1.6 l-4.3-0.7l-2-4.1C8.6,0.2,8.3,0,8,0L8,0z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M44,15.2c-4,0-7.2-3.2-7.2-7.2c0-4,3.2-7.2,7.2-7.2 c4,0,7.2,3.2,7.2,7.2C51.2,12,48,15.2,44,15.2z M44,3c-2.8,0-5,2.2-5,5c0,2.7,2.2,5,5,5c2.8,0,5-2.2,5-5C49,5.3,46.8,3,44,3z M43.7,8.9C43.3,8.8,43,8.4,43,8V5c0-0.6,0.4-1,1-1c0.6,0,1,0.4,1,1v2.8c1.1,1.1,2,3.2,2,3.2S44.8,10,43.7,8.9z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M86.7,9.1l-5.6,5.5C80.8,14.9,80.4,15,80,15 c-0.4,0-0.8-0.1-1.1-0.4l-5.6-5.5C72.7,8.5,72.9,8,73.8,8H77l0-6c0-0.6,0.4-1,1-1h4c0.6,0,1,0.4,1,1v6h3.2C87.1,8,87.3,8.5,86.7,9.1 z"/> - <path fill="#00a3f2" d="M-241,52c0.5,0,1-0.4,1-1v-4c0,0,0.1-0.8,0.8-0.8c0.6,0,0.6,0.8,1.8,0.8c0.6,0,1.5-0.2,1.5-2 c0-1.8-0.9-2-1.5-2c-1.1,0-1.1,0.8-1.8,0.8c-0.6,0-0.8-0.8-0.8-0.8v-2c0-0.6-0.4-1-1-1h-3c0,0-0.8-0.1-0.8-0.8 c0-0.6,0.8-0.6,0.8-1.8c0-0.6-0.2-1.5-2-1.5c-1.8,0-2,0.9-2,1.5c0,1.1,0.8,1.1,0.8,1.8c0,0.6-0.8,0.8-0.8,0.8h-3c-0.5,0-1,0.4-1,1 l0,2.5c0,0-0.1,1.5,1.1,1.5c0.8,0,0.9-1,1.9-1c0.5,0,1,0.5,1,1.6c0,1-0.5,1.6-1,1.6c-1,0-1.1-1-1.9-1c-1.2,0-1.1,1.5-1.1,1.5l0,3.5 c0,0.6,0.4,1,1,1h3.8c0,0,1.5,0.1,1.5-1.1c0-0.8-1-0.9-1-1.9c0-0.5,0.7-1.2,1.8-1.2c1,0,1.8,0.7,1.8,1.2c0,1-1,1.1-1,1.9 c0,1.2,1.5,1.1,1.5,1.1H-241z"/> - <path fill-rule="evenodd" d="M-200.4,41.9h-0.3v0h-14.4v0h-0.3c-0.2,0-0.4,0.2-0.4,0.4c0,0,0.3,2.2,0.5,4.4 c0.2,2.5,0.2,4.2,0.2,4.2c0,0.2,0.2,0.4,0.4,0.4h13.7c0.2,0,0.4-0.2,0.4-0.4c0,0,0.1-2.1,0.2-4.2c0.1-2.2,0.5-4.4,0.5-4.4 C-200.1,42.1-200.2,41.9-200.4,41.9z"/> - <path fill-rule="evenodd" d="M-200.8,41.3v-2c0-0.3-0.2-0.5-0.5-0.5l-6.7,0l-0.8-1.1c0,0-0.6-0.9-1.2-0.9h-4.2 c-0.6,0-1,0.5-1,1v1l0,2.5H-200.8z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M-169,37h-7.5c-0.8,0-1.5,0.7-1.5,1.5v11c0,0.8,0.7,1.5,1.5,1.5 h9c0.8,0,1.5-0.7,1.5-1.5V40L-169,37z M-170,41v-3.3l3.3,3.3H-170z"/> - <path fill-rule="evenodd" d="M-132.5,38c-0.4,0.2-0.9,0.6-1.3,1.2c-0.3,0.4-0.5,0.9-0.8,1.3 c0.7,0.3,1.3,0.8,1.7,1.4c0.4,0.7,0.7,1.5,0.6,2.3c-0.1,1.3-1,2.4-2.1,3c-0.5-0.5-1.4-2.1-1.4-2.1c0,0,0,1.8-0.6,3 c-0.4,0.8-0.9,1.5-1.6,2.1c1,0.4,2,0.6,3,0.6l0-0.1c0,0,0.1,0.1,0.1,0.1c2.1,0,4.1-0.3,4.1-0.3s-0.9-0.6-1.3-0.9 c1.3-0.7,2.2-2,2.5-3.3c0.2-0.5,0.3-1.1,0.4-1.7C-128.7,41.9-130.2,39.3-132.5,38z M-139.8,44.2c0-1.4,0.8-2.8,2.2-3.5 c0.5,0.5,1.6,2,1.6,2s0-3.6,1.2-5.6c-4.3-0.5-6.8,0.3-6.8,0.3s1.2,0.4,1.6,0.8c-0.1,0.1-0.2,0.1-0.3,0.2c-1,0.7-1.7,1.6-2.1,2.7 c-0.3,0.6-0.5,1.3-0.5,2c-0.3,2.8,1.1,5.4,3.4,6.7c0.4-0.3,0.8-0.6,1.2-1.1c0.4-0.4,0.7-0.9,1-1.4 C-138.7,46.9-139.7,45.7-139.8,44.2z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M-96.6,41.5c-3.3-4-9.6-4.5-9.6-4.5c-0.4,0-0.8,0.3-0.8,0.7v1.4 c0,0.4,0.3,0.7,0.8,0.7c0,0,4.5,0.1,7.1,3.2c3.5,3.6,3.2,7.2,3.2,7.2c0,0.4,0.3,0.8,0.8,0.8h1.5c0.4,0,0.7-0.3,0.7-0.8 C-93,50.2-93.3,44.5-96.6,41.5z M-106.2,42c-0.4,0-0.8,0.3-0.8,0.7V44c0,0.4,0.3,0.7,0.8,0.7c0,0,2.4,0.1,3.8,1.4 c1.9,1.7,1.8,4.2,1.8,4.2c0,0.4,0.2,0.8,0.6,0.8h1.5c0.4,0,0.5-0.3,0.5-0.8c0,0-0.4-3.9-2.5-5.9C-102.5,42.4-106.2,42-106.2,42z M-105,47c-1.1,0-2,0.9-2,2c0,1.1,0.9,2,2,2c1.1,0,2-0.9,2-2C-103,47.9-103.9,47-105,47z"/> - <path fill="none" d="M-102.6,34.4c0.5,0,1-0.4,1-1v-4c0,0,0.1-0.8,0.8-0.8c0.6,0,0.6,0.8,1.8,0.8c0.6,0,1.5-0.2,1.5-2 c0-1.8-0.9-2-1.5-2c-1.1,0-1.1,0.8-1.8,0.8c-0.6,0-0.8-0.8-0.8-0.8v-2c0-0.6-0.4-1-1-1h-3c0,0-0.8-0.1-0.8-0.8 c0-0.6,0.8-0.6,0.8-1.8c0-0.6-0.2-1.5-2-1.5c-1.8,0-2,0.9-2,1.5c0,1.1,0.8,1.1,0.8,1.8c0,0.6-0.8,0.8-0.8,0.8h-3c-0.5,0-1,0.4-1,1 l0,2.5c0,0-0.1,1.5,1.1,1.5c0.8,0,0.9-1,1.9-1c0.5,0,1,0.5,1,1.6c0,1-0.5,1.6-1,1.6c-1,0-1.1-1-1.9-1c-1.2,0-1.1,1.5-1.1,1.5l0,3.5 c0,0.6,0.4,1,1,1h3.8c0,0,1.5,0.1,1.5-1.1c0-0.8-1-0.9-1-1.9c0-0.5,0.7-1.2,1.8-1.2c1,0,1.8,0.7,1.8,1.2c0,1-1,1.1-1,1.9 c0,1.2,1.5,1.1,1.5,1.1H-102.6z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M-63,46.7l-0.3-0.1L-63,52l2.6-3.8L-63,46.7z M-63.3,46l0.3,0 l6,2.9V36l-14,11l4.6-0.6L-63,52l-1.9-5.7l-0.3-0.1l0.3,0L-65,46l7-8L-63.3,46L-63.3,46z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M-23,37h-10c-1.1,0-2,0.9-2,2v10c0,1.1,0.9,2,2,2h10 c1.1,0,2-0.9,2-2V39C-21,37.9-21.9,37-23,37z M-23,46c0,1.7-1.3,2-3,2h-4c-1.7,0-3-1.3-3-3v-4c0-1.7,1.3-3,3-3h4c1.7,0,3,1.3,3,3 V46z"/> - <path fill="#00a3f2" d="M-23.7,42.6c0-0.8-0.2-1.5-0.6-2c-0.4-0.5-1-0.7-1.7-0.7c-0.4,0-0.8,0.1-1.1,0.3s-0.6,0.4-0.8,0.8 c-0.2-0.4-0.4-0.6-0.7-0.8c-0.3-0.2-0.7-0.2-1.2-0.2c-0.4,0-0.7,0-1.1,0.1s-0.7,0.2-1,0.4l0.3,0.7c0.6-0.3,1.2-0.5,1.7-0.5 c0.4,0,0.8,0.1,1,0.3c0.2,0.2,0.3,0.6,0.3,1.1v0.4l-1,0c-0.9,0-1.6,0.2-2.1,0.5c-0.5,0.3-0.7,0.8-0.7,1.4c0,0.6,0.2,1,0.5,1.3 c0.3,0.3,0.8,0.5,1.4,0.5c0.5,0,0.9-0.1,1.3-0.3c0.4-0.2,0.7-0.5,1-1c0.5,0.9,1.2,1.3,2.3,1.3c0.4,0,0.7,0,1-0.1 c0.3-0.1,0.6-0.2,0.9-0.3v-0.8c-0.3,0.1-0.6,0.3-0.9,0.3c-0.3,0.1-0.6,0.1-0.9,0.1c-1.2,0-1.8-0.7-1.8-2.2h3.9V42.6z M-28.5,43.6 c0,0.6-0.2,1-0.5,1.3c-0.3,0.3-0.7,0.5-1.3,0.5c-0.3,0-0.6-0.1-0.8-0.2c-0.2-0.2-0.3-0.4-0.3-0.8c0-0.4,0.2-0.7,0.5-0.9 c0.3-0.2,0.8-0.3,1.5-0.3l0.9,0V43.6z M-27.5,42.4c0-0.6,0.2-1,0.4-1.3c0.3-0.3,0.6-0.5,1.1-0.5c0.4,0,0.8,0.2,1,0.5 c0.2,0.3,0.4,0.8,0.4,1.3H-27.5z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M14.5,37h-13C0.7,37,0,37.7,0,38.5v11C0,50.3,0.7,51,1.5,51h13 c0.8,0,1.5-0.7,1.5-1.5v-11C16,37.7,15.3,37,14.5,37z M6.5,38C6.8,38,7,38.2,7,38.5C7,38.8,6.8,39,6.5,39C6.2,39,6,38.8,6,38.5 C6,38.2,6.2,38,6.5,38z M4.4,38c0.3,0,0.5,0.2,0.5,0.5c0,0.3-0.2,0.5-0.5,0.5c-0.3,0-0.5-0.2-0.5-0.5C3.9,38.2,4.2,38,4.4,38z M2.5,38C2.8,38,3,38.2,3,38.5C3,38.8,2.8,39,2.5,39C2.2,39,2,38.8,2,38.5C2,38.2,2.2,38,2.5,38z M14,48c0,0.6-0.4,1-1,1H3 c-0.6,0-1-0.4-1-1v-6c0-0.6,0.4-1,1-1h10c0.6,0,1,0.4,1,1V48z"/> - <path fill="#00a3f2" d="M51.2,45.9L51.2,45.9c-0.4-0.1-0.7-0.3-1-0.6c-0.1-0.1-0.1-0.1-0.2-0.2c-0.1-0.1-0.1-0.1-0.2-0.2 c0-0.1-0.1-0.1-0.1-0.2c0-0.1-0.1-0.1-0.1-0.2c-0.3-0.6-0.4-1.5-0.5-2.4c-0.3-2.2-0.1-3.8-3-3.8h-4.4c-2.9,0-2.6,1.6-2.9,3.8 c-0.1,0.9-0.3,1.8-0.6,2.4c0,0,0,0,0,0c-0.1,0.1-0.1,0.2-0.2,0.3c0,0,0,0-0.1,0.1c-0.1,0.2-0.2,0.3-0.4,0.4 c-0.3,0.2-0.5,0.4-0.9,0.5l0,0C36.4,46,36,46.3,36,46.8v1.9c0,0.5,0.4,0.9,0.9,0.9h14.1c0.5,0,0.9-0.4,0.9-0.9v-1.9 C52,46.3,51.6,46,51.2,45.9z M46.4,43.8c0,0.1-0.1,0.2-0.2,0.2h-1.6v1.6c0,0.1-0.1,0.2-0.2,0.2h-0.5c-0.1,0-0.2-0.1-0.2-0.2V44h-1.6 c-0.1,0-0.2-0.1-0.2-0.2v-0.5c0-0.1,0.1-0.2,0.2-0.2h1.6v-1.6c0-0.1,0.1-0.2,0.2-0.2h0.5c0.1,0,0.2,0.1,0.2,0.2v1.6h1.6 c0.1,0,0.2,0.1,0.2,0.2V43.8z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M87.7,42c-0.1,1.1,0.2,2.5-1.3,4.4c-1.6,2.1-3.1,2.1-3.4,2.1 c-1.8-0.1-2-1.5-3-1.5c-0.9,0-1.6,1.4-3,1.5c-0.3,0-1.9,0-3.4-2c-1.5-1.9-1.2-3.3-1.3-4.4S72,39.7,72,39.7s0.7,0.7,1.6,0.8 c0.9,0.1,1.1-0.3,3-0.9c2.1-0.6,3.4,1.9,3.4,1.9s1.4-2.4,3.4-1.9c1.9,0.6,2,0.9,2.9,0.9c0.9-0.1,1.7-0.8,1.7-0.8S87.8,40.9,87.7,42z M76.9,42.5c-1.1-0.3-1.6,0.2-2.1,0.4C74.4,43,74,43.1,74,43.1s0.1,0.7,1.2,1.2c1.1,0.6,3.5,0.3,3.5,0.3S78.9,42.9,76.9,42.5z M85.2,42.9c-0.5-0.2-1-0.6-2.1-0.4c-2,0.4-1.8,2.1-1.8,2.1s2.4,0.3,3.5-0.3c1.1-0.6,1.2-1.2,1.2-1.2S85.6,43,85.2,42.9z"/> - <path fill-rule="evenodd" d="M-237.5,84.9l-3.3-3.3c0.5-0.9,0.9-1.9,0.9-2.9c0-3-2.4-5.5-5.5-5.5 c-3,0-5.5,2.4-5.5,5.5c0,3,2.4,5.5,5.5,5.5c1.1,0,2.1-0.3,3-0.9l3.3,3.3c0.4,0.4,1,0.4,1.4,0l0.2-0.2 C-237.1,85.9-237.1,85.3-237.5,84.9z M-245.4,82c-1.8,0-3.3-1.5-3.3-3.4c0-1.9,1.5-3.4,3.3-3.4c1.8,0,3.3,1.5,3.3,3.4 C-242,80.5-243.5,82-245.4,82z"/> - <path fill-rule="evenodd" d="M-214.5,86.3l0.2,0.2c0.4,0.4,1,0.4,1.4,0l3.3-3.3c0.9,0.6,1.9,0.9,3,0.9 c3,0,5.5-2.4,5.5-5.5c0-3-2.4-5.5-5.5-5.5c-3,0-5.5,2.4-5.5,5.5c0,1.1,0.3,2.1,0.9,2.9l-3.3,3.3 C-214.9,85.3-214.9,85.9-214.5,86.3z M-210,78.6c0-1.9,1.5-3.4,3.3-3.4c1.8,0,3.3,1.5,3.3,3.4c0,1.9-1.5,3.4-3.3,3.4 C-208.5,82-210,80.5-210,78.6z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M-165,77.5h-1v-2c0-0.6-0.4-1-1-1v-1c0-0.6-0.4-1-1-1h-8 c-0.6,0-1,0.4-1,1v1c-0.6,0-1,0.4-1,1v2h-1c-0.6,0-1,0.4-1,1v5c0,0.6,0.4,1,1,1h2v-1h0.5l-1.5,3h12l-1.5-3h0.5v1h2c0.6,0,1-0.4,1-1 v-5C-164,77.9-164.4,77.5-165,77.5z M-176.5,80.5h-1c-0.3,0-0.5-0.2-0.5-0.5c0-0.3,0.2-0.5,0.5-0.5h1c0.3,0,0.5,0.2,0.5,0.5 C-176,80.2-176.2,80.5-176.5,80.5z M-176,85.5l0.9-2h6.2l0.9,2H-176z M-168,77.5c0,0.6-0.4,1-1,1h-6c-0.6,0-1-0.4-1-1v-3 c0-0.6,0.4-1,1-1h6c0.6,0,1,0.4,1,1V77.5z"/> - <path fill="#00a3f2" d="M-135,73l1.9,1.9l-2.6,2.6c-0.5,0.5-0.5,1.4,0.1,2c0.6,0.6,1.5,0.6,2,0.1l2.6-2.6l1.9,1.9v-6H-135z M-138.5,80.4l-2.6,2.6L-143,81v6h6l-1.9-1.9l2.6-2.6c0.5-0.5,0.5-1.4-0.1-2C-137.1,79.9-138,79.9-138.5,80.4z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M-93.5,73.5c-0.6-0.6-1.5-0.6-2-0.1l-2.6,2.6L-100,74v6h6 l-1.9-1.9l2.6-2.6C-92.9,75-92.9,74.1-93.5,73.5z M-104.1,81.9l-2.6,2.6c-0.5,0.5-0.5,1.4,0.1,2c0.6,0.6,1.5,0.6,2,0.1l2.6-2.6 l1.9,1.9v-6h-6L-104.1,81.9z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M14.6,75.1l-2.3,2.3c-0.5,0.5-1.3,0.5-1.7,0 c-0.5-0.5-0.5-1.2,0-1.7l2.4-2.3c-0.6-0.3-1.2-0.5-1.9-0.5C8.8,72.9,7,74.7,7,77c0,0.5,0.1,1.1,0.3,1.5l-5.9,5.8 c-0.6,0.6-0.6,1.7,0,2.3c0.6,0.6,1.7,0.6,2.3,0l6-5.9c0.4,0.2,0.9,0.3,1.4,0.3c2.2,0,4.1-1.8,4.1-4.1 C15.1,76.3,14.9,75.7,14.6,75.1z M2.5,86.4c-0.5,0-0.9-0.4-0.9-0.9c0-0.5,0.4-0.9,0.9-0.9c0.5,0,0.9,0.4,0.9,0.9 C3.4,86,3,86.4,2.5,86.4z"/> - <path fill="#00a3f2" d="M-22.7,83.9l-1.1-1.1c0.2-0.3,0.3-0.6,0.5-0.9c0.1-0.3,0.2-0.6,0.3-0.9l1.6,0c0.3,0,0.5-0.2,0.5-0.5l0-1 c0-0.3-0.2-0.5-0.5-0.5l-1.6,0c-0.1-0.6-0.4-1.2-0.7-1.8l1.1-1.1c0.2-0.2,0.2-0.5,0-0.7l-0.7-0.7c-0.2-0.2-0.5-0.2-0.7,0l-1.1,1.1 c-0.3-0.2-0.6-0.3-0.9-0.5c-0.3-0.1-0.6-0.2-0.9-0.3l0-1.6c0-0.3-0.2-0.5-0.5-0.5l-1,0c-0.3,0-0.5,0.2-0.5,0.5l0,1.6 c-0.6,0.1-1.2,0.4-1.8,0.7l-1.1-1.1c-0.2-0.2-0.5-0.2-0.7,0l-0.7,0.7c-0.2,0.2-0.2,0.5,0,0.7l1.1,1.1c-0.2,0.3-0.3,0.6-0.5,0.9 c-0.1,0.3-0.2,0.6-0.3,0.9l-1.6,0c-0.3,0-0.5,0.2-0.5,0.5l0,1c0,0.3,0.2,0.5,0.5,0.5l1.6,0c0.1,0.6,0.4,1.2,0.7,1.8l-1.1,1.1 c-0.2,0.2-0.2,0.5,0,0.7l0.7,0.7c0.2,0.2,0.5,0.2,0.7,0l1.1-1.1c0.3,0.2,0.6,0.3,0.9,0.5c0.3,0.1,0.6,0.2,0.9,0.3l0,1.6 c0,0.3,0.2,0.5,0.5,0.5l1,0c0.3,0,0.5-0.2,0.5-0.5l0-1.6c0.6-0.1,1.2-0.4,1.8-0.7l1.1,1.1c0.2,0.2,0.5,0.2,0.7,0l0.7-0.7 C-22.5,84.4-22.5,84.1-22.7,83.9z M-28.8,82.1c-1.2-0.5-1.7-1.8-1.3-3c0.5-1.2,1.8-1.7,3-1.3c1.2,0.5,1.7,1.8,1.3,3 C-26.4,82-27.7,82.6-28.8,82.1z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M-62,77h-4c-0.6,0-1,0.4-1,1v4c0,0.6,0.4,1,1,1h4 c0.6,0,1-0.4,1-1v-4C-61,77.4-61.4,77-62,77z M-62,81c0,0.6-0.4,1-1,1h-2c-0.6,0-1-0.4-1-1v-1c0-0.6,0.4-1,1-1h2c0.6,0,1,0.4,1,1 V81z M-64,87l3-3h-6L-64,87z M-67,76h6l-3-3L-67,76z M-60,76.9v6l3-3L-60,76.9z M-68,82.9v-6l-3,3L-68,82.9z"/> - <path fill-rule="evenodd" d="M37.5,76.5h13c0.8,0,1.5-0.7,1.5-1.5c0-0.8-0.7-1.5-1.5-1.5h-13 c-0.8,0-1.5,0.7-1.5,1.5C36,75.8,36.7,76.5,37.5,76.5z M50.5,78.5h-13c-0.8,0-1.5,0.7-1.5,1.5c0,0.8,0.7,1.5,1.5,1.5h13 c0.8,0,1.5-0.7,1.5-1.5C52,79.2,51.3,78.5,50.5,78.5z M50.5,83.5h-13c-0.8,0-1.5,0.7-1.5,1.5c0,0.8,0.7,1.5,1.5,1.5h13 c0.8,0,1.5-0.7,1.5-1.5C52,84.2,51.3,83.5,50.5,83.5z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M85.6,87c-0.8,0-1.5-0.2-2.3-1.3c-0.8-1.1-1.7-2.5-1.7-2.5 s-0.7-0.9-1.1-1.6c-0.4-0.7-1.1-0.5-1.1-0.5s-2.8-4.6-3.3-5.4c-0.7-1,0.6-2.7,0.6-2.7l4.4,7c0,0,1.3,1.9,1.9,2.3 c0.5,0.4,1.4-0.4,2.8,0.9C87.7,85,87.1,87,85.6,87z M85.4,84.1c-0.9-1-1.7-0.9-1.9-0.6c-0.2,0.3,0,1.2,0.4,1.7 c0.4,0.5,0.8,0.7,1.4,0.7C85.9,86,86.4,85.2,85.4,84.1z M81.6,79.4l-1.2-1.8l2.9-4.6c0,0,1.2,1.7,0.6,2.7 C83.6,76.1,82.5,78,81.6,79.4z M77,82.3c0.3-0.3,1-1.1,1.4-1.7l0.8,1.2c-0.4,0.6-0.9,1.4-0.9,1.4s-0.9,1.4-1.7,2.5 c-0.8,1.1-1.5,1.3-2.3,1.3c-1.4,0-2.1-2-0.1-3.8C75.6,82,76.5,82.7,77,82.3z M74.6,84.1c-0.9,1-0.4,1.8,0.2,1.8c0.6,0,1-0.2,1.4-0.7 c0.4-0.5,0.6-1.5,0.4-1.7C76.3,83.2,75.5,83.1,74.6,84.1z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M-243,111c0-0.1-2-2-2-2c-1.7,0-5,0-5,0c-0.6,0-1,0.4-1,1v8 c0,0.6,0.4,1,1,1h4v-6.1c0-0.3,0.2-0.5,0.5-0.5h2.5V111z M-246,112v-2l2,2H-246z M-239,113c-1.7,0-5,0-5,0c-0.6,0-1,0.4-1,1v8 c0,0.6,0.4,1,1,1h6c0.6,0,1-0.4,1-1c0,0,0-4.8,0-7C-237,115-239,113-239,113z M-240,116v-2l2,2H-240z"/> - <path fill="#00a3f2" d="M-204.5,111h-1.3l0,0c0,0-0.2-2-2.2-2c-2,0-2.2,2-2.2,2l0,0h-1.3c-0.8,0-1.5,0.7-1.5,1.5v9 c0,0.8,0.7,1.5,1.5,1.5h7c0.8,0,1.5-0.7,1.5-1.5v-9C-203,111.7-203.7,111-204.5,111z M-210.7,112.1l0.8-0.4l0.4-0.2l0-0.4 c0-0.2,0.2-1.3,1.5-1.3c1.2,0,1.4,1.1,1.5,1.3l0,0.4l0.4,0.2l0.8,0.4l0.3,0.7h-6.1L-210.7,112.1z M-210.1,120.4l-2.8-4.9l3.3-1.9 h4.3l1.8,3.1L-210.1,120.4z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M-177,115h10v2h-10V115z"/> - <polygon fill="#00a3f2" points="-131,115 -135,115 -135,111 -137,111 -137,115 -141,115 -141,117 -137,117 -137,121 -135,121 -135,117 -131,117 "/> - <path fill="#00a3f2" d="M-94,111.7l-3,2.7v-2c0-0.8-0.6-1.4-1.3-1.4h-7.4c-0.7,0-1.3,0.6-1.3,1.4v7.2c0,0.8,0.6,1.4,1.3,1.4h7.4 c0.7,0,1.3-0.6,1.3-1.4v-2.1l3,2.7c0.3,0.3,0.6,0.4,1,0.3v-9.1C-93.3,111.4-93.7,111.5-94,111.7z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M-61.9,112h-3l3.8,4l-3.8,4h3.1l3.8-4L-61.9,112z M-66.9,112h-3 l3.8,4l-3.8,4h3.1l3.8-4L-66.9,112z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M-23,111.5h-2l-3-3l-3,3h-2c-1.1,0-2,0.9-2,2v8c0,1.1,0.9,2,2,2 h10c1.1,0,2-0.9,2-2v-8C-21,112.4-21.9,111.5-23,111.5z M-32,121.5c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S-31.4,121.5-32,121.5z M-32,118.5c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S-31.4,118.5-32,118.5z M-32,115.5c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1 S-31.4,115.5-32,115.5z M-23,121.5h-7v-2h7V121.5z M-23,118.5h-7v-2h7V118.5z M-23,115.5h-7v-2h7V115.5z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M2,115h7c0.6,0,1-0.4,1-1v-4c0-0.6-0.4-1-1-1H2c-0.6,0-1,0.4-1,1 v4C1,114.6,1.4,115,2,115z M14,109h-2c-0.6,0-1,0.4-1,1v4c0,0.6,0.4,1,1,1h2c0.6,0,1-0.4,1-1v-4C15,109.4,14.6,109,14,109z M14,116H8c-0.6,0-1,0.4-1,1v5c0,0.6,0.4,1,1,1h6c0.6,0,1-0.4,1-1v-5C15,116.4,14.6,116,14,116z M5,116H2c-0.6,0-1,0.4-1,1v5 c0,0.6,0.4,1,1,1h3c0.6,0,1-0.4,1-1v-5C6,116.4,5.6,116,5,116z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M45.8,116c0,0-0.6,0.8-1.8,0.8c-1.2,0-1.8-0.8-1.8-0.8l-6-5.1 c0.3-0.5,0.9-0.9,1.6-0.9h12.4c0.7,0,1.3,0.4,1.6,0.9L45.8,116z M42.2,117.7c0,0,0.6,0.8,1.8,0.8c1.2,0,1.8-0.8,1.8-0.8l6.2-5.4v8 c0,0.9-0.8,1.7-1.8,1.7H37.8c-1,0-1.8-0.8-1.8-1.7v-8L42.2,117.7z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M-237.5,145h-13c-0.8,0-1.5,0.7-1.5,1.5v11 c0,0.8,0.7,1.5,1.5,1.5h13c0.8,0,1.5-0.7,1.5-1.5v-11C-236,145.7-236.7,145-237.5,145z M-245.5,146c0.3,0,0.5,0.2,0.5,0.5 c0,0.3-0.2,0.5-0.5,0.5c-0.3,0-0.5-0.2-0.5-0.5C-246,146.2-245.8,146-245.5,146z M-247.6,146c0.3,0,0.5,0.2,0.5,0.5 c0,0.3-0.2,0.5-0.5,0.5s-0.5-0.2-0.5-0.5C-248.1,146.2-247.8,146-247.6,146z M-249.5,146c0.3,0,0.5,0.2,0.5,0.5 c0,0.3-0.2,0.5-0.5,0.5s-0.5-0.2-0.5-0.5C-250,146.2-249.8,146-249.5,146z M-250,156v-6c0-0.6,0.4-1,1-1h7v8h-7 C-249.6,157-250,156.6-250,156z M-238,156c0,0.6-0.4,1-1,1h-1v-8h1c0.6,0,1,0.4,1,1V156z"/> - <path fill-rule="evenodd" fill="#00a3f2" d="M-213.2,156c-1.3-1.2-2.2-2.8-2.2-4.6c0-3.6,3.3-6.5,7.4-6.5 c4.1,0,7.4,2.9,7.4,6.5c0,3.6-3.3,6.5-7.4,6.5c-0.8,0-1.6-0.1-2.4-0.3c-1.8,0.7-4.3,1.7-4.5,1.4C-213.9,157.9-213.5,156.8-213.2,156 z"/> + <path fill="#0095dd" d="M8,0C7.7,0,7.4,0.2,7.2,0.7l-2,4.1L0.9,5.5c-1,0.2-1.2,0.9-0.5,1.6l3.1,3.3l-0.7,4.6C2.7,15.6,3,16,3.4,16c0.2,0,0.4-0.1,0.6-0.2L8,13.7l3.9,2.1c0.2,0.1,0.5,0.2,0.6,0.2c0.5,0,0.8-0.4,0.7-1.1l-0.7-4.6l3.1-3.3c0.7-0.7,0.4-1.4-0.5-1.6l-4.3-0.7l-2-4.1C8.6,0.2,8.3,0,8,0L8,0z"/> </svg> diff --git a/arc-firefox-theme/chrome/browser/heartbeat-star-off.svg b/arc-firefox-theme/chrome/browser/heartbeat-star-off.svg index 48f7a0f..143fe48 100644 --- a/arc-firefox-theme/chrome/browser/heartbeat-star-off.svg +++ b/arc-firefox-theme/chrome/browser/heartbeat-star-off.svg @@ -1,50 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?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" width="100%" height="100%"> - <path fill-rule="evenodd" fill="#231f20" d="M-238.2,6h-6.1l2.7-2.7c0.4-0.4,0.5-1.1,0.2-1.4l-1.2-1.2 c-0.3-0.3-1-0.3-1.4,0.2l-6.4,6.4c-0.1,0.1-0.1,0.2-0.2,0.2l0,0c0,0,0,0,0,0c0,0.1-0.1,0.1-0.1,0.1c0,0.1-0.1,0.2-0.1,0.3 c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0.1,0,0.2,0.1,0.3c0,0.1,0.1,0.1,0.1,0.1c0,0,0,0,0,0l0,0c0.1,0.1,0.1,0.2,0.2,0.2l6.4,6.4 c0.4,0.4,1.1,0.5,1.4,0.2l1.2-1.2c0.3-0.3,0.3-1-0.2-1.4l-2.8-2.8h6.2c0.6,0,1-0.4,1-1V7C-237.2,6.4-237.6,6-238.2,6z"/> - <path fill-rule="evenodd" fill="#231f20" d="M-212.7,6.3l-1,1c-0.2,0.2-0.2,0.4-0.2,0.7c0,0.3,0,0.5,0.2,0.7 l0.8,0.9l4.5,4.5c0.5,0.5,1.2,0.6,1.6,0.2l0.8-0.9c0.4-0.4,0.3-1.1-0.2-1.6l-1.8-1.8h4.7c0.6,0,1-0.5,1-1V7c0-0.6-0.5-1-1-1h-4.8 l1.9-1.9c0.5-0.5,0.6-1.3,0.2-1.6l-0.8-0.9c-0.4-0.4-1.1-0.3-1.6,0.2L-212.7,6.3z"/> - <path fill-rule="evenodd" fill="#231f20" d="M-167.3,9.7l1-1c0.2-0.2,0.2-0.4,0.2-0.7c0-0.3,0-0.5-0.2-0.7 l-0.8-0.9l-4.5-4.5c-0.5-0.5-1.2-0.6-1.6-0.2l-0.8,0.9c-0.4,0.4-0.3,1.1,0.2,1.6l1.8,1.8h-4.7c-0.6,0-1,0.5-1,1v2c0,0.6,0.5,1,1,1 h4.8l-1.9,1.9c-0.5,0.5-0.6,1.3-0.2,1.6l0.8,0.9c0.4,0.4,1.1,0.3,1.6-0.2L-167.3,9.7z"/> - <path fill-rule="evenodd" fill="#231f20" d="M-129.5,8h-7l2.8-2.8c-0.7-0.5-1.4-0.7-2.3-0.7c-2.2,0-4,1.8-4,4 c0,2.2,1.8,4,4,4c1.4,0,2.7-0.7,3.4-1.9l2.3,1c-1.1,2-3.2,3.4-5.7,3.4c-3.6,0-6.5-2.9-6.5-6.5c0-3.6,2.9-6.5,6.5-6.5 c1.5,0,2.9,0.5,4.1,1.4l2.4-2.4V8z"/> - <polygon fill="#231f20" points="-93.6,3.8 -95.8,1.7 -100,5.9 -104.3,1.6 -106.4,3.8 -102.1,8 -106.3,12.2 -104.1,14.3 -99.9,10.2 -95.7,14.4 -93.6,12.2 -97.8,8.1 "/> - <path fill-rule="evenodd" fill="#231f20" d="M-64,1l-8,7h2l6-5l6,5h2L-64,1z M-69,8v7h4v-5h2v5h4V8l-5-4L-69,8 z"/> - <path fill="#231f20" d="M-28,3.6l1,2l0.5,0.9l1,0.2l2.3,0.4l-1.7,1.8l-0.7,0.7l0.1,1l0.4,2.4l-2-1l-0.9-0.5l-0.9,0.5l-2,1l0.4-2.4 l0.1-1l-0.7-0.7l-1.7-1.8l2.4-0.4l1-0.2l0.5-0.9L-28,3.6 M-28,0c-0.3,0-0.6,0.2-0.8,0.7l-2,4.1l-4.3,0.7c-1,0.2-1.2,0.9-0.5,1.6 l3.1,3.3l-0.7,4.6c-0.1,0.7,0.2,1.1,0.7,1.1c0.2,0,0.4-0.1,0.6-0.2l3.9-2.1l3.9,2.1c0.2,0.1,0.5,0.2,0.6,0.2c0.5,0,0.8-0.4,0.7-1.1 l-0.7-4.6l3.1-3.3c0.7-0.7,0.4-1.4-0.5-1.6l-4.3-0.7l-2-4.1C-27.4,0.2-27.7,0-28,0L-28,0z"/> - <path fill="#231f20" style="fill:#c0c0c0;fill-opacity:1" d="M8,0C7.7,0,7.4,0.2,7.2,0.7l-2,4.1L0.9,5.5c-1,0.2-1.2,0.9-0.5,1.6l3.1,3.3l-0.7,4.6C2.7,15.6,3,16,3.4,16 c0.2,0,0.4-0.1,0.6-0.2L8,13.7l3.9,2.1c0.2,0.1,0.5,0.2,0.6,0.2c0.5,0,0.8-0.4,0.7-1.1l-0.7-4.6l3.1-3.3c0.7-0.7,0.4-1.4-0.5-1.6 l-4.3-0.7l-2-4.1C8.6,0.2,8.3,0,8,0L8,0z"/> - <path fill-rule="evenodd" fill="#231f20" d="M44,15.2c-4,0-7.2-3.2-7.2-7.2c0-4,3.2-7.2,7.2-7.2 c4,0,7.2,3.2,7.2,7.2C51.2,12,48,15.2,44,15.2z M44,3c-2.8,0-5,2.2-5,5c0,2.7,2.2,5,5,5c2.8,0,5-2.2,5-5C49,5.3,46.8,3,44,3z M43.7,8.9C43.3,8.8,43,8.4,43,8V5c0-0.6,0.4-1,1-1c0.6,0,1,0.4,1,1v2.8c1.1,1.1,2,3.2,2,3.2S44.8,10,43.7,8.9z"/> - <path fill-rule="evenodd" fill="#231f20" d="M86.7,9.1l-5.6,5.5C80.8,14.9,80.4,15,80,15 c-0.4,0-0.8-0.1-1.1-0.4l-5.6-5.5C72.7,8.5,72.9,8,73.8,8H77l0-6c0-0.6,0.4-1,1-1h4c0.6,0,1,0.4,1,1v6h3.2C87.1,8,87.3,8.5,86.7,9.1 z"/> - <path fill="#231f20" d="M-241,52c0.5,0,1-0.4,1-1v-4c0,0,0.1-0.8,0.8-0.8c0.6,0,0.6,0.8,1.8,0.8c0.6,0,1.5-0.2,1.5-2 c0-1.8-0.9-2-1.5-2c-1.1,0-1.1,0.8-1.8,0.8c-0.6,0-0.8-0.8-0.8-0.8v-2c0-0.6-0.4-1-1-1h-3c0,0-0.8-0.1-0.8-0.8 c0-0.6,0.8-0.6,0.8-1.8c0-0.6-0.2-1.5-2-1.5c-1.8,0-2,0.9-2,1.5c0,1.1,0.8,1.1,0.8,1.8c0,0.6-0.8,0.8-0.8,0.8h-3c-0.5,0-1,0.4-1,1 l0,2.5c0,0-0.1,1.5,1.1,1.5c0.8,0,0.9-1,1.9-1c0.5,0,1,0.5,1,1.6c0,1-0.5,1.6-1,1.6c-1,0-1.1-1-1.9-1c-1.2,0-1.1,1.5-1.1,1.5l0,3.5 c0,0.6,0.4,1,1,1h3.8c0,0,1.5,0.1,1.5-1.1c0-0.8-1-0.9-1-1.9c0-0.5,0.7-1.2,1.8-1.2c1,0,1.8,0.7,1.8,1.2c0,1-1,1.1-1,1.9 c0,1.2,1.5,1.1,1.5,1.1H-241z"/> - <path fill-rule="evenodd" d="M-200.4,41.9h-0.3v0h-14.4v0h-0.3c-0.2,0-0.4,0.2-0.4,0.4c0,0,0.3,2.2,0.5,4.4 c0.2,2.5,0.2,4.2,0.2,4.2c0,0.2,0.2,0.4,0.4,0.4h13.7c0.2,0,0.4-0.2,0.4-0.4c0,0,0.1-2.1,0.2-4.2c0.1-2.2,0.5-4.4,0.5-4.4 C-200.1,42.1-200.2,41.9-200.4,41.9z"/> - <path fill-rule="evenodd" d="M-200.8,41.3v-2c0-0.3-0.2-0.5-0.5-0.5l-6.7,0l-0.8-1.1c0,0-0.6-0.9-1.2-0.9h-4.2 c-0.6,0-1,0.5-1,1v1l0,2.5H-200.8z"/> - <path fill-rule="evenodd" fill="#231f20" d="M-169,37h-7.5c-0.8,0-1.5,0.7-1.5,1.5v11c0,0.8,0.7,1.5,1.5,1.5 h9c0.8,0,1.5-0.7,1.5-1.5V40L-169,37z M-170,41v-3.3l3.3,3.3H-170z"/> - <path fill-rule="evenodd" d="M-132.5,38c-0.4,0.2-0.9,0.6-1.3,1.2c-0.3,0.4-0.5,0.9-0.8,1.3 c0.7,0.3,1.3,0.8,1.7,1.4c0.4,0.7,0.7,1.5,0.6,2.3c-0.1,1.3-1,2.4-2.1,3c-0.5-0.5-1.4-2.1-1.4-2.1c0,0,0,1.8-0.6,3 c-0.4,0.8-0.9,1.5-1.6,2.1c1,0.4,2,0.6,3,0.6l0-0.1c0,0,0.1,0.1,0.1,0.1c2.1,0,4.1-0.3,4.1-0.3s-0.9-0.6-1.3-0.9 c1.3-0.7,2.2-2,2.5-3.3c0.2-0.5,0.3-1.1,0.4-1.7C-128.7,41.9-130.2,39.3-132.5,38z M-139.8,44.2c0-1.4,0.8-2.8,2.2-3.5 c0.5,0.5,1.6,2,1.6,2s0-3.6,1.2-5.6c-4.3-0.5-6.8,0.3-6.8,0.3s1.2,0.4,1.6,0.8c-0.1,0.1-0.2,0.1-0.3,0.2c-1,0.7-1.7,1.6-2.1,2.7 c-0.3,0.6-0.5,1.3-0.5,2c-0.3,2.8,1.1,5.4,3.4,6.7c0.4-0.3,0.8-0.6,1.2-1.1c0.4-0.4,0.7-0.9,1-1.4 C-138.7,46.9-139.7,45.7-139.8,44.2z"/> - <path fill-rule="evenodd" fill="#231f20" d="M-96.6,41.5c-3.3-4-9.6-4.5-9.6-4.5c-0.4,0-0.8,0.3-0.8,0.7v1.4 c0,0.4,0.3,0.7,0.8,0.7c0,0,4.5,0.1,7.1,3.2c3.5,3.6,3.2,7.2,3.2,7.2c0,0.4,0.3,0.8,0.8,0.8h1.5c0.4,0,0.7-0.3,0.7-0.8 C-93,50.2-93.3,44.5-96.6,41.5z M-106.2,42c-0.4,0-0.8,0.3-0.8,0.7V44c0,0.4,0.3,0.7,0.8,0.7c0,0,2.4,0.1,3.8,1.4 c1.9,1.7,1.8,4.2,1.8,4.2c0,0.4,0.2,0.8,0.6,0.8h1.5c0.4,0,0.5-0.3,0.5-0.8c0,0-0.4-3.9-2.5-5.9C-102.5,42.4-106.2,42-106.2,42z M-105,47c-1.1,0-2,0.9-2,2c0,1.1,0.9,2,2,2c1.1,0,2-0.9,2-2C-103,47.9-103.9,47-105,47z"/> - <path fill="none" d="M-102.6,34.4c0.5,0,1-0.4,1-1v-4c0,0,0.1-0.8,0.8-0.8c0.6,0,0.6,0.8,1.8,0.8c0.6,0,1.5-0.2,1.5-2 c0-1.8-0.9-2-1.5-2c-1.1,0-1.1,0.8-1.8,0.8c-0.6,0-0.8-0.8-0.8-0.8v-2c0-0.6-0.4-1-1-1h-3c0,0-0.8-0.1-0.8-0.8 c0-0.6,0.8-0.6,0.8-1.8c0-0.6-0.2-1.5-2-1.5c-1.8,0-2,0.9-2,1.5c0,1.1,0.8,1.1,0.8,1.8c0,0.6-0.8,0.8-0.8,0.8h-3c-0.5,0-1,0.4-1,1 l0,2.5c0,0-0.1,1.5,1.1,1.5c0.8,0,0.9-1,1.9-1c0.5,0,1,0.5,1,1.6c0,1-0.5,1.6-1,1.6c-1,0-1.1-1-1.9-1c-1.2,0-1.1,1.5-1.1,1.5l0,3.5 c0,0.6,0.4,1,1,1h3.8c0,0,1.5,0.1,1.5-1.1c0-0.8-1-0.9-1-1.9c0-0.5,0.7-1.2,1.8-1.2c1,0,1.8,0.7,1.8,1.2c0,1-1,1.1-1,1.9 c0,1.2,1.5,1.1,1.5,1.1H-102.6z"/> - <path fill-rule="evenodd" fill="#231f20" d="M-63,46.7l-0.3-0.1L-63,52l2.6-3.8L-63,46.7z M-63.3,46l0.3,0 l6,2.9V36l-14,11l4.6-0.6L-63,52l-1.9-5.7l-0.3-0.1l0.3,0L-65,46l7-8L-63.3,46L-63.3,46z"/> - <path fill-rule="evenodd" fill="#231f20" d="M-23,37h-10c-1.1,0-2,0.9-2,2v10c0,1.1,0.9,2,2,2h10 c1.1,0,2-0.9,2-2V39C-21,37.9-21.9,37-23,37z M-23,46c0,1.7-1.3,2-3,2h-4c-1.7,0-3-1.3-3-3v-4c0-1.7,1.3-3,3-3h4c1.7,0,3,1.3,3,3 V46z"/> - <path fill="#231f20" d="M-23.7,42.6c0-0.8-0.2-1.5-0.6-2c-0.4-0.5-1-0.7-1.7-0.7c-0.4,0-0.8,0.1-1.1,0.3s-0.6,0.4-0.8,0.8 c-0.2-0.4-0.4-0.6-0.7-0.8c-0.3-0.2-0.7-0.2-1.2-0.2c-0.4,0-0.7,0-1.1,0.1s-0.7,0.2-1,0.4l0.3,0.7c0.6-0.3,1.2-0.5,1.7-0.5 c0.4,0,0.8,0.1,1,0.3c0.2,0.2,0.3,0.6,0.3,1.1v0.4l-1,0c-0.9,0-1.6,0.2-2.1,0.5c-0.5,0.3-0.7,0.8-0.7,1.4c0,0.6,0.2,1,0.5,1.3 c0.3,0.3,0.8,0.5,1.4,0.5c0.5,0,0.9-0.1,1.3-0.3c0.4-0.2,0.7-0.5,1-1c0.5,0.9,1.2,1.3,2.3,1.3c0.4,0,0.7,0,1-0.1 c0.3-0.1,0.6-0.2,0.9-0.3v-0.8c-0.3,0.1-0.6,0.3-0.9,0.3c-0.3,0.1-0.6,0.1-0.9,0.1c-1.2,0-1.8-0.7-1.8-2.2h3.9V42.6z M-28.5,43.6 c0,0.6-0.2,1-0.5,1.3c-0.3,0.3-0.7,0.5-1.3,0.5c-0.3,0-0.6-0.1-0.8-0.2c-0.2-0.2-0.3-0.4-0.3-0.8c0-0.4,0.2-0.7,0.5-0.9 c0.3-0.2,0.8-0.3,1.5-0.3l0.9,0V43.6z M-27.5,42.4c0-0.6,0.2-1,0.4-1.3c0.3-0.3,0.6-0.5,1.1-0.5c0.4,0,0.8,0.2,1,0.5 c0.2,0.3,0.4,0.8,0.4,1.3H-27.5z"/> - <path fill-rule="evenodd" fill="#231f20" d="M14.5,37h-13C0.7,37,0,37.7,0,38.5v11C0,50.3,0.7,51,1.5,51h13 c0.8,0,1.5-0.7,1.5-1.5v-11C16,37.7,15.3,37,14.5,37z M6.5,38C6.8,38,7,38.2,7,38.5C7,38.8,6.8,39,6.5,39C6.2,39,6,38.8,6,38.5 C6,38.2,6.2,38,6.5,38z M4.4,38c0.3,0,0.5,0.2,0.5,0.5c0,0.3-0.2,0.5-0.5,0.5c-0.3,0-0.5-0.2-0.5-0.5C3.9,38.2,4.2,38,4.4,38z M2.5,38C2.8,38,3,38.2,3,38.5C3,38.8,2.8,39,2.5,39C2.2,39,2,38.8,2,38.5C2,38.2,2.2,38,2.5,38z M14,48c0,0.6-0.4,1-1,1H3 c-0.6,0-1-0.4-1-1v-6c0-0.6,0.4-1,1-1h10c0.6,0,1,0.4,1,1V48z"/> - <path fill="#231f20" d="M51.2,45.9L51.2,45.9c-0.4-0.1-0.7-0.3-1-0.6c-0.1-0.1-0.1-0.1-0.2-0.2c-0.1-0.1-0.1-0.1-0.2-0.2 c0-0.1-0.1-0.1-0.1-0.2c0-0.1-0.1-0.1-0.1-0.2c-0.3-0.6-0.4-1.5-0.5-2.4c-0.3-2.2-0.1-3.8-3-3.8h-4.4c-2.9,0-2.6,1.6-2.9,3.8 c-0.1,0.9-0.3,1.8-0.6,2.4c0,0,0,0,0,0c-0.1,0.1-0.1,0.2-0.2,0.3c0,0,0,0-0.1,0.1c-0.1,0.2-0.2,0.3-0.4,0.4 c-0.3,0.2-0.5,0.4-0.9,0.5l0,0C36.4,46,36,46.3,36,46.8v1.9c0,0.5,0.4,0.9,0.9,0.9h14.1c0.5,0,0.9-0.4,0.9-0.9v-1.9 C52,46.3,51.6,46,51.2,45.9z M46.4,43.8c0,0.1-0.1,0.2-0.2,0.2h-1.6v1.6c0,0.1-0.1,0.2-0.2,0.2h-0.5c-0.1,0-0.2-0.1-0.2-0.2V44h-1.6 c-0.1,0-0.2-0.1-0.2-0.2v-0.5c0-0.1,0.1-0.2,0.2-0.2h1.6v-1.6c0-0.1,0.1-0.2,0.2-0.2h0.5c0.1,0,0.2,0.1,0.2,0.2v1.6h1.6 c0.1,0,0.2,0.1,0.2,0.2V43.8z"/> - <path fill-rule="evenodd" fill="#231f20" d="M87.7,42c-0.1,1.1,0.2,2.5-1.3,4.4c-1.6,2.1-3.1,2.1-3.4,2.1 c-1.8-0.1-2-1.5-3-1.5c-0.9,0-1.6,1.4-3,1.5c-0.3,0-1.9,0-3.4-2c-1.5-1.9-1.2-3.3-1.3-4.4S72,39.7,72,39.7s0.7,0.7,1.6,0.8 c0.9,0.1,1.1-0.3,3-0.9c2.1-0.6,3.4,1.9,3.4,1.9s1.4-2.4,3.4-1.9c1.9,0.6,2,0.9,2.9,0.9c0.9-0.1,1.7-0.8,1.7-0.8S87.8,40.9,87.7,42z M76.9,42.5c-1.1-0.3-1.6,0.2-2.1,0.4C74.4,43,74,43.1,74,43.1s0.1,0.7,1.2,1.2c1.1,0.6,3.5,0.3,3.5,0.3S78.9,42.9,76.9,42.5z M85.2,42.9c-0.5-0.2-1-0.6-2.1-0.4c-2,0.4-1.8,2.1-1.8,2.1s2.4,0.3,3.5-0.3c1.1-0.6,1.2-1.2,1.2-1.2S85.6,43,85.2,42.9z"/> - <path fill-rule="evenodd" d="M-237.5,84.9l-3.3-3.3c0.5-0.9,0.9-1.9,0.9-2.9c0-3-2.4-5.5-5.5-5.5 c-3,0-5.5,2.4-5.5,5.5c0,3,2.4,5.5,5.5,5.5c1.1,0,2.1-0.3,3-0.9l3.3,3.3c0.4,0.4,1,0.4,1.4,0l0.2-0.2 C-237.1,85.9-237.1,85.3-237.5,84.9z M-245.4,82c-1.8,0-3.3-1.5-3.3-3.4c0-1.9,1.5-3.4,3.3-3.4c1.8,0,3.3,1.5,3.3,3.4 C-242,80.5-243.5,82-245.4,82z"/> - <path fill-rule="evenodd" d="M-214.5,86.3l0.2,0.2c0.4,0.4,1,0.4,1.4,0l3.3-3.3c0.9,0.6,1.9,0.9,3,0.9 c3,0,5.5-2.4,5.5-5.5c0-3-2.4-5.5-5.5-5.5c-3,0-5.5,2.4-5.5,5.5c0,1.1,0.3,2.1,0.9,2.9l-3.3,3.3 C-214.9,85.3-214.9,85.9-214.5,86.3z M-210,78.6c0-1.9,1.5-3.4,3.3-3.4c1.8,0,3.3,1.5,3.3,3.4c0,1.9-1.5,3.4-3.3,3.4 C-208.5,82-210,80.5-210,78.6z"/> - <path fill-rule="evenodd" fill="#231f20" d="M-165,77.5h-1v-2c0-0.6-0.4-1-1-1v-1c0-0.6-0.4-1-1-1h-8 c-0.6,0-1,0.4-1,1v1c-0.6,0-1,0.4-1,1v2h-1c-0.6,0-1,0.4-1,1v5c0,0.6,0.4,1,1,1h2v-1h0.5l-1.5,3h12l-1.5-3h0.5v1h2c0.6,0,1-0.4,1-1 v-5C-164,77.9-164.4,77.5-165,77.5z M-176.5,80.5h-1c-0.3,0-0.5-0.2-0.5-0.5c0-0.3,0.2-0.5,0.5-0.5h1c0.3,0,0.5,0.2,0.5,0.5 C-176,80.2-176.2,80.5-176.5,80.5z M-176,85.5l0.9-2h6.2l0.9,2H-176z M-168,77.5c0,0.6-0.4,1-1,1h-6c-0.6,0-1-0.4-1-1v-3 c0-0.6,0.4-1,1-1h6c0.6,0,1,0.4,1,1V77.5z"/> - <path fill="#231f20" d="M-135,73l1.9,1.9l-2.6,2.6c-0.5,0.5-0.5,1.4,0.1,2c0.6,0.6,1.5,0.6,2,0.1l2.6-2.6l1.9,1.9v-6H-135z M-138.5,80.4l-2.6,2.6L-143,81v6h6l-1.9-1.9l2.6-2.6c0.5-0.5,0.5-1.4-0.1-2C-137.1,79.9-138,79.9-138.5,80.4z"/> - <path fill-rule="evenodd" fill="#231f20" d="M-93.5,73.5c-0.6-0.6-1.5-0.6-2-0.1l-2.6,2.6L-100,74v6h6 l-1.9-1.9l2.6-2.6C-92.9,75-92.9,74.1-93.5,73.5z M-104.1,81.9l-2.6,2.6c-0.5,0.5-0.5,1.4,0.1,2c0.6,0.6,1.5,0.6,2,0.1l2.6-2.6 l1.9,1.9v-6h-6L-104.1,81.9z"/> - <path fill-rule="evenodd" fill="#231f20" d="M14.6,75.1l-2.3,2.3c-0.5,0.5-1.3,0.5-1.7,0 c-0.5-0.5-0.5-1.2,0-1.7l2.4-2.3c-0.6-0.3-1.2-0.5-1.9-0.5C8.8,72.9,7,74.7,7,77c0,0.5,0.1,1.1,0.3,1.5l-5.9,5.8 c-0.6,0.6-0.6,1.7,0,2.3c0.6,0.6,1.7,0.6,2.3,0l6-5.9c0.4,0.2,0.9,0.3,1.4,0.3c2.2,0,4.1-1.8,4.1-4.1 C15.1,76.3,14.9,75.7,14.6,75.1z M2.5,86.4c-0.5,0-0.9-0.4-0.9-0.9c0-0.5,0.4-0.9,0.9-0.9c0.5,0,0.9,0.4,0.9,0.9 C3.4,86,3,86.4,2.5,86.4z"/> - <path fill="#231f20" d="M-22.7,83.9l-1.1-1.1c0.2-0.3,0.3-0.6,0.5-0.9c0.1-0.3,0.2-0.6,0.3-0.9l1.6,0c0.3,0,0.5-0.2,0.5-0.5l0-1 c0-0.3-0.2-0.5-0.5-0.5l-1.6,0c-0.1-0.6-0.4-1.2-0.7-1.8l1.1-1.1c0.2-0.2,0.2-0.5,0-0.7l-0.7-0.7c-0.2-0.2-0.5-0.2-0.7,0l-1.1,1.1 c-0.3-0.2-0.6-0.3-0.9-0.5c-0.3-0.1-0.6-0.2-0.9-0.3l0-1.6c0-0.3-0.2-0.5-0.5-0.5l-1,0c-0.3,0-0.5,0.2-0.5,0.5l0,1.6 c-0.6,0.1-1.2,0.4-1.8,0.7l-1.1-1.1c-0.2-0.2-0.5-0.2-0.7,0l-0.7,0.7c-0.2,0.2-0.2,0.5,0,0.7l1.1,1.1c-0.2,0.3-0.3,0.6-0.5,0.9 c-0.1,0.3-0.2,0.6-0.3,0.9l-1.6,0c-0.3,0-0.5,0.2-0.5,0.5l0,1c0,0.3,0.2,0.5,0.5,0.5l1.6,0c0.1,0.6,0.4,1.2,0.7,1.8l-1.1,1.1 c-0.2,0.2-0.2,0.5,0,0.7l0.7,0.7c0.2,0.2,0.5,0.2,0.7,0l1.1-1.1c0.3,0.2,0.6,0.3,0.9,0.5c0.3,0.1,0.6,0.2,0.9,0.3l0,1.6 c0,0.3,0.2,0.5,0.5,0.5l1,0c0.3,0,0.5-0.2,0.5-0.5l0-1.6c0.6-0.1,1.2-0.4,1.8-0.7l1.1,1.1c0.2,0.2,0.5,0.2,0.7,0l0.7-0.7 C-22.5,84.4-22.5,84.1-22.7,83.9z M-28.8,82.1c-1.2-0.5-1.7-1.8-1.3-3c0.5-1.2,1.8-1.7,3-1.3c1.2,0.5,1.7,1.8,1.3,3 C-26.4,82-27.7,82.6-28.8,82.1z"/> - <path fill-rule="evenodd" fill="#231f20" d="M-62,77h-4c-0.6,0-1,0.4-1,1v4c0,0.6,0.4,1,1,1h4 c0.6,0,1-0.4,1-1v-4C-61,77.4-61.4,77-62,77z M-62,81c0,0.6-0.4,1-1,1h-2c-0.6,0-1-0.4-1-1v-1c0-0.6,0.4-1,1-1h2c0.6,0,1,0.4,1,1 V81z M-64,87l3-3h-6L-64,87z M-67,76h6l-3-3L-67,76z M-60,76.9v6l3-3L-60,76.9z M-68,82.9v-6l-3,3L-68,82.9z"/> - <path fill-rule="evenodd" d="M37.5,76.5h13c0.8,0,1.5-0.7,1.5-1.5c0-0.8-0.7-1.5-1.5-1.5h-13 c-0.8,0-1.5,0.7-1.5,1.5C36,75.8,36.7,76.5,37.5,76.5z M50.5,78.5h-13c-0.8,0-1.5,0.7-1.5,1.5c0,0.8,0.7,1.5,1.5,1.5h13 c0.8,0,1.5-0.7,1.5-1.5C52,79.2,51.3,78.5,50.5,78.5z M50.5,83.5h-13c-0.8,0-1.5,0.7-1.5,1.5c0,0.8,0.7,1.5,1.5,1.5h13 c0.8,0,1.5-0.7,1.5-1.5C52,84.2,51.3,83.5,50.5,83.5z"/> - <path fill-rule="evenodd" fill="#231f20" d="M85.6,87c-0.8,0-1.5-0.2-2.3-1.3c-0.8-1.1-1.7-2.5-1.7-2.5 s-0.7-0.9-1.1-1.6c-0.4-0.7-1.1-0.5-1.1-0.5s-2.8-4.6-3.3-5.4c-0.7-1,0.6-2.7,0.6-2.7l4.4,7c0,0,1.3,1.9,1.9,2.3 c0.5,0.4,1.4-0.4,2.8,0.9C87.7,85,87.1,87,85.6,87z M85.4,84.1c-0.9-1-1.7-0.9-1.9-0.6c-0.2,0.3,0,1.2,0.4,1.7 c0.4,0.5,0.8,0.7,1.4,0.7C85.9,86,86.4,85.2,85.4,84.1z M81.6,79.4l-1.2-1.8l2.9-4.6c0,0,1.2,1.7,0.6,2.7 C83.6,76.1,82.5,78,81.6,79.4z M77,82.3c0.3-0.3,1-1.1,1.4-1.7l0.8,1.2c-0.4,0.6-0.9,1.4-0.9,1.4s-0.9,1.4-1.7,2.5 c-0.8,1.1-1.5,1.3-2.3,1.3c-1.4,0-2.1-2-0.1-3.8C75.6,82,76.5,82.7,77,82.3z M74.6,84.1c-0.9,1-0.4,1.8,0.2,1.8c0.6,0,1-0.2,1.4-0.7 c0.4-0.5,0.6-1.5,0.4-1.7C76.3,83.2,75.5,83.1,74.6,84.1z"/> - <path fill-rule="evenodd" fill="#231f20" d="M-243,111c0-0.1-2-2-2-2c-1.7,0-5,0-5,0c-0.6,0-1,0.4-1,1v8 c0,0.6,0.4,1,1,1h4v-6.1c0-0.3,0.2-0.5,0.5-0.5h2.5V111z M-246,112v-2l2,2H-246z M-239,113c-1.7,0-5,0-5,0c-0.6,0-1,0.4-1,1v8 c0,0.6,0.4,1,1,1h6c0.6,0,1-0.4,1-1c0,0,0-4.8,0-7C-237,115-239,113-239,113z M-240,116v-2l2,2H-240z"/> - <path fill="#231f20" d="M-204.5,111h-1.3l0,0c0,0-0.2-2-2.2-2c-2,0-2.2,2-2.2,2l0,0h-1.3c-0.8,0-1.5,0.7-1.5,1.5v9 c0,0.8,0.7,1.5,1.5,1.5h7c0.8,0,1.5-0.7,1.5-1.5v-9C-203,111.7-203.7,111-204.5,111z M-210.7,112.1l0.8-0.4l0.4-0.2l0-0.4 c0-0.2,0.2-1.3,1.5-1.3c1.2,0,1.4,1.1,1.5,1.3l0,0.4l0.4,0.2l0.8,0.4l0.3,0.7h-6.1L-210.7,112.1z M-210.1,120.4l-2.8-4.9l3.3-1.9 h4.3l1.8,3.1L-210.1,120.4z"/> - <path fill-rule="evenodd" fill="#231f20" d="M-177,115h10v2h-10V115z"/> - <polygon fill="#231f20" points="-131,115 -135,115 -135,111 -137,111 -137,115 -141,115 -141,117 -137,117 -137,121 -135,121 -135,117 -131,117 "/> - <path fill="#231f20" d="M-94,111.7l-3,2.7v-2c0-0.8-0.6-1.4-1.3-1.4h-7.4c-0.7,0-1.3,0.6-1.3,1.4v7.2c0,0.8,0.6,1.4,1.3,1.4h7.4 c0.7,0,1.3-0.6,1.3-1.4v-2.1l3,2.7c0.3,0.3,0.6,0.4,1,0.3v-9.1C-93.3,111.4-93.7,111.5-94,111.7z"/> - <path fill-rule="evenodd" fill="#231f20" d="M-61.9,112h-3l3.8,4l-3.8,4h3.1l3.8-4L-61.9,112z M-66.9,112h-3 l3.8,4l-3.8,4h3.1l3.8-4L-66.9,112z"/> - <path fill-rule="evenodd" fill="#231f20" d="M-23,111.5h-2l-3-3l-3,3h-2c-1.1,0-2,0.9-2,2v8c0,1.1,0.9,2,2,2 h10c1.1,0,2-0.9,2-2v-8C-21,112.4-21.9,111.5-23,111.5z M-32,121.5c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S-31.4,121.5-32,121.5z M-32,118.5c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1S-31.4,118.5-32,118.5z M-32,115.5c-0.6,0-1-0.4-1-1s0.4-1,1-1s1,0.4,1,1 S-31.4,115.5-32,115.5z M-23,121.5h-7v-2h7V121.5z M-23,118.5h-7v-2h7V118.5z M-23,115.5h-7v-2h7V115.5z"/> - <path fill-rule="evenodd" fill="#231f20" d="M2,115h7c0.6,0,1-0.4,1-1v-4c0-0.6-0.4-1-1-1H2c-0.6,0-1,0.4-1,1 v4C1,114.6,1.4,115,2,115z M14,109h-2c-0.6,0-1,0.4-1,1v4c0,0.6,0.4,1,1,1h2c0.6,0,1-0.4,1-1v-4C15,109.4,14.6,109,14,109z M14,116H8c-0.6,0-1,0.4-1,1v5c0,0.6,0.4,1,1,1h6c0.6,0,1-0.4,1-1v-5C15,116.4,14.6,116,14,116z M5,116H2c-0.6,0-1,0.4-1,1v5 c0,0.6,0.4,1,1,1h3c0.6,0,1-0.4,1-1v-5C6,116.4,5.6,116,5,116z"/> - <path fill-rule="evenodd" fill="#231f20" d="M45.8,116c0,0-0.6,0.8-1.8,0.8c-1.2,0-1.8-0.8-1.8-0.8l-6-5.1 c0.3-0.5,0.9-0.9,1.6-0.9h12.4c0.7,0,1.3,0.4,1.6,0.9L45.8,116z M42.2,117.7c0,0,0.6,0.8,1.8,0.8c1.2,0,1.8-0.8,1.8-0.8l6.2-5.4v8 c0,0.9-0.8,1.7-1.8,1.7H37.8c-1,0-1.8-0.8-1.8-1.7v-8L42.2,117.7z"/> - <path fill-rule="evenodd" fill="#231f20" d="M-237.5,145h-13c-0.8,0-1.5,0.7-1.5,1.5v11 c0,0.8,0.7,1.5,1.5,1.5h13c0.8,0,1.5-0.7,1.5-1.5v-11C-236,145.7-236.7,145-237.5,145z M-245.5,146c0.3,0,0.5,0.2,0.5,0.5 c0,0.3-0.2,0.5-0.5,0.5c-0.3,0-0.5-0.2-0.5-0.5C-246,146.2-245.8,146-245.5,146z M-247.6,146c0.3,0,0.5,0.2,0.5,0.5 c0,0.3-0.2,0.5-0.5,0.5s-0.5-0.2-0.5-0.5C-248.1,146.2-247.8,146-247.6,146z M-249.5,146c0.3,0,0.5,0.2,0.5,0.5 c0,0.3-0.2,0.5-0.5,0.5s-0.5-0.2-0.5-0.5C-250,146.2-249.8,146-249.5,146z M-250,156v-6c0-0.6,0.4-1,1-1h7v8h-7 C-249.6,157-250,156.6-250,156z M-238,156c0,0.6-0.4,1-1,1h-1v-8h1c0.6,0,1,0.4,1,1V156z"/> - <path fill-rule="evenodd" fill="#231f20" d="M-213.2,156c-1.3-1.2-2.2-2.8-2.2-4.6c0-3.6,3.3-6.5,7.4-6.5 c4.1,0,7.4,2.9,7.4,6.5c0,3.6-3.3,6.5-7.4,6.5c-0.8,0-1.6-0.1-2.4-0.3c-1.8,0.7-4.3,1.7-4.5,1.4C-213.9,157.9-213.5,156.8-213.2,156 z"/> + <path fill="#c0c0c0" d="M8,0C7.7,0,7.4,0.2,7.2,0.7l-2,4.1L0.9,5.5c-1,0.2-1.2,0.9-0.5,1.6l3.1,3.3l-0.7,4.6C2.7,15.6,3,16,3.4,16c0.2,0,0.4-0.1,0.6-0.2L8,13.7l3.9,2.1c0.2,0.1,0.5,0.2,0.6,0.2c0.5,0,0.8-0.4,0.7-1.1l-0.7-4.6l3.1-3.3c0.7-0.7,0.4-1.4-0.5-1.6l-4.3-0.7l-2-4.1C8.6,0.2,8.3,0,8,0L8,0z"/> </svg> diff --git a/arc-firefox-theme/chrome/browser/info.svg b/arc-firefox-theme/chrome/browser/info.svg index f004119..9ff38dd 100644 --- a/arc-firefox-theme/chrome/browser/info.svg +++ b/arc-firefox-theme/chrome/browser/info.svg @@ -2,7 +2,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 version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> +<svg 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" /> diff --git a/arc-firefox-theme/chrome/browser/newtab/newTab.css b/arc-firefox-theme/chrome/browser/newtab/newTab.css index 4073cd9..16a21d3 100644 --- a/arc-firefox-theme/chrome/browser/newtab/newTab.css +++ b/arc-firefox-theme/chrome/browser/newtab/newTab.css @@ -119,7 +119,7 @@ .newtab-cell:not([ignorehover]) .newtab-link:hover, .newtab-site[dragged] { border: 2px solid white; - box-shadow: 0 0 6px 2px #4cb1ff; + box-shadow: 0 0 6px 1px #add6ff; margin: -2px; } @@ -171,7 +171,10 @@ } .newtab-site:hover .newtab-title { - color: #222; + color: white; + background-color: #333; + border: 1px solid #333; + border-top: 1px solid white; } .newtab-site[pinned] .newtab-title { diff --git a/arc-firefox-theme/chrome/browser/notification-pluginAlert@2x.png b/arc-firefox-theme/chrome/browser/notification-pluginAlert@2x.png Binary files differnew file mode 100644 index 0000000..f335996 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/notification-pluginAlert@2x.png diff --git a/arc-firefox-theme/chrome/browser/notification-pluginBlocked@2x.png b/arc-firefox-theme/chrome/browser/notification-pluginBlocked@2x.png Binary files differnew file mode 100644 index 0000000..5126be0 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/notification-pluginBlocked@2x.png diff --git a/arc-firefox-theme/chrome/browser/notification-pluginNormal@2x.png b/arc-firefox-theme/chrome/browser/notification-pluginNormal@2x.png Binary files differnew file mode 100644 index 0000000..c081bbb --- /dev/null +++ b/arc-firefox-theme/chrome/browser/notification-pluginNormal@2x.png diff --git a/arc-firefox-theme/chrome/browser/places/autocomplete-star.png b/arc-firefox-theme/chrome/browser/places/autocomplete-star.png Binary files differnew file mode 100644 index 0000000..2675f93 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/places/autocomplete-star.png diff --git a/arc-firefox-theme/chrome/browser/places/star-icons.png b/arc-firefox-theme/chrome/browser/places/star-icons.png Binary files differdeleted file mode 100644 index fd4e0cd..0000000 --- a/arc-firefox-theme/chrome/browser/places/star-icons.png +++ /dev/null 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 c83e0eb..30b860f 100644 --- a/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css +++ b/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css @@ -21,6 +21,27 @@ treecol { -moz-user-select: none; } +#engineList treechildren::-moz-tree-image(engineShown, checked), +#blocklistsTree treechildren::-moz-tree-image(selectionCol, checked) { + list-style-image: url("chrome://global/skin/in-content/check.svg#check"); + width: 21px; + height: 21px; +} + +#engineList treechildren::-moz-tree-image(engineShown, checked, selected), +#blocklistsTree treechildren::-moz-tree-image(selectionCol, checked, selected) { + list-style-image: url("chrome://global/skin/in-content/check.svg#check-inverted"); +} + +#engineList treechildren::-moz-tree-row, +#blocklistsTree treechildren::-moz-tree-row { + min-height: 36px; +} + +#selectionCol { + min-width: 26px; +} + /* Category List */ #categories { @@ -414,6 +435,101 @@ description > html|a { -moz-box-align: start; } +#syncStatusMessage { + visibility: collapse; + opacity: 0; + transition: opacity 1s linear; + padding: 14px 8px 14px 14px; + border-radius: 2px; +} + +#syncStatusMessage[message-type] { + visibility: visible; + opacity: 1; +} + +#syncStatusMessage[message-type="verify-success"] { + background-color: #74BF43; +} + +#syncStatusMessage[message-type="verify-error"] { + background-color: #D74345; +} + +#syncStatusMessage[message-type="migration"] { + background-color: #FF9500; +} + +#sync-migration-buttons-deck { + visibility: collapse; +} + +#learnMoreLink { + margin: 0; + color: #FBFBFB; + text-decoration: underline; +} + +#syncStatusMessage[message-type="migration"] #sync-migration-buttons-deck { + visibility: visible; +} + +#sync-migration-buttons-deck { + margin-top: 20px; +} + +#sync-migration-buttons-deck button { + margin: 0 10px 0 0; + border: 0; + border-radius: 2px; +} + +#sync-migrate-upgrade, +#sync-migrate-resend { + background-color: #0095DD; + color: #FBFBFB; +} + +#sync-migrate-upgrade:hover, +#sync-migrate-resend:hover { + background-color: #008ACB; +} + +#sync-migrate-upgrade:hover:active, +#sync-migrate-resend:hover:active { + background-color: #006B9D; +} + +#syncStatusMessageWrapper { + -moz-box-flex: 1; + padding-right: 5px; +} + +#syncStatusMessageTitle, #syncStatusMessageDescription { + color: #FBFBFB; +} + +#syncStatusMessage[message-type="migration"] #syncStatusMessageTitle { + display: none; +} + +#syncStatusMessageTitle { + font-weight: bold !important; + font-size: 16px; + line-height: 157%; + margin: 0 0 20px; +} + +#syncStatusMessageDescription { + font-size: 14px; + line-height: 158%; + margin: 0 !important; +} + +#syncStatusMessageClose { + margin: 0px; +} + #fxaSyncEngines > vbox:first-child { margin-right: 80px; } @@ -459,7 +575,6 @@ description > html|a { } #signedOutAccountBoxTitle { - margin-inline-start: 6px !important; font-weight: bold; } @@ -468,9 +583,19 @@ description > html|a { margin-top: 11px; } +.fxaAccountBoxButtons > * { + -moz-box-flex: 1; +} + .fxaAccountBoxButtons > button { padding-left: 11px; padding-right: 11px; + margin: 0; + min-width: 0; +} + +.fxaAccountBoxButtons > button:first-child { + margin-right: 14px !important; } .fxaSyncIllustration { diff --git a/arc-firefox-theme/chrome/browser/preferences/in-content/search.css b/arc-firefox-theme/chrome/browser/preferences/in-content/search.css index a203a4d..db9fd3a 100644 --- a/arc-firefox-theme/chrome/browser/preferences/in-content/search.css +++ b/arc-firefox-theme/chrome/browser/preferences/in-content/search.css @@ -19,16 +19,6 @@ margin: .5em 0; } -#engineList treechildren::-moz-tree-image(engineShown, checked) { - list-style-image: url("chrome://global/skin/in-content/check.svg#check"); - width: 21px; - height: 21px; -} - -#engineList treechildren::-moz-tree-image(engineShown, checked, selected) { - list-style-image: url("chrome://global/skin/in-content/check.svg#check-inverted"); -} - #engineList treechildren::-moz-tree-image(engineName) { -moz-margin-end: 10px; -moz-margin-start: 1px; @@ -36,10 +26,6 @@ height: 16px; } -#engineList treechildren::-moz-tree-row { - min-height: 36px; -} - #engineList treechildren::-moz-tree-drop-feedback { background-color: Highlight; width: 10000px; /* 100% doesn't work; 10k is hopefully larger than any window diff --git a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss index dfb78a4..fd0d813 100644 --- a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss +++ b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss @@ -63,6 +63,10 @@ $darker_asset_path_2: if($darker=='true', 'dark', $asset_path); background-color: $borders_color; } +#navigator-toolbox:-moz-lwtheme::after { + background-color: rgba(0,0,0,.3); +} + #navigator-toolbox > toolbar:not(:-moz-lwtheme):not(#toolbar-menubar):not(#TabsToolbar) { -moz-appearance: none; border-style: none; @@ -149,7 +153,7 @@ toolbarbutton.bookmark-item:not(.subviewbutton):not(:hover):not(:active):not([op // -moz-padding-end: 2px; //} -.bookmark-item:not(#home-button) > .toolbarbutton-icon, +.bookmark-item > .toolbarbutton-icon, #personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon { width: 16px; height: 16px; @@ -354,7 +358,7 @@ menuitem.bookmark-item { } /* Stock icons for the menu bar items */ -menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip):not([endimage]) { +menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); } @@ -1084,7 +1088,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #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), +#nav-bar #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; } @@ -1734,6 +1738,11 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { .urlbar-history-dropmarker { -moz-appearance: toolbarbutton-dropdown; + transition: opacity 0.15s ease; +} + +#urlbar:not(:hover) > .urlbar-textbox-container > .urlbar-history-dropmarker { + opacity: 0; } #urlbar-container { @@ -1853,7 +1862,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button { -moz-appearance: none; - -moz-user-focus: ignore; min-width: 80px; border-radius: 3px; padding: 4px 16px; @@ -2149,11 +2157,20 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box // padding-left: 7px; //} +/* This changes the direction of the main notification box on the url bar. */ #notification-popup-box:-moz-locale-dir(rtl), +/* This adds a second flip for the notification anchors, as they don't switch direction + for RTL mode. */ .notification-anchor-icon:-moz-locale-dir(rtl) { transform: scaleX(-1); } +/* For the anchor icons in the chat window, we don't have the notification popup box, + so we need to cancel the RTL transform. */ +.notification-anchor-icon.chat-toolbarbutton:-moz-locale-dir(rtl) { + transform: none; +} + .notification-anchor-icon { list-style-image: url(moz-icon://stock/gtk-dialog-info?size=16); width: 16px; @@ -2593,8 +2610,7 @@ notification[value="loop-sharing-notification"] .messageImage { .ac-result-type-bookmark, .autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/star-icons.png"); - -moz-image-region: rect(0px 32px 16px 16px); + list-style-image: url("chrome://browser/skin/places/autocomplete-star.png"); width: 16px; height: 16px; } @@ -3672,6 +3688,14 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- box-shadow: inset -5px 0 ThreeDShadow; } +.alltabs-endimage[muted] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted); +} + +.alltabs-endimage[soundplaying] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); +} + /* Sidebar */ #sidebar-throbber[loading="true"] { list-style-image: url("chrome://global/skin/icons/loading_16.png"); @@ -3753,15 +3777,13 @@ toolbarbutton.chevron > .toolbarbutton-icon { margin-top: 1em; } -#sync-error-panel-title, #sync-start-panel-title { font-size: 120%; font-weight: bold; margin-bottom: 5px; } -#sync-start-panel-subtitle, -#sync-error-panel-subtitle { +#sync-start-panel-subtitle { margin: 0; } @@ -3791,23 +3813,52 @@ toolbarbutton.chevron > .toolbarbutton-icon { margin-left: 1em; } -#full-screen-warning-message { - background-image: url("chrome://browser/skin/fullscreen-darknoise.png"); - color: white; - border-radius: 4px; - margin-top: 30px; - padding: 30px 50px; - box-shadow: 0 0 2px white; + +html|*#fullscreen-warning { + align-items: center; + background: rgba(45, 62, 72, 0.9); + border: 2px solid #fafafa; + box-shadow: 0px 0px 5px 2px rgba(0, 0, 0, 0.5); + border-radius: 8px; + padding: 24px 16px; + font: message-box; +} + +html|*#fullscreen-warning::before { + margin: 0; + width: 24px; height: 24px; } -.full-screen-description { - font-size: 150%; +html|*#fullscreen-warning.verifiedIdentity::before, +html|*#fullscreen-warning.verifiedDomain::before { + content: url("chrome://browser/skin/fullscreen/secure.svg"); } -#full-screen-domain-text { - font-size: 300%; +html|*#fullscreen-warning.unknownIdentity::before { + content: url("chrome://browser/skin/fullscreen/insecure.svg"); } +html|*#fullscreen-domain-text, +html|*#fullscreen-generic-text { + font-size: 21px; + font-weight: lighter; + color: #fafafa; + margin: 0 16px; +} + +html|*#fullscreen-domain { + font-weight: bold; + margin: 0; +} + +html|*#fullscreen-exit-button { + padding: 5px 30px; + font: message-box; + font-size: 14px; + font-weight: lighter; + margin: 0; + box-sizing: content-box; +} /* Responsive Mode */ @@ -3960,7 +4011,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate.png"); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-close { list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); } @@ -3979,7 +4030,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { -moz-image-region: rect(0px,32px,16px,16px); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-touch { list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch@2x.png"); -moz-image-region: rect(0px,32px,32px,0px); @@ -3994,7 +4045,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot.png"); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-screenshot { list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot@2x.png"); } @@ -4069,12 +4120,14 @@ toolbarbutton.chevron > .toolbarbutton-icon { } .devtools-responsiveui-home-button { + -moz-user-focus: ignore; width: 40px; height: 30px; list-style-image: url("chrome://browser/skin/devtools/responsiveui-home.png"); } .devtools-responsiveui-sleep-button { + -moz-user-focus: ignore; -moz-appearance: none; /* compensate browserStack top padding */ margin-top: -67px; @@ -4102,6 +4155,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-volume-up-button, .devtools-responsiveui-volume-down-button { + -moz-user-focus: ignore; -moz-appearance: none; border: 1px solid red; min-width: 8px; @@ -4126,7 +4180,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { border-bottom-left-radius: 12px; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-resizebarV { background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer@2x.png"); } @@ -4218,7 +4272,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { -moz-image-region: rect(0px, 64px, 16px, 48px); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #developer-toolbar-toolbox-button { list-style-image: url("chrome://browser/skin/devtools/toggle-tools@2x.png"); -moz-image-region: rect(0px, 32px, 32px, 0px); @@ -4247,7 +4301,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { opacity: 0.6; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #developer-toolbar-closebutton { list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); } @@ -4335,7 +4389,7 @@ html|*#gcli-output-frame { background-position: -16px center; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .gclitoolbar-input-node::before { background-image: url("chrome://browser/skin/devtools/commandline-icon@2x.png"); } @@ -4826,14 +4880,6 @@ toolbar[brighttext] #downloads-indicator-counter { background: none; } -.chat-toolbarbutton:hover { - background-color: rgba(255,255,255,.35); -} - -.chat-toolbarbutton:hover:active { - background-color: rgba(255,255,255,.5); -} - .chat-toolbarbutton > .toolbarbutton-text { display: none; } @@ -4847,7 +4893,11 @@ toolbar[brighttext] #downloads-indicator-counter { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close"); } -.chat-close-button:-moz-any(:hover,:hover:active) { +.chat-close-button:hover { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-hover"); +} + +.chat-close-button:hover:active { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-active"); } @@ -4855,7 +4905,11 @@ toolbar[brighttext] #downloads-indicator-counter { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize"); } -.chat-minimize-button:-moz-any(:hover,:hover:active) { +.chat-minimize-button:hover { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-hover"); +} + +.chat-minimize-button:hover:active { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-active"); } @@ -4864,7 +4918,11 @@ toolbar[brighttext] #downloads-indicator-counter { transform: rotate(180deg); } -.chat-swap-button:-moz-any(:hover,:hover:active) { +.chat-swap-button:hover { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-hover"); +} + +.chat-swap-button:hover:active { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-active"); } @@ -4872,22 +4930,46 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button { transform: none; } +.chat-loop-hangup { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#exit-white"); + background-color: #d13f1a; + border: 1px solid #d13f1a; + border-top-right-radius: 4px; + width: 32px; + height: 26px; + margin-top: -6px; + margin-bottom: -5px; + -moz-margin-start: 6px; + -moz-margin-end: -5px; +} + +.chat-toolbarbutton.chat-loop-hangup:-moz-any(:hover,:hover:active) { + background-color: #ef6745; + border-color: #ef6745; +} + .chat-title { - font-weight: bold; - color: black; + color: #666; text-shadow: none; cursor: inherit; } .chat-titlebar { - height: 30px; - min-height: 30px; + height: 26px; + min-height: 26px; width: 100%; margin: 0; - padding: 7px 6px; - border: none; - border-bottom: 1px solid #ccc; + padding: 5px 4px; + border: 1px solid #ebebeb; + border-bottom: 0; + border-top-left-radius: 4px; + border-top-right-radius: 4px; cursor: pointer; + background-color: #ebebeb; +} + +.chat-titlebar[selected] { + background-color: #f0f0f0; } .chat-titlebar > .notification-anchor-icon { @@ -4906,18 +4988,6 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button { background-position: 0 -10px; } -chatbox[dark=true] > .chat-titlebar, -chatbox[dark=true] > .chat-titlebar[selected] { - border-bottom: none; - background-color: #000; - background-image: none; -} - -chatbox[dark=true] > .chat-titlebar > hbox > .chat-title { - font-weight: normal; - color: #c1c1c1; -} - .chat-frame { padding: 0; margin: 0; @@ -4932,6 +5002,10 @@ chatbox[dark=true] > .chat-titlebar > hbox > .chat-title { width: 21px; border: 1px solid #ccc; border-bottom: none; + background-color: #d9d9d9; + background-image: linear-gradient(rgba(255,255,255,.43), transparent); + border-top-left-radius: 3px; + border-top-right-radius: 3px; } @media (min-resolution: 2dppx) { @@ -4940,6 +5014,15 @@ chatbox[dark=true] > .chat-titlebar > hbox > .chat-title { } } +.chatbar-button:hover, +.chatbar-button[open="true"] { + background-color: #f0f0f0; +} + +.chatbar-button[activity]:not([open]) { + background-image: radial-gradient(circle farthest-corner at center 2px, rgb(254,254,255) 3%, rgba(210,235,255,0.9) 12%, rgba(148,205,253,0.6) 30%, rgba(148,205,253,0.2) 70%); +} + .chatbar-button > .toolbarbutton-icon { width: 16px; } @@ -4975,9 +5058,18 @@ chatbar { chatbox { -moz-margin-start: 4px; - background-color: white; - border: 1px solid #ccc; - border-bottom: none; + background-color: transparent; +} + +chatbar > chatbox { + /* Apply the same border-radius as the .chat-titlebar to make the box-shadow + go round nicely. */ + border-top-left-radius: 4px; + border-top-right-radius: 4px; + box-shadow: 0 0 5px rgba(0,0,0,.3); + /* Offset the chatbox the same amount as the box-shadows' spread, to make it + visible. */ + -moz-margin-end: 5px; } window > chatbox { @@ -4985,39 +5077,7 @@ window > chatbox { margin: 0px; border: none; padding: 0px; -} - -.chat-titlebar { - background-color: #d9d9d9; - background-image: linear-gradient(rgba(255,255,255,.3), transparent); -} - -.chat-titlebar[selected] { - background-color: #f0f0f0; -} - -.chatbar-button { - -moz-appearance: none; - background-color: #d9d9d9; - background-image: linear-gradient(rgba(255,255,255,.3), transparent); -} - -.chatbar-button > .toolbarbutton-icon { - -moz-margin-end: 0; -} - -.chatbar-button:hover, -.chatbar-button[open="true"] { - background-color: #f0f0f0; -} - -.chatbar-button[activity] { - background-image: radial-gradient(circle farthest-corner at center 3px, rgb(233,242,252) 3%, rgba(172,206,255,0.75) 40%, rgba(87,151,201,0.5) 80%, transparent); -} - -chatbox { - border-top-left-radius: 2.5px; - border-top-right-radius: 2.5px; + border-radius: 4px; } /* Customization mode */ diff --git a/arc-firefox-theme/chrome/browser/sass/browser-dark.css b/arc-firefox-theme/chrome/browser/sass/browser-dark.css index b559ab2..f636bac 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-dark.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-dark.css @@ -40,6 +40,9 @@ height: 1px; background-color: #2b2e39; } +#navigator-toolbox:-moz-lwtheme::after { + background-color: rgba(0, 0, 0, 0.3); } + #navigator-toolbox > toolbar:not(:-moz-lwtheme):not(#toolbar-menubar):not(#TabsToolbar) { -moz-appearance: none; border-style: none; @@ -105,7 +108,7 @@ toolbarbutton.bookmark-item:not(.subviewbutton), toolbarbutton.bookmark-item:not(.subviewbutton):not(:hover):not(:active):not([open]) { color: inherit; } -.bookmark-item:not(#home-button) > .toolbarbutton-icon, +.bookmark-item > .toolbarbutton-icon, #personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon { width: 16px; height: 16px; } @@ -283,7 +286,7 @@ menuitem.bookmark-item { opacity: 0.7; } /* Stock icons for the menu bar items */ -menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip):not([endimage]) { +menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); } #placesContext_open\:newwindow, @@ -794,7 +797,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #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), +#nav-bar #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; } @@ -1310,7 +1313,11 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { -moz-margin-start: 0; } .urlbar-history-dropmarker { - -moz-appearance: toolbarbutton-dropdown; } + -moz-appearance: toolbarbutton-dropdown; + transition: opacity 0.15s ease; } + +#urlbar:not(:hover) > .urlbar-textbox-container > .urlbar-history-dropmarker { + opacity: 0; } #urlbar-container { -moz-box-align: center; } @@ -1377,7 +1384,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button { -moz-appearance: none; - -moz-user-focus: ignore; min-width: 80px; border-radius: 3px; padding: 4px 16px; @@ -1583,10 +1589,16 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box border-style: solid; border-color: #2b2e39; } +/* This changes the direction of the main notification box on the url bar. */ #notification-popup-box:-moz-locale-dir(rtl), .notification-anchor-icon:-moz-locale-dir(rtl) { transform: scaleX(-1); } +/* For the anchor icons in the chat window, we don't have the notification popup box, + so we need to cancel the RTL transform. */ +.notification-anchor-icon.chat-toolbarbutton:-moz-locale-dir(rtl) { + transform: none; } + .notification-anchor-icon { list-style-image: url(moz-icon://stock/gtk-dialog-info?size=16); width: 16px; @@ -1930,8 +1942,7 @@ notification[value="loop-sharing-notification"] .messageImage { .ac-result-type-bookmark, .autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/star-icons.png"); - -moz-image-region: rect(0px 32px 16px 16px); + list-style-image: url("chrome://browser/skin/places/autocomplete-star.png"); width: 16px; height: 16px; } @@ -2712,6 +2723,12 @@ lwtHeader;*/ /* box-shadow instead of background-color to work around native styling */ box-shadow: inset -5px 0 ThreeDShadow; } +.alltabs-endimage[muted] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted); } + +.alltabs-endimage[soundplaying] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); } + /* Sidebar */ #sidebar-throbber[loading="true"] { list-style-image: url("chrome://global/skin/icons/loading_16.png"); @@ -2775,14 +2792,12 @@ toolbarbutton.chevron > .toolbarbutton-icon { .sync-panel-button-box { margin-top: 1em; } -#sync-error-panel-title, #sync-start-panel-title { font-size: 120%; font-weight: bold; margin-bottom: 5px; } -#sync-start-panel-subtitle, -#sync-error-panel-subtitle { +#sync-start-panel-subtitle { margin: 0; } /* Status panel */ @@ -2807,19 +2822,45 @@ toolbarbutton.chevron > .toolbarbutton-icon { border-top-left-radius: .3em; margin-left: 1em; } -#full-screen-warning-message { - background-image: url("chrome://browser/skin/fullscreen-darknoise.png"); - color: white; - border-radius: 4px; - margin-top: 30px; - padding: 30px 50px; - box-shadow: 0 0 2px white; } +html|*#fullscreen-warning { + align-items: center; + background: rgba(45, 62, 72, 0.9); + border: 2px solid #fafafa; + box-shadow: 0px 0px 5px 2px rgba(0, 0, 0, 0.5); + border-radius: 8px; + padding: 24px 16px; + font: message-box; } + +html|*#fullscreen-warning::before { + margin: 0; + width: 24px; + height: 24px; } + +html|*#fullscreen-warning.verifiedIdentity::before, +html|*#fullscreen-warning.verifiedDomain::before { + content: url("chrome://browser/skin/fullscreen/secure.svg"); } -.full-screen-description { - font-size: 150%; } +html|*#fullscreen-warning.unknownIdentity::before { + content: url("chrome://browser/skin/fullscreen/insecure.svg"); } + +html|*#fullscreen-domain-text, +html|*#fullscreen-generic-text { + font-size: 21px; + font-weight: lighter; + color: #fafafa; + margin: 0 16px; } + +html|*#fullscreen-domain { + font-weight: bold; + margin: 0; } -#full-screen-domain-text { - font-size: 300%; } +html|*#fullscreen-exit-button { + padding: 5px 30px; + font: message-box; + font-size: 14px; + font-weight: lighter; + margin: 0; + box-sizing: content-box; } /* Responsive Mode */ .browserContainer[responsivemode] { @@ -2946,7 +2987,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-rotate { list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate.png"); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-close { list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); } @@ -2959,7 +3000,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-touch[checked] { -moz-image-region: rect(0px, 32px, 16px, 16px); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-touch { list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch@2x.png"); -moz-image-region: rect(0px, 32px, 32px, 0px); } @@ -2969,7 +3010,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-screenshot { list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot.png"); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-screenshot { list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot@2x.png"); } } .devtools-responsiveui-resizebarV { @@ -3027,11 +3068,13 @@ toolbarbutton.chevron > .toolbarbutton-icon { background-image: linear-gradient(to right, #111 11%, #333 56%); } .devtools-responsiveui-home-button { + -moz-user-focus: ignore; width: 40px; height: 30px; list-style-image: url("chrome://browser/skin/devtools/responsiveui-home.png"); } .devtools-responsiveui-sleep-button { + -moz-user-focus: ignore; -moz-appearance: none; /* compensate browserStack top padding */ margin-top: -67px; @@ -3053,6 +3096,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-volume-up-button, .devtools-responsiveui-volume-down-button { + -moz-user-focus: ignore; -moz-appearance: none; border: 1px solid red; min-width: 8px; @@ -3071,7 +3115,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-volume-down-button { border-bottom-left-radius: 12px; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-resizebarV { background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer@2x.png"); } @@ -3159,7 +3203,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { #developer-toolbar-toolbox-button[checked=true] { -moz-image-region: rect(0px, 64px, 16px, 48px); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #developer-toolbar-toolbox-button { list-style-image: url("chrome://browser/skin/devtools/toggle-tools@2x.png"); -moz-image-region: rect(0px, 32px, 32px, 0px); } @@ -3181,7 +3225,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { width: 16px; opacity: 0.6; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #developer-toolbar-closebutton { list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); } } #developer-toolbar-closebutton > .toolbarbutton-icon { @@ -3252,7 +3296,7 @@ html|*#gcli-output-frame { .gclitoolbar-input-node[focused="true"]::before { background-position: -16px center; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .gclitoolbar-input-node::before { background-image: url("chrome://browser/skin/devtools/commandline-icon@2x.png"); } } .gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection { @@ -3652,12 +3696,6 @@ toolbar[brighttext] #downloads-indicator-counter { margin: 0; background: none; } -.chat-toolbarbutton:hover { - background-color: rgba(255, 255, 255, 0.35); } - -.chat-toolbarbutton:hover:active { - background-color: rgba(255, 255, 255, 0.5); } - .chat-toolbarbutton > .toolbarbutton-text { display: none; } @@ -3668,40 +3706,70 @@ toolbar[brighttext] #downloads-indicator-counter { .chat-close-button { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close"); } -.chat-close-button:-moz-any(:hover, :hover:active) { +.chat-close-button:hover { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-hover"); } + +.chat-close-button:hover:active { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-active"); } .chat-minimize-button { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize"); } -.chat-minimize-button:-moz-any(:hover, :hover:active) { +.chat-minimize-button:hover { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-hover"); } + +.chat-minimize-button:hover:active { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-active"); } .chat-swap-button { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand"); transform: rotate(180deg); } -.chat-swap-button:-moz-any(:hover, :hover:active) { +.chat-swap-button:hover { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-hover"); } + +.chat-swap-button:hover:active { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-active"); } chatbar > chatbox > .chat-titlebar > .chat-swap-button { transform: none; } +.chat-loop-hangup { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#exit-white"); + background-color: #d13f1a; + border: 1px solid #d13f1a; + border-top-right-radius: 4px; + width: 32px; + height: 26px; + margin-top: -6px; + margin-bottom: -5px; + -moz-margin-start: 6px; + -moz-margin-end: -5px; } + +.chat-toolbarbutton.chat-loop-hangup:-moz-any(:hover, :hover:active) { + background-color: #ef6745; + border-color: #ef6745; } + .chat-title { - font-weight: bold; - color: black; + color: #666; text-shadow: none; cursor: inherit; } .chat-titlebar { - height: 30px; - min-height: 30px; + height: 26px; + min-height: 26px; width: 100%; margin: 0; - padding: 7px 6px; - border: none; - border-bottom: 1px solid #ccc; - cursor: pointer; } + padding: 5px 4px; + border: 1px solid #ebebeb; + border-bottom: 0; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + cursor: pointer; + background-color: #ebebeb; } + +.chat-titlebar[selected] { + background-color: #f0f0f0; } .chat-titlebar > .notification-anchor-icon { margin-left: 2px; @@ -3716,16 +3784,6 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button { background-size: 100% 20px; background-position: 0 -10px; } -chatbox[dark=true] > .chat-titlebar, -chatbox[dark=true] > .chat-titlebar[selected] { - border-bottom: none; - background-color: #000; - background-image: none; } - -chatbox[dark=true] > .chat-titlebar > hbox > .chat-title { - font-weight: normal; - color: #c1c1c1; } - .chat-frame { padding: 0; margin: 0; @@ -3738,11 +3796,22 @@ chatbox[dark=true] > .chat-titlebar > hbox > .chat-title { height: 21px; width: 21px; border: 1px solid #ccc; - border-bottom: none; } + border-bottom: none; + background-color: #d9d9d9; + background-image: linear-gradient(rgba(255, 255, 255, 0.43), transparent); + border-top-left-radius: 3px; + border-top-right-radius: 3px; } @media (min-resolution: 2dppx) { .chatbar-button { list-style-image: url("chrome://browser/skin/social/services-16@2x.png"); } } +.chatbar-button:hover, +.chatbar-button[open="true"] { + background-color: #f0f0f0; } + +.chatbar-button[activity]:not([open]) { + background-image: radial-gradient(circle farthest-corner at center 2px, #fefeff 3%, rgba(210, 235, 255, 0.9) 12%, rgba(148, 205, 253, 0.6) 30%, rgba(148, 205, 253, 0.2) 70%); } + .chatbar-button > .toolbarbutton-icon { width: 16px; } @@ -3771,41 +3840,24 @@ chatbar { chatbox { -moz-margin-start: 4px; - background-color: white; - border: 1px solid #ccc; - border-bottom: none; } + background-color: transparent; } + +chatbar > chatbox { + /* Apply the same border-radius as the .chat-titlebar to make the box-shadow + go round nicely. */ + border-top-left-radius: 4px; + border-top-right-radius: 4px; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); + /* Offset the chatbox the same amount as the box-shadows' spread, to make it + visible. */ + -moz-margin-end: 5px; } window > chatbox { -moz-margin-start: 0px; margin: 0px; border: none; - padding: 0px; } - -.chat-titlebar { - background-color: #d9d9d9; - background-image: linear-gradient(rgba(255, 255, 255, 0.3), transparent); } - -.chat-titlebar[selected] { - background-color: #f0f0f0; } - -.chatbar-button { - -moz-appearance: none; - background-color: #d9d9d9; - background-image: linear-gradient(rgba(255, 255, 255, 0.3), transparent); } - -.chatbar-button > .toolbarbutton-icon { - -moz-margin-end: 0; } - -.chatbar-button:hover, -.chatbar-button[open="true"] { - background-color: #f0f0f0; } - -.chatbar-button[activity] { - background-image: radial-gradient(circle farthest-corner at center 3px, #e9f2fc 3%, rgba(172, 206, 255, 0.75) 40%, rgba(87, 151, 201, 0.5) 80%, transparent); } - -chatbox { - border-top-left-radius: 2.5px; - border-top-right-radius: 2.5px; } + padding: 0px; + border-radius: 4px; } /* Customization mode */ /* This Source Code Form is subject to the terms of the Mozilla Public diff --git a/arc-firefox-theme/chrome/browser/sass/browser-darker.css b/arc-firefox-theme/chrome/browser/sass/browser-darker.css index 1e9220c..84b7369 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-darker.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-darker.css @@ -40,6 +40,9 @@ height: 1px; background-color: #dcdfe3; } +#navigator-toolbox:-moz-lwtheme::after { + background-color: rgba(0, 0, 0, 0.3); } + #navigator-toolbox > toolbar:not(:-moz-lwtheme):not(#toolbar-menubar):not(#TabsToolbar) { -moz-appearance: none; border-style: none; @@ -105,7 +108,7 @@ toolbarbutton.bookmark-item:not(.subviewbutton), toolbarbutton.bookmark-item:not(.subviewbutton):not(:hover):not(:active):not([open]) { color: inherit; } -.bookmark-item:not(#home-button) > .toolbarbutton-icon, +.bookmark-item > .toolbarbutton-icon, #personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon { width: 16px; height: 16px; } @@ -283,7 +286,7 @@ menuitem.bookmark-item { opacity: 0.7; } /* Stock icons for the menu bar items */ -menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip):not([endimage]) { +menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); } #placesContext_open\:newwindow, @@ -794,7 +797,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #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), +#nav-bar #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; } @@ -1309,7 +1312,11 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { -moz-margin-start: 0; } .urlbar-history-dropmarker { - -moz-appearance: toolbarbutton-dropdown; } + -moz-appearance: toolbarbutton-dropdown; + transition: opacity 0.15s ease; } + +#urlbar:not(:hover) > .urlbar-textbox-container > .urlbar-history-dropmarker { + opacity: 0; } #urlbar-container { -moz-box-align: center; } @@ -1376,7 +1383,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button { -moz-appearance: none; - -moz-user-focus: ignore; min-width: 80px; border-radius: 3px; padding: 4px 16px; @@ -1582,10 +1588,16 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box border-style: solid; border-color: #dcdfe3; } +/* This changes the direction of the main notification box on the url bar. */ #notification-popup-box:-moz-locale-dir(rtl), .notification-anchor-icon:-moz-locale-dir(rtl) { transform: scaleX(-1); } +/* For the anchor icons in the chat window, we don't have the notification popup box, + so we need to cancel the RTL transform. */ +.notification-anchor-icon.chat-toolbarbutton:-moz-locale-dir(rtl) { + transform: none; } + .notification-anchor-icon { list-style-image: url(moz-icon://stock/gtk-dialog-info?size=16); width: 16px; @@ -1929,8 +1941,7 @@ notification[value="loop-sharing-notification"] .messageImage { .ac-result-type-bookmark, .autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/star-icons.png"); - -moz-image-region: rect(0px 32px 16px 16px); + list-style-image: url("chrome://browser/skin/places/autocomplete-star.png"); width: 16px; height: 16px; } @@ -2712,6 +2723,12 @@ lwtHeader;*/ /* box-shadow instead of background-color to work around native styling */ box-shadow: inset -5px 0 ThreeDShadow; } +.alltabs-endimage[muted] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted); } + +.alltabs-endimage[soundplaying] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); } + /* Sidebar */ #sidebar-throbber[loading="true"] { list-style-image: url("chrome://global/skin/icons/loading_16.png"); @@ -2775,14 +2792,12 @@ toolbarbutton.chevron > .toolbarbutton-icon { .sync-panel-button-box { margin-top: 1em; } -#sync-error-panel-title, #sync-start-panel-title { font-size: 120%; font-weight: bold; margin-bottom: 5px; } -#sync-start-panel-subtitle, -#sync-error-panel-subtitle { +#sync-start-panel-subtitle { margin: 0; } /* Status panel */ @@ -2807,19 +2822,45 @@ toolbarbutton.chevron > .toolbarbutton-icon { border-top-left-radius: .3em; margin-left: 1em; } -#full-screen-warning-message { - background-image: url("chrome://browser/skin/fullscreen-darknoise.png"); - color: white; - border-radius: 4px; - margin-top: 30px; - padding: 30px 50px; - box-shadow: 0 0 2px white; } +html|*#fullscreen-warning { + align-items: center; + background: rgba(45, 62, 72, 0.9); + border: 2px solid #fafafa; + box-shadow: 0px 0px 5px 2px rgba(0, 0, 0, 0.5); + border-radius: 8px; + padding: 24px 16px; + font: message-box; } + +html|*#fullscreen-warning::before { + margin: 0; + width: 24px; + height: 24px; } + +html|*#fullscreen-warning.verifiedIdentity::before, +html|*#fullscreen-warning.verifiedDomain::before { + content: url("chrome://browser/skin/fullscreen/secure.svg"); } -.full-screen-description { - font-size: 150%; } +html|*#fullscreen-warning.unknownIdentity::before { + content: url("chrome://browser/skin/fullscreen/insecure.svg"); } + +html|*#fullscreen-domain-text, +html|*#fullscreen-generic-text { + font-size: 21px; + font-weight: lighter; + color: #fafafa; + margin: 0 16px; } + +html|*#fullscreen-domain { + font-weight: bold; + margin: 0; } -#full-screen-domain-text { - font-size: 300%; } +html|*#fullscreen-exit-button { + padding: 5px 30px; + font: message-box; + font-size: 14px; + font-weight: lighter; + margin: 0; + box-sizing: content-box; } /* Responsive Mode */ .browserContainer[responsivemode] { @@ -2946,7 +2987,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-rotate { list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate.png"); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-close { list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); } @@ -2959,7 +3000,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-touch[checked] { -moz-image-region: rect(0px, 32px, 16px, 16px); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-touch { list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch@2x.png"); -moz-image-region: rect(0px, 32px, 32px, 0px); } @@ -2969,7 +3010,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-screenshot { list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot.png"); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-screenshot { list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot@2x.png"); } } .devtools-responsiveui-resizebarV { @@ -3027,11 +3068,13 @@ toolbarbutton.chevron > .toolbarbutton-icon { background-image: linear-gradient(to right, #111 11%, #333 56%); } .devtools-responsiveui-home-button { + -moz-user-focus: ignore; width: 40px; height: 30px; list-style-image: url("chrome://browser/skin/devtools/responsiveui-home.png"); } .devtools-responsiveui-sleep-button { + -moz-user-focus: ignore; -moz-appearance: none; /* compensate browserStack top padding */ margin-top: -67px; @@ -3053,6 +3096,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-volume-up-button, .devtools-responsiveui-volume-down-button { + -moz-user-focus: ignore; -moz-appearance: none; border: 1px solid red; min-width: 8px; @@ -3071,7 +3115,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-volume-down-button { border-bottom-left-radius: 12px; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-resizebarV { background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer@2x.png"); } @@ -3159,7 +3203,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { #developer-toolbar-toolbox-button[checked=true] { -moz-image-region: rect(0px, 64px, 16px, 48px); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #developer-toolbar-toolbox-button { list-style-image: url("chrome://browser/skin/devtools/toggle-tools@2x.png"); -moz-image-region: rect(0px, 32px, 32px, 0px); } @@ -3181,7 +3225,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { width: 16px; opacity: 0.6; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #developer-toolbar-closebutton { list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); } } #developer-toolbar-closebutton > .toolbarbutton-icon { @@ -3252,7 +3296,7 @@ html|*#gcli-output-frame { .gclitoolbar-input-node[focused="true"]::before { background-position: -16px center; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .gclitoolbar-input-node::before { background-image: url("chrome://browser/skin/devtools/commandline-icon@2x.png"); } } .gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection { @@ -3652,12 +3696,6 @@ toolbar[brighttext] #downloads-indicator-counter { margin: 0; background: none; } -.chat-toolbarbutton:hover { - background-color: rgba(255, 255, 255, 0.35); } - -.chat-toolbarbutton:hover:active { - background-color: rgba(255, 255, 255, 0.5); } - .chat-toolbarbutton > .toolbarbutton-text { display: none; } @@ -3668,40 +3706,70 @@ toolbar[brighttext] #downloads-indicator-counter { .chat-close-button { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close"); } -.chat-close-button:-moz-any(:hover, :hover:active) { +.chat-close-button:hover { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-hover"); } + +.chat-close-button:hover:active { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-active"); } .chat-minimize-button { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize"); } -.chat-minimize-button:-moz-any(:hover, :hover:active) { +.chat-minimize-button:hover { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-hover"); } + +.chat-minimize-button:hover:active { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-active"); } .chat-swap-button { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand"); transform: rotate(180deg); } -.chat-swap-button:-moz-any(:hover, :hover:active) { +.chat-swap-button:hover { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-hover"); } + +.chat-swap-button:hover:active { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-active"); } chatbar > chatbox > .chat-titlebar > .chat-swap-button { transform: none; } +.chat-loop-hangup { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#exit-white"); + background-color: #d13f1a; + border: 1px solid #d13f1a; + border-top-right-radius: 4px; + width: 32px; + height: 26px; + margin-top: -6px; + margin-bottom: -5px; + -moz-margin-start: 6px; + -moz-margin-end: -5px; } + +.chat-toolbarbutton.chat-loop-hangup:-moz-any(:hover, :hover:active) { + background-color: #ef6745; + border-color: #ef6745; } + .chat-title { - font-weight: bold; - color: black; + color: #666; text-shadow: none; cursor: inherit; } .chat-titlebar { - height: 30px; - min-height: 30px; + height: 26px; + min-height: 26px; width: 100%; margin: 0; - padding: 7px 6px; - border: none; - border-bottom: 1px solid #ccc; - cursor: pointer; } + padding: 5px 4px; + border: 1px solid #ebebeb; + border-bottom: 0; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + cursor: pointer; + background-color: #ebebeb; } + +.chat-titlebar[selected] { + background-color: #f0f0f0; } .chat-titlebar > .notification-anchor-icon { margin-left: 2px; @@ -3716,16 +3784,6 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button { background-size: 100% 20px; background-position: 0 -10px; } -chatbox[dark=true] > .chat-titlebar, -chatbox[dark=true] > .chat-titlebar[selected] { - border-bottom: none; - background-color: #000; - background-image: none; } - -chatbox[dark=true] > .chat-titlebar > hbox > .chat-title { - font-weight: normal; - color: #c1c1c1; } - .chat-frame { padding: 0; margin: 0; @@ -3738,11 +3796,22 @@ chatbox[dark=true] > .chat-titlebar > hbox > .chat-title { height: 21px; width: 21px; border: 1px solid #ccc; - border-bottom: none; } + border-bottom: none; + background-color: #d9d9d9; + background-image: linear-gradient(rgba(255, 255, 255, 0.43), transparent); + border-top-left-radius: 3px; + border-top-right-radius: 3px; } @media (min-resolution: 2dppx) { .chatbar-button { list-style-image: url("chrome://browser/skin/social/services-16@2x.png"); } } +.chatbar-button:hover, +.chatbar-button[open="true"] { + background-color: #f0f0f0; } + +.chatbar-button[activity]:not([open]) { + background-image: radial-gradient(circle farthest-corner at center 2px, #fefeff 3%, rgba(210, 235, 255, 0.9) 12%, rgba(148, 205, 253, 0.6) 30%, rgba(148, 205, 253, 0.2) 70%); } + .chatbar-button > .toolbarbutton-icon { width: 16px; } @@ -3771,41 +3840,24 @@ chatbar { chatbox { -moz-margin-start: 4px; - background-color: white; - border: 1px solid #ccc; - border-bottom: none; } + background-color: transparent; } + +chatbar > chatbox { + /* Apply the same border-radius as the .chat-titlebar to make the box-shadow + go round nicely. */ + border-top-left-radius: 4px; + border-top-right-radius: 4px; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); + /* Offset the chatbox the same amount as the box-shadows' spread, to make it + visible. */ + -moz-margin-end: 5px; } window > chatbox { -moz-margin-start: 0px; margin: 0px; border: none; - padding: 0px; } - -.chat-titlebar { - background-color: #d9d9d9; - background-image: linear-gradient(rgba(255, 255, 255, 0.3), transparent); } - -.chat-titlebar[selected] { - background-color: #f0f0f0; } - -.chatbar-button { - -moz-appearance: none; - background-color: #d9d9d9; - background-image: linear-gradient(rgba(255, 255, 255, 0.3), transparent); } - -.chatbar-button > .toolbarbutton-icon { - -moz-margin-end: 0; } - -.chatbar-button:hover, -.chatbar-button[open="true"] { - background-color: #f0f0f0; } - -.chatbar-button[activity] { - background-image: radial-gradient(circle farthest-corner at center 3px, #e9f2fc 3%, rgba(172, 206, 255, 0.75) 40%, rgba(87, 151, 201, 0.5) 80%, transparent); } - -chatbox { - border-top-left-radius: 2.5px; - border-top-right-radius: 2.5px; } + padding: 0px; + border-radius: 4px; } /* Customization mode */ /* This Source Code Form is subject to the terms of the Mozilla Public diff --git a/arc-firefox-theme/chrome/browser/sass/browser-light.css b/arc-firefox-theme/chrome/browser/sass/browser-light.css index f7ed613..3752502 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-light.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-light.css @@ -40,6 +40,9 @@ height: 1px; background-color: #dcdfe3; } +#navigator-toolbox:-moz-lwtheme::after { + background-color: rgba(0, 0, 0, 0.3); } + #navigator-toolbox > toolbar:not(:-moz-lwtheme):not(#toolbar-menubar):not(#TabsToolbar) { -moz-appearance: none; border-style: none; @@ -105,7 +108,7 @@ toolbarbutton.bookmark-item:not(.subviewbutton), toolbarbutton.bookmark-item:not(.subviewbutton):not(:hover):not(:active):not([open]) { color: inherit; } -.bookmark-item:not(#home-button) > .toolbarbutton-icon, +.bookmark-item > .toolbarbutton-icon, #personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon { width: 16px; height: 16px; } @@ -283,7 +286,7 @@ menuitem.bookmark-item { opacity: 0.7; } /* Stock icons for the menu bar items */ -menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip):not([endimage]) { +menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); } #placesContext_open\:newwindow, @@ -794,7 +797,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #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), +#nav-bar #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; } @@ -1309,7 +1312,11 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { -moz-margin-start: 0; } .urlbar-history-dropmarker { - -moz-appearance: toolbarbutton-dropdown; } + -moz-appearance: toolbarbutton-dropdown; + transition: opacity 0.15s ease; } + +#urlbar:not(:hover) > .urlbar-textbox-container > .urlbar-history-dropmarker { + opacity: 0; } #urlbar-container { -moz-box-align: center; } @@ -1376,7 +1383,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button { -moz-appearance: none; - -moz-user-focus: ignore; min-width: 80px; border-radius: 3px; padding: 4px 16px; @@ -1582,10 +1588,16 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box border-style: solid; border-color: #dcdfe3; } +/* This changes the direction of the main notification box on the url bar. */ #notification-popup-box:-moz-locale-dir(rtl), .notification-anchor-icon:-moz-locale-dir(rtl) { transform: scaleX(-1); } +/* For the anchor icons in the chat window, we don't have the notification popup box, + so we need to cancel the RTL transform. */ +.notification-anchor-icon.chat-toolbarbutton:-moz-locale-dir(rtl) { + transform: none; } + .notification-anchor-icon { list-style-image: url(moz-icon://stock/gtk-dialog-info?size=16); width: 16px; @@ -1929,8 +1941,7 @@ notification[value="loop-sharing-notification"] .messageImage { .ac-result-type-bookmark, .autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/star-icons.png"); - -moz-image-region: rect(0px 32px 16px 16px); + list-style-image: url("chrome://browser/skin/places/autocomplete-star.png"); width: 16px; height: 16px; } @@ -2712,6 +2723,12 @@ lwtHeader;*/ /* box-shadow instead of background-color to work around native styling */ box-shadow: inset -5px 0 ThreeDShadow; } +.alltabs-endimage[muted] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted); } + +.alltabs-endimage[soundplaying] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); } + /* Sidebar */ #sidebar-throbber[loading="true"] { list-style-image: url("chrome://global/skin/icons/loading_16.png"); @@ -2775,14 +2792,12 @@ toolbarbutton.chevron > .toolbarbutton-icon { .sync-panel-button-box { margin-top: 1em; } -#sync-error-panel-title, #sync-start-panel-title { font-size: 120%; font-weight: bold; margin-bottom: 5px; } -#sync-start-panel-subtitle, -#sync-error-panel-subtitle { +#sync-start-panel-subtitle { margin: 0; } /* Status panel */ @@ -2807,19 +2822,45 @@ toolbarbutton.chevron > .toolbarbutton-icon { border-top-left-radius: .3em; margin-left: 1em; } -#full-screen-warning-message { - background-image: url("chrome://browser/skin/fullscreen-darknoise.png"); - color: white; - border-radius: 4px; - margin-top: 30px; - padding: 30px 50px; - box-shadow: 0 0 2px white; } +html|*#fullscreen-warning { + align-items: center; + background: rgba(45, 62, 72, 0.9); + border: 2px solid #fafafa; + box-shadow: 0px 0px 5px 2px rgba(0, 0, 0, 0.5); + border-radius: 8px; + padding: 24px 16px; + font: message-box; } + +html|*#fullscreen-warning::before { + margin: 0; + width: 24px; + height: 24px; } + +html|*#fullscreen-warning.verifiedIdentity::before, +html|*#fullscreen-warning.verifiedDomain::before { + content: url("chrome://browser/skin/fullscreen/secure.svg"); } -.full-screen-description { - font-size: 150%; } +html|*#fullscreen-warning.unknownIdentity::before { + content: url("chrome://browser/skin/fullscreen/insecure.svg"); } + +html|*#fullscreen-domain-text, +html|*#fullscreen-generic-text { + font-size: 21px; + font-weight: lighter; + color: #fafafa; + margin: 0 16px; } + +html|*#fullscreen-domain { + font-weight: bold; + margin: 0; } -#full-screen-domain-text { - font-size: 300%; } +html|*#fullscreen-exit-button { + padding: 5px 30px; + font: message-box; + font-size: 14px; + font-weight: lighter; + margin: 0; + box-sizing: content-box; } /* Responsive Mode */ .browserContainer[responsivemode] { @@ -2946,7 +2987,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-rotate { list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate.png"); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-close { list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); } @@ -2959,7 +3000,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-touch[checked] { -moz-image-region: rect(0px, 32px, 16px, 16px); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-touch { list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch@2x.png"); -moz-image-region: rect(0px, 32px, 32px, 0px); } @@ -2969,7 +3010,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-screenshot { list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot.png"); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-screenshot { list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot@2x.png"); } } .devtools-responsiveui-resizebarV { @@ -3027,11 +3068,13 @@ toolbarbutton.chevron > .toolbarbutton-icon { background-image: linear-gradient(to right, #111 11%, #333 56%); } .devtools-responsiveui-home-button { + -moz-user-focus: ignore; width: 40px; height: 30px; list-style-image: url("chrome://browser/skin/devtools/responsiveui-home.png"); } .devtools-responsiveui-sleep-button { + -moz-user-focus: ignore; -moz-appearance: none; /* compensate browserStack top padding */ margin-top: -67px; @@ -3053,6 +3096,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-volume-up-button, .devtools-responsiveui-volume-down-button { + -moz-user-focus: ignore; -moz-appearance: none; border: 1px solid red; min-width: 8px; @@ -3071,7 +3115,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { .devtools-responsiveui-volume-down-button { border-bottom-left-radius: 12px; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .devtools-responsiveui-resizebarV { background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer@2x.png"); } @@ -3159,7 +3203,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { #developer-toolbar-toolbox-button[checked=true] { -moz-image-region: rect(0px, 64px, 16px, 48px); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #developer-toolbar-toolbox-button { list-style-image: url("chrome://browser/skin/devtools/toggle-tools@2x.png"); -moz-image-region: rect(0px, 32px, 32px, 0px); } @@ -3181,7 +3225,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { width: 16px; opacity: 0.6; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #developer-toolbar-closebutton { list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); } } #developer-toolbar-closebutton > .toolbarbutton-icon { @@ -3252,7 +3296,7 @@ html|*#gcli-output-frame { .gclitoolbar-input-node[focused="true"]::before { background-position: -16px center; } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .gclitoolbar-input-node::before { background-image: url("chrome://browser/skin/devtools/commandline-icon@2x.png"); } } .gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection { @@ -3652,12 +3696,6 @@ toolbar[brighttext] #downloads-indicator-counter { margin: 0; background: none; } -.chat-toolbarbutton:hover { - background-color: rgba(255, 255, 255, 0.35); } - -.chat-toolbarbutton:hover:active { - background-color: rgba(255, 255, 255, 0.5); } - .chat-toolbarbutton > .toolbarbutton-text { display: none; } @@ -3668,40 +3706,70 @@ toolbar[brighttext] #downloads-indicator-counter { .chat-close-button { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close"); } -.chat-close-button:-moz-any(:hover, :hover:active) { +.chat-close-button:hover { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-hover"); } + +.chat-close-button:hover:active { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-active"); } .chat-minimize-button { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize"); } -.chat-minimize-button:-moz-any(:hover, :hover:active) { +.chat-minimize-button:hover { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-hover"); } + +.chat-minimize-button:hover:active { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-active"); } .chat-swap-button { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand"); transform: rotate(180deg); } -.chat-swap-button:-moz-any(:hover, :hover:active) { +.chat-swap-button:hover { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-hover"); } + +.chat-swap-button:hover:active { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-active"); } chatbar > chatbox > .chat-titlebar > .chat-swap-button { transform: none; } +.chat-loop-hangup { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#exit-white"); + background-color: #d13f1a; + border: 1px solid #d13f1a; + border-top-right-radius: 4px; + width: 32px; + height: 26px; + margin-top: -6px; + margin-bottom: -5px; + -moz-margin-start: 6px; + -moz-margin-end: -5px; } + +.chat-toolbarbutton.chat-loop-hangup:-moz-any(:hover, :hover:active) { + background-color: #ef6745; + border-color: #ef6745; } + .chat-title { - font-weight: bold; - color: black; + color: #666; text-shadow: none; cursor: inherit; } .chat-titlebar { - height: 30px; - min-height: 30px; + height: 26px; + min-height: 26px; width: 100%; margin: 0; - padding: 7px 6px; - border: none; - border-bottom: 1px solid #ccc; - cursor: pointer; } + padding: 5px 4px; + border: 1px solid #ebebeb; + border-bottom: 0; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + cursor: pointer; + background-color: #ebebeb; } + +.chat-titlebar[selected] { + background-color: #f0f0f0; } .chat-titlebar > .notification-anchor-icon { margin-left: 2px; @@ -3716,16 +3784,6 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button { background-size: 100% 20px; background-position: 0 -10px; } -chatbox[dark=true] > .chat-titlebar, -chatbox[dark=true] > .chat-titlebar[selected] { - border-bottom: none; - background-color: #000; - background-image: none; } - -chatbox[dark=true] > .chat-titlebar > hbox > .chat-title { - font-weight: normal; - color: #c1c1c1; } - .chat-frame { padding: 0; margin: 0; @@ -3738,11 +3796,22 @@ chatbox[dark=true] > .chat-titlebar > hbox > .chat-title { height: 21px; width: 21px; border: 1px solid #ccc; - border-bottom: none; } + border-bottom: none; + background-color: #d9d9d9; + background-image: linear-gradient(rgba(255, 255, 255, 0.43), transparent); + border-top-left-radius: 3px; + border-top-right-radius: 3px; } @media (min-resolution: 2dppx) { .chatbar-button { list-style-image: url("chrome://browser/skin/social/services-16@2x.png"); } } +.chatbar-button:hover, +.chatbar-button[open="true"] { + background-color: #f0f0f0; } + +.chatbar-button[activity]:not([open]) { + background-image: radial-gradient(circle farthest-corner at center 2px, #fefeff 3%, rgba(210, 235, 255, 0.9) 12%, rgba(148, 205, 253, 0.6) 30%, rgba(148, 205, 253, 0.2) 70%); } + .chatbar-button > .toolbarbutton-icon { width: 16px; } @@ -3771,41 +3840,24 @@ chatbar { chatbox { -moz-margin-start: 4px; - background-color: white; - border: 1px solid #ccc; - border-bottom: none; } + background-color: transparent; } + +chatbar > chatbox { + /* Apply the same border-radius as the .chat-titlebar to make the box-shadow + go round nicely. */ + border-top-left-radius: 4px; + border-top-right-radius: 4px; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); + /* Offset the chatbox the same amount as the box-shadows' spread, to make it + visible. */ + -moz-margin-end: 5px; } window > chatbox { -moz-margin-start: 0px; margin: 0px; border: none; - padding: 0px; } - -.chat-titlebar { - background-color: #d9d9d9; - background-image: linear-gradient(rgba(255, 255, 255, 0.3), transparent); } - -.chat-titlebar[selected] { - background-color: #f0f0f0; } - -.chatbar-button { - -moz-appearance: none; - background-color: #d9d9d9; - background-image: linear-gradient(rgba(255, 255, 255, 0.3), transparent); } - -.chatbar-button > .toolbarbutton-icon { - -moz-margin-end: 0; } - -.chatbar-button:hover, -.chatbar-button[open="true"] { - background-color: #f0f0f0; } - -.chatbar-button[activity] { - background-image: radial-gradient(circle farthest-corner at center 3px, #e9f2fc 3%, rgba(172, 206, 255, 0.75) 40%, rgba(87, 151, 201, 0.5) 80%, transparent); } - -chatbox { - border-top-left-radius: 2.5px; - border-top-right-radius: 2.5px; } + padding: 0px; + border-radius: 4px; } /* Customization mode */ /* This Source Code Form is subject to the terms of the Mozilla Public diff --git a/arc-firefox-theme/chrome/browser/searchbar.css b/arc-firefox-theme/chrome/browser/searchbar.css index 08fd9dd..b026cdb 100644 --- a/arc-firefox-theme/chrome/browser/searchbar.css +++ b/arc-firefox-theme/chrome/browser/searchbar.css @@ -15,47 +15,35 @@ margin: 0; } -.searchbar-engine-menuitem[selected="true"] > .menu-iconic-text { - font-weight: bold; -} - /* Engine button */ .searchbar-engine-image { height: 16px; width: 16px; list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); + -moz-margin-start: -1px; } -.searchbar-engine-button { - -moz-appearance: none; - min-width: 0; - margin: 0; - border: 0; +/* Search go button */ +.search-go-container { -moz-box-align: center; - background-color: transparent; } -.searchbar-engine-button > .button-box { - -moz-appearance: none; - padding: 2px 0; - -moz-padding-end: 2px; - border: 0; +.search-go-button { + padding: 1px; + list-style-image: url("chrome://browser/skin/reload-stop-go.png"); + -moz-image-region: rect(0, 42px, 14px, 28px); } -.searchbar-dropmarker-image { - -moz-appearance: toolbarbutton-dropdown !important; - width: 12px; - height: 12px; +.search-go-button:hover { + -moz-image-region: rect(14px, 42px, 28px, 28px); } -/* Search go button */ -.search-go-container { - -moz-box-align: center; +.search-go-button:hover:active { + -moz-image-region: rect(28px, 42px, 42px, 28px); } -.search-go-button { - padding: 1px; - list-style-image: url(moz-icon://stock/gtk-find?size=menu); +.search-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { + transform: scaleX(-1); } menuitem[cmd="cmd_clearhistory"] { @@ -93,23 +81,6 @@ menuitem[cmd="cmd_clearhistory"][disabled] { -moz-image-region: rect(0, 60px, 20px, 40px); } -searchbar[oneoffui] .search-go-button { - list-style-image: url("chrome://browser/skin/reload-stop-go.png"); - -moz-image-region: rect(0, 42px, 14px, 28px); -} - -searchbar[oneoffui] .search-go-button:hover { - -moz-image-region: rect(14px, 42px, 28px, 28px); -} - -searchbar[oneoffui] .search-go-button:hover:active { - -moz-image-region: rect(28px, 42px, 42px, 28px); -} - -searchbar[oneoffui] .search-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { - transform: scaleX(-1); -} - .search-panel-current-engine { border-top: none !important; @@ -236,10 +207,6 @@ searchbar[oneoffui] .search-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon list-style-image: url("chrome://browser/skin/search-engine-placeholder.png"); } -searchbar[oneoffui] .searchbar-engine-button { - display: none; -} - .search-panel-tree > .autocomplete-treebody::-moz-tree-cell { border-top: none !important; } @@ -262,10 +229,6 @@ searchbar[oneoffui] .searchbar-engine-button { list-style-image: url("chrome://browser/skin/search-history-icon.svg#search-history-icon-active"); } -searchbar[oneoffui] .searchbar-engine-image { - -moz-margin-start: -1px; -} - .search-setting-button { -moz-appearance: none; border: none; diff --git a/arc-firefox-theme/chrome/browser/social/chat-icons.svg b/arc-firefox-theme/chrome/browser/social/chat-icons.svg index a11bc65..766b974 100644 --- a/arc-firefox-theme/chrome/browser/social/chat-icons.svg +++ b/arc-firefox-theme/chrome/browser/social/chat-icons.svg @@ -8,28 +8,42 @@ display: none; } use { - fill: #c1c1c1; + fill: #666; + } + use[id$="-hover"] { + fill: #4a4a4a; } use[id$="-active"] { - fill: #c1c1c1; + fill: #4a4a4a; } use[id$="-disabled"] { - fill: #c1c1c1; + fill: #666; + } + use[id$="-white"] { + fill: #fff; } </style> <defs> <polygon id="close-shape" points="10,1.717 8.336,0.049 5.024,3.369 1.663,0 0,1.668 3.36,5.037 0.098,8.307 1.762,9.975 5.025,6.705 8.311,10 9.975,8.332 6.688,5.037"/> <path id="dropdown-shape" fill-rule="evenodd" d="M9,3L4.984,7L1,3H9z"/> - <polygon id="expand-shape" points="10,0 4.838,0 6.506,1.669 0,8.175 1.825,10 8.331,3.494 10,5.162"/> - <rect id="minimize-shape" y="3.6" width="10" height="2.8"/> + <g id="expand-shape"> + <path fill-rule="evenodd" d="M9.429,7.072v2.143c0,0.531-0.188,0.985-0.566,1.363c-0.377,0.377-0.832,0.565-1.363,0.565H1.929 c-0.531,0-0.986-0.188-1.363-0.565C0.188,10.2,0,9.746,0,9.214V3.643c0-0.531,0.188-0.985,0.566-1.362 c0.377-0.378,0.832-0.566,1.363-0.566h4.714c0.062,0,0.114,0.021,0.154,0.061s0.06,0.092,0.06,0.154v0.428 c0,0.063-0.02,0.114-0.06,0.154S6.705,2.572,6.643,2.572H1.929c-0.295,0-0.547,0.104-0.757,0.314S0.857,3.348,0.857,3.643v5.571 c0,0.295,0.105,0.547,0.315,0.757s0.462,0.314,0.757,0.314H7.5c0.294,0,0.547-0.104,0.757-0.314 c0.209-0.21,0.314-0.462,0.314-0.757V7.072c0-0.062,0.02-0.114,0.061-0.154c0.04-0.04,0.091-0.061,0.154-0.061h0.428 c0.062,0,0.114,0.021,0.154,0.061S9.429,7.009,9.429,7.072z"/> + <path fill-rule="evenodd" d="M7.07,5.82L6.179,4.93C6.127,4.878,6.101,4.818,6.101,4.75s0.026-0.128,0.079-0.18l2.594-2.594L7.648,0.852 C7.549,0.753,7.5,0.636,7.5,0.5s0.049-0.252,0.148-0.351S7.864,0,8,0h3.5c0.136,0,0.252,0.05,0.351,0.149S12,0.365,12,0.5V4 c0,0.136-0.05,0.253-0.149,0.351C11.752,4.451,11.635,4.5,11.5,4.5c-0.136,0-0.253-0.05-0.352-0.149l-1.124-1.125L7.429,5.82 c-0.052,0.052-0.112,0.079-0.18,0.079"/> + </g> + <rect id="minimize-shape" y="7.5" width="10" height="2.2"/> + <path id="exit-shape" fill-rule="evenodd" d="M5.01905144,3.00017279 C5.01277908,3.00005776 5.0064926,3 5.00019251,3 L1.99980749,3 C1.44371665,3 1,3.44762906 1,3.99980749 L1,7.00019251 C1,7.55628335 1.44762906,8 1.99980749,8 L5.00019251,8 C5.00649341,8 5.01277988,7.99994253 5.01905144,7.99982809 L5.01905144,8.5391818 C5.01905144,10.078915 5.37554713,10.2645548 5.81530684,9.9314625 L10.8239665,6.13769619 C11.2653143,5.80340108 11.2637262,5.26455476 10.8239665,4.93146254 L5.81530684,1.13769619 C5.37395904,0.80340108 5.01905144,0.98023404 5.01905144,1.52997693 L5.01905144,3.00017279 Z M-1,1 L4,1 L4,2 L0,2 L0,9 L4,9 L4,10.0100024 L-1,10.0100021 L-1,1 Z" /> </defs> <use id="close" xlink:href="#close-shape"/> <use id="close-active" xlink:href="#close-shape"/> <use id="close-disabled" xlink:href="#close-shape"/> + <use id="close-hover" xlink:href="#close-shape"/> + <use id="exit-white" xlink:href="#exit-shape"/> <use id="expand" xlink:href="#expand-shape"/> <use id="expand-active" xlink:href="#expand-shape"/> <use id="expand-disabled" xlink:href="#expand-shape"/> + <use id="expand-hover" xlink:href="#expand-shape"/> <use id="minimize" xlink:href="#minimize-shape"/> <use id="minimize-active" xlink:href="#minimize-shape"/> <use id="minimize-disabled" xlink:href="#minimize-shape"/> + <use id="minimize-hover" xlink:href="#minimize-shape"/> </svg> diff --git a/arc-firefox-theme/chrome/browser/tabbrowser/loading.png b/arc-firefox-theme/chrome/browser/tabbrowser/loading.png Binary files differindex 55f25e5..a2f9b79 100644 --- a/arc-firefox-theme/chrome/browser/tabbrowser/loading.png +++ b/arc-firefox-theme/chrome/browser/tabbrowser/loading.png diff --git a/arc-firefox-theme/chrome/browser/tabbrowser/pendingpaint.png b/arc-firefox-theme/chrome/browser/tabbrowser/pendingpaint.png Binary files differindex 512b525..7bbf0fe 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/global/in-content/common.css b/arc-firefox-theme/chrome/global/in-content/common.css index dc3d018..5814b1e 100644 --- a/arc-firefox-theme/chrome/global/in-content/common.css +++ b/arc-firefox-theme/chrome/global/in-content/common.css @@ -146,6 +146,8 @@ xul|tab { color: var(--in-content-tab-color); background-color: var(--in-content-page-background); border-width: 0; + /* !important overrides tabbox.css RTL and visuallyselected rules */ + border-radius: 0 !important; transition: background-color 50ms ease 0s; } @@ -178,7 +180,7 @@ html|button { xul|colorpicker[type="button"], xul|menulist { -moz-appearance: none; - height: 30px; + min-height: 30px; color: var(--in-content-text-color); border: 1px solid var(--in-content-box-border-color); -moz-border-top-colors: none !important; @@ -292,6 +294,7 @@ xul|*.help-button > xul|*.button-box > xul|*.button-text { } xul|*.spinbuttons-button { + min-height: initial; -moz-margin-start: 10px !important; -moz-margin-end: 2px !important; } @@ -459,7 +462,7 @@ html|a:hover:active, /* Hide the actual checkbox */ html|input[type="checkbox"] { - opacity: 0; + visibility: hidden; position: absolute; } @@ -557,7 +560,7 @@ xul|*.radio-label-box { /* Category List */ -xul|*#categories { +*|*#categories { -moz-appearance: none; background-color: var(--in-content-category-background); padding-top: 39px; @@ -565,7 +568,7 @@ xul|*#categories { border-width: 0; } -xul|*.category { +*|*.category { -moz-appearance: none; color: var(--in-content-category-text); -moz-border-end-width: 0; @@ -575,18 +578,18 @@ xul|*.category { transition: background-color 150ms; } -xul|*.category:hover { +*|*.category:hover { background-color: var(--in-content-category-background-hover); } -xul|*.category[selected] { +*|*.category[selected] { background-color: var(--in-content-category-background-active); color: var(--in-content-category-text-selected); -moz-padding-start: 11px; /* compensate the 4px border */ -moz-border-start: solid 4px var(--in-content-border-highlight); } -xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[current] { +*|*#categories[keyboard-navigation="true"]:-moz-focusring > *|*.category[current] { border-top: var(--in-content-category-border-focus); border-bottom: var(--in-content-category-border-focus); } diff --git a/arc-firefox-theme/chrome/global/in-content/dropdown.svg b/arc-firefox-theme/chrome/global/in-content/dropdown.svg index 458eb0b..bc7bad2 100644 --- a/arc-firefox-theme/chrome/global/in-content/dropdown.svg +++ b/arc-firefox-theme/chrome/global/in-content/dropdown.svg @@ -15,7 +15,7 @@ }
</style>
<defs>
- <path id="dropdown-shape" fill-rule="evenodd" d="M12,6l-4.016,4L4,6H12z"/>
+ <path id="dropdown-shape" d="M12,6l-4.016,4L4,6H12z"/>
</defs>
<use id="dropdown" xlink:href="#dropdown-shape"/>
<use id="dropdown-disabled" xlink:href="#dropdown-shape"/>
diff --git a/arc-firefox-theme/chrome/global/menu.css b/arc-firefox-theme/chrome/global/menu.css index c2c779b..aab929e 100644 --- a/arc-firefox-theme/chrome/global/menu.css +++ b/arc-firefox-theme/chrome/global/menu.css @@ -160,10 +160,7 @@ menucaption > .menu-iconic-text { menulist > menupopup > menuitem > .menu-iconic-left, menulist > menupopup > menucaption > .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 { +menulist > menupopup > menu > .menu-iconic-left { display: none; } diff --git a/arc-firefox-theme/chrome/global/menu/shared-menu-check@2x.png b/arc-firefox-theme/chrome/global/menu/shared-menu-check@2x.png Binary files differnew file mode 100644 index 0000000..2b1f836 --- /dev/null +++ b/arc-firefox-theme/chrome/global/menu/shared-menu-check@2x.png diff --git a/arc-firefox-theme/chrome/global/notification.css b/arc-firefox-theme/chrome/global/notification.css index 079f408..f525710 100644 --- a/arc-firefox-theme/chrome/global/notification.css +++ b/arc-firefox-theme/chrome/global/notification.css @@ -20,6 +20,7 @@ notification[type="info"] { notification[type="critical"] { color: white; background-image: linear-gradient(rgb(212,0,0), rgb(152,0,0)); + -moz-appearance: none; } .notification-inner { diff --git a/arc-firefox-theme/chrome/mozapps/extensions/extensions.css b/arc-firefox-theme/chrome/mozapps/extensions/extensions.css index e3e5a63..ed8efcf 100644 --- a/arc-firefox-theme/chrome/mozapps/extensions/extensions.css +++ b/arc-firefox-theme/chrome/mozapps/extensions/extensions.css @@ -124,6 +124,10 @@ padding-top: 0; } +.category[selected="true"]:hover { + background-color:#1A2533; +} + .category[disabled] { overflow: hidden; height: 0; @@ -969,7 +973,7 @@ button.button-link { color: #0095dd; cursor: pointer; min-width: 0; - height: 20px; + min-height: 20px; margin: 0 6px; } diff --git a/arc-firefox-theme/install.rdf b/arc-firefox-theme/install.rdf index b8d6d49..f68d1a4 100644 --- a/arc-firefox-theme/install.rdf +++ b/arc-firefox-theme/install.rdf @@ -5,7 +5,7 @@ <Description about="urn:mozilla:install-manifest"> <em:id>{52c2877e-44e1-11e5-8874-a62d1d5d46B0}</em:id> - <em:version>42.20151104</em:version> + <em:version>43.20151213</em:version> <em:type>4</em:type> <em:name>Arc Theme</em:name> <em:description>Arc Theme for Firefox</em:description> @@ -20,8 +20,8 @@ <em:targetApplication> <Description> <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> - <em:minVersion>42.0</em:minVersion> - <em:maxVersion>44.0</em:maxVersion> + <em:minVersion>43.0</em:minVersion> + <em:maxVersion>45.0</em:maxVersion> </Description> </em:targetApplication> diff --git a/configure.ac b/configure.ac index a3f17bd..f9b7ba7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([arc-firefox-theme], [42.20151104], [https://github.com/horst3180/arc-firefox-theme/issues], [arc-firefox-theme], [https://github.com/horst3180/arc-firefox-theme]) +AC_INIT([arc-firefox-theme], [43.20151213], [https://github.com/horst3180/arc-firefox-theme/issues], [arc-firefox-theme], [https://github.com/horst3180/arc-firefox-theme]) AM_INIT_AUTOMAKE([-Wno-portability no-dist-gzip dist-xz foreign subdir-objects tar-ustar]) AC_PREFIX_DEFAULT(/usr/local) AM_SILENT_RULES([yes]) |
