commit 4ed4034f5d90cefb20377f088f2482b346259510 parent 92c5d400386d944e3bf0c54c54e90b047bd49bd1 Author: Lootyhoof <lootyhoofer@gmail.com> Date: Tue, 15 May 2018 22:42:19 +0100 Re-base on White Moon v3.0.0 Diffstat:
365 files changed, 12467 insertions(+), 4980 deletions(-)
diff --git a/src/chrome.manifest b/src/chrome.manifest @@ -2,5 +2,29 @@ skin abouthome darkmoon chrome/abouthome/ skin browser darkmoon chrome/browser/ skin mozapps darkmoon chrome/mozapps/ skin global darkmoon chrome/global/ -skin ostarget darkmoon chrome/ostarget/general/ -skin ostarget darkmoon chrome/ostarget/aero/ os=WINNT osversion>=6 +skin os darkmoon chrome/os/darwin/ os=Darwin +skin os darkmoon chrome/os/linux/ os=Linux +skin os darkmoon chrome/os/winnt/ os=WINNT + +skin appver darkmoon chrome/appver/27/ appversion<28.0.0a1 +skin appver darkmoon chrome/appver/28/ appversion>=28.0.0a1 + +override chrome://browser/skin/autocomplete.css chrome://global/skin/autocomplete.css +override chrome://browser/skin/page-livemarks.png chrome://browser/skin/feeds/feedIcon16.svg +override chrome://browser/skin/feeds/audioFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.svg +override chrome://browser/skin/feeds/feedIcon16.png chrome://browser/skin/feeds/feedIcon16.svg +override chrome://browser/skin/feeds/videoFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.svg +override chrome://browser/skin/permissions/aboutPermissions.css chrome://browser/skin/preferences/aboutPermissions.css +override chrome://browser/skin/preferences/application.png chrome://browser/skin/toolbar/new-window.svg +override chrome://browser/skin/preferences/mail.png chrome://browser/skin/preferences/mail.svg +override chrome://browser/skin/preferences/saveFile.png chrome://browser/skin/toolbar/downloads.svg + +override chrome://devtools/skin/images/debugging-addons.svg chrome://global/skin/devtools/debugging-addons.svg +override chrome://devtools/skin/images/debugging-devices.svg chrome://global/skin/devtools/debugging-devices.svg +override chrome://devtools/skin/images/debugging-tabs.svg chrome://global/skin/devtools/debugging-tabs.svg +override chrome://devtools/skin/images/debugging-workers.svg chrome://global/skin/devtools/debugging-workers.svg +override chrome://devtools/skin/images/debugging-workers-generic.svg chrome://global/skin/devtools/workers-generic.svg + +override chrome://mozapps/skin/extensions/extensionGeneric-16.png chrome://mozapps/skin/extensions/extensionGeneric-16.svg +override chrome://mozapps/skin/passwordmgr/key.png chrome://mozapps/skin/passwordmgr/key.svg +override chrome://mozapps/skin/places/defaultFavicon.png chrome://mozapps/skin/places/defaultFavicon.svg +\ No newline at end of file diff --git a/src/chrome/abouthome/abouthome.css b/src/chrome/abouthome/abouthome.css @@ -147,7 +147,7 @@ body[narrow] #launcher[session] { white-space: normal; background: transparent padding-box; border: 1px solid transparent; - border-radius: 3px; + border-radius: 2.5px; color: #fff; font-size: 75%; cursor: pointer; @@ -204,35 +204,31 @@ body[narrow] #restorePreviousSession { } #downloads::before { - content: url("chrome://abouthome/skin/downloads.png"); + content: url("chrome://abouthome/skin/downloads.svg"); } #bookmarks::before { - content: url("chrome://abouthome/skin/bookmarks.png"); + content: url("chrome://abouthome/skin/bookmarks.svg"); } #history::before { - content: url("chrome://abouthome/skin/history.png"); -} - -#apps::before { - content: url("chrome://abouthome/skin/apps.png"); + content: url("chrome://abouthome/skin/history.svg"); } #addons::before { - content: url("chrome://abouthome/skin/addons.png"); + content: url("chrome://abouthome/skin/addons.svg"); } #sync::before { - content: url("chrome://abouthome/skin/sync.png"); + content: url("chrome://abouthome/skin/sync.svg"); } #settings::before { - content: url("chrome://abouthome/skin/settings.png"); + content: url("chrome://abouthome/skin/settings.svg"); } #restorePreviousSession::before { - content: url("chrome://abouthome/skin/restore.png"); + content: url("chrome://abouthome/skin/restore.svg"); height: 32px; width: 32px; display: inline-block; /* display on same line as text label */ @@ -245,76 +241,13 @@ body[narrow] #restorePreviousSession { transform: scaleX(-1); } -#aboutMozilla { - display: block; - position: relative; /* pin wordmark to edge of document, not of viewport */ - -moz-box-ordinal-group: 0; - opacity: .5; - transition: opacity 150ms; -} - -#aboutMozilla:hover { - opacity: 1; -} - -#aboutMozilla::before { - content: url("chrome://browser/content/abouthome/mozilla.png"); - display: block; - position: absolute; - top: 12px; - right: 12px; - width: 69px; - height: 19px; -} - /* [HiDPI] * At resolutions above 1dppx, prefer downscaling the 2x Retina graphics * rather than upscaling the original-size ones (bug 818940). */ @media not all and (max-resolution: 1dppx) { #brandLogo { - background-image: url("chrome://branding/content/about-logo@2x.png"); - } - - .launchButton::before, - #aboutMozilla::before { - transform: scale(.5); - transform-origin: 0 0; - } - - #downloads::before { - content: url("chrome://abouthome/skin/downloads@2x.png"); - } - - #bookmarks::before { - content: url("chrome://abouthome/skin/bookmarks@2x.png"); - } - - #history::before { - content: url("chrome://abouthome/skin/history@2x.png"); - } - - #apps::before { - content: url("chrome://abouthome/skin/apps@2x.png"); - } - - #addons::before { - content: url("chrome://abouthome/skin/addons@2x.png"); - } - - #sync::before { - content: url("chrome://abouthome/skin/sync@2x.png"); - } - - #settings::before { - content: url("chrome://abouthome/skin/settings@2x.png"); - } - - #restorePreviousSession::before { - content: url("chrome://abouthome/skin/restore@2x.png"); - } - - #aboutMozilla::before { - content: url("chrome://browser/content/abouthome/mozilla@2x.png"); + background-image: url("chrome://branding/content/about-logo@2x.png"); } } + diff --git a/src/chrome/abouthome/addons.png b/src/chrome/abouthome/addons.png Binary files differ. diff --git a/src/chrome/abouthome/addons.svg b/src/chrome/abouthome/addons.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="32" height="32" viewBox="0 0 32 32"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + </style> + <g> + <path d="M 1.5,20.25 v 6.75 a 3.5,3.5 0 0,0 3.5,3.5 h 6.75 v -.1 a 3.1,3.1 0 1,1 5,0 v .1 h 4.25 a 3.5,3.5 0 0,0 3.5,-3.5 v -6 h .1 a 3.75,4 0 1,0 0,-6.5 h-.1 + v -3.5 a 3.5,3.5 0 0,0 -3.5,-3.5 h -3.5 v -.1 a 4,3.75 0 1,0 -6.5,0 v .1 h -6 a 3.5,3.5 0 0,0 -3.5,3.5 v 4.25 h .1 a 3.1,3.1 0 1,1 0,5 h-.1 Z"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/abouthome/addons@2x.png b/src/chrome/abouthome/addons@2x.png Binary files differ. diff --git a/src/chrome/abouthome/apps.png b/src/chrome/abouthome/apps.png Binary files differ. diff --git a/src/chrome/abouthome/apps@2x.png b/src/chrome/abouthome/apps@2x.png Binary files differ. diff --git a/src/chrome/abouthome/bookmarks.png b/src/chrome/abouthome/bookmarks.png Binary files differ. diff --git a/src/chrome/abouthome/bookmarks.svg b/src/chrome/abouthome/bookmarks.svg @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="32" height="32" viewBox="0 0 32 32"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #highlight:target + g { + stroke: #fff; + fill: #fff; + } + </style> + <g id="highlight"/> + <g> + <path d="M 6.5,29 l 9.5,-7.8 l 9.5,7.8 v -22.9 a 3.6,3.6 0 0,0 -3.6,-3.6 h -11.8 a 3.6,3.6 0 0,0 -3.6,3.6 v 22.9 Z"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/abouthome/bookmarks@2x.png b/src/chrome/abouthome/bookmarks@2x.png Binary files differ. diff --git a/src/chrome/abouthome/downloads.png b/src/chrome/abouthome/downloads.png Binary files differ. diff --git a/src/chrome/abouthome/downloads.svg b/src/chrome/abouthome/downloads.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="32" height="32" viewBox="0 0 32 32"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #hihglighttext:target + g { + stroke: #fff; + } + #highlight:target ~ g { + stroke: #0082f0; + } + #highlight:target ~ g > rect { + fill: #bcf5ff; + } + </style> + <g id="highlight"/> + <g id="highlighttext"/> + <g> + <rect x="3.5" y="21.5" width="24" height="8" rx="3" ry="3"/> + <path d="M 19,25.5 h4"/> + <path d="M 15.5,2 v16 M 8,11 l 7.5,7.5 l 7.5,-7.5"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/abouthome/downloads@2x.png b/src/chrome/abouthome/downloads@2x.png Binary files differ. diff --git a/src/chrome/abouthome/history.png b/src/chrome/abouthome/history.png Binary files differ. diff --git a/src/chrome/abouthome/history.svg b/src/chrome/abouthome/history.svg @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="32" height="32" viewBox="0 0 32 32"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #highlight:target + g { + stroke: #fff; + } + </style> + <g id="highlight"/> + <g> + <circle cx="16" cy="16" r="13.5"/> + <path d="M 13,7 l 3,9 l 6.75,3.75"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/abouthome/history@2x.png b/src/chrome/abouthome/history@2x.png Binary files differ. diff --git a/src/chrome/abouthome/restore.png b/src/chrome/abouthome/restore.png Binary files differ. diff --git a/src/chrome/abouthome/restore.svg b/src/chrome/abouthome/restore.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="32" height="32" viewBox="0 0 32 32"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #highlight:target + g { + stroke: #fff; + } + </style> + <g id="highlight"/> + <g> + <path d="M 4.5,7.5 h 13 a 11,11 0 0,1 11,11 a 12,12 0 0,1 -12,12 a 14.5,14.5 0 0,1 -10,-4"/> + <path d="M 9.5,2.5 l -5,5 l 5,5"/> + <path d="M 14,10.5 l 1.5,8.5 l 5,3"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/abouthome/restore@2x.png b/src/chrome/abouthome/restore@2x.png Binary files differ. diff --git a/src/chrome/abouthome/settings.png b/src/chrome/abouthome/settings.png Binary files differ. diff --git a/src/chrome/abouthome/settings.svg b/src/chrome/abouthome/settings.svg @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="32" height="32" viewBox="0 0 32 32"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + </style> + <g> + <circle cx="16" cy="16" r="4.53"/> + <!-- circle cx="16" cy="16" r="11.75" stroke-width=".25"/ --> + <!-- circle cx="16" cy="16" r="13.5" stroke-width=".25"/ --> + <path d="M 16,16 m 13.265,2.5 + l -1.955,0.686 a 11.75,11.75 0 0,1 -1.06,2.558 l 0.896,1.869 a 13.5,13.5 0 0,1 -3.533,3.533 + l -1.869,-0.896 a 11.75,11.75 0 0,1 -2.558,1.06 l -0.686,1.955 a 13.5,13.5 0 0,1 -5,0 + l -0.686,-1.955 a 11.75,11.75 0 0,1 -2.558,-1.06 l -1.869,0.896 a 13.5,13.5 0 0,1 -3.533,-3.533 + l 0.896,-1.869 a 11.75,11.75 0 0,1 -1.06,-2.558 l -1.955,-0.686 a 13.5,13.5 0 0,1 0,-5 + l 1.955,-0.686 a 11.75,11.75 0 0,1 1.06,-2.558 l -0.896,-1.869 a 13.5,13.5 0 0,1 3.533,-3.533 + l 1.869,0.896 a 11.75,11.75 0 0,1 2.558,-1.06 l 0.686,-1.955 a 13.5,13.5 0 0,1 5,0 + l 0.686,1.955 a 11.75,11.75 0 0,1 2.558,1.06 l 1.869,-0.896 a 13.5,13.5 0 0,1 3.533,3.533 + l -0.896,1.869 a 11.75,11.75 0 0,1 1.06,2.558 l 1.955,0.686 a 13.5,13.5 0 0,1 0,5 Z"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/abouthome/settings@2x.png b/src/chrome/abouthome/settings@2x.png Binary files differ. diff --git a/src/chrome/abouthome/sync.png b/src/chrome/abouthome/sync.png Binary files differ. diff --git a/src/chrome/abouthome/sync.svg b/src/chrome/abouthome/sync.svg @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="32" height="32" viewBox="0 0 32 32"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + </style> + <g> + <path d="M 19.5,19.5 v 8 h 8" transform="rotate(20,19.5,27.5)"/> + <path d="M 5.5,4.5 h 8 v 8" transform="rotate(20,13.5,4.5)"/> + <path d="M 13.5,4.5 a 14,12 0 0,0 -1,23 + M 20.5,5.5 a 14,12 0 0,1 -1,22"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/abouthome/sync@2x.png b/src/chrome/abouthome/sync@2x.png Binary files differ. diff --git a/src/chrome/appver/27/aboutNetworking.css b/src/chrome/appver/27/aboutNetworking.css @@ -0,0 +1,60 @@ +/* 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 { + min-width: 330px; + max-width: 100%; + min-height: 330px; + max-height: 100%; +} + +#menu { + position: absolute; + top: 5px; + color: gray; +} + +.warningBackground { + display: none; + background: rgb(23,23,23); + width:100%; + height:100%; + z-index:10; + top:0; + left:0; + position:fixed; +} + +.warningMessage { + color: #fff; + position: relative; + min-width: 330px; + max-width: 50em; + margin: 4em auto; + border: 1px solid rgb(50,50,50); + border-radius: 10px; + padding: 3em; + -moz-padding-start: 30px; + background: rgb(43,43,43); + margin-left: auto; + text-align: center; +} + +.tab { + display: none; +} + +.active { + display: block; +} + +#menu .selected { + color: blue; +} + +#refreshdiv { + top: 5px; + position: absolute; + right: 30px; +} diff --git a/src/chrome/global/aboutSupport.css b/src/chrome/appver/27/aboutSupport.css diff --git a/src/chrome/appver/27/alert.css b/src/chrome/appver/27/alert.css @@ -0,0 +1,81 @@ +/* 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/. */ + +/* ===== alert.css ===================================================== + == Styles specific to the alerts dialog. + ======================================================================= */ + +@import url("chrome://global/skin/"); + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +.alertBox { + border: 1px solid rgb(75,75,75); + border-radius: 3px; + background-color: rgb(43,43,43); +} + +.alertImageBox { + padding: 8px 0; + width: 64px; +} + +.alertTextBox { + padding: 8px; + -moz-padding-start: 16px; + width: 255px; +} + +.alertTitle { + font-weight: bold; + font-size: 110%; +} + +#alertImage { + max-width: 48px; + max-height: 48px; + list-style-image: url(chrome://global/skin/alerts/notification.svg); +} + +#alertNotification[clickable="true"] { + cursor: pointer; +} + +label { + cursor: inherit; +} + +.alertText[clickable="true"] { + color: #fff; + text-decoration: underline; +} + +.alertText[clickable="true"]:hover:active { + color: rgb(219,219,219); +} + +@keyframes alert-animation { + from { + opacity: 0; + } + 6.25% { + opacity: 1; + } + 93.75% { + opacity: 1; + } + to { + opacity: 0; + } +} + +.alertCloseButton { + -moz-appearance: none; + padding: 4px 2px; + border: none !important; +} + +.alertCloseButton > .toolbarbutton-text { + display: none; +} diff --git a/src/chrome/global/config.css b/src/chrome/appver/27/config.css diff --git a/src/chrome/appver/28/aboutNetworking.css b/src/chrome/appver/28/aboutNetworking.css @@ -0,0 +1,248 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +@import url("chrome://global/skin/in-content/common.css"); + +html { + height: 100%; +} + +body { + display: flex; + align-items: stretch; + height: 100%; +} + +#sectionTitle { + float: left; +} + +#refreshDiv { + justify-content: flex-end; + margin-bottom: 0.5em; +} + +#refreshButton { + margin-top: 0; +} + +/** Categories **/ + +.category { + cursor: pointer; + /* Center category names */ + display: flex; + align-items: center; +} + +.category .category-name { + pointer-events: none; +} + +#categories hr { + border-top-color: rgb(50,50,50); +} + +[id].category::before, +.category[value]::before{ + background-size: 100%; + background-position: center; + background-repeat: no-repeat; + height: 32px; + width: 32px; + min-width: 32px; + margin-inline-start: 6px; +} + +#category-http::before, +.category[value="http"]::before{ + content: ""; + background-image: url(chrome://mozapps/skin/aboutNetworking.svg#http); +} +#category-sockets::before, +.category[value="sockets"]::before{ + content: ""; + background-image: url(chrome://mozapps/skin/aboutNetworking.svg#sockets); +} +#category-dns::before, +.category[value="dns"]::before{ + content: ""; + background-image: url(chrome://mozapps/skin/aboutNetworking.svg#dns); +} +#category-websockets::before, +.category[value="websockets"]::before{ + content: ""; + background-image: url(chrome://mozapps/skin/aboutNetworking.svg#websockets); +} +#category-dnslookuptool::before, +.category[value="dnslookuptool"]::before{ + content: ""; + background-image: url(chrome://mozapps/skin/aboutNetworking.svg#dnslookup); +} +#category-logging::before, +.category[value="logging"]::before{ + content: ""; + background-image: url(chrome://mozapps/skin/aboutNetworking.svg#logging); +} +#category-rcwn::before { + content: ""; +} + +.header{ + border: none; + margin: 0; + padding: 0; +} +#sectionTitle{ + display: none; +} +#refreshDiv{ + font-size: 1.1rem; + margin: 0 0 13px; + -moz-padding-end: 2px; +} +#refreshButton{ + line-height: unset; + font-size: 1.1rem; + height: 23px; + vertical-align: bottom; + margin: 0; + margin-inline-end: 8px; + padding: 0 2px; +} + +.main-content{ + padding: 0; + border: none; + border-radius: 0; + overflow: hidden; + background: transparent; +} + +.main-content > div:not(.header){ + padding: 40px 48px; + border: 1px solid var(--in-content-main-border-color); + border-radius: 5px; + overflow: auto; + height: calc(100% - 43px); + box-sizing: border-box; + background-color: var(--in-content-main-background-color); + background-image: var(--in-content-main-background-image); +} + +.main-content > div:not(.header)> table{ + margin-bottom: 40px; +} + +#logging > div { + max-width: 800px; + min-width: 400px; +} + +#logging > div ~ div ~ div { + text-align-last: justify; + margin-top: 12px; +} +#logging > div > br { + display: none; +} + +#logging > div > button { + padding: 0 8px; +} + +#logging > div:nth-of-type(+2) > button { + margin: 5px 0; + margin-inline-start: 40px; +} + +#logging > div > [id^="current-log"] { + display: inline-block; + margin-inline-start: 20px; + min-width: 200px; +} + +#logging > div > input { + margin: 10px 12px; + min-width: 50%; + width: calc(100% - 200px); +} + +/** Warning container **/ + +/* XXX: a lot of this is duplicated from info-pages.css since that stylesheet + is incompatible with this type of layout */ +.warningBackground:not([hidden]) { + display: flex; +} + +.warningBackground { + flex-direction: column; + box-sizing: border-box; + min-height: 100vh; + align-items: center; + justify-content: center; + width: 100%; + height: 100%; + z-index: 10; + top: 0; + left: 0; + position: fixed; + background: var(--in-content-page-background); +} + +.title { + position: relative; + border-bottom: 1px solid var(--in-content-box-border-color); + margin-bottom: 1em; + padding-bottom: 0.5em; +} + +.title::before { + content: ""; + left: -2.3em; + top: 0; + position: absolute; + display: block; + width: 1.6em; + height: 1.6em; + background: url("chrome://global/skin/icons/warning.svg") no-repeat left center; + background-size: 1.6em; +} + +.warningBackground button { + margin-top: 1em; + margin-left: 0; + min-width: 100px; +} + +/** Content area **/ + +.main-content { + flex: 1; +} + +.tab { + padding: 0.5em 0; +} + +.tab table { + width: 100%; +} + +th, td, table { + border-collapse: collapse; + border: none; + text-align: start; +} + +th { + padding-bottom: 0.5em; + font-size: larger; +} + +td { + padding-bottom: 0.25em; + border-bottom: 1px solid var(--in-content-box-border-color); +} diff --git a/src/chrome/appver/28/aboutSupport.css b/src/chrome/appver/28/aboutSupport.css @@ -0,0 +1,131 @@ +/* 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/. */ + +html { + --aboutSupport-table-background: rgb(75,75,75); + background-color: var(--in-content-page-background); +} + +body { + margin: 40px 48px; +} + +.page-subtitle { + margin-bottom: 3em; +} + +.major-section { + margin-top: 2em; + margin-bottom: 1em; + font-size: large; + text-align: start; + font-weight: bold; +} + +button { + margin-inline-start: 0; + margin-inline-end: 8px; +} + +table { + background-color: var(--aboutSupport-table-background); + color: var(--in-content-text-color); + font: message-box; + text-align: start; + width: 100%; + border: 1px solid var(--in-content-border-color); + border-spacing: 0px; +} + +th, td { + border: 1px solid var(--in-content-border-color); + padding: 4px; +} + +thead th { + text-align: center; +} + +th { + text-align: start; + background-color: var(--in-content-table-header-background); + color: var(--in-content-selected-text); +} + +th.title-column { + white-space: nowrap; + width: 0px; + font-size: medium; +} + +th.column { + white-space: nowrap; + width: 0px; +} + +td { + text-align: start; + border-color: var(--in-content-table-border-dark-color); +} + +.prefs-table { + width: 100%; + table-layout: fixed; +} + +.pref-name { + width: 70%; + white-space: nowrap; + overflow: hidden; +} + +.pref-value { + width: 30%; + white-space: nowrap; + overflow: hidden; +} + +#action-box { + background-color: var(--aboutSupport-table-background); + border: 1px solid var(--in-content-border-color); + color: var(--in-content-text-color); + float: right; + margin-top: 2em; + margin-bottom: 20px; + margin-inline-start: 20px; + margin-inline-end: 0; + padding: 16px; + width: 30%; +} + +#action-box, +#reset-box, +#safe-mode-box { + display: none; +} + +#action-box:dir(rtl) { + float: left; +} + +#reset-box > h3 { + margin-top: 0; +} + +#action-box button { + display: block; +} + +#verify-place-result { + max-height: 200px; + overflow: auto; +} + +.block { + display: block; +} + +.hidden { + display: none; +} diff --git a/src/chrome/appver/28/alert.css b/src/chrome/appver/28/alert.css @@ -0,0 +1,46 @@ +/* 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/. */ + +/* ===== alert.css ===================================================== + == Styles specific to the alerts dialog. + ======================================================================= */ + +@import url("chrome://global/skin/alerts/alert-common.css"); + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +#alertNotification { + -moz-appearance: none; + background: transparent; + padding: 10px; +} + +#alertBox { + border: 1px solid rgb(75,75,75); + border-radius: 0; + background-color: rgb(43,43,43); + color: #fff; + box-shadow: 0 0 4px rgba(255,255,255,.3); +} + +.alertCloseButton { + -moz-appearance: none; + padding: 4px 2px; + border: none !important; +} + +#alertTitleBox > .alertCloseBox { + /* The close button is larger on Windows and has a large + circle around it, so we add more space between the close + button and the edge of the window. */ + margin-inline-end: 2px; +} + +#alertSettings { + /* The close button is larger on Windows, so the + gear button is moved over to accomodate it and + keep the two buttons horizontally aligned together. */ + margin-inline-end: 4px; + margin-bottom: -1px; +} diff --git a/src/chrome/appver/28/config.css b/src/chrome/appver/28/config.css @@ -0,0 +1,52 @@ +/* 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/. */ + +#warningScreen { + font-size: 15px; + padding-top: 0; + padding-bottom: 0; + -moz-padding-start: calc(48px + 4.6em); + -moz-padding-end: 48px; + padding-inline-start: calc(48px + 4.6em); + padding-inline-end: 48px; +} + +.title { + background-image: url("chrome://global/skin/icons/warning.svg"); +} + +#warningTitle { + font-weight: lighter; + line-height: 1.2; + color: #fff; + margin: 0; + margin-bottom: .5em; +} + +#warningText { + margin: 1em 0; +} + +#warningButton { + margin-top: 0.6em; +} + +#filterRow { + margin-top: 4px; + -moz-margin-start: 4px; + margin-inline-start: 4px; +} + +#configTree { + margin-top: 4px; + margin-bottom: 4px; +} + +#configTreeBody::-moz-tree-cell-text(user) { + font-weight: bold; +} + +#configTreeBody::-moz-tree-cell-text(locked) { + font-style: italic; +} diff --git a/src/chrome/browser/Geolocation-16.png b/src/chrome/browser/Geolocation-16.png Binary files differ. diff --git a/src/chrome/browser/Geolocation-16.svg b/src/chrome/browser/Geolocation-16.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" + y="0" + width="16" + height="16" + viewBox="0 0 16 16"> + <style> + path { + fill: #9c9c9c; + } + </style> + <path d="M0,8 a8,8 0 0,1 8-8 a8,8 0 0,1 8,8 a8,8 0 0,1 -8,8 a8,8 0 0,1 -8-8 + m2.084,1 a6,6 0 0,0 4.917,4.916 v-2.916 h2 v2.916 a6,6 0 0,0 4.917-4.917 h-2.916 v-2 h2.916 + a6,6 0 0,0 -4.917-4.917 v2.916 h-2 v-2.916 a6,6 0 0,0 -4.917,4.917 h2.916 v2 h-2.916 m-2.084,-1 z"/> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/Geolocation-64.png b/src/chrome/browser/Geolocation-64.png Binary files differ. diff --git a/src/chrome/browser/Privacy-16.png b/src/chrome/browser/Privacy-16.png Binary files differ. diff --git a/src/chrome/browser/Privacy-32.png b/src/chrome/browser/Privacy-32.png Binary files differ. diff --git a/src/chrome/browser/Privacy-48.png b/src/chrome/browser/Privacy-48.png Binary files differ. diff --git a/src/chrome/browser/Secure24.png b/src/chrome/browser/Secure24.png Binary files differ. diff --git a/src/chrome/browser/Toolbar-inverted.png b/src/chrome/browser/Toolbar-inverted.png Binary files differ. diff --git a/src/chrome/browser/Toolbar.svg b/src/chrome/browser/Toolbar.svg @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="378" height="36" viewBox="0 0 378 36"> + <style> + use { + fill: none; + } + use[id="darktext"]:not(:target), + use[id="toolbar"]:not(:target) { + display: none; + } + use[id="toolbar"] { + stroke: #fff; + stroke-width: 1.0325; + } + use[id="darktext"] { + stroke: #000; + stroke-width: 1; + } + </style> + <defs style="display: none;"> + <g id="back-shape"> + <path d="M 12.5,1.5 l -7,7 l 7,7"/> + </g> + <g id="forward-shape"> + <path d="M 5.5,1.5 l 7,7 l -7,7"/> + </g> + <g id="reload-shape"> + <path d="M 9.5,9.5 m 3,-5.196 a 6,6 0 1,0 2.916,6.196"/> + <path d="M 9,4.627 h 4 v -4" transform="rotate(-25,13,4.627)"/> + </g> + <g id="stop-shape"> + <line x1="3" y1="3" x2="15" y2="15"/> + <line x1="3" y1="15" x2="15" y2="3"/> + </g> + <g id="home-shape"> + <path d="M 4.5,15.5 h 9 v -7 h 1.9 l -6.4,-6.4 l -6.4,6.4 h 1.9 v 7 Z"/> + <path d="M 9.5,11.5 h 2 v -2 h -2 v 2 Z"/> + </g> + <g id="downloads-shape"> + <rect x="2.5" y="11.5" width="12" height="4" rx="1.4" ry="1.4"/> + <path d="M 10,13.5 h2"/> + <path d="M 8.5,2 v7.5 m -3.5,-3.5 l 3.5,3.5 l 3.5,-3.5"/> + </g> + <g id="history-shape"> + <circle cx="9" cy="9" r="6.6"/> + <path d="M 7.5,4 l 1,5.5 l 4.5,1"/> + </g> + <g id="bookmarks-shape"> + <path d="M 2.5,5 c .7,-2.2 6.3,-2.2 7,0 c .7,-2.2 6.3,-2.2 7,0 l 0,10 c -.7,-2.2 -6.3,-2.2 -7,0 v-10 v10 c -.7,-2.2 -6.3,-2.2 -7,0 l 0,-10 z"/> + </g> + <g id="new-tab-shape"> + <path d="M 2.5,15.5 h 14 v -9.7 a 2.3,2.3 0 0,0 -2.3,-2.3 h -9.4 a 2.3,2.3 0 0,0 -2.3,2.3 v 9.7 Z + M 9.5,6 v 7 M 6,9.5 h 7"/> + </g> + <g id="new-window-shape"> + <rect x="1.5" y="2.5" width="15" height="13" rx="1.4" ry="1.4"/> + <rect x="14.5" y="3.5" width="0.001" height="0.001"/> + <path d="M 1.5,5.5 h 15"/> + </g> + <g id="print-shape"> + <path d="M 3.5,13.5 h -.6 a 1.4,1.4 0 0,1 -1.4,-1.4 v -4.2 a 1.4,1.4 0 0,1 1.4,-1.4 h 12.2 a 1.4,1.4 0 0,1 1.4,1.4 v 4.2 a 1.4,1.4 0 0,1 -1.4,1.4 h-.6"/> + <path d="M 4.5,12.5 l -1,3 h 11 l -1,-3 h -9 Z"/> + <path d="M 4.5,6.5 v -4 h 9 v 4"/> + <rect x="13.5" y="8.5" width=".001" height=".001"/> + </g> + <g id="cut-shape"> + <path d="M 5.25,3.25 l 6.034,7 + M 12.75,3.25 l -6.25,7.25 + M 6.5,10.5 a 2.75,1.25 -49.236 0,0 -3.602,4.156 + a 2.75,1.25 -49.236 0,0 3.602,-4.156 + M 11.234,10.25 a 3,1.25 49.236 0,0 3.930,4.534 + a 3,1.25 49.236 0,0 -3.930,-4.534"/> + </g> + <g id="copy-shape"> + <path d="M 8.5,11.5 h -6 v -9 h 4.3 l 2.7,2.7 v 1.3 m 0,-1 h -3 v -3 + M 12.8,6.5 h -4.3 v 9 h 7 v -6.3 l -2.7,-2.7 z m -0.3,0 v 3 h 3"/> + </g> + <g id="paste-shape"> + <path d="M 7.5,13.5 h -3 a 1,1 0 0,1 -1,-1 v -8 a 1,1 0 0,1 1,-1 h 1 m 5,0 h 1 a 1,1 0 0,1 1,1 v 3 + M 6,2.5 h 4 a .5,.5 0 0,1 .5,.5 v 2 a .5,.5 0 0,1 -.5,.5 h -4 a .5,.5 0 0,1 -.5,-.5 v -2 a .5,.5 0 0,1 .5,-.5 z + M 11.8,6.5 h -4.3 v 9 h 7 v -6.3 l -2.7,-2.7 z m -0.3,0 v 3 h 3"/> + </g> + <g id="fullscreen-shape"> + <path d="M 1.5,2.5 h 5.5 m 4,0 h 5.5 v 4.5 m 0,4 v 4.5 h -5.5 m -4,0 h -5.5 v -4.5 m 0,-4 v -4.5 h 2"/> + <rect x="3.5" y="4.5" width="11" height="9" rx="1.5" ry="1.5"/> + </g> + <g id="zoom-out-shape"> + <path d="M 4,8.5 h 9"/> + </g> + <g id="zoom-in-shape"> + <path d="M 4,8.5 h 9 m -4.5 -4.5 v 9"/> + </g> + <g id="sync-shape"> + <path d="M 10,11 v 3.5 h 3.5" transform="rotate(20,10,14.5)"/> + <path d="M 3.5,3.5 h 3.5 v 3.5" transform="rotate(20,7,3.5)"/> + <path d="M 7,3.5 a 7,6 0 0,0 -1,11 + M 11,4 a 8,6 0 0,1 -1,10.5"/> + </g> + <g id="feed-shape"> + <circle cx="3.5" cy="14.5" r="1"/> + <path d="M 2,3.5 a 12.5,12.5 0 0,1 12.5,12.5 M 2,8.5 a 7.5,7.5 0 0,1 7.5,7.5"/> + </g> + <g id="webrtc-shape"> + <path d="M 11.5,8 l 4,-3 v 8 l -4,-3"/> + <rect x="2.5" y="4.5" width="9" height="9" rx="1.4" ry="1.4"/> + </g> + <g id="bookmark-shape"> + <path d="M 5.5,15 l 4,-3.5 l 4,3.5 v -10.1 a 1.4,1.4 0 0,0 -1.4,-1.4 h -5.2 a 1.4,1.4 0 0,0 -1.4,1.4 v 10.1 Z"/> + </g> + <g id="bookmarked-shape"> + <path d="M 5.5,15 l 4,-3.5 l 4,3.5 v -10.1 a 1.4,1.4 0 0,0 -1.4,-1.4 h -5.2 a 1.4,1.4 0 0,0 -1.4,1.4 v 10.1 Z"/> + <path d="M 2,5.5 h 3 m 9,0 h 3"/> + </g> + <g id="toolbar-shape"> + <use x="0" xlink:href="#back-shape"/> + <use x="18" xlink:href="#forward-shape"/> + <use x="36" xlink:href="#reload-shape"/> + <use x="54" xlink:href="#stop-shape"/> + <use x="72" xlink:href="#home-shape"/> + <use x="90" xlink:href="#downloads-shape"/> + <use x="108" xlink:href="#history-shape"/> + <use x="126" xlink:href="#bookmarks-shape"/> + <use x="144" xlink:href="#new-tab-shape"/> + <use x="162" xlink:href="#new-window-shape"/> + <use x="180" xlink:href="#print-shape"/> + <use x="198" xlink:href="#cut-shape"/> + <use x="216" xlink:href="#copy-shape"/> + <use x="234" xlink:href="#paste-shape"/> + <use x="252" xlink:href="#fullscreen-shape"/> + <use x="270" xlink:href="#zoom-out-shape"/> + <use x="288" xlink:href="#zoom-in-shape"/> + <use x="306" xlink:href="#sync-shape"/> + <use x="324" xlink:href="#feed-shape"/> + <use x="342" xlink:href="#webrtc-shape"/> + <use x="360" xlink:href="#bookmark-shape"/> + <use x="360" y="18" xlink:href="#bookmarked-shape"/> + </g> + </defs> + <use id="toolbar" xlink:href="#toolbar-shape"/> + <use id="darktext" xlink:href="#toolbar-shape"/> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/aboutPrivateBrowsing.css b/src/chrome/browser/aboutPrivateBrowsing.css @@ -1,10 +1,12 @@ body.private > #errorPageContainer { - background-image: url("chrome://browser/skin/Privacy-48.png"); + background-image: url("chrome://browser/skin/toolbar/private.svg"); + background-size: 48px 48px; } body.normal > #errorPageContainer { - background-image: url("chrome://global/skin/icons/question-48.png"); + background-image: url("chrome://global/skin/icons/question-16.svg"); + background-size: 48px 48px; } #clearRecentHistoryDesc { @@ -26,7 +28,7 @@ body.normal > #errorPageContainer { #moreInfo { font-size: 110%; /* to match the value set in chrome://global/skin/netError.css */ -moz-padding-start: 25px; - background: url("chrome://global/skin/icons/information-16.png") no-repeat top left; + background: url("chrome://global/skin/icons/information-16.svg") no-repeat top left; } #moreInfo:-moz-dir(rtl) { @@ -40,7 +42,3 @@ body.normal > #errorPageContainer { #moreInfoLinkContainer { margin-top: 0.5em; } - -#moreInfoLinkContainer a { - color: #fff; -} diff --git a/src/chrome/browser/aboutSocialError.css b/src/chrome/browser/aboutSocialError.css @@ -1,98 +0,0 @@ -body { - background-color: rgb(241, 244, 248); - margin-top: 2em; - font: message-box; - font-size: 100%; -} - -p { - font-size: .8em; -} - -#error-box { - background: url('chrome://global/skin/icons/information-24.png') no-repeat left 4px; - -moz-padding-start: 30px; -} - -#error-box:-moz-locale-dir(rtl) { - background-position: right 4px; -} - -#main-error-msg { - color: #4b4b4b; - font-weight: bold; -} - - -#button-box { - text-align: center; - width: 75%; - margin: 0 auto; -} - -@media all and (min-width: 300px) { - #error-box { - max-width: 50%; - margin: 0 auto; - background-image: url('chrome://global/skin/icons/information-32.png'); - min-height: 36px; - -moz-padding-start: 38px; - } - - button { - width: auto !important; - min-width: 150px; - } -} - -@media all and (min-width: 780px) { - #error-box { - max-width: 30%; - } -} - -button { - font: message-box; - font-size: 0.6875em; - -moz-appearance: none; - -moz-user-select: none; - width: 100%; - margin: 2px 0; - padding: 2px 6px; - line-height: 1.2; - background-color: hsla(210,30%,95%,.1); - background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1)); - background-clip: padding-box; - border: 1px solid hsla(210,15%,25%,.4); - border-color: hsla(210,15%,25%,.3) hsla(210,15%,25%,.35) hsla(210,15%,25%,.4); - border-radius: 3px; - box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset, - 0 0 0 1px hsla(0,0%,100%,.3) inset, - 0 1px 0 hsla(0,0%,100%,.1); - - transition-property: background-color, border-color, box-shadow; - transition-duration: 150ms; - transition-timing-function: ease; - -} - -button:hover { - background-color: hsla(210,30%,95%,.8); - border-color: hsla(210,15%,25%,.45) hsla(210,15%,25%,.5) hsla(210,15%,25%,.55); - box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset, - 0 0 0 1px hsla(0,0%,100%,.3) inset, - 0 1px 0 hsla(0,0%,100%,.1), - 0 0 3px hsla(210,15%,25%,.1); - transition-property: background-color, border-color, box-shadow; - transition-duration: 150ms; - transition-timing-function: ease; -} - -button:hover:active { - background-color: hsla(210,15%,25%,.2); - box-shadow: 0 1px 1px hsla(210,15%,25%,.2) inset, - 0 0 2px hsla(210,15%,25%,.4) inset; - transition-property: background-color, border-color, box-shadow; - transition-duration: 10ms; - transition-timing-function: linear; -} diff --git a/src/chrome/browser/actionicon-tab.png b/src/chrome/browser/actionicon-tab.png Binary files differ. diff --git a/src/chrome/browser/appmenu-dropmarker.png b/src/chrome/browser/appmenu-dropmarker.png Binary files differ. diff --git a/src/chrome/browser/appmenu-icons.png b/src/chrome/browser/appmenu-icons.png Binary files differ. diff --git a/src/chrome/browser/browser.css b/src/chrome/browser/browser.css @@ -1,10 +1,57 @@ -@import url("chrome://ostarget/skin/browser.css"); -@import url("chrome://global/skin/"); +@import url("chrome://os/skin/browser.css"); @import url("chrome://browser/skin/padlock/padlock.css"); +@import url("chrome://global/skin/"); @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); @namespace html url("http://www.w3.org/1999/xhtml"); +:root { + --tab-background: linear-gradient(rgba(23,23,23,1), rgba(23,23,23,1)); + --tab-border-color: rgb(75,75,75); + --tab-border-radius: 2px; + --tab-box-shadow: none; + --tab-hover-background: linear-gradient(rgba(80,80,80,.85), rgba(80,80,80,.85)); + --tab-hover-border: var(--tab-border-color); + --tab-pinned-background: linear-gradient(rgba(255,255,255,1) -8px, rgba(23,23,23,1), rgba(23,23,23,1)); + --tab-selected-background: linear-gradient(rgba(43,43,43,1), rgba(43,43,43,1)); + --tab-selected-border: var(--tab-border-color); + + --toolbar-border: rgba(75,75,75,1); + --toolbar-highlight-top: rgba(43,43,43); + --toolbar-highlight-bottom: var(--toolbar-highlight-top); + + --toolbarbutton-background-color: hsla(210,32%,93%,0); + --toolbarbutton-border-color: hsla(210,54%,20%,0) hsla(210,54%,20%,0) hsla(210,54%,20%,0); + --toolbarbutton-box-shadow: 0 1px hsla(0,0%,100%,0) inset, 0 1px hsla(210,54%,20%,0), 0 0 2px hsla(210,54%,20%,0); + --toolbarbutton-active-background-color: rgb(75,75,75); + --toolbarbutton-active-border-color: var(--toolbarbutton-border-color); + --toolbarbutton-active-box-shadow: var(--toolbarbutton-box-shadow); + + --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg#toolbar"); + --toolbarbutton-inverted-image: url("chrome://browser/skin/Toolbar.svg#darktext"); + + --urlbar-dropmarker-background: transparent; + --urlbar-dropmarker-box-shadow: -3px 0 0 -2px #D0D0D0; + + --window-text-color: currentColor; +} + +:root:-moz-lwtheme-brighttext { + --tab-background: linear-gradient(rgba(105,105,105,.4), rgba(105,105,105,.4)); + --tab-box-shadow: none; + --tab-hover-background: linear-gradient(rgba(110,110,110,.8), rgba(110,110,110,.8)); + --tab-selected-background: linear-gradient(rgba(5,5,5,.9), rgba(5,5,5,.9)); + --toolbar-highlight-top: rgba(5,5,5,0.9); + --toolbar-highlight-bottom: rgba(5,5,5,0.6); +} + +:root:-moz-lwtheme-darktext { + --tab-background: linear-gradient(rgba(235,235,235,.4), rgba(235,235,235,.4)); + --tab-hover-background: linear-gradient(rgba(240,240,240,.8), rgba(240,240,240,.8)); + --tab-selected-background: linear-gradient(rgba(250,250,250,.9), rgba(250,250,250,.9)); + --toolbar-highlight-top: rgba(250,250,250,0.9); + --toolbar-highlight-bottom: rgba(250,250,250,0.5); +} #main-window:not(:-moz-lwtheme):after { color: #fff !important; @@ -16,24 +63,24 @@ } #menubar-items { - -moz-box-orient: vertical; + -moz-box-orient: vertical; } #main-menubar { - -moz-box-flex: 1; + -moz-box-flex: 1; } #navigator-toolbox { -moz-appearance: none; background-color: transparent; border-top: none; - border-bottom-color: rgb(50,50,50); + color: #fff; } #navigator-toolbox::after { content: ""; display: -moz-box; - -moz-box-ordinal-group: 101; + -moz-box-ordinal-group: 101; height: 1px; background-color: rgba(75,75,75,1); } @@ -49,8 +96,34 @@ background-color: rgba(43,43,43,1); } -#nav-bar[tabsontop=true]:-moz-lwtheme-darktext { - background-image: -moz-linear-gradient(rgba(250,250,250,0.9), rgba(250,250,250,0.5)); +#toolbar-menubar:not(:-moz-lwtheme), +#TabsToolbar[tabsontop=true]:not(:-moz-lwtheme), +#navigator-toolbox[tabsontop=false] > #nav-bar:not(:-moz-lwtheme), +#nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child:not(:-moz-lwtheme) { + background-color: transparent !important; + color: #fff; + border-left-style: none !important; + border-right-style: none !important; +} + +@media not all and (-moz-windows-compositor) { + #main-window[sizemode="normal"] > #titlebar { + -moz-appearance: none !important; + } + + #main-window[tabsintitlebar] #titlebar { + visibility: hidden; + } + #main-window[tabsintitlebar] #titlebar-content { + -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox"); + visibility: visible; + } +} + +#navigator-toolbox[tabsontop="true"] > #nav-bar, +#navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + toolbar, +#navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + #customToolbars + #PersonalToolbar { + background-image: linear-gradient(var(--toolbar-highlight-top), var(--toolbar-highlight-bottom)); } #main-window[tabsontop=true] #PersonalToolbar:-moz-lwtheme-darktext, @@ -58,71 +131,29 @@ background-image: -moz-linear-gradient(rgba(250,250,250,0.5), rgba(250,250,250,0.5)); } -#nav-bar[tabsontop=true]:-moz-lwtheme-brighttext { - background-image: -moz-linear-gradient(rgba(5,5,5,0.9), rgba(5,5,5,0.6)); -} - #main-window[tabsontop=true] #PersonalToolbar:-moz-lwtheme-brighttext, #addon-bar:-moz-lwtheme-brighttext { background-image: -moz-linear-gradient(rgba(5,5,5,0.6), rgba(5,5,5,0.6)); } -#personal-bookmarks { - min-height: 24px; -} - -/* ::::: app menu button ::::: */ - -#appmenu-button, -#appmenu-toolbar-button { - -moz-appearance: none; - background: rgba(90,90,90,.85); - background-clip: padding-box; - border-radius: 0 0 4px 4px; - border: 1px solid rgba(0,0,0,.15) !important; - border-top: none !important; - font-weight: bold; - box-shadow: none !important; - padding: 0 1.5em .05em; - margin: 0 0 2px; - color: #fff; -} - -@media (-moz-windows-classic) { - #appmenu-button { - margin-bottom: 1px; - } +#navigator-toolbox[tabsontop=false] > #PersonalToolbar { + margin-top: 3px; } - -#appmenu-button:hover:not(:active):not([open]), -#appmenu-toolbar-button:hover:not(:active):not([open]) { - background: rgba(110,110,110,.75); - border-color: rgba(0,0,0,.20) !important; +#navigator-toolbox[tabsontop=false] > #PersonalToolbar:not(:-moz-lwtheme) { + margin-top: 2px; + border-top: 1px solid rgb(50,50,50); } -#appmenu-button:hover:active, -#appmenu-button[open], -#appmenu-toolbar-button:hover:active, -#appmenu-toolbar-button[open] { - border-radius: 0; - background: rgba(75,75,75,.4); - border-color: rgba(0,0,0,.25) !important; +#personal-bookmarks { + min-height: 24px; } -#appmenu-button > .button-box { - border-style: none; - padding: 0; +#print-preview-toolbar:not(:-moz-lwtheme) { + -moz-appearance: none; + background-color: rgb(43, 43, 43); } -#appmenu-button > .button-box > .button-menu-dropmarker, -#appmenu-toolbar-button > .toolbarbutton-menu-dropmarker { - list-style-image: url(chrome://browser/skin/appmenu-dropmarker.png); - width: auto; - height: auto; - padding: 0; - margin: 0; - -moz-margin-start: .5em; -} +/* ::::: app menu button ::::: */ .splitmenu-menuitem { -moz-margin-end: 1px; @@ -179,10 +210,7 @@ } .appmenu-edit-button:not([disabled]):hover { - border: 1px solid #b8d6fb; - box-shadow: inset 0 0 1px white; - background: -moz-linear-gradient(#fafbfd, #ebf3fd); - -moz-transition: .2s ease-in; + background: rgb(110,110,110); } #appmenuSecondaryPane-spacer { @@ -193,38 +221,28 @@ -moz-box-pack: end; } -#appmenu_print, -#appmenu_print_popup, -.appmenu-edit-button, -#appmenu-editmenu-cut, -#appmenu-editmenu-copy, -#appmenu-editmenu-paste, -#appmenu-quit { - list-style-image: url("chrome://browser/skin/appmenu-icons.png"); -} - #appmenu-cut, #appmenu-editmenu-cut { - -moz-image-region: rect(0 16px 16px 0); + list-style-image: url("chrome://browser/skin/toolbar/cut.svg"); } #appmenu-copy, #appmenu-editmenu-copy { - -moz-image-region: rect(0 32px 16px 16px); + list-style-image: url("chrome://browser/skin/toolbar/copy.svg"); } #appmenu-paste, #appmenu-editmenu-paste { - -moz-image-region: rect(0 48px 16px 32px); + list-style-image: url("chrome://browser/skin/toolbar/paste.svg"); } #appmenu_print, #appmenu_print_popup { - -moz-image-region: rect(0 64px 16px 48px); + list-style-image: url("chrome://browser/skin/toolbar/print.svg"); } #appmenu-quit { - -moz-image-region: rect(0 80px 16px 64px); + list-style-image: url("chrome://browser/skin/toolbar/quit.svg"); } #appmenu-edit-label { @@ -234,90 +252,108 @@ } #appmenu_bookmarks { - list-style-image: url("chrome://browser/skin/places/bookmark.png"); - -moz-image-region: rect(0px 32px 16px 16px); + list-style-image: url("chrome://browser/skin/toolbar/bookmarked.svg"); } #appmenu_privateBrowsing, #appmenu_newPrivateWindow { - list-style-image: url("chrome://browser/skin/Privacy-16.png"); + list-style-image: url("chrome://browser/skin/toolbar/private.svg"); } #appmenu_addons { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.svg"); } #appmenu_showAllBookmarks, #bookmarksShowAll, #BMB_bookmarksShowAll { - list-style-image: url("chrome://browser/skin/places/allBookmarks.png"); + list-style-image: url("chrome://browser/skin/places/places.svg"); + -moz-image-region: rect(2px, 118px, 18px, 102px); } #appmenu_bookmarkThisPage, #menu_bookmarkThisPage, #BMB_bookmarkThisPage { - list-style-image: url("chrome://browser/skin/places/bookmark.png"); - -moz-image-region: rect(0 16px 16px 0); + list-style-image: url("chrome://browser/skin/toolbar/bookmark.svg"); +} + +/* ::::: bookmark buttons ::::: */ + +#wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box { + width: 16px; + height: 16px; + background: -moz-image-rect(url("chrome://browser/skin/places/places.svg"), + 2, 138, 18, 122) no-repeat center; +} + +.bookmarks-toolbar-customize { + max-width: 15em !important; + list-style-image: url("chrome://browser/skin/places/places.svg") !important; + -moz-image-region: rect(2px, 138px, 18px, 122px); +} + +/* ::::: bookmark menus ::::: */ + +menu.bookmark-item, +menuitem.bookmark-item { + min-width: 0; + max-width: 32em; +} + +.bookmark-item > .menu-iconic-left { + margin-top: 0; + margin-bottom: 0; } -#appmenu_showAllHistory, -#menu_showAllHistory, -#HMB_showAllHistory { - list-style-image: url("chrome://browser/skin/places/history.png"); +.bookmark-item > .menu-iconic-left > .menu-iconic-icon { + -moz-padding-start: 0px; } /* ::::: bookmark items ::::: */ .bookmark-item { - list-style-image: url("chrome://global/skin/icons/folder-item.png"); - -moz-image-region: rect(0px, 16px, 16px, 0px); + list-style-image: url(chrome://browser/skin/places/places.svg); + -moz-image-region: rect(2px, 396px, 18px, 380px); } .bookmark-item[container] { - -moz-image-region: rect(0px, 32px, 16px, 16px); + -moz-image-region: rect(2px, 198px, 18px, 182px); } .bookmark-item[container][open] { - -moz-image-region: rect(16px, 32px, 32px, 16px); + -moz-image-region: rect(2px, 198px, 18px, 182px); } -.bookmark-item[container][livemark] { - list-style-image: url("chrome://browser/skin/livemark-folder.png"); - -moz-image-region: auto; +.bookmark-item[container][livemark] { + -moz-image-region: rect(2px, 238px, 18px, 222px); } .bookmark-item[container][livemark] .bookmark-item { - list-style-image: url("chrome://browser/skin/places/livemark-item.png"); - -moz-image-region: rect(0px, 16px, 16px, 0px); + -moz-image-region: rect(2px, 258px, 18px, 242px); } .bookmark-item[container][livemark] .bookmark-item[visited] { - -moz-image-region: rect(0px, 32px, 16px, 16px); + -moz-image-region: rect(2px, 278px, 18px, 262px); } .bookmark-item[container][query] { - list-style-image: url("chrome://browser/skin/places/query.png"); - -moz-image-region: auto; + -moz-image-region: rect(2px, 218px, 18px, 202px); } .bookmark-item[query][tagContainer] { - list-style-image: url("chrome://browser/skin/places/tag.png"); - -moz-image-region: auto; + -moz-image-region: rect(2px, 98px, 18px, 82px); } .bookmark-item[query][dayContainer] { - list-style-image: url("chrome://browser/skin/places/calendar.png"); - -moz-image-region: auto; + -moz-image-region: rect(2px, 58px, 18px, 42px); } .bookmark-item[query][hostContainer] { - list-style-image: url("chrome://global/skin/icons/folder-item.png"); - -moz-image-region: rect(0px, 32px, 16px, 16px); + -moz-image-region: rect(2px, 198px, 18px, 182px); } .bookmark-item[query][hostContainer][open] { - list-style-image: url("chrome://global/skin/icons/folder-item.png"); - -moz-image-region: rect(16px, 32px, 32px, 16px); + -moz-image-region: rect(2px, 198px, 18px, 182px); } .bookmark-item[cutting] > .toolbarbutton-icon, @@ -347,11 +383,11 @@ toolbarbutton.bookmark-item:hover:active { /* ::::: primary toolbar buttons ::::: */ .toolbarbutton-1 { - list-style-image: url("chrome://browser/skin/Toolbar.png"); + list-style-image: var(--toolbarbutton-image); } -.toolbarbutton-1:-moz-lwtheme-darktext { - list-style-image: url("chrome://browser/skin/Toolbar-inverted.png"); +toolbar:not([brighttext]) .toolbarbutton-1 { + list-style-image: var(--toolbarbutton-inverted-image); } .toolbarbutton-1[disabled=true] > .toolbarbutton-icon, @@ -364,12 +400,12 @@ toolbarbutton.bookmark-item:hover:active { .toolbarbutton-1 > .toolbarbutton-menu-dropmarker, .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { - list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png"); + list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.svg"); } -.toolbarbutton-1 > .toolbarbutton-menu-dropmarker:-moz-lwtheme-darktext, -.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-darktext { - list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png"); +toolbar:not([brighttext]) .toolbarbutton-1 > .toolbarbutton-menu-dropmarker, +toolbar:not([brighttext]) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { + list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.svg#darktext"); } .toolbarbutton-1 > .toolbarbutton-icon, @@ -425,22 +461,22 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button { #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-icon, #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container, +#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-badge-stack, #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon, #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { padding: 2px 6px; - background: hsla(210,32%,93%,0) padding-box; + background: var(--toolbarbutton-background-color) padding-box; border-radius: 2px; border: 1px solid; - border-color: hsla(210,54%,20%,0) hsla(210,54%,20%,0) hsla(210,54%,20%,0); - box-shadow: 0 1px hsla(0,0%,100%,0) inset, - 0 1px hsla(210,54%,20%,0), - 0 0 2px hsla(210,54%,20%,0); + border-color: var(--toolbarbutton-border-color); + box-shadow: var(--toolbarbutton-box-shadow); transition-property: background-color, border-color, box-shadow; transition-duration: 150ms; } #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #history-button, #history-menu-button, #bookmarks-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button)) > .toolbarbutton-icon, #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #history-button, #history-menu-button, #bookmarks-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button)) > .toolbarbutton-badge-container, +#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #history-button, #history-menu-button, #bookmarks-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button)) > .toolbarbutton-badge-stack, #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1:not(:-moz-any(#back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #history-button, #history-menu-button, #bookmarks-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { padding: 3px 7px; } @@ -479,11 +515,12 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button { width: 1px; height: 18px; -moz-margin-end: -1px; - background-image: linear-gradient(rgba(75,75,75,1) 0, rgba(75,75,75,1) 18px); + background-image: linear-gradient(hsla(210,54%,20%,.2) 0, hsla(210,54%,20%,.2) 18px); background-clip: padding-box; background-position: center; background-repeat: no-repeat; background-size: 1px 18px; + box-shadow: 0 0 0 1px hsla(0,0%,100%,.2); } #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon:-moz-locale-dir(ltr), @@ -503,8 +540,11 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button { #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover:active > .toolbarbutton-icon, #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon, #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1:not([disabled]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon, -#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1:not([disabled]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-container { - background: rgb(75,75,75); +#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1:not([disabled]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-container, +#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1:not([disabled]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-stack { + background-color: var(--toolbarbutton-active-background-color); + border-color: var(--toolbarbutton-active-border-color); + box-shadow: var(--toolbarbutton-active-box-shadow); text-shadow: none; transition: none; } @@ -565,12 +605,10 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button { transform: scaleX(-1); } - - window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #unified-back-forward-button > #forward-button > .toolbarbutton-icon { -moz-margin-start: -4px !important; -moz-margin-end: -2px !important; - + padding-left: 2px; padding-right: 2px; } @@ -585,27 +623,27 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon .unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr), .unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl) { - list-style-image: url("chrome://browser/skin/menu-back.png") !important; + list-style-image: url("chrome://browser/skin/toolbar/back.svg") !important; } .unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr), .unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl) { - list-style-image: url("chrome://browser/skin/menu-forward.png") !important; + list-style-image: url("chrome://browser/skin/toolbar/forward.svg") !important; } #stop-button { - -moz-image-region: rect(0, 54px, 18px, 36px); + -moz-image-region: rect(0, 72px, 18px, 54px); } #reload-button { - -moz-image-region: rect(0, 72px, 18px, 54px); + -moz-image-region: rect(0, 54px, 18px, 36px); } #home-button.bookmark-item { - list-style-image: url("chrome://browser/skin/Toolbar.png"); + list-style-image: var(--toolbarbutton-image); } -#home-button.bookmark-item:-moz-lwtheme-darktext { - list-style-image: url("chrome://browser/skin/Toolbar-inverted.png"); +toolbar:not([brighttext]) #home-button.bookmark-item { + list-style-image: var(--toolbarbutton-inverted-image); } #home-button { -moz-image-region: rect(0, 90px, 18px, 72px); @@ -626,23 +664,23 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon } #bookmarks-menu-button.bookmark-item { - list-style-image: url("chrome://browser/skin/Toolbar.png"); + list-style-image: var(--toolbarbutton-image); } -#bookmarks-menu-button.bookmark-item:-moz-lwtheme-darktext { - list-style-image: url("chrome://browser/skin/Toolbar-inverted.png"); +toolbar:not([brighttext]) #bookmarks-menu-button.bookmark-item { + list-style-image: var(--toolbarbutton-inverted-image); } #print-button { - -moz-image-region: rect(0, 162px, 18px, 144px); + -moz-image-region: rect(0, 198px, 18px, 180px); } #new-tab-button { - -moz-image-region: rect(0, 180px, 18px, 162px); + -moz-image-region: rect(0, 162px, 18px, 144px); } #new-window-button { - -moz-image-region: rect(0, 198px, 18px, 180px); + -moz-image-region: rect(0, 180px, 18px, 162px); } #cut-button { @@ -685,17 +723,23 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon -moz-image-region: rect(0, 360px, 18px, 342px); } - - #tabview-button, #menu_tabview { list-style-image: url(chrome://browser/skin/tabview/tabview.png); } -#tabview-button:-moz-lwtheme-darktext { +toolbar:not([brighttext]) #tabview-button { list-style-image: url(chrome://browser/skin/tabview/tabview-inverted.png); } +@media (-moz-os-version: windows-vista), + (-moz-os-version: windows-win7) { + :-moz-any(#TabsToolbar, #nav-bar[tabsontop=false], #toolbar-menubar) > #tabview-button:-moz-system-metric(windows-compositor):not(:-moz-lwtheme), + :-moz-any(#TabsToolbar, #nav-bar[tabsontop=false], #toolbar-menubar) > toolbarpaletteitem > #tabview-button:-moz-system-metric(windows-compositor):not(:-moz-lwtheme) { + list-style-image: url(chrome://browser/skin/tabview/tabview-inverted.png); + } +} + #tabview-button { -moz-image-region: rect(0, 90px, 18px, 72px); } @@ -736,6 +780,50 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon -moz-image-region: rect(1px, 71px, 17px, 55px); } +/* ::::: fullscreen window controls ::::: */ + +#TabsToolbar > #window-controls { + -moz-margin-start: 4px; +} + +#minimize-button, +#restore-button, +#close-button { + list-style-image: url("chrome://global/skin/icons/windowControls.png"); + padding: 0; +} + +#minimize-button { + -moz-image-region: rect(0, 16px, 16px, 0); +} +#minimize-button:hover { + -moz-image-region: rect(16px, 16px, 32px, 0); +} +#minimize-button:hover:active { + -moz-image-region: rect(32px, 16px, 48px, 0); +} +#restore-button { + -moz-image-region: rect(0, 32px, 16px, 16px); +} +#restore-button:hover { + -moz-image-region: rect(16px, 32px, 32px, 16px); +} +#restore-button:hover:active { + -moz-image-region: rect(32px, 32px, 48px, 16px); +} +#close-button { + -moz-image-region: rect(0, 48px, 16px, 32px); + -moz-appearance: none; + border-style: none; + margin: 2px; +} +#close-button:hover { + -moz-image-region: rect(16px, 48px, 32px, 32px); +} +#close-button:hover:active { + -moz-image-region: rect(32px, 48px, 48px, 32px); +} + /* ::::: Location Bar ::::: */ #urlbar, @@ -824,7 +912,7 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder, color: GrayText; } - +/* identity box */ #identity-box { padding: 4px 2px; @@ -863,7 +951,7 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder, -moz-padding-end: 5px; } - +/* Location bar dropmarker */ .urlbar-history-dropmarker { -moz-appearance: none; @@ -883,9 +971,6 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder, list-style-image: url("chrome://browser/skin/urlbar-history-dropmarker.svg#open"); } - - - #urlbar[pageproxystate="valid"] > #identity-box.chromeUI, #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity, #urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain { @@ -913,10 +998,17 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder, color: hsl(207,100%,63%); } +/* page proxy icon */ + #page-proxy-favicon { width: 16px; height: 16px; - list-style-image: url(chrome://browser/skin/identity-icons-generic.png); + list-style-image: url(chrome://browser/skin/identity-not-secure.svg); + margin-top: 1px; + margin-bottom: 1px; + -moz-margin-start: 3px; + -moz-margin-end: 2px; + -moz-image-region: rect(0, 16px, 16px, 0); } #page-proxy-favicon[pageproxystate="invalid"] { @@ -938,28 +1030,11 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder, max-width: 50ch; } -#page-proxy-favicon { - margin-top: 1px; - margin-bottom: 1px; - -moz-margin-start: 3px; - -moz-margin-end: 2px; - -moz-image-region: rect(0, 16px, 16px, 0); -} - window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #unified-back-forward-button + #urlbar-container > #urlbar > #identity-box > #page-proxy-favicon { -moz-margin-end: 1px; } -#identity-box:hover > #page-proxy-favicon { - -moz-image-region: rect(0, 32px, 16px, 16px); -} - -#identity-box:hover:active > #page-proxy-favicon, -#identity-box[open=true] > #page-proxy-favicon { - -moz-image-region: rect(0, 48px, 16px, 32px); -} - - +/* autocomplete */ #treecolAutoCompleteImage { max-width: 36px; @@ -967,8 +1042,7 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon .ac-result-type-bookmark, .autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/bookmark.png"); - -moz-image-region: rect(0px 32px 16px 16px); + list-style-image: url("chrome://browser/skin/places/bookmark.svg"); width: 16px; height: 16px; } @@ -982,8 +1056,8 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon .ac-result-type-tag, .autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/tag.png"); - width: 16px; + list-style-image: url("chrome://browser/skin/places/places.svg#tag"); + width: 16px; height: 16px; } @@ -996,8 +1070,7 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon } .ac-url-text, -.ac-action-text, -.ac-title { +.ac-action-text { color: #fff; } @@ -1010,8 +1083,14 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- color: GrayText; } -.autocomplete-treebody::-moz-tree-cell-text(suggesthint, treecolAutoCompleteComment), -.autocomplete-treebody::-moz-tree-cell-text(suggestfirst, treecolAutoCompleteComment) +.ac-comment[selected="true"], +.ac-url-text[selected="true"], +.ac-action-text[selected="true"] { + color: inherit !important; +} + +.autocomplete-treebody::-moz-tree-cell-text(suggesthint, treecolAutoCompleteComment), +.autocomplete-treebody::-moz-tree-cell-text(suggestfirst, treecolAutoCompleteComment) { color: GrayText; font-size: smaller; @@ -1021,6 +1100,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- border-top: 1px solid GrayText; } +/* ::::: go button ::::: */ + #go-button, #urlbar > toolbarbutton { -moz-appearance: none; @@ -1076,6 +1157,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- opacity: .6; } +/* popup blocker button */ + #page-report-button { list-style-image: url("chrome://browser/skin/urlbar-popup-blocked.png"); -moz-image-region: rect(0, 16px, 16px, 0); @@ -1090,155 +1173,35 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- -moz-image-region: rect(0, 48px, 16px, 32px); } -#social-share-panel > iframe { - background: linear-gradient(to bottom, #f0f4f7, #fafbfc); - width: 300px; - height: 150px; -} - -#social-share-button { - list-style-image: url(chrome://browser/skin/social/share-button.png); - -moz-image-region: rect(0, 16px, 16px, 0); -} - -.social-share-toolbar { - border-right: 1px solid #e2e5e8; - background: linear-gradient(to bottom, #ffffff, #f5f7fa); -} - -#social-share-provider-buttons { - padding: 6px; -} - -#social-share-provider-buttons > .share-provider-button { - -moz-appearance: none; - padding: 5px; - margin: 1px; - border: none; - background: none; - border-radius: 2px; -} - -#social-share-provider-buttons > .share-provider-button[checked="true"]:not([disabled="true"]), -#social-share-provider-buttons > .share-provider-button:hover, -#social-share-provider-buttons > .share-provider-button:active { - padding: 4px; - border: 1px solid #aeb8c1; - box-shadow: inset 1px 1px 1px rgba(10, 31, 51, 0.1); -} - -#social-share-provider-buttons > .share-provider-button[checked="true"]:not([disabled="true"]) { - background: linear-gradient(to bottom, rgba(230,232,234,.65), #d2d5d9); -} - -#social-share-provider-buttons > .share-provider-button > .toolbarbutton-text { - display: none; -} -#social-share-provider-buttons > .share-provider-button > .toolbarbutton-icon { - width: 16px; - min-height: 16px; - max-height: 16px; -} - - -toolbarbutton[type="socialmark"] > .toolbarbutton-icon { - width: auto; - height: auto; - max-width: 32px; - max-height: 24px; -} - - -.social-panel > .social-panel-frame { - border-radius: inherit; -} - -#social-share-panel { - max-height: 600px; - min-height: 100px; - max-width: 800px; - min-width: 300px; -} - -.social-share-frame { - background: linear-gradient(to bottom, #f0f4f7, #fafbfc); - width: 330px; - height: 150px; - - transition: height 100ms ease-out, width 100ms ease-out; -} - -.social-share-frame:-moz-locale-dir(ltr) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - border-top-right-radius: inherit; - border-bottom-right-radius: inherit; -} - -.social-share-frame:-moz-locale-dir(rtl) { - border-top-left-radius: inherit; - border-bottom-left-radius: inherit; - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -#social-share-panel > .social-share-toolbar:-moz-locale-dir(ltr) { - border-top-left-radius: inherit; - border-bottom-left-radius: inherit; -} - -#social-share-panel > .social-share-toolbar:-moz-locale-dir(rtl) { - border-top-right-radius: inherit; - border-bottom-right-radius: inherit; -} - -#social-share-provider-buttons:-moz-locale-dir(ltr) { - border-top-left-radius: inherit; - border-bottom-left-radius: inherit; -} - -#social-share-provider-buttons:-moz-locale-dir(rtl) { - border-top-right-radius: inherit; - border-bottom-right-radius: inherit; -} - - - -#social-mark-button { - -moz-image-region: rect(0, 16px, 16px, 0); -} - - +/* star button */ #star-button { - list-style-image: url("chrome://browser/skin/places/bookmark.png"); - -moz-image-region: rect(0px 16px 16px 0px); + list-style-image: url("chrome://browser/skin/toolbar/bookmark.svg"); } #star-button:hover { - background-image: -moz-radial-gradient(center, circle closest-side, hsla(45,100%,73%,.3), hsla(45,100%,73%,0)); - -moz-image-region: rect(0px 32px 16px 16px); + background-image: radial-gradient(ircle closest-side, hsla(45,100%,73%,.3), hsla(45,100%,73%,0)); + list-style-image: url("chrome://browser/skin/places/bookmark.svg"); } #star-button:hover:active { - background-image: -moz-radial-gradient(center, circle closest-side, hsla(45,100%,73%,.1), hsla(45,100%,73%,0)); - -moz-image-region: rect(0px 48px 16px 32px); + background-image: radial-gradient(circle closest-side, hsla(45,100%,73%,.1), hsla(45,100%,73%,0)); + list-style-image: url("chrome://browser/skin/places/bookmark.svg#active"); } #star-button[starred="true"] { - list-style-image: url("chrome://browser/skin/places/bookmark.png"); - -moz-image-region: rect(0px 32px 16px 16px); + list-style-image: url("chrome://browser/skin/places/bookmark.svg"); } - +/* bookmarking panel */ #editBookmarkPanelStarIcon { - list-style-image: url("chrome://browser/skin/places/starred48.png"); + list-style-image: url("chrome://browser/skin/places/bookmarked48.svg"); width: 48px; height: 48px; } #editBookmarkPanelStarIcon[unstarred] { - list-style-image: url("chrome://browser/skin/places/unstarred48.png"); + list-style-image: url("chrome://browser/skin/places/bookmark48.svg"); } #editBookmarkPanelTitle { @@ -1250,11 +1213,30 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { margin-bottom: .5em; } - +/* Implements editBookmarkPanel resizing on folderTree un-collapse. */ #editBMPanel_folderTree { min-width: 27em; } +.panel-promo-box { + color: GrayText; +} + +.panel-promo-message { + font-style: italic; +} + +.panel-promo-icon { + list-style-image: url("chrome://browser/skin/sync-32.png"); +} + +.panel-promo-closebutton { + -moz-appearance: none; + -moz-image-region: rect(0, 64px, 16px, 48px); + border: none; + padding: 0px; +} + /* ::::: content area ::::: */ #sidebar { @@ -1294,24 +1276,43 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { list-style-image: url("chrome://global/skin/icons/notloading_16.png"); } +/* Tabstrip */ +#TabsToolbar { + min-height: 0; + padding: 0; +} + +#TabsToolbar:not(:-moz-lwtheme), +#TabsToolbar[tabsontop=false] { + background-image: linear-gradient(to top, var(--toolbar-border) 1px, rgba(0,0,0,.05) 1px, transparent 50%); +} + +@media (-moz-os-version: windows-win10) { + #TabsToolbar:not(:-moz-lwtheme), + #TabsToolbar[tabsontop=false] { + background-image: linear-gradient(to top, var(--toolbar-border) 1px, rgba(0,0,0,0) 1px, transparent); + } +} + .tabbrowser-tab, .tabs-newtab-button { -moz-appearance: none; - background: rgb(23,23,23); + background: var(--tab-background); background-origin: border-box; background-repeat: no-repeat; /* top margin of 0 is important for Fitts' Law in ToT/FS */ margin: 0; - padding: 3px 3px 4px 1px; - border: 1px solid rgba(64,72,81,.4); + padding: 3px 3px 3px 1px; + border: 1px solid var(--tab-border-color); border-bottom: 0px; - border-radius: 2.5px 2.5px 0 0; - box-shadow: inset 0.5px 1px 1px rgba(255,255,255,.2); + border-radius: var(--tab-border-radius) var(--tab-border-radius) 0 0; + box-shadow: var(--tab-box-shadow); -moz-margin-start: -1px; + color: #fff; } .tabs-newtab-button { - padding: 3px 1px 4px 1px; + padding: 3px 1px 3px 1px; } /* Make sure extra margin is added when tabs are not in the title bar so it doesn't @@ -1331,57 +1332,21 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { background-repeat: repeat-x !important; } -.tabbrowser-tab:-moz-lwtheme-darktext, -.tabs-newtab-button:-moz-lwtheme-darktext { - background: -moz-linear-gradient(rgba(235,235,235,.4), rgba(235,235,235,.4)); -} - -.tabbrowser-tab:-moz-lwtheme-brighttext, -.tabs-newtab-button:-moz-lwtheme-brighttext { - background: -moz-linear-gradient(rgba(105,105,105,.4), rgba(105,105,105,.4)); -} - .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox { -moz-padding-start: 1px; } .tabbrowser-tab:hover, .tabs-newtab-button:hover { - background-image: -moz-linear-gradient(rgba(80,80,80,.85), rgba(80,80,80,.85)); -} - -.tabbrowser-tab:-moz-lwtheme-darktext:hover, -.tabs-newtab-button:-moz-lwtheme-darktext:hover { - background-image: -moz-linear-gradient(rgba(240,240,240,.8), rgba(240,240,240,.8)) !important; -} - -.tabbrowser-tab:-moz-lwtheme-brighttext:hover, -.tabs-newtab-button:-moz-lwtheme-brighttext:hover { - background-image: -moz-linear-gradient(rgba(110,110,110,.8), rgba(110,110,110,.8)) !important; + background-image: var(--tab-hover-background); } .tabbrowser-tab[selected="true"] { - background-image: -moz-linear-gradient(rgba(43,43,43,1), rgba(43,43,43,1)); -} - -.tabbrowser-tab[selected="true"]:-moz-lwtheme-darktext { - background-image: -moz-linear-gradient(rgba(250,250,250,.9), rgba(250,250,250,.9)) !important; -} - -.tabbrowser-tab[selected="true"]:-moz-lwtheme-brighttext { - background-image: -moz-linear-gradient(rgba(5,5,5,.9), rgba(5,5,5,.9)) !important; -} - -.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):not(:-moz-lwtheme) { - background-image: -moz-linear-gradient(rgba(255,255,255,1) -8px, rgba(23,23,23,1), rgba(23,23,23,1)); -} - -.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):-moz-lwtheme-brighttext { - background-image: -moz-linear-gradient(rgba(255,255,255,1) -8px, rgba(105,105,105,.4), rgba(105,105,105,.4)); + background-image: var(--tab-selected-background); } -.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):-moz-lwtheme-darktext { - background-image: -moz-linear-gradient(rgba(255,255,255,1) -8px, rgba(235,235,235,.4), rgba(235,235,235,.4)); +.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) { + background-image: lvar(--tab-pinned-background); } .tabbrowser-tab:not([selected=true]):not(:hover):not(:-moz-lwtheme) > * > * > .tab-text { @@ -1392,22 +1357,24 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { .tab-icon-image { width: 16px; height: 16px; - list-style-image: url("chrome://global/skin/icons/folder-item.png"); - -moz-image-region: rect(0px, 16px, 16px, 0px); + list-style-image: url(chrome://browser/skin/places/places.svg); + -moz-image-region: rect(2px, 396px, 18px, 380px); -moz-margin-start: 2px; -moz-margin-end: 3px; } .tab-throbber { list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png"); + -moz-image-region: auto; } .tab-throbber[progress] { list-style-image: url("chrome://browser/skin/tabbrowser/loading.png"); + -moz-image-region: auto; } #tabbrowser-tabs[positionpinnedtabs] > .tabbrowser-tab[pinned] { - min-height: 16px; + min-height: 16px; } .tab-throbber[pinned], @@ -1416,36 +1383,40 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { -moz-margin-end: 5px; } - +.tabbrowser-tab[label="about:config"] > * > * > .tab-icon-image { + list-style-image: url("chrome://browser/skin/toolbar/options.svg") !important; + -moz-image-region: auto; +} + .tabbrowser-tab:focus > .tab-stack { outline: 1px dotted; } - +/* Tab DnD indicator */ .tab-drop-indicator { list-style-image: url(chrome://browser/skin/tabbrowser/tabDragIndicator.png); margin-bottom: -11px; } - +/* Tab close button */ .tab-close-button { -moz-appearance: none; border: none; padding: 0px; } -.tabbrowser-tab:not(:hover):not([selected="true"]) .tab-close-button { - opacity: .375; /* It is much faster to leave the normal image and change the opacity here --johnGraciliano */ -} - .tab-close-button:-moz-lwtheme-darktext { - filter: url("chrome://global/skin/icons/invert.svg#invert"); -} + filter: invert(100%); +} .tab-close-button:-moz-system-metric(touch-enabled) { -moz-transform: scale(1.2); } +.tab-close-button:not([selected]):not(:hover):not(:active) { + opacity: 0.4; +} + .tab-close-button:focus { outline: none !important; } @@ -1496,22 +1467,22 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { } .tab-content { - min-height: -moz-calc(6.8mozmm - 7px); + min-height: -moz-calc(6.8mozmm - 7px); } } .tabbrowser-arrowscrollbox > .scrollbutton-up, .tabbrowser-arrowscrollbox > .scrollbutton-down { - list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.png"); + list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow.svg#left"); margin: 0; padding-right: 2px; border-right: 2px solid transparent; background-origin: border-box; } -.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-lwtheme-darktext, -.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-lwtheme-darktext { - list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.png); +toolbar:not([brighttext]) .tabbrowser-arrowscrollbox > .scrollbutton-up, +toolbar:not([brighttext]) .tabbrowser-arrowscrollbox > .scrollbutton-down { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow.svg#left-inverted); } .tabbrowser-arrowscrollbox > .scrollbutton-up[disabled], @@ -1541,14 +1512,14 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { .tabs-newtab-button, #TabsToolbar > #new-tab-button, #TabsToolbar > toolbarpaletteitem > #new-tab-button { - list-style-image: url(chrome://browser/skin/tabbrowser/newtab.png); - -moz-image-region: auto; + list-style-image: url(chrome://browser/skin/toolbar/zoom-in.svg#dim); + -moz-image-region: rect(1px, 17px, 17px, 1px); } -.tabs-newtab-button:-moz-lwtheme-darktext, -#TabsToolbar > #new-tab-button:-moz-lwtheme-darktext, -#TabsToolbar > toolbarpaletteitem > #new-tab-button:-moz-lwtheme-darktext { - list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted.png); +#TabsToolbar:not([brighttext]) .tabs-newtab-button, +#TabsToolbar:not([brighttext]) > #new-tab-button, +#TabsToolbar:not([brighttext]) > toolbarpaletteitem > #new-tab-button { + list-style-image: url(chrome://browser/skin/toolbar/zoom-in.svg#darktext); } .tabs-newtab-button { @@ -1560,25 +1531,28 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { } #alltabs-button { - list-style-image: url("chrome://browser/skin/tabbrowser/alltabs.png"); - -moz-image-region: rect(0, 14px, 16px, 0); + list-style-image: url("chrome://browser/skin/tabbrowser/alltabs.svg#alltabs"); +} + +toolbar:not([brighttext]) #alltabs-button:not([type="menu"]) { + list-style-image: url("chrome://browser/skin/tabbrowser/alltabs.svg#darktext"); } #alltabs-button:hover:active { - -moz-image-region: rect(0, 28px, 16px, 14px); + list-style-image: url("chrome://browser/skin/tabbrowser/alltabs.svg#active"); +} + +#main-window[sizemode="normal"][tabsontop=true] #alltabs-button { + margin-top: 5px; } #alltabs-button[type="menu"] { - list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png"); + list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.svg"); -moz-image-region: auto; } -#alltabs-button[type="menu"]:-moz-lwtheme-darktext { - list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png"); -} - -#alltabs-button:-moz-lwtheme-darktext { - list-style-image: url("chrome://browser/skin/tabbrowser/alltabs-inverted.png"); +toolbar:not([brighttext]) #alltabs-button[type="menu"] { + list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.svg#darktext"); } #alltabs-button[type="menu"] > .toolbarbutton-icon { @@ -1591,8 +1565,8 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { .alltabs-item > .menu-iconic-left > .menu-iconic-icon { - list-style-image: url("chrome://global/skin/icons/folder-item.png"); - -moz-image-region: rect(0px, 16px, 16px, 0px); + list-style-image: url(chrome://browser/skin/places/places.svg); + -moz-image-region: rect(2px, 396px, 18px, 380px); } .alltabs-item[selected="true"] { @@ -1615,8 +1589,8 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { border: none; } -.tabs-closebutton:-moz-lwtheme-darktext { - filter: url("chrome://global/skin/icons/invert.svg#invert"); +.tabs-closebutton:-moz-lwtheme-brighttext { + filter: invert(100%); } .tabs-closebutton > .toolbarbutton-icon { @@ -1643,7 +1617,7 @@ toolbarbutton.chevron > .toolbarbutton-icon { } toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon { - display: -moz-box; + display: -moz-box; } #sidebar-throbber[loading="true"] { @@ -1665,7 +1639,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { .menupopup-drop-indicator-bar { position: relative; - + margin-top: -1px; margin-bottom: -1px; } @@ -1679,28 +1653,24 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { /* ::::: Identity Indicator Styling ::::: */ - +/* Popup Icons */ #identity-popup-icon { - height: 64px; - width: 64px; + height: 32px; + width: 32px; padding: 0; - list-style-image: url("chrome://browser/skin/identity.png"); - -moz-image-region: rect(0px, 64px, 64px, 0px); + margin: 6px 6px 0 10px; + list-style-image: url("chrome://browser/skin/identity-not-secure.svg"); } #identity-popup.verifiedDomain > #identity-popup-container > #identity-popup-icon { - -moz-image-region: rect(64px, 64px, 128px, 0px); + list-style-image: url("chrome://browser/skin/identity-domain-secure.svg"); } #identity-popup.verifiedIdentity > #identity-popup-container > #identity-popup-icon { - -moz-image-region: rect(128px, 64px, 192px, 0px); -} - -#identity-popup.chromeUI > #identity-popup-container > #identity-popup-icon { - list-style-image: url("chrome://branding/content/icon64.png"); + list-style-image: url("chrome://browser/skin/identity-secure.svg"); } - +/* Popup Body Text */ .identity-popup-description { white-space: pre-wrap; -moz-padding-start: 15px; @@ -1746,14 +1716,9 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { -moz-margin-start: -24px; } -#identity-popup-content-box.verifiedIdentity > #identity-popup-encryption > vbox > #identity-popup-encryption-icon { - list-style-image: url("chrome://browser/skin/identity-secure.svg"); - width: 32px; -} - +#identity-popup-content-box.verifiedIdentity > #identity-popup-encryption > vbox > #identity-popup-encryption-icon , #identity-popup-content-box.verifiedDomain > #identity-popup-encryption > vbox > #identity-popup-encryption-icon { - list-style-image: url("chrome://browser/skin/identity-domain-secure.svg"); - width: 32px; + padding: 12px; } #identity-popup-help-icon { @@ -1762,7 +1727,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { margin: 7px 0 0 -3px; background: none; min-width: 0; - list-style-image: url("chrome://global/skin/icons/question-16.png"); + list-style-image: url("chrome://global/skin/icons/question-16.svg"); cursor: pointer; } @@ -1788,7 +1753,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { } .popup-notification-icon[popupid="geolocation"] { - list-style-image: url(chrome://browser/skin/Geolocation-64.png); + list-style-image: url(chrome://browser/skin/Geolocation-16.svg); } .popup-notification-icon[popupid="xpinstall-disabled"], @@ -1798,7 +1763,13 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { .popup-notification-icon[popupid="addon-install-origin-blocked"], .popup-notification-icon[popupid="addon-install-failed"], .popup-notification-icon[popupid="addon-install-complete"] { - list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png); + list-style-image: url(chrome://mozapps/skin/extensions/addons.svg#extensionGeneric); + width: 32px; + height: 32px; +} + +.popup-notification-icon[popupid="addon-theme-change"] { + list-style-image: url(chrome://mozapps/skin/extensions/addons.svg#themeGeneric); width: 32px; height: 32px; } @@ -1812,7 +1783,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { } .popup-notification-icon[popupid="web-notifications"] { - list-style-image: url(chrome://browser/skin/notification-64.png); + list-style-image: url(chrome://global/skin/alerts/notification.svg); } .addon-progress-description { @@ -1850,12 +1821,12 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { .popup-notification-icon[popupid="indexedDB-quota-prompt"], .popup-notification-icon[popupid*="offline-app-requested"], .popup-notification-icon[popupid="offline-app-usage"] { - list-style-image: url(chrome://global/skin/icons/question-64.png); + list-style-image: url("chrome://global/skin/icons/question-16.svg"); } .popup-notification-icon[popupid="password-save"], .popup-notification-icon[popupid="password-change"] { - list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png); + list-style-image: url(chrome://mozapps/skin/passwordmgr/key.svg#large); } .popup-notification-icon[popupid="webapps-install"] { @@ -1863,7 +1834,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { } .popup-notification-icon[popupid="mixed-content-blocked"] { - list-style-image: url(chrome://browser/skin/mixed-content-blocked-64.png); + list-style-image: url(chrome://browser/skin/mixed-content-blocked.svg); } .popup-notification-icon[popupid="webRTC-sharingDevices"], @@ -1872,20 +1843,20 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { } .popup-notification-icon[popupid="pointerLock"] { - list-style-image: url(chrome://browser/skin/pointerLock-64.png); + list-style-image: url(chrome://browser/skin/pointer-lock.svg); } #notification-popup-box { position: relative; - + background-clip: padding-box; padding-left: 3px; padding-right: 2px; border-radius: 2.5px 0 0 2.5px; border-width: 0 8px 0 0; border-style: solid; - -moz-border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 / 0 8px 0 0; + -moz-border-image: url("chrome://browser/skin/urlbar-arrow.svg") 0 8 0 0 / 0 8px 0 0; -moz-margin-end: -8px; margin-top: -2px; margin-bottom: -2px; @@ -1909,7 +1880,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { .default-notification-icon, #default-notification-icon { - list-style-image: url(chrome://global/skin/icons/information-16.png); + list-style-image: url(chrome://global/skin/icons/information-16.svg); } .identity-notification-icon, @@ -1919,20 +1890,21 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { .geo-notification-icon, #geo-notification-icon { - list-style-image: url(chrome://browser/skin/Geolocation-16.png); + list-style-image: url(chrome://browser/skin/Geolocation-16.svg); } #addons-notification-icon { - list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png); + list-style-image: url(chrome://mozapps/skin/extensions/addons.svg#extensionGeneric); + filter: grayscale(100%); } .indexedDB-notification-icon, #indexedDB-notification-icon { - list-style-image: url(chrome://global/skin/icons/question-16.png); + list-style-image: url(chrome://global/skin/icons/question-16.svg); } #password-notification-icon { - list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16.png); + list-style-image: url(chrome://mozapps/skin/passwordmgr/key.svg); } #webapps-notification-icon { @@ -1993,7 +1965,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { .mixed-content-blocked-notification-icon, #mixed-content-blocked-notification-icon { - list-style-image: url(chrome://browser/skin/mixed-content-blocked-16.png); + list-style-image: url(chrome://browser/skin/mixed-content-blocked.svg); } .webRTC-shareDevices-notification-icon, @@ -2008,11 +1980,11 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { .web-notifications-notification-icon, #web-notifications-notification-icon { - list-style-image: url(chrome://browser/skin/notification-16.png); + list-style-image: url(chrome://browser/skin/notification-16.svg); } #pointerLock-notification-icon { - list-style-image: url(chrome://browser/skin/pointerLock-16.png); + list-style-image: url(chrome://browser/skin/pointer-lock.svg); } #pointerLock-cancel { margin: 0px; @@ -2029,21 +2001,20 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { #subscribeToPageMenupopup, #BMB_subscribeToPageMenuitem:not([disabled]), #BMB_subscribeToPageMenupopup { - list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png"); + list-style-image: url("chrome://browser/skin/feeds/feedIcon16.svg"); } #bookmarksToolbarFolderMenu, #appmenu_bookmarksToolbar, #BMB_bookmarksToolbar { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png"); - -moz-image-region: auto; + list-style-image: url("chrome://browser/skin/places/places.svg"); + -moz-image-region: rect(2px, 138px, 18px, 122px); } #appmenu_unsortedBookmarks, -#menu_unsortedBookmarks, #BMB_unsortedBookmarks { - list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); - -moz-image-region: auto; + list-style-image: url("chrome://browser/skin/places/places.svg"); + -moz-image-region: rect(2px, 178px, 18px, 162px); } /* ::::: Keyboard UI Panel ::::: */ @@ -2130,8 +2101,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { margin-top: .5em; } - - #allTabs-panel { padding-bottom: 10px; -moz-appearance: none; @@ -2225,14 +2194,24 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { -moz-appearance: none; } -#addonbar-closebutton:-moz-lwtheme-darktext { - filter: url("chrome://global/skin/icons/invert.svg#invert"); +#addonbar-closebutton:-moz-lwtheme-brighttext { + filter: invert(100%); +} + +toolbar[mode="text"] #addonbar-closebutton { + padding: 0 0 0 5px; + margin-left: 0px; + margin-right: -5px; +} + +toolbar[mode="text"] #addonbar-closebutton > .toolbarbutton-icon { + display: -moz-box; } .statuspanel-label { margin: 0; padding: 2px 4px; - background: -moz-linear-gradient(white, #ddd); + background: linear-gradient(white, #ddd); border: 1px none #ccc; border-top-style: solid; color: #333; @@ -2251,10 +2230,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { margin-left: 1em; } - - - - #full-screen-warning-message { background-color: hsl(0,0%,15%); color: white; @@ -2281,6 +2256,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { font-size: 120%; } + /* Responsive Mode */ .browserContainer[responsivemode] { @@ -2827,6 +2803,7 @@ html|*#gcli-output-frame { .gcli-in-closebrace { color: hsl(0,0%,80%); } + #notification-popup[popupid="click-to-play-plugins"] > .panel-arrowcontainer > .panel-arrowcontent { padding: 0px; } @@ -2892,195 +2869,45 @@ html|*#gcli-output-frame { -moz-margin-end: 5px; } -/* 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/. */ - -/*** Status and progress indicator ***/ - -#downloads-animation-container { - min-height: 1px; - min-width: 1px; - height: 1px; - margin-bottom: -1px; - /* Makes the outermost animation container element positioned, so that its - contents are rendered over the main browser window in the Z order. - This is required by the animated event notification. */ - position: relative; - /* The selected tab may overlap #downloads-indicator-notification */ - z-index: 5; -} - -/*** Main indicator icon ***/ - -#downloads-indicator-icon { - background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), - 0, 108, 18, 90) center no-repeat; - min-width: 18px; - min-height: 18px; -} - -#downloads-indicator-icon:-moz-lwtheme-darktext { - background: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"), - 0, 108, 18, 90) center no-repeat; -} - -#downloads-button[attention] > #downloads-indicator-anchor > #downloads-indicator-icon { - background-image: url("chrome://browser/skin/downloads/download-glow.png"); -} - -/* In the next few rules, we use :not([counter]) as a shortcut that is - equivalent to -moz-any([progress], [paused]). */ - -#downloads-button:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter { - background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), - 0, 108, 18, 90) center no-repeat; - background-size: 12px; -} - -#downloads-button:not([counter])[attention] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter { - background-image: url("chrome://browser/skin/downloads/download-glow.png"); -} - -/*** Download notifications ***/ - -#downloads-indicator-notification { - opacity: 0; - background-size: 16px; - background-position: center; - background-repeat: no-repeat; - width: 16px; - height: 16px; -} - -@keyframes downloadsIndicatorNotificationStartRight { - from { opacity: 0; transform: translate(-128px, 128px) scale(8); } - 20% { opacity: .85; animation-timing-function: ease-out; } - to { opacity: 0; transform: translate(0) scale(1); } -} - -@keyframes downloadsIndicatorNotificationStartLeft { - from { opacity: 0; transform: translate(128px, 128px) scale(8); } - 20% { opacity: .85; animation-timing-function: ease-out; } - to { opacity: 0; transform: translate(0) scale(1); } -} - -#downloads-notification-anchor[notification="start"] > #downloads-indicator-notification { - background-image: url("chrome://browser/skin/downloads/download-notification-start.png"); - animation-name: downloadsIndicatorNotificationStartRight; - animation-duration: 1s; -} - -#downloads-notification-anchor[notification="start"]:-moz-locale-dir(rtl) > #downloads-indicator-notification { - animation-name: downloadsIndicatorNotificationStartLeft; -} - -@keyframes downloadsIndicatorNotificationFinish { - from { opacity: 0; transform: scale(1); } - 20% { opacity: .65; animation-timing-function: ease-in; } - to { opacity: 0; transform: scale(8); } -} - -#downloads-notification-anchor[notification="finish"] > #downloads-indicator-notification { - background-image: url("chrome://browser/skin/downloads/download-notification-finish.png"); - animation-name: downloadsIndicatorNotificationFinish; - animation-duration: 1s; +.messageImage[value="plugin-hidden"] { + list-style-image: url("chrome://browser/skin/notification-pluginNormal.png"); + -moz-image-region: rect(0, 16px, 16px, 0); } -/*** Progress bar and text ***/ - -#downloads-indicator-counter { - height: 9px; - margin: -3px 0px 0px 0px; +/* Keep any changes to this style in sync with pluginProblem.css */ +notification.pluginVulnerable { + background-color: rgb(72,72,72); + background-image: url(chrome://mozapps/skin/plugins/contentPluginStripe.png); color: white; - text-shadow: 0 0 1px rgba(0,0,0,.7), - 0 1px 1.5px rgba(0,0,0,.5); - font-size: 9px; - line-height: 9px; - text-align: center; -} - -#downloads-indicator-counter:-moz-lwtheme-darktext { - color: hsl(0,0%,30%); - text-shadow: hsla(0,0%,100%,.5) 0 1px; -} - -#downloads-indicator-progress { - width: 16px; - height: 5px; - min-width: 0; - min-height: 0; - margin-top: 1px; - margin-bottom: 2px; - border-radius: 2px; - box-shadow: 0 1px 0 hsla(0,0%,100%,.4); -} - -#downloads-indicator-progress > .progress-bar { - -moz-appearance: none; - min-width: 0; - min-height: 0; - /* The background-clip: border-box; and background-image: none; are there to expand the background-color behind the border */ - background-clip: padding-box, border-box; - background-color: rgb(90, 201, 66); - background-image: linear-gradient(transparent 1px, rgba(255, 255, 255, 0.4) 1px, rgba(255, 255, 255, 0.4) 2px, transparent 2px), none; - border: 1px solid; - border-color: rgba(0,43,86,.6) rgba(0,43,86,.4) rgba(0,43,86,.4); - border-radius: 2px 0 0 2px; -} - -#downloads-indicator-progress > .progress-remainder { - -moz-appearance: none; - min-width: 0; - min-height: 0; - background-image: linear-gradient(#505050, #575757); - border: 1px solid; - border-color: hsla(0,0%,0%,.6) hsla(0,0%,0%,.4) hsla(0,0%,0%,.4); - -moz-border-start: none; - border-radius: 0 2px 2px 0; -} - -#downloads-button[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-bar { - background-color: rgb(220, 230, 81); -} - -#downloads-button[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-remainder { - background-image: linear-gradient(#4b5000, #515700); } -toolbar[mode="full"] > #downloads-button[indicator] > .toolbarbutton-text { - margin: 0; - text-align: center; -} - -/* Social toolbar item */ - -#social-provider-button { - -moz-image-region: rect(0, 16px, 16px, 0); - list-style-image: url(chrome://browser/skin/social/services-16.png); +notification.pluginVulnerable .messageImage { + list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png"); } -#social-provider-button > .toolbarbutton-menu-dropmarker { - display: none; -} +/* Badge toolbar item */ -.toolbarbutton-badge-container { +.toolbarbutton-badge-container, +.toolbarbutton-badge-stack { margin: 0; padding: 0; position: relative; } -#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container { +#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container, +#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-badge-stack { padding: 2px 5px; } -.toolbarbutton-1 > .toolbarbutton-badge-container > .toolbar-icon { +.toolbarbutton-1 > .toolbarbutton-badge-container > .toolbar-icon, +.toolbarbutton-1 > .toolbarbutton-badge-stack > .toolbar-icon { position: absolute; top: 2px; right: 2px; } -.toolbarbutton-badge-container > .toolbarbutton-icon[label]:not([label=""]) { +.toolbarbutton-badge-container > .toolbarbutton-icon[label]:not([label=""]), +.toolbarbutton-badge-stack > .toolbarbutton-icon[label]:not([label=""]) { -moz-margin-end: 0; } @@ -3099,388 +2926,27 @@ toolbar[mode="full"] > #downloads-button[indicator] > .toolbarbutton-text { right: auto; } -.popup-notification-icon[popupid="servicesInstall"] { - list-style-image: url(chrome://browser/skin/social/services-64.png); -} -#servicesInstall-notification-icon { - list-style-image: url(chrome://browser/skin/social/services-16.png); -} -#social-undoactivation-button, -#servicesInstall-learnmore-link { - -moz-margin-start: 0; /* override default label margin to match description margin */ -} - -#socialActivatedNotification .popup-notification-button-container { - margin-left: 6px; -} - -.social-activation-icon { - width: auto; - height: auto; - max-height: 64px; - max-width: 64px; -} - -#social-activation-message { - max-width: 250px; -} - -#social-activation-message > label { - margin: 0; -} - -/* social toolbar provider menu */ -.social-statusarea-popup { - margin-top: 0; - margin-left: -12px; - margin-right: -12px; -} - -.social-statusarea-user { - -moz-appearance: none; - border-bottom: 1px solid rgb(221,221,221); - background-color: -moz-Dialog; - position: relative; - cursor: pointer; - list-style-image:url("chrome://global/skin/icons/information-32.png"); -} - -.social-statusarea-user-portrait { - width: 32px; - height: 32px; - border-radius: 2px; - margin: 10px; -} - -.social-statusarea-loggedInStatus { - -moz-appearance: none; - background: transparent; - border: none; - color: -moz-nativehyperlinktext; - min-width: 0; - margin: 0 6px; - list-style-image: none; -} - -.social-statusarea-user[_moz-menuactive] > vbox > .social-statusarea-loggedInStatus { - text-decoration: underline; -} - -.social-panel > .panel-arrowcontainer > .panel-arrowcontent { - padding: 0; -} - -.social-panel-frame { - border-radius: inherit; -} - - -.chat-status-icon { - max-height: 16px; - max-width: 16px; - padding: 0; -} - -.chat-toolbarbutton { - -moz-appearance: none; - border: none; - padding: 0; - margin: 0; - background: none; - width: 16px; -} - -.chat-toolbarbutton > .toolbarbutton-text { - display: none; -} - -.chat-toolbarbutton > .toolbarbutton-icon { - width: inherit; -} - -.chat-close-button { - list-style-image: url('chrome://browser/skin/social/chat-icons.png'); - -moz-image-region: rect(0, 16px, 16px, 0); -} - -.chat-close-button:hover { - -moz-image-region: rect(0, 32px, 16px, 16px); -} - -.chat-close-button:hover:active { - -moz-image-region: rect(0, 48px, 16px, 32px); -} - -.chat-minimize-button { - list-style-image: url('chrome://browser/skin/social/chat-icons.png'); - -moz-image-region: rect(16px, 16px, 32px, 0); -} - -.chat-minimize-button:hover { - -moz-image-region: rect(16px, 32px, 32px, 16px); -} - -.chat-minimize-button:hover:active { - -moz-image-region: rect(16px, 48px, 32px, 32px); -} - -.chat-swap-button { - list-style-image: url('chrome://browser/skin/social/chat-icons.png'); - -moz-image-region: rect(48px, 16px, 64px, 0); -} - -.chat-swap-button:hover { - -moz-image-region: rect(48px, 32px, 64px, 16px); -} - -.chat-swap-button:hover:active { - -moz-image-region: rect(48px, 48px, 64px, 32px); -} - -chatbar > chatbox > .chat-titlebar > .chat-swap-button { - list-style-image: url('chrome://browser/skin/social/chat-icons.png'); - -moz-image-region: rect(32px, 16px, 48px, 0); -} - -chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover { - -moz-image-region: rect(32px, 32px, 48px, 16px); -} - -chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover:active { - -moz-image-region: rect(32px, 48px, 48px, 32px); -} - -@media (min-resolution: 2dppx) { - .chat-close-button { - list-style-image: url('chrome://browser/skin/social/chat-icons@2x.png'); - -moz-image-region: rect(0, 32px, 32px, 0); - } - - .chat-close-button:hover { - -moz-image-region: rect(0, 64px, 32px, 32px); - } - - .chat-close-button:hover:active { - -moz-image-region: rect(0, 96px, 32px, 64px); - } - - .chat-minimize-button { - list-style-image: url('chrome://browser/skin/social/chat-icons@2x.png'); - -moz-image-region: rect(32px, 32px, 64px, 0); - } - - .chat-minimize-button:hover { - -moz-image-region: rect(32px, 64px, 64px, 32px); - } - - .chat-minimize-button:hover:active { - -moz-image-region: rect(32px, 96px, 64px, 64px); - } - - .chat-swap-button { - list-style-image: url('chrome://browser/skin/social/chat-icons@2x.png'); - -moz-image-region: rect(96px, 32px, 128px, 0); - } - - .chat-swap-button:hover { - -moz-image-region: rect(96px, 64px, 128px, 32px); - } - - .chat-swap-button:hover:active { - -moz-image-region: rect(96px, 96px, 128px, 64px); - } - - chatbar > chatbox > .chat-titlebar > .chat-swap-button { - list-style-image: url('chrome://browser/skin/social/chat-icons@2x.png'); - -moz-image-region: rect(64px, 32px, 96px, 0); - } - - chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover { - -moz-image-region: rect(64px, 64px, 96px, 32px); - } - - chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover:active { - -moz-image-region: rect(64px, 96px, 96px, 64px); - } -} - -.chat-title { - font-weight: bold; - color: black; - text-shadow: none; - cursor: inherit; -} - -.chat-titlebar { - height: 20px; - min-height: 20px; - width: 100%; - margin: 0; - padding: 2px; - -moz-padding-start: 6px; - border: none; - border-bottom: 1px solid #ccc; - cursor: pointer; -} - -.chat-titlebar > .notification-anchor-icon { - margin-left: 2px; - margin-right: 2px; -} - -.chat-titlebar[minimized="true"] { - border-bottom: none; -} - -.chat-titlebar[activity] { - background-image: radial-gradient(ellipse closest-side at center, rgb(255,255,255), rgba(255,255,255,0)); - background-repeat: no-repeat; - background-size: 100% 20px; - background-position: 0 -10px; -} - -.chat-frame { - padding: 0; - margin: 0; - overflow: hidden; -} - -.chatbar-button { - list-style-image: url("chrome://browser/skin/social/services-16.png"); - margin: 0; - padding: 2px; - height: 21px; - width: 21px; - border: 1px solid #ccc; - border-bottom: none; -} - -@media (min-resolution: 2dppx) { - .chatbar-button { - list-style-image: url("chrome://browser/skin/social/services-16@2x.png"); - } -} - -.chatbar-button > .toolbarbutton-icon { - width: 16px; -} - -.chatbar-button > menupopup > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon { - width: auto; - height: auto; - max-height: 16px; - max-width: 16px; -} - -.chatbar-button[open="true"] { - box-shadow: inset 0 2px 5px rgba(0,0,0,0.6), 0 1px rgba(255,255,255,0.2); -} - -.chatbar-button > .toolbarbutton-text, -.chatbar-button > .toolbarbutton-menu-dropmarker { - display: none; -} - -.chatbar-button > menupopup > menuitem[activity] { - font-weight: bold; -} - -.chatbar-innerbox { - background: transparent; - margin: -285px 0 0; - overflow: hidden; -} - -chatbar { - -moz-margin-end: 20px; -} - -chatbox { - -moz-margin-start: 4px; - background-color: white; - border: 1px solid #ccc; - border-bottom: none; -} - -window > chatbox { - -moz-margin-start: 0px; - margin: 0px; - border: none; - padding: 0px; -} - -.chat-titlebar { - background-color: #c4cfde; - background-image: linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,0)); -} - -.chat-titlebar[selected] { - background-color: #dae3f0; -} - -.chatbar-button { - -moz-appearance: none; - background-color: #c4cfde; - background-image: linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,0)); -} - -.chatbar-button > .toolbarbutton-icon { - -moz-margin-end: 0; -} - -.chatbar-button:hover, -.chatbar-button[open="true"] { - background-color: #dae3f0; -} - -.chatbar-button[activity]:not([open="true"]) { - background-image: radial-gradient(circle farthest-corner at center 3px, rgb(255,255,255) 3%, rgba(186,221,251,0.75) 40%, rgba(127,179,255,0.5) 80%, rgba(127,179,255,0.25)); -} - -chatbox { - border-top-left-radius: 2.5px; - border-top-right-radius: 2.5px; -} - #main-window[privatebrowsingmode=temporary] #toolbar-menubar { - background-image: url("chrome://browser/skin/privatebrowsing-dark.png"); + background-image: url("chrome://browser/skin/toolbar/private.svg"); + background-size: auto 24px; background-position: top right; background-repeat: no-repeat; } +#main-window[privatebrowsingmode=temporary] #toolbar-menubar[brighttext] { + background-image: url("chrome://browser/skin/toolbar/private.svg#darktext"); +} + #main-window[privatebrowsingmode=temporary] #toolbar-menubar:-moz-locale-dir(rtl) { background-position: top left; } #main-window[privatebrowsingmode=temporary] #appmenu-button > .button-box > .box-inherit > .button-icon { - list-style-image: url("chrome://browser/skin/privatebrowsing-light.png"); + background-image: url("chrome://browser/skin/toolbar/private.svg#darktext"); + background-repeat: no-repeat; width: 20px; height: 16px; -} - - -/* UI Tour */ - -html|div#UITourHighlight { - border-radius: 20px; - border: 2px #5B9CD9 solid; - box-shadow: 0 0 2px #5B9CD9, inset 0 0 1px #5B9CD9; - min-height: 32px; - min-width: 32px; -} - -#UITourTooltip { - max-width: 20em; -} - -#UITourTooltipTitle { - font-size: 130%; - font-weight: bold; - margin: 0 0 5px 0; -} - -#UITourTooltipDescription { - max-width: 20em; + margin: 0 6px 3px -6px; } /* Pale Moon feed icon */ @@ -3496,5 +2962,5 @@ html|div#UITourHighlight { #ub-feed-button { -moz-appearance: none; min-width: 0px; - list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png"); + list-style-image: url("chrome://browser/skin/feeds/feedIcon16.svg"); } diff --git a/src/chrome/browser/caption-buttons.svg b/src/chrome/browser/caption-buttons.svg @@ -1,57 +1,74 @@ -<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> <!-- 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="12" height="12" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> <style> + g:not(:target) { + display: none; + } + use:target > g { + display: initial; + } + g { stroke: ButtonText; stroke-width: 0.9px; fill: none; } - - g:not(:target) { - display: none; + g:not([id|="close"]) { + shape-rendering: crispEdges; } - - use:target > g { - display: initial; + g[id|="close"] { + shape-rendering: geometricPrecision; } - .highlight > g { + .highcontrast { + stroke-width: 1.9px; + } + .highcontrast-hover > g { stroke: HighlightText; } - - .bolder { - stroke-width: 1.6px; - stroke: black; + .white > g { + stroke: #fff; + } + .themes { + stroke: #fff; + stroke-width: 1.9px; + } + .outer-stroke { + stroke: #000; + stroke-width: 3.5; + opacity: .275; + shape-rendering: geometricPrecision; } - - .outline { - stroke-width: 4px; - stroke: white; - opacity: 0.75; + .outer-thinstroke { + stroke: #000; + stroke-width: 2; + opacity: .275; + shape-rendering: geometricPrecision; } - - .inverted { - stroke-width: 1.6px; - stroke: white; + .darktext { + stroke: #000; + stroke-width: 1.9px; } - - .outline-inverted { - stroke-width: 4px; - stroke: black; - opacity: 0.75; + .outer-strokeDT { + stroke: #fff; + stroke-width: 3.5; + opacity: .275; + shape-rendering: geometricPrecision; } - - .outline-thinner { - stroke-width: 3.6px; + .outer-thinstrokeDT { + stroke: #fff; + stroke-width: 2; + opacity: .275; + shape-rendering: geometricPrecision; + } + .restore-background-window { + stroke-width: .9; } - </style> - <g id="close"> - <line x1="1" y1="1" x2="11" y2="11"/> - <line x1="11" y1="1" x2="1" y2="11"/> + <path d="M1,1 l 10,10 M1,11 l 10,-10"/> </g> <g id="maximize"> <rect x="1.5" y="1.5" width="9" height="9"/> @@ -63,51 +80,66 @@ <rect x="1.5" y="3.5" width="7" height="7"/> <polyline points="3.5,3.5 3.5,1.5 10.5,1.5 10.5,8.5 8.5,8.5"/> </g> - - <g id="close-outline"> - <line x1="1" y1="1" x2="11" y2="11" stroke-linecap="round" class="outline"/> - <line x1="11" y1="1" x2="1" y2="11" stroke-linecap="round" class="outline"/> - <line x1="1" y1="1" x2="11" y2="11" class="bolder"/> - <line x1="11" y1="1" x2="1" y2="11" class="bolder"/> - </g> - <g id="maximize-outline"> - <rect x="1.2" y="1.2" width="9.6" height="9.6" stroke-linecap="round" class="outline"/> - <rect x="1.5" y="1.5" width="9" height="9" class="bolder"/> - </g> - <g id="minimize-outline"> - <line x1="1" y1="5.5" x2="11" y2="5.5" stroke-linecap="round" class="outline outline-thinner"/> - <line x1="1" y1="5.5" x2="11" y2="5.5" class="bolder"/> - </g> - <g id="restore-outline"> - <rect x="1.5" y="3.5" width="7" height="7" stroke-linecap="round" class="outline"/> - <polyline points="3.5,3.5 3.5,1.5 10.5,1.5 10.5,8.5 8.5,8.5" stroke-linecap="round" class="outline"/> - <rect x="1.5" y="3.5" width="7" height="7" class="bolder"/> - <polyline points="3.5,3.5 3.5,1.5 10.5,1.5 10.5,8.5 8.5,8.5" class="bolder"/> - </g> - - <g id="close-outline-inverted"> - <line x1="1" y1="1" x2="11" y2="11" stroke-linecap="round" class="outline-inverted"/> - <line x1="11" y1="1" x2="1" y2="11" stroke-linecap="round" class="outline-inverted"/> - <line x1="1" y1="1" x2="11" y2="11" class="inverted"/> - <line x1="11" y1="1" x2="1" y2="11" class="inverted"/> - </g> - <g id="maximize-outline-inverted"> - <rect x="1.2" y="1.2" width="9.6" height="9.6" stroke-linecap="round" class="outline-inverted"/> - <rect x="1.5" y="1.5" width="9" height="9" class="inverted"/> - </g> - <g id="minimize-outline-inverted"> - <line x1="1" y1="5.5" x2="11" y2="5.5" stroke-linecap="round" class="outline-inverted outline-thinner"/> - <line x1="1" y1="5.5" x2="11" y2="5.5" class="inverted"/> - </g> - <g id="restore-outline-inverted"> - <rect x="1.5" y="3.5" width="7" height="7" stroke-linecap="round" class="outline-inverted"/> - <polyline points="3.5,3.5 3.5,1.5 10.5,1.5 10.5,8.5 8.5,8.5" stroke-linecap="round" class="outline-inverted"/> - <rect x="1.5" y="3.5" width="7" height="7" class="inverted"/> - <polyline points="3.5,3.5 3.5,1.5 10.5,1.5 10.5,8.5 8.5,8.5" class="inverted"/> - </g> - - <use id="close-highlight" class="highlight" xlink:href="#close"/> - <use id="maximize-highlight" class="highlight" xlink:href="#maximize"/> - <use id="minimize-highlight" class="highlight" xlink:href="#minimize"/> - <use id="restore-highlight" class="highlight" xlink:href="#restore"/> -</svg> -\ No newline at end of file + + <use id="close-white" class="white" xlink:href="#close"/> + <use id="maximize-white" class="white" xlink:href="#maximize"/> + <use id="minimize-white" class="white" xlink:href="#minimize"/> + <use id="restore-white" class="white" xlink:href="#restore"/> + + <g id="close-highcontrast" class="highcontrast"> + <path d="M1,1 l 10,10 M1,11 l 10,-10"/> + </g> + <g id="maximize-highcontrast" class="highcontrast"> + <rect x="2" y="2" width="8" height="8"/> + </g> + <g id="minimize-highcontrast" class="highcontrast"> + <line x1="1" y1="6" x2="11" y2="6"/> + </g> + <g id="restore-highcontrast" class="highcontrast"> + <rect x="2" y="4" width="6" height="6"/> + <polyline points="3.5,1.5 10.5,1.5 10.5,8.5" class="restore-background-window"/> + </g> + + <use id="close-highcontrast-hover" class="highcontrast-hover" xlink:href="#close-highcontrast"/> + <use id="maximize-highcontrast-hover" class="highcontrast-hover" xlink:href="#maximize-highcontrast"/> + <use id="minimize-highcontrast-hover" class="highcontrast-hover" xlink:href="#minimize-highcontrast"/> + <use id="restore-highcontrast-hover" class="highcontrast-hover" xlink:href="#restore-highcontrast"/> + + <g id="close-themes" class="themes"> + <path d="M.4343,.4343 l 11.1314,11.1314 M.4343,11.5657 l 11.1314,-11.1314" class="outer-stroke" /> + <path d="M1,1 l 10,10 M1,11 l 10,-10"/> + </g> + <g id="maximize-themes" class="themes"> + <rect x="2" y="2" width="8" height="8" class="outer-stroke"/> + <rect x="2" y="2" width="8" height="8"/> + </g> + <g id="minimize-themes" class="themes"> + <line x1=".2" y1="6" x2="11.8" y2="6" class="outer-stroke"/> + <line x1="1" y1="6" x2="11" y2="6"/> + </g> + <g id="restore-themes" class="themes"> + <rect x="2" y="4" width="6" height="6" class="outer-stroke"/> + <polyline points="2.7,1.25 10.75,1.25 10.75,9.3" class="outer-thinstroke"/> + <rect x="2" y="4" width="6" height="6"/> + <polyline points="3.5,1.5 10.5,1.5 10.5,8.5" class="restore-background-window"/> + </g> + + <g id="close-darktext" class="darktext"> + <path d="M.4343,.4343 l 11.1314,11.1314 M.4343,11.5657 l 11.1314,-11.1314" class="outer-strokeDT" /> + <path d="M1,1 l 10,10 M1,11 l 10,-10"/> + </g> + <g id="maximize-darktext" class="darktext"> + <rect x="2" y="2" width="8" height="8" class="outer-strokeDT"/> + <rect x="2" y="2" width="8" height="8"/> + </g> + <g id="minimize-darktext" class="darktext"> + <line x1=".2" y1="6" x2="11.8" y2="6" class="outer-strokeDT"/> + <line x1="1" y1="6" x2="11" y2="6"/> + </g> + <g id="restore-darktext" class="darktext"> + <rect x="2" y="4" width="6" height="6" class="outer-strokeDT"/> + <polyline points="2.7,1.25 10.75,1.25 10.75,9.3" class="outer-thinstrokeDT"/> + <rect x="2" y="4" width="6" height="6"/> + <polyline points="3.5,1.5 10.5,1.5 10.5,8.5" class="restore-background-window"/> + </g> +</svg> diff --git a/src/chrome/browser/close-btn.png b/src/chrome/browser/close-btn.png Binary files differ. diff --git a/src/chrome/browser/downloads/allDownloadsViewOverlay.css b/src/chrome/browser/downloads/allDownloadsViewOverlay.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/. */ - #downloadsRichListBox { /** The default listbox appearance comes with an unwanted margin. **/ -moz-appearance: none; @@ -26,7 +22,7 @@ } .blockedIcon { - list-style-image: url("chrome://global/skin/icons/Error.png"); + list-style-image: url("chrome://global/skin/icons/error-16.svg"); } .downloadTarget, @@ -49,39 +45,38 @@ margin: 3px; border: none; padding: 5px; - list-style-image: url("chrome://browser/skin/downloads/buttons.png"); } /*** Button icons ***/ .downloadButton.downloadCancel { - -moz-image-region: rect(0px, 16px, 16px, 0px); + list-style-image: url("chrome://browser/skin/downloads/buttons.svg#cancel-normal"); } .downloadButton.downloadCancel:hover { - -moz-image-region: rect(0px, 32px, 16px, 16px); + list-style-image: url("chrome://browser/skin/downloads/buttons.svg#cancel"); } .downloadButton.downloadCancel:active { - -moz-image-region: rect(0px, 48px, 16px, 32px); + list-style-image: url("chrome://browser/skin/downloads/buttons.svg#cancel-active"); } .downloadButton.downloadShow { - -moz-image-region: rect(16px, 16px, 32px, 0px); + list-style-image: url("chrome://browser/skin/downloads/buttons.svg#show-normal"); } .downloadButton.downloadShow:hover { - -moz-image-region: rect(16px, 32px, 32px, 16px); + list-style-image: url("chrome://browser/skin/downloads/buttons.svg#show"); } .downloadButton.downloadShow:active { - -moz-image-region: rect(16px, 48px, 32px, 32px); + list-style-image: url("chrome://browser/skin/downloads/buttons.svg#show-active"); } .downloadButton.downloadRetry { - -moz-image-region: rect(32px, 16px, 48px, 0px); + list-style-image: url("chrome://browser/skin/downloads/buttons.svg#retry-normal"); } .downloadButton.downloadRetry:hover { - -moz-image-region: rect(32px, 32px, 48px, 16px); + list-style-image: url("chrome://browser/skin/downloads/buttons.svg#retry"); } .downloadButton.downloadRetry:active { - -moz-image-region: rect(32px, 48px, 48px, 32px); + list-style-image: url("chrome://browser/skin/downloads/buttons.svg#retry-active"); } #downloadsRichListBox > richlistitem.download[selected] { diff --git a/src/chrome/browser/downloads/buttons.png b/src/chrome/browser/downloads/buttons.png Binary files differ. diff --git a/src/chrome/browser/downloads/buttons.svg b/src/chrome/browser/downloads/buttons.svg @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="16" height="16" viewBox="0 0 16 16"> + <style> + use:not(:target) { + display: none; + } + use { + fill: none; + stroke: #fff; + stroke-width: 1; + } + use[id$="normal"] { + opacity: 0.6; + } + use[id="retry-active"] { + stroke: #128ED3; + } + use[id="cancel-active"] { + stroke: #C62323; + } + use[id="show-active"] { + stroke: #F5F500; + } + </style> + <defs> + <g id="cancel-shape"> + <line x1="4" y1="4" x2="12" y2="12"/> + <line x1="4" y1="12" x2="12" y2="4"/> + </g> + <g id="show-shape"> + <path d="M1.5,2.936v10.13c0,0.796,0.641,1.435,1.435,1.435h10.131c0.8,0,1.435-0.639,1.435-1.435 + V4.93c0-0.797-0.635-1.436-1.435-1.436H7.479V2.936c0-0.797-0.559-1.436-1.352-1.436H2.935C2.141,1.5,1.5,2.138,1.5,2.936 + L1.5,2.936z M1.5,8.119c0-1.436,1.193-2.631,2.634-2.631h7.732c1.44,0,2.634,1.196,2.634,2.631"/> + </g> + <g id="retry-shape"> + <path d="M8.041,8.935L8.041,8.935z M10.26,5.034 + c-3.779-2.22-8.159,1.8-6.299,5.82c1.86,3.96,7.739,3.18,8.52-1.2"/> + <polyline points="7.921,6.534 10.62,5.274 9.361,2.574 "/> + </g> + </defs> + <use id="retry" xlink:href="#retry-shape"/> + <use id="retry-normal" xlink:href="#retry-shape"/> + <use id="retry-hover" xlink:href="#retry-shape"/> + <use id="retry-active" xlink:href="#retry-shape"/> + <use id="cancel" xlink:href="#cancel-shape"/> + <use id="cancel-normal" xlink:href="#cancel-shape"/> + <use id="cancel-active" xlink:href="#cancel-shape"/> + <use id="show" xlink:href="#show-shape"/> + <use id="show-normal" xlink:href="#show-shape"/> + <use id="show-active" xlink:href="#show-shape"/> +</svg> + diff --git a/src/chrome/browser/downloads/download-glow.png b/src/chrome/browser/downloads/download-glow.png Binary files differ. diff --git a/src/chrome/browser/downloads/downloads.css b/src/chrome/browser/downloads/downloads.css @@ -95,7 +95,7 @@ richlistitem[type="download"]:first-child { } .blockedIcon { - list-style-image: url("chrome://global/skin/icons/Error.png"); + list-style-image: url("chrome://global/skin/icons/error-16.svg"); } /* We hold .downloadTarget, .downloadDisplayName, .downloadProgress and @@ -143,7 +143,6 @@ richlistitem[type="download"]:first-child { border: none; background: transparent; padding: 5px; - list-style-image: url("chrome://browser/skin/downloads/buttons.png"); } .downloadButton > .button-box { @@ -165,33 +164,33 @@ richlistitem[type="download"]:first-child { /*** Button icons ***/ .downloadButton.downloadCancel { - -moz-image-region: rect(0px, 16px, 16px, 0px); + list-style-image: url("chrome://browser/skin/downloads/buttons.svg#cancel-normal"); } .downloadButton.downloadCancel:hover { - -moz-image-region: rect(0px, 32px, 16px, 16px); + list-style-image: url("chrome://browser/skin/downloads/buttons.svg#cancel"); } .downloadButton.downloadCancel:active { - -moz-image-region: rect(0px, 48px, 16px, 32px); + list-style-image: url("chrome://browser/skin/downloads/buttons.svg#cancel-active"); } .downloadButton.downloadShow { - -moz-image-region: rect(16px, 16px, 32px, 0px); + list-style-image: url("chrome://browser/skin/downloads/buttons.svg#show-normal"); } .downloadButton.downloadShow:hover { - -moz-image-region: rect(16px, 32px, 32px, 16px); + list-style-image: url("chrome://browser/skin/downloads/buttons.svg#show"); } .downloadButton.downloadShow:active { - -moz-image-region: rect(16px, 48px, 32px, 32px); + list-style-image: url("chrome://browser/skin/downloads/buttons.svg#show-active"); } .downloadButton.downloadRetry { - -moz-image-region: rect(32px, 16px, 48px, 0px); + list-style-image: url("chrome://browser/skin/downloads/buttons.svg#retry-normal"); } .downloadButton.downloadRetry:hover { - -moz-image-region: rect(32px, 32px, 48px, 16px); + list-style-image: url("chrome://browser/skin/downloads/buttons.svg#retry"); } .downloadButton.downloadRetry:active { - -moz-image-region: rect(32px, 48px, 48px, 32px); + list-style-image: url("chrome://browser/skin/downloads/buttons.svg#retry-active"); } /*** Status and progress indicator ***/ @@ -206,32 +205,32 @@ richlistitem[type="download"]:first-child { /*** Main indicator icon ***/ #downloads-indicator-icon { - background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), + background: -moz-image-rect(var(--toolbarbutton-image), 0, 108, 18, 90) center no-repeat; min-width: 18px; min-height: 18px; } -#downloads-indicator-icon:-moz-lwtheme-darktext { - background: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"), +toolbar:not([brighttext]) #downloads-indicator-icon { + background: -moz-image-rect(var(--toolbarbutton-inverted-image), 0, 108, 18, 90) center no-repeat; } #downloads-indicator[attention] > #downloads-indicator-anchor > #downloads-indicator-icon { - background-image: url("chrome://browser/skin/downloads/download-glow.png"); + background-image: url("chrome://browser/skin/toolbar/downloads.svg#highlight"); } /* In the next few rules, we use :not([counter]) as a shortcut that is equivalent to -moz-any([progress], [paused]). */ #downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter { - background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), + background: -moz-image-rect(var(--toolbarbutton-image), 0, 108, 18, 90) center no-repeat; background-size: 12px; } #downloads-indicator:not([counter])[attention] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter { - background-image: url("chrome://browser/skin/downloads/download-glow.png"); + background-image: url("chrome://browser/skin/toolbar/downloads.svg#highlight"); } /*** Download notifications ***/ @@ -290,7 +289,7 @@ richlistitem[type="download"]:first-child { text-align: center; } -#downloads-indicator-counter:-moz-lwtheme-darktext { +toolbar:not([brighttext]) #downloads-indicator-counter { color: hsl(0,0%,30%); text-shadow: hsla(0,0%,100%,.5) 0 1px; } @@ -345,4 +344,5 @@ toolbar[mode="full"] > #downloads-indicator > .toolbarbutton-text { #downloads-indicator-counter { margin-bottom: -1px; -} -\ No newline at end of file +} + diff --git a/src/chrome/browser/feeds/audioFeedIcon.png b/src/chrome/browser/feeds/audioFeedIcon.png Binary files differ. diff --git a/src/chrome/browser/feeds/audioFeedIcon16.png b/src/chrome/browser/feeds/audioFeedIcon16.png Binary files differ. diff --git a/src/chrome/browser/feeds/feedIcon.png b/src/chrome/browser/feeds/feedIcon.png Binary files differ. diff --git a/src/chrome/browser/feeds/feedIcon.svg b/src/chrome/browser/feeds/feedIcon.svg @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="32" height="32" viewBox="0 0 32 32"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M8.166,26.854c0,1.159-0.833,1.986-1.999,1.986S4,28.014,4,26.854 + C4,25.692,5,24.701,6.167,24.701S8.166,25.692,8.166,26.854L8.166,26.854z"/> + <path d="M3,4c14.333,0,26,11.593,26,26 M3,14.434c8.667,0,15.666,6.954,15.666,15.566"/> + </g> +</svg> diff --git a/src/chrome/browser/feeds/feedIcon16.png b/src/chrome/browser/feeds/feedIcon16.png Binary files differ. diff --git a/src/chrome/browser/feeds/feedIcon16.svg b/src/chrome/browser/feeds/feedIcon16.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <circle cx="3.5" cy="14.5" r="1"/> + <path d="M 2,3.5 a 12.5,12.5 0 0,1 12.5,12.5 M 2,8.5 a 7.5,7.5 0 0,1 7.5,7.5"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/feeds/subscribe-ui.css b/src/chrome/browser/feeds/subscribe-ui.css @@ -21,7 +21,7 @@ } .chooseApplicationMenuItem { - list-style-image: url("chrome://browser/skin/preferences/application.png"); + list-style-image: url("chrome://browser/skin/toolbar/new-window.svg"); } #feedHeader[dir="rtl"] .handlersMenuList > menupopup { diff --git a/src/chrome/browser/feeds/subscribe.css b/src/chrome/browser/feeds/subscribe.css @@ -37,16 +37,10 @@ html { display: none; } -.feedBackground { - background: url("chrome://browser/skin/feeds/feedIcon.png") 0% 10% no-repeat rgb(50,50,50); -} - -.videoPodcastBackground { - background: url("chrome://browser/skin/feeds/videoFeedIcon.png") 0% 10% no-repeat rgb(50,50,50); -} - +.feedBackground, +.videoPodcastBackground, .audioPodcastBackground { - background: url("chrome://browser/skin/feeds/audioFeedIcon.png") 0% 10% no-repeat rgb(50,50,50); + background: url("chrome://browser/skin/feeds/feedIcon.svg") 0% 10% no-repeat rgb(50,50,50); } #feedHeader[dir="rtl"] { diff --git a/src/chrome/browser/feeds/videoFeedIcon.png b/src/chrome/browser/feeds/videoFeedIcon.png Binary files differ. diff --git a/src/chrome/browser/feeds/videoFeedIcon16.png b/src/chrome/browser/feeds/videoFeedIcon16.png Binary files differ. diff --git a/src/chrome/browser/identity-icons-generic.png b/src/chrome/browser/identity-icons-generic.png Binary files differ. diff --git a/src/chrome/browser/identity-not-secure.svg b/src/chrome/browser/identity-not-secure.svg @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> + <circle fill="#a6a6a6" cx="8" cy="8" r="7" /> + <path transform="translate(1 1)" fill="#fff" d="M5.31617536,1.74095137 C5.29841561,1.73995137 5.27868256,1.74095137 5.26190947,1.74795137 C5.25796286,1.74995137 5.2530296,1.75395137 5.24908299,1.75895137 C5.2550029,1.75895137 5.26190947,1.75895137 5.26684273,1.75795137 C5.28460248,1.75395137 5.29841561,1.74195137 5.31617536,1.74095137 L5.31617536,1.74095137 Z M5.33886837,2.59995137 C5.36156138,2.57095137 5.30729549,2.54695137 5.27670926,2.54895137 C5.28460248,2.51395137 5.32900184,2.49595137 5.31716201,2.45195137 C5.30630884,2.40595137 5.25105629,2.41495137 5.22145672,2.43995137 C5.1948171,2.46295137 5.18100396,2.50295137 5.15831095,2.52995137 C5.14548447,2.54495137 5.12180481,2.54995137 5.11292494,2.56795137 C5.10503172,2.58495137 5.11489824,2.61395137 5.11391159,2.63295137 C5.15041773,2.63795137 5.18889718,2.62695137 5.2155368,2.60095137 L5.23329655,2.59295137 C5.22934994,2.59595137 5.22737663,2.60295137 5.22540333,2.60695137 C5.24316307,2.62895137 5.32209528,2.62295137 5.33886837,2.59995137 L5.33886837,2.59995137 Z M5.37636117,1.37295137 C5.37438786,1.42695137 5.42668044,1.43295137 5.46515989,1.45395137 C5.45332006,1.48495137 5.410894,1.48395137 5.39116095,1.50895137 C5.36748129,1.53995137 5.410894,1.56695137 5.43260036,1.58095137 C5.47502642,1.60695137 5.45134676,1.63695137 5.44345354,1.67395137 C5.43161371,1.72595137 5.54310544,1.71195137 5.56777176,1.71095137 C5.61019782,1.70895137 5.67729019,1.71595137 5.71774294,1.69595137 C5.76115565,1.67195137 5.78384866,1.61895137 5.82923468,1.59295137 C5.86672748,1.57095137 5.92000671,1.55895137 5.96144612,1.57395137 C6.00485883,1.58895137 5.99992557,1.64495137 6.03544506,1.66895137 C6.07688447,1.69795137 6.12227048,1.70695137 6.15778997,1.66395137 C6.18048298,1.63695137 6.23080226,1.60295137 6.23277557,1.57395137 C6.23672218,1.52295137 6.25152196,1.48295137 6.30776116,1.47195137 C6.35314718,1.46295137 6.34328065,1.50695137 6.37485353,1.51495137 C6.44490586,1.53295137 6.47845205,1.31895137 6.55442429,1.38195137 C6.57218404,1.39695137 6.5771173,1.45495137 6.60770353,1.44995137 C6.63927641,1.44495137 6.64026306,1.39895137 6.67380925,1.39795137 C6.68466243,1.42895137 6.61559675,1.46695137 6.60671688,1.50095137 C6.64914294,1.46595137 6.66986264,1.47095137 6.71820861,1.46595137 C6.7310351,1.49895137 6.63631645,1.55295137 6.61165014,1.55795137 C6.5771173,1.56695137 6.5563976,1.54695137 6.52975798,1.56595137 C6.50903828,1.57995137 6.48042535,1.57895137 6.45575904,1.58095137 C6.4212262,1.58495137 6.35610713,1.63095137 6.35709379,1.66895137 C6.35709379,1.68395137 6.36893362,1.71795137 6.35610713,1.72995137 C6.3442673,1.74295137 6.31565438,1.73095137 6.31269442,1.71795137 C6.28309485,1.76195137 6.2446154,1.68495137 6.21994908,1.74695137 C6.25941518,1.75695137 6.29592133,1.79495137 6.34032069,1.80595137 C6.3837334,1.81695137 6.42714612,1.82795137 6.46957217,1.83995137 C6.54159781,1.86195137 6.64914294,1.77495137 6.70439548,1.73295137 C6.75668806,1.69395137 6.82279378,1.60595137 6.83660692,1.54295137 C6.85239336,1.47395137 6.92737895,1.39495137 6.91159251,1.32695137 C6.89777937,1.26295137 6.88791285,1.23295137 6.95993848,1.20995137 C6.99052471,1.19995137 7.06452365,1.18395137 7.07537683,1.14895137 C7.09116327,1.09695137 6.9283656,1.11095137 6.90369929,1.09895137 C6.82180713,1.06195137 6.78628764,1.02095137 6.69156899,1.05795137 C6.64223637,1.07695137 6.59389039,1.09295137 6.54258446,1.10695137 C6.51594484,1.11395137 6.48930523,1.11595137 6.47450544,1.13895137 C6.46858552,1.14795137 6.4606923,1.15495137 6.45082578,1.15995137 C6.40839972,1.17695137 6.4606923,1.09595137 6.46562556,1.09095137 C6.4794387,1.07495137 6.50213171,1.02595137 6.45773234,1.03695137 C6.39261328,1.05195137 6.34525395,1.15195137 6.27520162,1.15695137 C6.22192239,1.16095137 6.23869548,1.11395137 6.25250862,1.08695137 C6.27914824,1.03795137 6.20317599,1.03195137 6.1696298,1.03195137 C6.12227048,1.03195137 6.08675099,1.05895137 6.04136497,1.06395137 C5.99893892,1.06795137 5.94960629,1.07595137 5.90718023,1.07495137 C5.82232811,1.07195137 5.76608892,1.12195137 5.68222345,1.09395137 C5.59342472,1.06495137 5.49771943,1.13895137 5.41188066,1.14895137 C5.38326773,1.15295137 5.34182833,1.14695137 5.3299885,1.18095137 C5.32012197,1.20895137 5.3299885,1.25195137 5.35169485,1.27295137 L5.35860142,1.26695137 C5.33985502,1.28595137 5.33788172,1.31295137 5.31025545,1.32295137 C5.28361583,1.33195137 5.25697621,1.36695137 5.24316307,1.39095137 C5.2323099,1.40895137 5.20172367,1.48395137 5.2550029,1.44495137 C5.29348235,1.41595137 5.31518871,1.36195137 5.37636117,1.37295137 L5.37636117,1.37295137 Z M2.18355356,6.10795137 C2.09278153,6.04195137 1.88657115,6.02595137 1.91222411,5.87195137 C1.92801055,5.77795137 2.0247025,5.70495137 2.10264805,5.65895137 C2.20525992,5.59895137 2.31971161,5.59695137 2.43514996,5.60695137 C2.46277623,5.60995137 2.51506881,5.60495137 2.5298686,5.62695137 C2.53776182,5.63795137 2.55354826,5.64495137 2.56637474,5.64895137 C2.59696097,5.65795137 2.62853385,5.65895137 2.66010674,5.66495137 C2.70746606,5.67395137 2.74101224,5.71495137 2.78837156,5.68095137 C2.84263745,5.64295137 2.85151733,5.63495137 2.91762305,5.64295137 C2.9768222,5.64995137 3.01234169,5.60495137 3.06167432,5.60895137 C3.07746076,5.60995137 3.09127389,5.61295137 3.10311372,5.61795137 C3.10804699,5.60095137 3.11495355,5.58595137 3.12580673,5.58295137 C3.15047305,5.57595137 3.20473893,5.63595137 3.2303919,5.64095137 C3.29551097,5.65495137 3.29156436,5.60895137 3.29649762,5.56195137 C3.32905715,5.55595137 3.34484359,5.60095137 3.37444317,5.57295137 C3.37345652,5.58195137 3.37937643,5.59595137 3.37937643,5.60495137 C3.38529635,5.60895137 3.39220292,5.60895137 3.39812283,5.60395137 C3.40108279,5.59895137 3.40206944,5.59395137 3.40009614,5.58795137 C3.41588258,5.59295137 3.4237758,5.58195137 3.4257491,5.56295137 C3.43758893,5.56395137 3.45633533,5.55695137 3.46817516,5.55895137 C3.47705503,5.52495137 3.49678809,5.47995137 3.47212177,5.44895137 C3.47804169,5.44795137 3.48494825,5.44595137 3.49185482,5.44495137 C3.49185482,5.41095137 3.51454783,5.39595137 3.51553448,5.36895137 C3.48001499,5.36395137 3.44054889,5.36595137 3.40404275,5.36695137 C3.4257491,5.34695137 3.47804169,5.30295137 3.48297495,5.27595137 C3.49284148,5.22795137 3.43068237,5.19895137 3.43561563,5.14195137 C3.44153554,5.17195137 3.47508173,5.24095137 3.50665461,5.25095137 C3.57769359,5.27495137 3.55697389,5.20395137 3.56190715,5.16695137 C3.5796669,5.04995137 3.68425207,5.14695137 3.68622537,5.20795137 C3.7168116,5.13795137 3.79278385,5.21595137 3.75825101,5.27595137 C3.74147791,5.30495137 3.71878491,5.29395137 3.73950461,5.33195137 C3.7543044,5.35895137 3.77601075,5.35995137 3.80758363,5.35295137 C3.81547685,5.33695137 3.82238342,5.31895137 3.82238342,5.29995137 C3.87664931,5.28295137 3.9121688,5.34795137 3.88059592,5.38695137 C3.92104868,5.36495137 3.96248808,5.34395137 4.00590079,5.33295137 C3.98024783,5.24295137 3.95360821,5.15495137 3.9703813,5.05895137 C3.97432791,5.03795137 3.97728787,5.01395137 3.99307431,4.99795137 C4.01280736,4.97695137 3.98814105,4.98495137 3.98616774,4.97095137 C3.98024783,4.92895137 4.02464719,4.88595137 4.04142028,4.84795137 C3.99504762,4.83795137 4.03747367,4.74595137 4.0680599,4.72995137 C4.10160609,4.71295137 4.20027134,4.74095137 4.20717791,4.71395137 C4.22691096,4.72495137 4.24565736,4.74095137 4.26933702,4.74095137 C4.32360291,4.74195137 4.36010905,4.74295137 4.39760185,4.78695137 C4.41634825,4.80995137 4.44397452,4.86095137 4.47752071,4.86495137 C4.47653405,4.90295137 4.51994676,4.93095137 4.47456075,4.96295137 C4.43904126,4.98795137 4.38970863,4.98195137 4.37490884,5.02995137 C4.36504232,5.05995137 4.33642939,5.07395137 4.3798421,5.09495137 C4.3985885,5.10495137 4.42226816,5.10695137 4.44298787,5.10695137 C4.44792113,5.13595137 4.46272092,5.17495137 4.50021371,5.16995137 C4.573226,5.16095137 4.58901244,5.06895137 4.64722494,5.03795137 C4.74194358,4.98795137 4.7271438,5.20395137 4.80903596,5.14995137 C4.82876901,5.13695137 4.82876901,5.08195137 4.83863553,5.06095137 C4.85836858,5.01695137 4.88106159,4.97195137 4.90967452,4.93295137 C4.94618066,4.88295137 4.99156668,4.83095137 4.97578024,4.76595137 C4.96690036,4.72995137 4.89783469,4.71495137 4.8662618,4.68995137 C4.82876901,4.65895137 4.79226286,4.62595137 4.76956986,4.58295137 C4.75575672,4.55695137 4.7478635,4.54795137 4.76956986,4.53495137 C4.78239634,4.52795137 4.77844973,4.51395137 4.77351647,4.50395137 C4.74983681,4.45395137 4.68570439,4.36495137 4.77548977,4.33395137 C4.79522282,4.32695137 4.83666223,4.26295137 4.83962219,4.23795137 C4.84455545,4.19595137 4.78140969,4.15795137 4.81002261,4.11595137 C4.83074231,4.08495137 4.8830349,4.06495137 4.90967452,4.03395137 C4.922501,4.01895137 4.93730079,4.00595137 4.95703384,4.00195137 C4.95802049,3.98495137 4.9619671,3.96595137 4.97676689,3.95495137 C5.00044655,3.93695137 5.03793935,3.94595137 5.06556562,3.93695137 C5.11095163,3.92295137 5.13068468,3.87595137 5.16620418,3.84995137 C5.19580375,3.82795137 5.22934994,3.83595137 5.26092282,3.81995137 C5.27769591,3.81195137 5.28460248,3.79395137 5.30137557,3.78595137 C5.34281498,3.76595137 5.3901743,3.79795137 5.4089207,3.83295137 C5.45332006,3.91695137 5.5085726,4.04695137 5.63486413,4.01295137 C5.68617006,3.99895137 5.72464951,3.95695137 5.74043595,3.90895137 C5.75523574,3.86295137 5.73747599,3.82495137 5.74043595,3.77995137 C5.74438256,3.69995137 5.82232811,3.64895137 5.83120798,3.56995137 C5.77200883,3.57095137 5.80259506,3.53395137 5.78286201,3.49995137 C5.76115565,3.46195137 5.71182303,3.48995137 5.67926349,3.48395137 C5.71280968,3.40295137 5.71280968,3.37495137 5.63387748,3.33595137 C5.59934464,3.31895137 5.54211879,3.23895137 5.51547917,3.24195137 C5.53718553,3.21195137 5.58849146,3.26195137 5.6042779,3.27595137 C5.63881074,3.30895137 5.66939697,3.32395137 5.71774294,3.32795137 C5.70392981,3.30695137 5.69702324,3.26895137 5.70590311,3.24495137 C5.71478298,3.22295137 5.69307663,3.19995137 5.69504993,3.17195137 C5.75030248,3.24295137 5.7414226,3.32395137 5.77299548,3.40195137 C5.78582197,3.43495137 5.8183815,3.45695137 5.83219464,3.49095137 C5.84995438,3.53395137 5.83811455,3.53295137 5.87560735,3.55895137 C5.89830036,3.57495137 5.90619358,3.60295137 5.91014019,3.62795137 C5.91704675,3.67195137 5.9328332,3.65295137 5.95651286,3.67795137 C5.97032599,3.69295137 6.00584548,3.69495137 5.99893892,3.72595137 C5.99400565,3.74795137 5.97920586,3.76595137 5.97624591,3.78895137 C5.96736603,3.85495137 6.09661752,3.76495137 6.109444,3.75595137 C6.13707027,3.73495137 6.18245629,3.73095137 6.20416264,3.70595137 C6.22685565,3.67995137 6.22192239,3.64195137 6.24560205,3.61795137 C6.27520162,3.58695137 6.30381455,3.60795137 6.33933404,3.60195137 C6.38077345,3.59595137 6.41629294,3.56295137 6.44687917,3.53795137 C6.51199823,3.48295137 6.55343764,3.42295137 6.60770353,3.35995137 C6.58402387,3.36595137 6.50311836,3.42495137 6.4981851,3.36995137 C6.46759887,3.36995137 6.39655989,3.36495137 6.38570671,3.33095137 C6.37682684,3.30595137 6.37978679,3.27795137 6.37978679,3.25295137 C6.37880014,3.22595137 6.34624061,3.23495137 6.32453425,3.22095137 C6.28112154,3.19295137 6.25941518,3.14095137 6.21304252,3.11695137 C6.13904358,3.07795137 6.09464421,3.01495137 6.05024485,2.94795137 C6.02459188,2.90895137 5.93381985,2.82995137 5.94072642,2.78295137 C5.94467303,2.75195137 5.97032599,2.71895137 5.96835269,2.68795137 C5.96736603,2.65995137 5.94565968,2.64495137 5.94861964,2.61395137 C5.95157959,2.57795137 5.86475417,2.51495137 5.94072642,2.50795137 C5.96440608,2.50595137 5.96835269,2.47695137 5.9949923,2.46095137 C6.02459188,2.44295137 6.01768531,2.42695137 6.05024485,2.43595137 C6.10253743,2.45195137 6.13904358,2.39395137 6.17456307,2.36295137 C6.23573552,2.30895137 6.13805692,2.30795137 6.13312366,2.26695137 C6.1281904,2.22595137 6.10451074,2.19595137 6.09760417,2.14795137 C6.09365756,2.11295137 6.06109802,2.12695137 6.04235163,2.13595137 C6.01669866,2.14795137 5.99104569,2.12995137 5.96637938,2.12495137 C5.94368637,2.11995137 5.92493997,2.08195137 5.8973137,2.09395137 C5.876594,2.10395137 5.87758065,2.12895137 5.84798108,2.12595137 C5.82627472,2.12395137 5.81246159,2.10295137 5.79075523,2.09895137 C5.75720904,2.09495137 5.78680862,2.12695137 5.74931582,2.12995137 C5.72267621,2.13195137 5.63683743,2.09595137 5.63486413,2.12995137 C5.60822451,2.08395137 5.59737133,2.16195137 5.56875841,2.16995137 C5.53718553,2.17895137 5.50363934,2.17095137 5.47206646,2.18295137 C5.40300078,2.21095137 5.42569379,2.27995137 5.49179951,2.29095137 C5.54507875,2.29895137 5.47601307,2.33595137 5.49377282,2.37195137 C5.50955926,2.40395137 5.51449252,2.42595137 5.54902536,2.43895137 C5.60625121,2.45995137 5.66742366,2.47695137 5.64769061,2.55095137 C5.62203765,2.64295137 5.55790523,2.72995137 5.46811985,2.77195137 C5.38228108,2.81195137 5.35860142,2.70295137 5.29348235,2.67495137 C5.2530296,2.65795137 5.20764358,2.66395137 5.16521752,2.66895137 C5.15831095,2.67995137 5.22441667,2.70095137 5.23526985,2.71995137 C5.2550029,2.75895137 5.20073701,2.75395137 5.1967904,2.78395137 C5.19284379,2.80895137 5.16028426,2.82695137 5.17804401,2.85195137 C5.15929761,2.82895137 5.12279146,2.85995137 5.10996498,2.87395137 C5.09121858,2.89395137 5.09516519,2.90695137 5.10305841,2.93195137 C5.11884485,2.98295137 5.04188596,3.03595137 4.99649994,3.02995137 C4.95802049,3.02395137 4.92151435,3.02695137 4.8850082,3.00895137 C4.84159549,2.98795137 4.85639528,3.00095137 4.84751541,2.95195137 C4.83863553,2.90595137 4.77548977,2.88595137 4.81298257,2.82895137 C4.83962219,2.78695137 4.8267957,2.79095137 4.82186244,2.75095137 C4.81594253,2.70895137 4.83468892,2.70295137 4.86823511,2.69695137 C4.90474125,2.68995137 4.92052769,2.62495137 4.94223405,2.59395137 C4.94716731,2.58695137 4.96986032,2.52895137 4.93434083,2.54395137 C4.91460778,2.55295137 4.92940757,2.57795137 4.89882134,2.58195137 C4.87711498,2.58595137 4.85540863,2.57095137 4.83271562,2.57095137 C4.80706265,2.57095137 4.78042303,2.58395137 4.75674337,2.56795137 C4.7685832,2.55395137 4.85343532,2.48395137 4.78634295,2.46995137 C4.75970333,2.46395137 4.78140969,2.50795137 4.7458902,2.50195137 C4.73898363,2.53695137 4.69655757,2.53395137 4.67583787,2.55595137 C4.68471774,2.51895137 4.76266329,2.49095137 4.73701032,2.46095137 C4.79324952,2.41195137 4.80508935,2.40295137 4.7291171,2.37595137 C4.60973215,2.33395137 4.61861202,2.21095137 4.70050418,2.13695137 C4.77548977,2.06895137 4.89882134,1.98295137 4.97183363,2.09595137 C5.04977918,2.21695137 5.0991118,2.12895137 5.16324422,2.05095137 C5.14153786,2.04195137 5.16127091,2.03595137 5.15436434,2.00895137 C5.08332536,2.03795137 5.0201796,1.94595137 5.06852557,1.89095137 C5.09812515,1.85795137 5.14351117,1.86695137 5.18297727,1.85695137 C5.21751011,1.84795137 5.24908299,1.81395137 5.26388278,1.78195137 C5.2342832,1.78995137 5.23822981,1.77195137 5.24908299,1.75895137 C5.23132324,1.75695137 5.21159019,1.74895137 5.1967904,1.74395137 C5.15436434,1.72895137 5.1573243,1.69595137 5.11193829,1.68995137 C5.00439316,1.67395137 5.22441667,1.54995137 5.11687155,1.54995137 C5.08233871,1.54895137 5.05175248,1.49695137 5.02609952,1.50695137 C5.00833977,1.51395137 5.00340651,1.52795137 4.98170015,1.51895137 C4.96690036,1.51295137 4.94914062,1.49995137 4.93138087,1.50995137 C4.89290142,1.53395137 4.8850082,1.50495137 4.84751541,1.51595137 C4.81692918,1.52595137 4.80015608,1.55595137 4.76463659,1.54795137 C4.80015608,1.49995137 4.8435688,1.45995137 4.87514168,1.40995137 C4.89586138,1.37595137 4.92151435,1.34495137 4.95604719,1.32395137 C4.97479358,1.31295137 5.02807282,1.30195137 5.03103278,1.27595137 C5.03596604,1.23295137 5.00932642,1.23695137 4.97972685,1.25395137 C4.90276795,1.29995137 4.82284909,1.34895137 4.7478635,1.39795137 C4.70247748,1.42695137 4.66695799,1.45195137 4.6107188,1.44395137 C4.56730609,1.43695137 4.54954634,1.48495137 4.5150135,1.48095137 C4.49824041,1.41395137 4.12824571,1.65695137 4.08285969,1.67795137 C4.01083406,1.70995137 3.92992855,1.76495137 3.85296965,1.78395137 C3.82139677,1.79195137 3.75529105,1.86595137 3.75923766,1.78395137 C3.71977156,1.77895137 3.69017198,1.81895137 3.66353236,1.83895137 C3.62603957,1.86795137 3.5816402,1.88595137 3.54118745,1.91095137 C3.45436203,1.96695137 3.37246987,2.03395137 3.29156436,2.09695137 C3.21460546,2.15695137 3.13764656,2.22695137 3.05674105,2.28095137 C3.02911478,2.29995137 2.92748957,2.35195137 2.93044953,2.39095137 C3.00247516,2.40495137 3.24815165,2.09695137 3.31721732,2.17995137 C3.33497707,2.20095137 3.21263216,2.26295137 3.1928991,2.27495137 C3.17612601,2.28395137 3.15639296,2.28295137 3.13961987,2.29195137 C3.11791351,2.30495137 3.10410038,2.32695137 3.08338067,2.34095137 C3.02812813,2.37595137 2.98175546,2.42095137 2.94130271,2.47095137 C2.91268978,2.50795137 2.89197008,2.55595137 2.8603972,2.58995137 C2.86533046,2.55395137 2.85842389,2.52795137 2.85941055,2.49295137 C2.81895779,2.51895137 2.8021847,2.56295137 2.74594551,2.55095137 C2.69463957,2.53895137 2.65418682,2.59095137 2.61768068,2.61895137 C2.53282856,2.68395137 2.47560271,2.75595137 2.40456373,2.83195137 C2.36509763,2.87495137 2.32267157,2.90495137 2.29800525,2.95795137 C2.27136564,3.01495137 2.23387284,3.06595137 2.19934,3.11895137 C2.13323428,3.21595137 2.05726204,3.30495137 1.99214297,3.40195137 C1.85894488,3.60095137 1.7711328,3.82895137 1.66161437,4.04095137 C1.60537517,4.15095137 1.55110929,4.25895137 1.52841628,4.38195137 C1.50868323,4.48795137 1.50769657,4.59595137 1.50966988,4.70395137 C1.56985568,4.65695137 1.56689573,4.75495137 1.55110929,4.78395137 C1.52841628,4.82895137 1.5195364,4.87995137 1.51262984,4.92995137 C1.50276331,4.99495137 1.49092348,5.05995137 1.49092348,5.12595137 C1.49092348,5.18195137 1.47316374,5.23395137 1.47217708,5.28795137 C1.45145738,5.27195137 1.49585674,5.20395137 1.45639064,5.21395137 C1.43665759,5.21895137 1.43567094,5.24795137 1.43073768,5.26295137 C1.41495124,5.31495137 1.34489891,5.30995137 1.33404573,5.36895137 C1.32812581,5.40495137 1.3241792,5.42595137 1.30049954,5.45495137 C1.28175314,5.47695137 1.29951289,5.48695137 1.3034595,5.50895137 C1.31233937,5.56095137 1.245247,5.63295137 1.26300675,5.67495137 C1.27977984,5.71595137 1.26794001,5.76195137 1.28668641,5.80095137 C1.29655293,5.82095137 1.31924594,5.84695137 1.31036607,5.87195137 C1.26794001,5.87995137 1.3222059,5.97795137 1.32615251,6.00795137 C1.33207242,6.05695137 1.37548513,6.21095137 1.42284446,6.23295137 C1.48204361,6.32395137 1.56294912,6.45095137 1.66753428,6.49695137 C1.74153322,6.52895137 1.76817284,6.43295137 1.80961225,6.39295137 C1.86190483,6.34095137 1.92998386,6.30795137 1.99904954,6.28395137 C2.05726204,6.26295137 2.30096521,6.19195137 2.18355356,6.10795137 L2.18355356,6.10795137 Z M2.28616542,9.39295137 C2.29800525,9.37295137 2.28912538,9.32195137 2.26741903,9.30495137 C2.21512644,9.26095137 2.19440674,9.36495137 2.22795292,9.39595137 C2.24077941,9.42895137 2.27136564,9.41795137 2.28616542,9.39295137 L2.28616542,9.39295137 Z M2.50026902,6.36895137 C2.48546924,6.35595137 2.47461606,6.36395137 2.47362941,6.33695137 C2.47461606,6.31295137 2.47658936,6.26695137 2.44501648,6.29595137 C2.43613661,6.29895137 2.44797644,6.30395137 2.43514996,6.30895137 C2.42627008,6.31195137 2.41936352,6.30495137 2.4134436,6.30195137 C2.39667051,6.29495137 2.38680398,6.29395137 2.3739775,6.31195137 C2.36509763,6.32395137 2.36509763,6.33795137 2.35029784,6.34795137 L2.32464487,6.35695137 C2.315765,6.35995137 2.29011203,6.37795137 2.28912538,6.38795137 C2.28517877,6.40295137 2.30787178,6.41395137 2.32365822,6.41795137 C2.3364847,6.42695137 2.3532578,6.43495137 2.36608428,6.44395137 C2.37891076,6.45295137 2.39963047,6.46895137 2.41541691,6.47295137 C2.4509364,6.49295137 2.50618894,6.51495137 2.53381521,6.47295137 C2.54170843,6.45695137 2.54762835,6.44495137 2.53677517,6.43095137 C2.52690864,6.41595137 2.5111222,6.41195137 2.50618894,6.39995137 C2.50224233,6.38695137 2.51309551,6.37895137 2.50026902,6.36895137 L2.50026902,6.36895137 Z M7.24508107,7.12395137 C7.22633467,7.12495137 7.19278848,7.13695137 7.17798869,7.14995137 C7.14838912,7.17595137 7.21153488,7.19095137 7.23620119,7.19795137 C7.26382747,7.21395137 7.30329357,7.22195137 7.32993319,7.23795137 C7.35262619,7.25495137 7.36841263,7.27795137 7.3940656,7.28895137 C7.42563848,7.30395137 7.46905119,7.31095137 7.50358403,7.31995137 C7.51838382,7.32495137 7.54107683,7.32395137 7.56080988,7.32795137 C7.58251623,7.34095137 7.59238276,7.36095137 7.61014251,7.37495137 C7.64072873,7.40295137 7.68414145,7.40995137 7.7245942,7.40795137 C7.76307365,7.41195137 7.79168657,7.41895137 7.82621941,7.40995137 C7.86568551,7.39995137 7.89331178,7.41995137 7.92981793,7.41995137 C7.94461771,7.41995137 7.9594175,7.40795137 7.97323064,7.40895137 C7.99197704,7.40895137 7.99395034,7.41695137 8.00283021,7.43295137 C8.01861666,7.45595137 8.05906941,7.49095137 8.08768233,7.49195137 C8.10544208,7.49195137 8.11925521,7.48895137 8.134055,7.49395137 C8.15082809,7.50395137 8.15773466,7.50395137 8.16957449,7.51395137 C8.1902942,7.52295137 8.20805394,7.52895137 8.21693381,7.54495137 C8.23272026,7.57295137 8.2317336,7.60395137 8.25639992,7.62595137 C8.27317301,7.63895137 8.29093275,7.65295137 8.3086925,7.66595137 C8.32053233,7.67695137 8.31066581,7.67495137 8.32842555,7.67495137 C8.33829208,7.67695137 8.35703847,7.67695137 8.36986496,7.67295137 C8.41919758,7.66995137 8.39255797,7.59995137 8.37677153,7.57695137 C8.366905,7.55695137 8.35802513,7.54095137 8.36197174,7.52195137 C8.36493169,7.49895137 8.37578487,7.48295137 8.36098508,7.46395137 C8.35309186,7.45195137 8.34223869,7.44595137 8.33138551,7.43995137 C8.32546559,7.43195137 8.32250564,7.42395137 8.31559907,7.41195137 C8.30079928,7.39295137 8.27218636,7.38695137 8.25343996,7.36895137 C8.22186708,7.33695137 8.20509398,7.29095137 8.16464123,7.26095137 C8.14293487,7.24795137 8.12320182,7.25795137 8.09656221,7.24695137 C8.08570903,7.23995137 8.07978911,7.23295137 8.06400267,7.22795137 C8.04920288,7.22295137 8.0363764,7.22595137 8.02256327,7.22495137 C7.99395034,7.22295137 7.96928403,7.19795137 7.94165776,7.19995137 C7.91107153,7.20395137 7.90515161,7.23695137 7.88739187,7.25495137 C7.87160543,7.26795137 7.85384568,7.26795137 7.84792577,7.24695137 C7.84595246,7.21995137 7.85581899,7.20395137 7.86963212,7.18695137 C7.89133848,7.16395137 7.86963212,7.15095137 7.8410192,7.14895137 C7.80451305,7.14895137 7.79760649,7.17795137 7.7828067,7.20895137 C7.75912704,7.24195137 7.74432725,7.21895137 7.71078106,7.21395137 C7.68808806,7.21495137 7.67230162,7.22395137 7.65059526,7.21495137 C7.63579547,7.20995137 7.63283551,7.19795137 7.62198234,7.19095137 C7.60520924,7.18195137 7.59238276,7.18495137 7.58054293,7.19295137 C7.56376984,7.19695137 7.56376984,7.19695137 7.54699674,7.18795137 C7.53219696,7.18195137 7.52825034,7.16995137 7.50950395,7.16595137 C7.47990437,7.15995137 7.44931814,7.18495137 7.42465183,7.17795137 C7.41379865,7.17195137 7.40491878,7.15595137 7.39011899,7.15095137 C7.3733459,7.14095137 7.37630585,7.14995137 7.36545268,7.16195137 C7.34670628,7.17995137 7.32105331,7.18595137 7.30329357,7.17195137 C7.28060056,7.15595137 7.27862725,7.12895137 7.24508107,7.12395137 L7.24508107,7.12395137 Z M8.37183826,8.30595137 C8.3876247,8.30395137 8.39551792,8.28795137 8.40933106,8.28995137 C8.4251175,8.28695137 8.41722428,8.30295137 8.42807746,8.31295137 C8.43794398,8.32195137 8.44781051,8.32195137 8.45767703,8.32195137 C8.47543678,8.32495137 8.50996962,8.32695137 8.51687619,8.31095137 C8.52476941,8.28595137 8.48333,8.28095137 8.47247682,8.26095137 C8.4626103,8.23195137 8.4853033,8.20395137 8.49319652,8.17895137 C8.50503635,8.14495137 8.4626103,8.12995137 8.46655691,8.10295137 C8.46557025,8.07395137 8.4853033,8.06395137 8.47938339,8.03595137 C8.47445013,8.01495137 8.45669038,7.99195137 8.4438639,7.97695137 C8.43202407,7.96095137 8.40933106,7.94595137 8.41130436,7.92295137 C8.41327767,7.89895137 8.45669038,7.89995137 8.43597068,7.87095137 C8.42413085,7.84595137 8.39255797,7.85095137 8.36394504,7.84695137 C8.35407852,7.84695137 8.34421199,7.84795137 8.33434547,7.83795137 C8.32546559,7.82395137 8.3294122,7.81695137 8.3294122,7.80695137 C8.32349229,7.77995137 8.30277259,7.76995137 8.27909292,7.75895137 C8.2711997,7.75495137 8.25935987,7.74995137 8.25442661,7.73795137 C8.25048,7.72595137 8.26231983,7.72195137 8.25837322,7.71095137 C8.24554674,7.68495137 8.19818742,7.72095137 8.17845437,7.71195137 C8.16464123,7.70995137 8.16661454,7.69695137 8.15773466,7.68295137 L8.134055,7.67195137 C8.10149547,7.65695137 8.08866899,7.68395137 8.0945889,7.71095137 C8.10938869,7.77195137 8.15378805,7.81195137 8.14885479,7.87295137 C8.15181475,7.89795137 8.15576136,7.90995137 8.16464123,7.93295137 C8.17253445,7.96595137 8.18141432,7.98195137 8.16661454,8.01395137 C8.14293487,8.03195137 8.16464123,8.05395137 8.17253445,8.07695137 C8.17746771,8.10795137 8.18536093,8.13195137 8.18437428,8.16495137 C8.17845437,8.22495137 8.15970797,8.28395137 8.16464123,8.34495137 C8.16760119,8.36995137 8.16562788,8.39295137 8.17450776,8.41695137 C8.17845437,8.44795137 8.20312068,8.45895137 8.22877365,8.47595137 C8.25343996,8.49695137 8.36789165,8.56595137 8.33434547,8.48195137 C8.32447894,8.46295137 8.3086925,8.43595137 8.30375924,8.41395137 C8.29586602,8.39095137 8.32349229,8.37495137 8.32447894,8.35095137 C8.32842555,8.32395137 8.30770585,8.31495137 8.3461853,8.30795137 C8.35407852,8.30195137 8.36591835,8.30795137 8.37183826,8.30595137 L8.37183826,8.30595137 Z M7.1819353,1.09995137 C7.21252153,1.09295137 7.24310776,1.10195137 7.27172069,1.09095137 C7.28652047,1.08495137 7.33486645,1.06795137 7.33190649,1.04795137 C7.32697323,1.01095137 7.17009547,1.03495137 7.14444251,1.04595137 C7.13654929,1.06895137 7.16022895,1.08695137 7.18094865,1.09295137 C7.18094865,1.09495137 7.1819353,1.09795137 7.1819353,1.09995137 L7.1819353,1.09995137 Z M7.93573784,7.78795137 C7.92981793,7.77495137 7.93573784,7.76295137 7.93573784,7.74995137 C7.93277788,7.72895137 7.92685797,7.72295137 7.92981793,7.70095137 C7.93672449,7.68895137 7.93672449,7.66995137 7.93376454,7.65495137 C7.92784462,7.64295137 7.9179781,7.63295137 7.90909822,7.62395137 C7.90909822,7.61795137 7.90613827,7.60795137 7.8992317,7.60195137 C7.88739187,7.58995137 7.87456538,7.60795137 7.8617389,7.61395137 C7.85187238,7.62295137 7.83312598,7.62895137 7.83016602,7.63895137 C7.8202995,7.65395137 7.82621941,7.66595137 7.82621941,7.67895137 L7.82917937,7.69395137 C7.80747301,7.71595137 7.82819272,7.77395137 7.82523276,7.79595137 C7.82523276,7.82095137 7.78971327,7.89095137 7.83707259,7.86995137 C7.84989907,7.86395137 7.8597656,7.85495137 7.87160543,7.84895137 C7.88739187,7.83995137 7.90712492,7.83995137 7.92587132,7.83395137 C7.93179123,7.83395137 7.96632407,7.83095137 7.96632407,7.82495137 C7.96731072,7.81195137 7.9386978,7.80295137 7.93573784,7.78795137 L7.93573784,7.78795137 Z M7.0447906,9.05195137 C7.0842567,9.07095137 7.15332238,9.03295137 7.19081518,9.02095137 C7.2381745,9.00595137 7.31316009,8.95595137 7.36150607,8.98395137 C7.38123912,8.99495137 7.39110564,9.01795137 7.41182535,9.02695137 C7.43747831,9.03795137 7.46806454,9.02795137 7.49371751,9.02195137 C7.52035712,9.01595137 7.55094335,9.01195137 7.57560967,8.99995137 C7.59731602,8.98895137 7.61112916,8.97095137 7.62987556,8.95695137 C7.67822153,8.91995137 7.71966094,8.95495137 7.77294017,8.94695137 C7.8035264,8.94295137 7.83213933,8.92795137 7.8617389,8.91995137 C7.88344526,8.91495137 7.92192471,8.91495137 7.9386978,8.89895137 C7.9574442,8.88095137 7.94856432,8.84195137 7.94856432,8.81895137 C7.94757767,8.78795137 7.94955098,8.75595137 7.9386978,8.72695137 C7.91699144,8.66995137 7.83805924,8.60295137 7.9199514,8.55795137 C7.93573784,8.45795137 7.81931284,8.47495137 7.78576666,8.40295137 C7.7640603,8.35595137 7.75715373,8.31995137 7.69499462,8.31495137 C7.64270204,8.30995137 7.61112916,8.33795137 7.56574314,8.35595137 C7.51443721,8.37495137 7.47497111,8.35795137 7.43057174,8.33295137 C7.40393213,8.31795137 7.34769293,8.28295137 7.33683975,8.32895137 C7.32697323,8.36895137 7.36545268,8.40795137 7.3338798,8.44395137 C7.30625352,8.47595137 7.25790755,8.48995137 7.21844145,8.49895137 C7.13260268,8.51695137 7.06452365,8.58295137 7.00236454,8.63995137 L7.00927111,8.64595137 C6.9846048,8.64495137 6.94809865,8.71095137 6.947112,8.73095137 C6.95697853,8.73395137 6.9658584,8.73695137 6.97671158,8.73995137 C6.97572493,8.77395137 7.01420437,8.75095137 7.01716433,8.72695137 C7.02505755,8.72895137 7.03295077,8.73395137 7.04084399,8.73495137 C7.04775056,8.73695137 7.06255035,8.73595137 7.06847026,8.73895137 C7.08524336,8.74595137 7.08820331,8.76195137 7.10892302,8.76395137 C7.09708319,8.81595137 7.10793636,8.87095137 7.08327005,8.91995137 C7.06748361,8.94995137 6.98756476,9.02395137 7.0447906,9.05195137 L7.0447906,9.05195137 Z M7.4522781,1.35995137 C7.48187768,1.39195137 7.51838382,1.40095137 7.51147725,1.45095137 C7.54897005,1.45595137 7.57264971,1.46995137 7.59435606,1.43795137 C7.6081692,1.41795137 7.6288889,1.40195137 7.65158191,1.39395137 C7.67920818,1.38295137 7.79267322,1.38395137 7.78773996,1.43095137 C7.78478,1.45395137 7.77096687,1.47395137 7.76702026,1.49695137 C7.762087,1.52895137 7.79661983,1.50595137 7.81141962,1.51395137 C7.79464653,1.52595137 7.77392683,1.53295137 7.75320712,1.53795137 C7.762087,1.54395137 7.76800691,1.55195137 7.76899356,1.56195137 C7.7433406,1.56795137 7.73051411,1.63995137 7.6851281,1.65395137 C7.65750183,1.66295137 7.61704907,1.64395137 7.5894228,1.64095137 C7.55686327,1.63695137 7.53219696,1.62695137 7.49963742,1.62495137 C7.46806454,1.62295137 7.49371751,1.58095137 7.4542514,1.58895137 C7.44734484,1.61695137 7.46115797,1.68795137 7.46609124,1.71595137 C7.4710245,1.75095137 7.50062407,1.77095137 7.53515691,1.77695137 C7.58350289,1.78495137 7.6061959,1.80095137 7.6476353,1.82495137 C7.68019484,1.84295137 7.71670098,1.83195137 7.75222047,1.83495137 C7.77590013,1.83695137 7.79563318,1.84595137 7.81339293,1.86095137 C7.80944632,1.87195137 7.80056644,1.88995137 7.80648636,1.90195137 C7.81339293,1.91795137 7.86371221,1.89995137 7.87555204,1.89895137 C7.91107153,1.89495137 7.94461771,1.85595137 7.9781639,1.86095137 C7.99099038,1.86295137 8.05018954,1.88095137 8.04722958,1.89595137 C8.0156567,1.88295137 7.99493699,1.92195137 7.97027068,1.90095137 C7.94856432,1.88195137 7.89035183,1.89795137 7.92784462,1.92495137 C7.93080458,1.92795137 7.9406711,2.00295137 7.9406711,2.01095137 C7.93771115,2.03895137 7.88739187,2.06895137 7.89133848,2.08695137 C7.89824505,2.08795137 7.94363106,2.09095137 7.95349759,2.09995137 C7.95645755,2.08795137 7.94757767,2.08295137 7.97520394,2.07495137 C7.99592365,2.06895137 8.02058996,2.06695137 8.04130966,2.07695137 C8.04920288,2.11195137 8.02354992,2.14795137 8.07189589,2.13895137 C8.11728191,2.12995137 8.13701496,2.15995137 8.18437428,2.12895137 C8.21397386,2.11095137 8.24554674,2.11395137 8.2711997,2.13995137 C8.30573254,2.17395137 8.23568021,2.22095137 8.27613297,2.25395137 C8.29191941,2.26695137 8.30474589,2.30695137 8.32053233,2.31395137 C8.33138551,2.31895137 8.39058466,2.29795137 8.40143784,2.29295137 C8.42018424,2.32695137 8.43695733,2.27495137 8.45175712,2.27195137 C8.45767703,2.24995137 8.4853033,2.22495137 8.51194292,2.22195137 C8.55140902,2.21795137 8.55239568,2.22495137 8.5790353,2.24395137 C8.65698085,2.29795137 8.64612767,2.16595137 8.68658042,2.13195137 C8.75959271,2.07195137 8.79609885,2.01495137 8.84641813,1.93795137 C8.88588423,1.87595137 8.94113678,1.86095137 9.01118911,1.84995137 C9.06644165,1.84095137 9.15129377,1.82795137 9.17398677,1.76795137 C9.20062639,1.69795137 9.13649398,1.65995137 9.08025478,1.63895137 C9.01710902,1.61695137 8.94607004,1.59295137 8.97369631,1.51295137 C9.00625584,1.41995137 8.97764292,1.36595137 8.87897767,1.33595137 C8.67079398,1.27095137 8.48333,1.16195137 8.2711997,1.10195137 C8.08373572,1.04895137 7.89429844,1.02995137 7.70190119,1.01995137 C7.61606242,0.98995137 7.43451835,0.98695137 7.38222577,1.05995137 C7.34867958,1.10695137 7.39110564,1.14795137 7.38715903,1.19695137 C7.38222577,1.25595137 7.41083869,1.31595137 7.4522781,1.35995137 L7.4522781,1.35995137 Z M10.7269779,10.6309514 L10.7259912,10.6299514 C10.7289512,10.6349514 10.7269779,10.6439514 10.7279645,10.6509514 C10.766444,10.6509514 10.7832171,10.6859514 10.8246565,10.6729514 C10.8670825,10.6609514 10.8917488,10.6199514 10.8582027,10.5859514 C10.8286031,10.5569514 10.8029501,10.5319514 10.7595374,10.5399514 C10.7082315,10.5499514 10.7190846,10.5909514 10.7269779,10.6309514 L10.7269779,10.6309514 Z M12.0678387,9.29395137 C12.0658654,9.28495137 12.0638921,9.27695137 12.0619187,9.26795137 C12.021466,9.25595137 11.995813,9.29795137 11.9583202,9.26695137 C11.8862946,9.31595137 11.9632535,9.41295137 11.8448552,9.40695137 C11.8655749,9.43195137 11.8636016,9.45995137 11.8537351,9.48895137 C11.8389353,9.53395137 11.8270954,9.52995137 11.7965092,9.53595137 C11.7323768,9.54595137 11.7017906,9.50595137 11.6820575,9.45195137 C11.6189118,9.45395137 11.5320863,9.55195137 11.4827537,9.58295137 C11.4699272,9.58995137 11.4472342,9.61095137 11.4334211,9.61995137 C11.4225679,9.62595137 11.3959283,9.63895137 11.3821151,9.64695137 C11.348569,9.66395137 11.2765433,9.68695137 11.2725967,9.72495137 C11.2558236,9.72195137 11.2301707,9.73195137 11.2133976,9.72995137 C11.2074776,9.73795137 11.2074776,9.74695137 11.2133976,9.75595137 C11.2903565,9.76895137 11.3308092,9.74295137 11.3959283,9.71495137 C11.4640073,9.68395137 11.5370196,9.69095137 11.601152,9.66695137 C11.6317382,9.65595137 11.6327249,9.62195137 11.6830442,9.64195137 C11.7047505,9.65195137 11.7304035,9.68395137 11.7353368,9.70595137 C11.7452033,9.75595137 11.6929107,9.82995137 11.6406181,9.83295137 C11.6277916,9.80195137 11.646538,9.76995137 11.6524579,9.74495137 C11.5833923,9.72195137 11.4699272,9.81995137 11.4511808,9.87795137 C11.5222198,9.89295137 11.5518194,9.99695137 11.5133399,10.0539514 C11.5005135,10.0679514 11.4857137,10.0859514 11.4610474,10.0939514 C11.4205946,10.1059514 11.4018482,10.0689514 11.3623821,10.0979514 C11.3110762,10.1369514 11.3673154,10.2439514 11.3377158,10.3039514 C11.3150228,10.3499514 11.2765433,10.3669514 11.2439838,10.3989514 C11.2222774,10.4219514 11.209451,10.4469514 11.1798514,10.4669514 C11.1413719,10.4929514 11.0476399,10.5489514 11.0555332,10.6029514 C11.1403853,10.6319514 11.3160094,10.4839514 11.3890217,10.4349514 C11.4353944,10.4039514 11.4640073,10.3559514 11.5113666,10.3249514 C11.5646459,10.2919514 11.6346982,10.2749514 11.669231,10.2159514 C11.6889641,10.1819514 11.6731776,10.1519514 11.6850175,10.1179514 C11.6958707,10.0879514 11.7165904,10.0779514 11.7363234,10.0549514 C11.7728296,10.0109514 11.8063757,9.99695137 11.8478151,9.96095137 C11.8991211,9.91495137 11.8872812,9.84295137 11.9109609,9.78195137 C11.9316806,9.72895137 11.9721334,9.68795137 12.0007463,9.63795137 C12.0451457,9.55895137 12.1615707,9.37095137 12.112238,9.28195137 C12.1003982,9.29195137 12.0786918,9.28895137 12.0678387,9.29395137 L12.0678387,9.29395137 Z M13.0752109,6.73495137 C13.0495579,6.68695137 13.0880374,6.54895137 13.0880374,6.49195137 C13.0870507,6.38695137 13.0554778,6.30795137 13.0406781,6.20995137 C13.0317982,6.11795137 13.0189717,5.87395137 13.0525179,5.79095137 C13.0998772,5.67395137 12.8690005,5.47595137 12.856174,5.34895137 C12.8443342,5.23895137 12.7821751,5.13495137 12.6923897,5.07195137 C12.6558836,5.04495137 12.5769514,4.68195137 12.5305787,4.69895137 C12.5078857,4.70995137 12.555245,4.78995137 12.5522851,4.81495137 C12.5394586,4.90295137 12.4950592,4.81495137 12.4486865,4.83495137 C12.3628478,4.86995137 12.2720757,4.95295137 12.2612226,5.03795137 C12.2207698,5.35295137 11.9977863,5.02695137 12.0155461,5.01395137 C12.0648787,4.97595137 12.0826384,4.98795137 12.1408509,4.97995137 C12.2049834,4.95695137 12.1053315,4.91095137 12.20597,4.90095137 C12.1822904,4.83595137 12.2355696,4.81495137 12.2099166,4.76395137 C12.1714372,4.68895137 12.1438109,4.69795137 12.1822904,4.61695137 C12.1990634,4.57295137 12.0984249,4.43395137 12.0905317,4.38095137 C12.0826384,4.32895137 12.0816518,4.26095137 12.0747452,4.20295137 C12.0707986,4.16595137 12.1309844,4.13095137 12.1201312,4.10195137 C12.1181579,3.99895137 12.1408509,3.88795137 12.1043448,3.78795137 C12.0786918,3.71995137 12.0490923,3.62995137 12.0056796,3.57195137 C11.9908798,3.55195137 11.9445071,3.44895137 11.9395738,3.41995137 C11.927734,3.35595137 11.8991211,3.37995137 11.8636016,3.35495137 C11.8438685,3.32995137 11.7550698,3.24695137 11.7294168,3.23495137 C11.7057372,3.22395137 11.5340596,3.06695137 11.530113,3.05395137 C11.5153132,3.00895137 11.4186213,2.97395137 11.4294745,2.92495137 C11.4452609,2.85095137 11.1877446,2.65895137 11.115719,2.64595137 C11.0693463,2.63795137 11.2577969,2.86395137 11.2568103,2.85895137 C11.2597702,2.87195137 11.3781685,3.02295137 11.3781685,3.02295137 C11.4048082,3.03195137 11.4699272,3.21695137 11.4679539,3.24095137 C11.4610474,3.31095137 11.2804899,3.12595137 11.2666768,3.10095137 C11.1778781,2.99195137 11.0170537,2.90395137 10.9154285,2.83095137 C10.8434029,2.76395137 10.8789224,2.72595137 10.7555908,2.66895137 C10.7102048,2.64795137 10.5868732,2.54695137 10.5483938,2.54395137 C10.5020211,2.54195137 10.5553003,2.63995137 10.556287,2.65095137 C10.5631935,2.72095137 10.6391658,2.72595137 10.6845518,2.77195137 C10.7210579,2.80995137 10.7536175,2.85695137 10.7220446,2.89895137 C10.7210579,2.89895137 10.6648188,3.00295137 10.6618588,2.99395137 C10.6776452,3.03795137 10.80887,3.13495137 10.8414296,3.17095137 C10.8355096,3.16195137 11.0131071,3.39495137 11.0279069,3.27095137 C11.0338268,3.22595137 10.9835075,3.17195137 10.9904141,3.13295137 C10.9953474,3.10895137 11.1936645,3.35995137 11.2045177,3.38195137 C11.2528637,3.51495137 11.2489171,3.36195137 11.2992363,3.37795137 C11.3406757,3.39095137 11.4521675,3.52995137 11.3594221,3.53595137 C11.2183308,3.54495137 11.3850751,3.66795137 11.4245412,3.68695137 C11.5064334,3.72695137 11.5626726,3.81995137 11.6475247,3.85495137 C11.7807228,3.90895137 11.7530965,4.00495137 11.8201889,4.10295137 C11.8418952,4.13395137 11.4373677,4.10295137 11.4057948,4.12095137 C11.3525156,4.16295137 11.6090452,4.44995137 11.6100319,4.49295137 C11.6120052,4.58295137 11.6633111,4.64895137 11.6771243,4.73895137 C11.6850175,4.82195137 11.675151,4.93095137 11.7294168,4.99795137 C11.7738162,5.03895137 11.8152556,4.92995137 11.8853079,4.99495137 C11.9109609,5.00695137 11.9474671,5.03595137 11.9553603,5.05795137 C11.9790399,5.11995137 12.1132247,5.49895137 11.9524003,5.47095137 C11.8813613,5.45795137 11.9218141,5.76895137 11.9267473,5.81395137 C11.9484537,5.91195137 11.9879198,5.90395137 11.9622668,6.02795137 C11.9652268,6.13095137 11.882348,6.18295137 11.8231488,6.25695137 C11.7955226,6.29095137 11.7777628,6.33095137 11.7649363,6.37395137 C11.7323768,6.34195137 11.7165904,6.29095137 11.6712043,6.27395137 C11.6218717,6.25495137 11.5133399,6.31495137 11.4699272,6.33595137 C11.3653421,6.38895137 11.442301,6.48495137 11.4008615,6.56795137 C11.371262,6.62895137 11.2824632,6.65895137 11.2242507,6.68895137 C11.1541984,6.72495137 11.0604664,6.76295137 10.9914007,6.70495137 C10.9322016,6.65695137 10.9578546,6.55995137 10.8956954,6.51795137 C10.8256431,6.47095137 10.8187366,6.57595137 10.8029501,6.61795137 C10.7723639,6.69695137 10.6806052,6.72395137 10.7042849,6.82295137 C10.7141514,6.86395137 10.7348711,6.90095137 10.7427643,6.94195137 C10.7526308,6.99295137 10.7269779,7.03895137 10.7240179,7.08995137 C10.718098,7.17695137 10.80887,7.19695137 10.8325497,7.26795137 C10.8532694,7.33195137 10.831563,7.43095137 10.7605241,7.45495137 C10.6845518,7.48195137 10.6006863,7.41295137 10.5257007,7.40495137 C10.4507152,7.39695137 10.3550099,7.41795137 10.3411967,7.50395137 C10.3283702,7.57995137 10.4053291,7.64195137 10.3678363,7.71995137 C10.3520499,7.75295137 10.3244236,7.77895137 10.3046906,7.80895137 C10.2701577,7.85895137 10.2504247,7.91695137 10.2178652,7.96795137 C10.2563446,7.96895137 10.252398,7.94495137 10.2869308,7.95195137 C10.323437,7.95995137 10.3559965,7.92295137 10.3865827,7.91095137 C10.3925027,7.93495137 10.3895427,7.95995137 10.3925027,7.98395137 C10.4181556,7.99195137 10.4438086,7.98195137 10.4665016,7.97295137 C10.4694616,7.99395137 10.459595,8.01795137 10.4684749,8.03895137 C10.4753815,8.05695137 10.4961012,8.06295137 10.507941,8.07695137 C10.5385272,8.11395137 10.5010344,8.17495137 10.4793281,8.20695137 C10.417169,8.29895137 10.3106105,8.34995137 10.2415448,8.43595137 C10.1764257,8.51595137 10.1705058,8.61295137 10.1221599,8.69995137 C10.1053868,8.72995137 10.0886137,8.77095137 10.133013,8.78495137 C10.1428796,8.76895137 10.1576794,8.75595137 10.1783991,8.75595137 C10.2089853,8.75495137 10.1971455,8.77795137 10.2129319,8.79595137 C10.2770643,8.87795137 10.3451433,8.74295137 10.3727696,8.70395137 C10.4003959,8.66195137 10.5148476,8.59895137 10.5464205,8.66895137 C10.5710868,8.72195137 10.5424738,8.79695137 10.5178075,8.84495137 C10.5592469,8.86395137 10.5474071,8.89395137 10.5572736,8.92995137 C10.5701001,8.97995137 10.6154861,9.01195137 10.6154861,9.06695137 C10.6154861,9.13295137 10.4714349,9.26395137 10.5276741,9.31395137 C10.5977264,9.37595137 10.6806052,9.20395137 10.7082315,9.16695137 C10.7605241,9.09595137 10.879909,9.08595137 10.9095086,8.99895137 C10.9420681,8.89995137 10.9312149,8.84095137 11.0624397,8.83795137 C11.1176923,8.83695137 11.158145,8.80195137 11.2104376,8.79095137 C11.2676635,8.77995137 11.2933164,8.77395137 11.3298226,8.72995137 C11.3821151,8.66695137 11.4294745,8.74195137 11.4314478,8.79195137 C11.4334211,8.84295137 11.4107281,8.90695137 11.442301,8.95295137 C11.4807804,9.00895137 11.5232065,8.93495137 11.5626726,8.89895137 C11.558726,8.93695137 11.6090452,8.95895137 11.6386448,8.97095137 C11.6840308,8.93995137 11.7126437,8.88895137 11.7609897,8.86095137 C11.7836827,8.84795137 11.8093357,8.84295137 11.8349887,8.83895137 C11.8418952,8.87995137 11.8488018,8.92395137 11.8853079,8.94395137 C11.9376005,8.97395137 11.8734681,9.00295137 11.9425338,9.03495137 C12.0283726,9.06795137 12.0569855,9.15495137 12.0984249,9.22495137 C12.1181579,9.25695137 12.2977287,9.06195137 12.3667944,9.05495137 C12.5956978,9.02895137 12.7150827,8.72995137 12.7999348,8.55295137 C12.9222798,8.29995137 12.9775323,8.01895137 13.0091052,7.75795137 C13.0870507,7.59695137 13.1186236,7.30195137 13.0870507,7.11495137 C13.0683043,7.00095137 13.1334234,6.84295137 13.0752109,6.73495137 L13.0752109,6.73495137 Z M11.0032406,10.5319514 C11.0091605,10.5039514 11.0683596,10.3999514 11.0131071,10.3849514 C10.993374,10.3799514 10.976601,10.4099514 10.9588412,10.4149514 C10.9351615,10.4229514 10.9095086,10.4079514 10.8878022,10.4189514 C10.8680692,10.4299514 10.8493228,10.4619514 10.8374829,10.4799514 C10.8226832,10.5019514 10.8286031,10.5109514 10.8522827,10.5229514 C10.8759624,10.5359514 10.9065486,10.5419514 10.9203618,10.5679514 C10.9322016,10.5909514 10.9262817,10.6219514 10.9233217,10.6459514 C10.9233217,10.6449514 10.9272683,10.6409514 10.928255,10.6369514 C10.9322016,10.6359514 10.9391082,10.6349514 10.9430548,10.6359514 L10.9381215,10.6459514 C11.0012673,10.6559514 10.996334,10.5729514 11.0032406,10.5319514 L11.0032406,10.5319514 Z M11.7422433,9.28095137 C11.7442166,9.31095137 11.7767762,9.30795137 11.7984825,9.29995137 C11.8182156,9.29395137 11.8310421,9.27695137 11.8438685,9.26195137 C11.8616283,9.23895137 11.8724815,9.21595137 11.856695,9.18895137 C11.8409086,9.16095137 11.8310421,9.14095137 11.8231488,9.10795137 C11.8103223,9.11495137 11.7945359,9.12695137 11.7807228,9.13095137 C11.7669096,9.13595137 11.7649363,9.13195137 11.7491499,9.13095137 C11.7126437,9.12995137 11.720537,9.15795137 11.7047505,9.18095137 C11.691924,9.20095137 11.6633111,9.20895137 11.6741643,9.23495137 C11.6820575,9.25495137 11.7146171,9.27195137 11.7333635,9.28095137 L11.7382967,9.27495137 C11.7373101,9.27695137 11.7363234,9.27795137 11.7353368,9.27995137 C11.7373101,9.28095137 11.74027,9.28095137 11.7422433,9.28095137 L11.7422433,9.28095137 Z M8.18042767,11.4279514 C8.21693381,11.3629514 8.28205288,11.3219514 8.34026538,11.2769514 C8.41031771,11.2229514 8.47247682,11.1599514 8.52772936,11.0919514 C8.49516983,11.0839514 8.49319652,11.0529514 8.47247682,11.0329514 C8.44090394,11.0019514 8.39255797,11.0219514 8.3856514,10.9749514 C8.37874483,10.9329514 8.34421199,10.9239514 8.31066581,10.9069514 C8.23370691,10.8679514 8.20213403,10.7919514 8.13997492,10.7389514 C8.07189589,10.6789514 7.97915055,10.6989514 7.89627174,10.6829514 C7.82325945,10.6689514 7.74926051,10.5519514 7.67131496,10.6019514 C7.62198234,10.6329514 7.59928933,10.7119514 7.63283551,10.7609514 C7.65947513,10.7989514 7.70486115,10.8179514 7.72262089,10.8629514 C7.69598128,10.8879514 7.69006136,10.9039514 7.72262089,10.9269514 C7.76110034,10.9539514 7.83509928,10.9819514 7.81635289,11.0409514 C7.80648636,11.0729514 7.77984674,11.1039514 7.7453139,11.1099514 C7.72064759,11.1149514 7.66046178,11.1009514 7.67328827,11.1459514 C7.645662,11.0719514 7.56771645,11.1879514 7.52529039,11.1269514 C7.49075755,11.0779514 7.46905119,11.0339514 7.4147853,11.0009514 C7.34473297,10.9579514 7.44339823,10.9159514 7.4315584,10.8509514 C7.41379865,10.7559514 7.2983603,10.7819514 7.2569209,10.7119514 C7.23225458,10.6719514 7.26580077,10.6399514 7.28158721,10.6049514 C7.29737365,10.5689514 7.33979971,10.5979514 7.36249272,10.6079514 C7.43649166,10.6429514 7.54502344,10.6299514 7.60718255,10.5789514 C7.63579547,10.5549514 7.69894123,10.4439514 7.61902238,10.4439514 C7.56376984,10.4449514 7.52134378,10.4929514 7.46905119,10.4959514 C7.46115797,10.4329514 7.4315584,10.3259514 7.49865077,10.2839514 C7.55982323,10.2459514 7.68808806,10.2019514 7.63382217,10.1039514 C7.61408912,10.0699514 7.57955628,10.1259514 7.55094335,10.1009514 C7.53910352,10.0909514 7.5479834,10.0679514 7.55193001,10.0569514 C7.53318361,10.0399514 7.51542386,10.0189514 7.50555734,9.99495137 C7.46214463,9.88895137 7.59040945,9.80595137 7.53614357,9.69395137 C7.51345056,9.64695137 7.47497111,9.61895137 7.43254505,9.58995137 C7.39011899,9.55995137 7.38814568,9.52195137 7.37235924,9.47695137 C7.36446602,9.45195137 7.32302662,9.39295137 7.28750713,9.40795137 C7.2569209,9.41995137 7.24804102,9.47295137 7.22436136,9.49495137 C7.17108213,9.54695137 7.05860374,9.56695137 6.98756476,9.54995137 C6.93033891,9.53695137 6.93329887,9.51495137 6.9056726,9.47695137 C6.89679272,9.46295137 6.87705967,9.46195137 6.86225988,9.45595137 C6.83660692,9.44595137 6.83364696,9.42295137 6.82772704,9.39995137 C6.80404738,9.31295137 6.63236984,9.42095137 6.60573022,9.29895137 C6.59981031,9.27095137 6.60967683,9.22395137 6.56922408,9.21795137 C6.52383806,9.20995137 6.52186476,9.16595137 6.52186476,9.12895137 C6.52186476,9.09895137 6.52383806,9.05695137 6.49226518,9.03995137 C6.45181243,9.01795137 6.4419459,9.02795137 6.42911942,8.98195137 C6.41431963,8.92295137 6.37386688,8.98395137 6.34032069,8.97195137 C6.26928171,8.94395137 6.28210819,8.97895137 6.22488235,9.00895137 C6.12720374,9.06095137 6.11635057,8.81995137 6.08280438,8.77295137 C6.01768531,8.68295137 6.03445841,8.88395137 5.99005904,8.90895137 C5.94960629,8.93195137 5.90718023,8.87895137 5.89238044,8.84795137 C5.88350057,8.82995137 5.87856731,8.80995137 5.86771413,8.79195137 C5.85094103,8.76595137 5.82134146,8.75495137 5.80456837,8.72895137 C5.79075523,8.70595137 5.77003553,8.67895137 5.760169,8.65395137 C5.75128913,8.63195137 5.75326243,8.60395137 5.73648934,8.58595137 C5.71576964,8.56295137 5.7414226,8.52495137 5.75622239,8.49595137 C5.78187536,8.48595137 5.82035481,8.50595137 5.8391012,8.52295137 C5.88547387,8.56195137 5.9555262,8.73295137 6.03643171,8.70095137 C6.01965862,8.67895137 6.0305118,8.65195137 6.01867197,8.62795137 C6.00584548,8.60295137 5.98117917,8.58795137 5.96243277,8.56795137 C5.92099336,8.51995137 5.87560735,8.47195137 5.84798108,8.41395137 C5.82430142,8.36395137 5.81246159,8.31095137 5.76411561,8.27595137 C5.72464951,8.24695137 5.64670396,8.21895137 5.66347705,8.15695137 C5.66347705,8.15595137 5.66446371,8.15495137 5.66446371,8.15495137 C5.69702324,8.16195137 5.71971625,8.18595137 5.74339591,8.20695137 C5.77792875,8.23695137 5.82232811,8.25195137 5.86278087,8.27195137 C5.93677981,8.30795137 6.02261858,8.33295137 6.08576434,8.38795137 C6.12523044,8.42095137 6.10451074,8.49495137 6.15384336,8.53595137 C6.19034951,8.56595137 6.2446154,8.66695137 6.31170777,8.62695137 C6.33637408,8.61195137 6.34722726,8.58295137 6.37189357,8.56595137 C6.39853319,8.54695137 6.44293256,8.52995137 6.47351878,8.51595137 C6.49226518,8.50695137 6.52383806,8.50995137 6.53863785,8.49495137 C6.56231751,8.47195137 6.50607832,8.40595137 6.49325184,8.38895137 C6.44293256,8.32395137 6.39655989,8.25295137 6.32946751,8.20395137 C6.29493468,8.17895137 6.26138849,8.15195137 6.22093574,8.13495137 C6.19922938,8.12595137 6.16074993,8.12695137 6.15680332,8.09695137 C6.1676565,8.10395137 6.17357641,8.10195137 6.17554972,8.09095137 C6.17456307,8.07095137 6.14595014,8.06995137 6.13213701,8.06595137 C6.09859082,8.05695137 6.07589781,8.05695137 6.06307133,8.02895137 C6.04629824,7.99495137 5.98709908,7.99595137 5.9555262,7.98795137 C5.90816688,7.97595137 5.87067409,7.93995137 5.82528807,7.92195137 C5.77200883,7.90195137 5.73155608,7.92295137 5.67926349,7.93495137 C5.67038362,7.93695137 5.65262388,7.96795137 5.63585078,7.99395137 C5.59835799,7.98495137 5.55691858,7.98895137 5.5253457,8.01395137 C5.47798638,8.05095137 5.45036011,8.10695137 5.41286731,8.15295137 C5.39708087,8.17195137 5.37438786,8.19095137 5.35169485,8.18395137 C5.34774824,8.18195137 5.34972155,8.17695137 5.34676159,8.17495137 C5.37537451,7.96995137 5.39116095,7.76295137 5.37241456,7.80395137 C5.33492176,7.88395137 5.30729549,7.93995137 5.27868256,7.99795137 C5.23724316,7.97995137 5.18889718,7.97895137 5.17113744,8.02295137 C5.15239104,8.06995137 5.17705735,8.13095137 5.14745778,8.17195137 C5.14055121,8.18295137 5.12969803,8.18195137 5.11983151,8.18695137 C5.1178582,8.18195137 5.10799168,8.16895137 5.10897833,8.16795137 C5.10009846,8.18295137 5.0991118,8.18795137 5.09121858,8.20095137 C5.06161901,8.20195137 5.02511286,8.18995137 4.98860672,8.17795137 C4.98860672,8.17795137 4.98860672,8.17495137 4.98762007,8.17495137 C4.98663341,8.17595137 4.98663341,8.17595137 4.98564676,8.17695137 C4.94223405,8.16195137 4.89684803,8.14795137 4.85738193,8.16195137 C4.77844973,8.18995137 4.77548977,8.30295137 4.72517049,8.37195137 C4.6501849,8.47695137 4.456801,8.43195137 4.42325482,8.30695137 C4.45088109,8.27295137 4.47752071,8.23895137 4.50514698,8.20495137 C4.46272092,8.09695137 4.34925588,8.02195137 4.23480418,8.02495137 C4.20224465,8.02595137 4.16771181,8.03195137 4.13811223,8.01795137 C4.107526,8.00295137 4.09075291,7.97095137 4.06411329,7.95095137 C3.98123448,7.88895137 3.8707294,7.97095137 3.80166372,8.04795137 C3.68326541,8.06795137 3.57374698,8.13495137 3.49974804,8.23095137 C3.45238872,8.22695137 3.4050294,8.22295137 3.35865673,8.21895137 C3.386283,8.29495137 3.29452432,8.35695137 3.25308491,8.42695137 C3.20177898,8.51195137 3.2284186,8.61095137 3.27873787,8.70195137 C3.27281796,8.71595137 3.26887135,8.73095137 3.25604487,8.73695137 C3.19585906,8.76895137 3.2116455,8.78795137 3.22940525,8.85295137 C3.24519169,8.90895137 3.23927177,9.01395137 3.22644529,9.06995137 C3.21657877,9.11395137 3.17316605,9.21995137 3.11988682,9.19495137 C3.09226055,9.18095137 3.06266097,9.16995137 3.037008,9.19595137 C3.02516817,9.20695137 3.01727495,9.22095137 3.01332834,9.23595137 C2.9955686,9.23695137 2.97780885,9.23895137 2.96103576,9.24295137 C2.92748957,9.24995137 2.89197008,9.25795137 2.85941055,9.24395137 C2.82685101,9.22995137 2.7834383,9.20295137 2.74693216,9.21495137 C2.71634593,9.22495137 2.65616013,9.25195137 2.64333364,9.28395137 C2.63741373,9.29795137 2.65616013,9.33495137 2.65616013,9.35395137 C2.65517347,9.38795137 2.68181309,9.43895137 2.67095991,9.46995137 C2.6462936,9.45795137 2.60978746,9.45395137 2.59301436,9.42895137 C2.57722792,9.40795137 2.55354826,9.41295137 2.53578852,9.39095137 C2.53184191,9.42895137 2.51802877,9.48195137 2.47264275,9.49195137 C2.42923004,9.50195137 2.38680398,9.46695137 2.34240462,9.47895137 C2.22597962,9.50895137 2.41245695,9.65495137 2.43712326,9.68295137 C2.47856267,9.72995137 2.4923758,9.79195137 2.52296203,9.84495137 C2.55650822,9.90295137 2.6255739,9.92195137 2.66602665,9.97295137 C2.69957284,10.0159514 2.7064794,10.0739514 2.75482538,10.1059514 C2.80810462,10.1429514 2.85645059,10.1759514 2.87815695,10.2389514 C2.90084995,10.2169514 2.94820928,10.3209514 2.99655525,10.2379514 C3.02220822,10.1929514 3.06759423,10.1539514 3.09620716,10.2269514 C3.12087347,10.2899514 3.09620716,10.3299514 3.15047305,10.3849514 C3.19191245,10.4279514 3.18993915,10.4789514 3.11890016,10.4739514 C3.13073999,10.5059514 3.14948639,10.5379514 3.11890016,10.5669514 C3.10508703,10.5809514 3.06562093,10.6099514 3.09423385,10.6299514 C3.12679338,10.6149514 3.16132622,10.6059514 3.19388576,10.5909514 C3.22940525,10.5759514 3.26393809,10.5399514 3.30537749,10.5409514 C3.3073508,10.5539514 3.25012495,10.5919514 3.28564444,10.5949514 C3.31524402,10.5979514 3.35767008,10.5669514 3.38134974,10.5929514 C3.40798936,10.6209514 3.37444317,10.6639514 3.39022961,10.6949514 C3.40601605,10.7269514 3.45929529,10.7029514 3.48494825,10.7079514 C3.47409508,10.7359514 3.43265567,10.7309514 3.40996266,10.7419514 C3.46225525,10.8059514 3.39417622,10.8999514 3.31820398,10.9019514 C3.28169783,10.9019514 3.15244635,10.7529514 3.14652644,10.8489514 C3.14553978,10.8769514 3.15441966,10.9119514 3.16329953,10.9389514 C3.17513936,10.9739514 3.25999148,10.9589514 3.29057771,10.9719514 C3.33497707,10.9899514 3.386283,11.0329514 3.40404275,11.0779514 C3.42081584,11.1239514 3.45929529,11.1539514 3.47409508,11.1979514 C3.502708,11.2799514 3.58065355,11.2909514 3.66155906,11.3149514 C3.76910418,11.3469514 3.7168116,11.5139514 3.71089169,11.5939514 C3.70595842,11.6729514 3.81646351,11.6919514 3.86678279,11.7369514 C3.92302198,11.7859514 3.93190185,11.8809514 3.83915652,11.8889514 C3.79179719,11.8929514 3.71286499,11.8709514 3.69510524,11.9319514 C3.66945228,12.0179514 3.79969041,12.0089514 3.85691626,12.0279514 C3.88355588,12.0369514 3.99110101,12.0479514 4.00096753,12.0729514 C4.01576732,12.1119514 4.00392749,12.1649514 4.01774062,12.2059514 C4.05128681,12.3109514 4.14797876,12.3809514 4.24171075,12.4329514 C4.44298787,12.5459514 4.68175778,12.6169514 4.90276795,12.6799514 C5.02609952,12.7159514 5.15140439,12.7439514 5.27769591,12.7609514 C5.40004083,12.7769514 5.50758595,12.7669514 5.61217112,12.8349514 C5.68419676,12.8819514 5.72958277,12.8469514 5.80358171,12.8599514 C5.83515459,12.8659514 5.84896773,12.8949514 5.87264739,12.9119514 C5.89928701,12.9329514 5.92987324,12.9059514 5.95848616,12.9169514 C5.96341942,12.8979514 5.96144612,12.8799514 5.95256625,12.8619514 C6.00880544,12.8829514 6.07787112,12.9429514 6.13707027,12.8949514 C6.16666985,12.8709514 6.1864029,12.8379514 6.21698913,12.8149514 C6.25349527,12.8179514 6.28901476,12.8199514 6.3255209,12.8199514 C6.47845205,12.8199514 6.59882366,12.7499514 6.72116857,12.6679514 C6.85239336,12.5799514 7.01025776,12.5779514 7.16220225,12.5639514 C7.32302662,12.5479514 7.49371751,12.5269514 7.64072873,12.4569514 C7.76899356,12.3949514 7.8015531,12.2819514 7.83805924,12.1569514 C7.87752534,12.0209514 7.99592365,11.9659514 8.0738692,11.8559514 C8.16562788,11.7279514 8.10544208,11.5609514 8.18042767,11.4279514 L8.18042767,11.4279514 Z M2.2950453,9.62395137 C2.29011203,9.59195137 2.2782722,9.57195137 2.25360589,9.55295137 C2.25261924,9.55595137 2.25163259,9.55795137 2.25163259,9.56195137 C2.2180864,9.54495137 2.21413979,9.48095137 2.16875377,9.48595137 C2.13126098,9.42595137 2.03654233,9.45295137 2.00694276,9.50795137 C1.98720971,9.54495137 2.01088937,9.56195137 2.03259572,9.58895137 C2.06022199,9.62295137 2.05528873,9.64895137 2.06515526,9.68795137 C2.08982157,9.78895137 2.17368704,9.71995137 2.23288619,9.75895137 C2.2555792,9.77395137 2.26445907,9.81695137 2.29800525,9.80995137 C2.33549805,9.80095137 2.33352475,9.74495137 2.32365822,9.71995137 C2.30984509,9.68395137 2.29997856,9.66295137 2.2950453,9.62395137 L2.2950453,9.62395137 Z M3.08338067,10.8149514 C3.08930059,10.7979514 3.06266097,10.7789514 3.04490122,10.7799514 C3.02911478,10.7809514 3.014315,10.8029514 3.00839508,10.8149514 C2.98866203,10.8499514 3.01036839,10.8969514 3.0557544,10.8969514 C3.06660758,10.8779514 3.06266097,10.8409514 3.09127389,10.8379514 C3.08930059,10.8289514 3.08338067,10.8259514 3.07548745,10.8229514 L3.08338067,10.8149514 L3.08338067,10.8149514 Z M2.24472602,9.54595137 C2.24768598,9.54795137 2.25064593,9.54995137 2.25360589,9.55295137 C2.25656585,9.54795137 2.25952581,9.54395137 2.26149911,9.53795137 L2.24472602,9.54595137 L2.24472602,9.54595137 Z M11.4896603,10.9489514 C11.4728872,10.9649514 11.4778204,10.9829514 11.4699272,11.0019514 C11.4610474,11.0249514 11.4265145,11.0339514 11.4077681,11.0459514 C11.3781685,11.0649514 11.368302,11.1099514 11.3357425,11.1209514 C11.3219293,11.0999514 11.3012096,11.0409514 11.2725967,11.0919514 C11.2558236,11.1249514 11.2666768,11.1579514 11.2400372,11.1879514 C11.2133976,11.2159514 11.2153709,11.2499514 11.1966245,11.2809514 C11.1680115,11.3299514 11.1393986,11.3589514 11.0910527,11.3879514 C11.0525732,11.4109514 11.04468,11.4539514 11.0170537,11.4859514 C10.9874541,11.5209514 10.9420681,11.5339514 10.9016154,11.5519514 C10.8730024,11.5639514 10.8256431,11.5979514 10.7930836,11.5789514 C10.7496709,11.5519514 10.80887,11.5039514 10.8295897,11.4869514 C10.8493228,11.4709514 10.9430548,11.4139514 10.9213484,11.3819514 C10.9065486,11.3609514 10.8532694,11.3639514 10.831563,11.3659514 C10.7871637,11.3709514 10.7536175,11.4159514 10.7161247,11.4369514 C10.6736986,11.4609514 10.6371925,11.4809514 10.5908198,11.4969514 C10.5375406,11.5159514 10.533594,11.5659514 10.4911679,11.5959514 C10.4576217,11.6219514 10.414209,11.6419514 10.3707963,11.6419514 C10.3135705,11.6419514 10.3165304,11.5939514 10.2997573,11.5539514 C10.278051,11.5569514 10.2593046,11.5849514 10.2385849,11.5939514 C10.2050387,11.6079514 10.1833323,11.6239514 10.1981321,11.6609514 C10.2119452,11.6989514 10.0590141,11.7339514 10.0323745,11.7529514 C10.0264546,11.7339514 10.0560541,11.7139514 10.067894,11.7029514 C10.0205346,11.6989514 9.96725541,11.7399514 9.91890944,11.7469514 C9.87253677,11.7529514 9.81531092,11.7849514 9.80840435,11.8329514 C9.80347109,11.8709514 9.75315181,11.8699514 9.72157893,11.8829514 C9.66928635,11.9049514 9.6909927,11.9359514 9.68112618,11.9779514 C9.66139313,12.0569514 9.49662215,11.9969514 9.58048762,11.8919514 C9.61008719,11.8549514 9.65448656,11.8309514 9.68112618,11.7929514 C9.71171241,11.7489514 9.71664567,11.6939514 9.74032533,11.6469514 C9.68803274,11.6619514 9.64856664,11.6919514 9.60416728,11.7209514 C9.553848,11.7539514 9.51142194,11.7459514 9.45518275,11.7349514 C9.39006368,11.7209514 9.34467766,11.7539514 9.28449186,11.7689514 C9.24601241,11.7779514 9.16017364,11.7749514 9.15524038,11.8309514 C9.15228042,11.8669514 9.21443953,11.8739514 9.23515923,11.8949514 C9.26574546,11.9269514 9.29929165,11.9739514 9.32494461,12.0099514 C9.34566432,12.0379514 9.42262321,12.0769514 9.41768995,12.1129514 C9.40979673,12.1829514 9.32198465,12.1709514 9.27462533,12.1829514 C9.22726601,12.1949514 9.22035944,12.2379514 9.1858266,12.2639514 C9.1463605,12.2929514 9.09308127,12.2589514 9.04966855,12.2769514 C9.00526919,12.2939514 8.97369631,12.3339514 8.93521686,12.3599514 C8.87009779,12.4049514 8.82767173,12.3559514 8.76057936,12.3529514 C8.70631347,12.3509514 8.65698085,12.3759514 8.60567491,12.3869514 C8.55930224,12.3969514 8.50306305,12.4049514 8.46754356,12.4379514 C8.38959801,12.5079514 8.64020775,12.4889514 8.66388741,12.4869514 C8.65303424,12.5269514 8.64218106,12.5739514 8.60567491,12.5999514 C8.5602889,12.6329514 8.49615648,12.6249514 8.4438639,12.6369514 C8.40341114,12.6469514 8.34717195,12.6919514 8.4063711,12.7239514 C8.45965034,12.7509514 8.52772936,12.7369514 8.5810086,12.7179514 C8.64218106,12.6969514 8.6994069,12.6639514 8.76353932,12.6499514 C8.83063169,12.6349514 8.90068402,12.6419514 8.96777639,12.6299514 C9.03980203,12.6159514 9.10294779,12.5769514 9.17004016,12.5499514 C9.23417258,12.5239514 9.30126495,12.5139514 9.36934398,12.5119514 C9.35553084,12.5369514 9.28843847,12.5349514 9.2627855,12.5409514 C9.21246622,12.5509514 9.17793338,12.5949514 9.1256408,12.5919514 C9.06644165,12.5899514 9.07334822,12.6319514 9.03092216,12.6419514 C9.00329589,12.6489514 8.93817682,12.7129514 8.91745711,12.6729514 C8.90167067,12.6419514 8.87108445,12.6479514 8.86121792,12.6859514 C8.8533247,12.7139514 8.86911114,12.7239514 8.83063169,12.7249514 C8.80103212,12.7249514 8.78721898,12.7129514 8.76057936,12.7059514 C8.70730012,12.6919514 8.68362046,12.7469514 8.64612767,12.7609514 C8.59087513,12.7819514 8.53167597,12.7749514 8.47839674,12.8099514 C8.44781051,12.8299514 8.41426432,12.8359514 8.37775818,12.8469514 C8.31165246,12.8679514 8.24949335,12.8929514 8.18338763,12.9149514 C8.1320817,12.9329514 8.08077576,12.9549514 8.02552322,12.9559514 C8.00283021,12.9559514 7.91205818,12.9399514 7.89725839,12.9669514 C7.86963212,13.0169514 7.95448424,12.9979514 7.97224399,12.9879514 C8.02256327,12.9609514 8.08373572,12.9769514 8.13997492,12.9769514 C8.20904059,12.9769514 8.26626644,12.9629514 8.32842555,12.9309514 C8.34519864,12.9219514 8.45669038,12.8979514 8.4626103,12.9109514 C8.47247682,12.9169514 8.54647576,12.8899514 8.55930224,12.8869514 C8.61948805,12.8729514 8.67967385,12.8599514 8.73887301,12.8449514 C8.92140372,12.7979514 9.10097449,12.7269514 9.27857194,12.6659514 C9.6327802,12.5459514 9.95837554,12.3429514 10.2662111,12.1369514 C10.4053291,12.0439514 10.5187942,11.9219514 10.669752,11.8459514 C10.8216965,11.7699514 10.9578546,11.6689514 11.0969726,11.5739514 C11.2331306,11.4809514 11.3367291,11.3529514 11.4501942,11.2359514 C11.5646459,11.1169514 11.6613378,11.0049514 11.7116571,10.8469514 C11.6830442,10.8399514 11.6534446,10.8989514 11.6297649,10.9099514 C11.5902988,10.9289514 11.5212332,10.9189514 11.4896603,10.9489514 L11.4896603,10.9489514 Z M10.6391658,10.7879514 C10.6736986,10.7409514 10.6440991,10.6769514 10.5829266,10.7139514 C10.5602336,10.7269514 10.5631935,10.7529514 10.5454338,10.7689514 C10.5266874,10.7859514 10.5247141,10.7659514 10.5059677,10.7609514 C10.4793281,10.7549514 10.4359154,10.7909514 10.4270355,10.8149514 C10.3905294,10.8139514 10.3579698,10.8549514 10.3747429,10.8869514 C10.4230889,10.8689514 10.4526885,10.8239514 10.504981,10.8379514 C10.5464205,10.8489514 10.6125262,10.8229514 10.6391658,10.7879514 L10.6391658,10.7879514 Z" /> +</svg> diff --git a/src/chrome/browser/identity.png b/src/chrome/browser/identity.png Binary files differ. diff --git a/src/chrome/browser/imagedocument.png b/src/chrome/browser/imagedocument.png Binary files differ. diff --git a/src/chrome/browser/livemark-folder.png b/src/chrome/browser/livemark-folder.png Binary files differ. diff --git a/src/chrome/browser/max-btn.png b/src/chrome/browser/max-btn.png Binary files differ. diff --git a/src/chrome/browser/menu-back.png b/src/chrome/browser/menu-back.png Binary files differ. diff --git a/src/chrome/browser/menu-forward.png b/src/chrome/browser/menu-forward.png Binary files differ. diff --git a/src/chrome/browser/min-btn.png b/src/chrome/browser/min-btn.png Binary files differ. diff --git a/src/chrome/browser/mixed-content-blocked-16.png b/src/chrome/browser/mixed-content-blocked-16.png Binary files differ. diff --git a/src/chrome/browser/mixed-content-blocked-64.png b/src/chrome/browser/mixed-content-blocked-64.png Binary files differ. diff --git a/src/chrome/browser/mixed-content-blocked.svg b/src/chrome/browser/mixed-content-blocked.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"> + <path fill="#9C9C9C" d="m8 1-5.1992 0.90039c-0.4 0-0.80078 0.50039-0.80078 0.90039 0 1.2-3.906e-4 3.2988 0.099609 4.2988 0.3 2.7 0.80039 3.9996 1.9004 5.5996 1.6 2 4 2.3008 4 2.3008s2.4-0.30039 4-2.4004c1.2-1.5 1.7004-2.8996 1.9004-5.5996 0.1-0.9 0.099609-2.9992 0.099609-4.1992 0-0.5-0.40078-0.9-0.80078-1zm0 1 5 0.80078c0 2 3.91e-4 3.4996-0.09961 4.0996-0.3 2.7-0.80117 3.7996-1.7012 5.0996-1.1 1.5-2.6992 1.9-3.1992 2-0.4-0.1-2.0992-0.5-3.1992-2-1-1.3-1.5012-2.3996-1.7012-5.0996-0.1-0.6-0.099609-2.0996-0.099609-4.0996zm0 1-4 0.69922c0 1.5-3.906e-4 2.6012 0.099609 3.2012 0.2 2.5 0.6 3.3996 1.5 4.5996 0.8 1 1.9004 1.4 2.4004 1.5z"/> +</svg> diff --git a/src/chrome/browser/newtab/controls.svg b/src/chrome/browser/newtab/controls.svg @@ -1,92 +1,32 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="icons-enhanced-tiles" - x="0" - y="0" - width="288" - height="33" - viewBox="0 0 288 33" - inkscape:version="0.91 r13725" - sodipodi:docname="controls.svg"> - <metadata - id="metadata71"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="690" - inkscape:window-height="480" - id="namedview69" - showgrid="false" - inkscape:zoom="2.8284271" - inkscape:cx="17.094499" - inkscape:cy="16.5" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="0" - inkscape:current-layer="icons-enhanced-tiles" /> - <defs - id="defs3"> - <style - type="text/css" - id="style5"><![CDATA[ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="icons-enhanced-tiles" width="288" height="33" version="1.1" viewBox="0 0 288 33" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <defs> + <style type="text/css"><![CDATA[ /* Glyph Styles */ - .glyphShape-style { fill: #737373; } - .glyphShape-style-hover-gear { fill: #00aeff; } - .glyphShape-style-hover-pin { fill: #00aeff; } - .glyphShape-style-hover-delete { fill: #666; } - .glyphShape-style-hover-active { fill: #999; } - /* Circle Background Styles */ - .glyphShape-style-circle { fill: #fff; } - .glyphShape-style-circle-dropshadow { fill: #000; fill-opacity: .3; filter: url(#filter-shadow-drop); } - .default-transparent { opacity: .7; } @@ -97,300 +37,88 @@ fill: #f0f0f0; } ]]></style> - <filter - id="filter-shadow-drop" - x="-10%" - y="-10%" - width="120%" - height="120%"> - <feOffset - in="SourceAlpha" - dx="0" - dy="1.6" - result="filter-shadow-drop-offset" - id="feOffset8" /> - <feGaussianBlur - in="filter-shadow-drop-offset" - stdDeviation="1" - result="filter-shadow-drop-blur" - id="feGaussianBlur10" /> + <filter id="filter-shadow-drop"> + <feOffset dx="0" dy="1.6" in="SourceAlpha" result="filter-shadow-drop-offset"/> + <feGaussianBlur in="filter-shadow-drop-offset" result="filter-shadow-drop-blur" stdDeviation="1"/> </filter> - <path - id="glyphShape-gear" - d="M14,18v3h-3v-3H14 M15,17h-5v5h5V17L15,17z M21,18v3h-3v-3H21 M22,17h-5v5h5V17L22,17z M14,11v3h-3v-3H14 M15,10h-5v5h5V10 L15,10z M21,11v3h-3v-3H21 M22,10h-5v5h5V10L22,10z" /> - <circle - id="glyphShape-circle" - cx="16" - cy="16" - r="14" /> - <path - id="glyphShape-pin" - d="M19,15v-5h2V7H11v3h2v5l-3,2v2h5c0,4.5,0.4,8,1,8s1-3.5,1-8h5v-2L19,15z" /> - <polygon - id="glyphShape-delete" - points="22.6,10.6 21.4,9.4 16,14.8 10.6,9.4 9.4,10.6 14.8,16 9.4,21.4 10.6,22.6 16,17.2 21.4,22.6 22.6,21.4 17.2,16" /> - <filter - style="color-interpolation-filters:sRGB;" - inkscape:label="Invert" - id="filter3586"> - <feColorMatrix - type="hueRotate" - values="180" - result="color1" - id="feColorMatrix3588" /> - <feColorMatrix - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 -0.21 -0.72 -0.07 2 0 " - result="color2" - id="feColorMatrix3590" /> + <path id="glyphShape-gear" d="m14 18v3h-3v-3h3m1-1h-5v5h5v-5zm6 1v3h-3v-3h3m1-1h-5v5h5v-5zm-8-6v3h-3v-3h3m1-1h-5v5h5v-5zm6 1v3h-3v-3h3m1-1h-5v5h5v-5z"/> + <circle id="glyphShape-circle" cx="16" cy="16" r="14"/> + <path id="glyphShape-pin" d="M19,15v-5h2V7H11v3h2v5l-3,2v2h5c0,4.5,0.4,8,1,8s1-3.5,1-8h5v-2L19,15z"/> + <polygon id="glyphShape-delete" points="22.6 10.6 21.4 9.4 16 14.8 10.6 9.4 9.4 10.6 14.8 16 9.4 21.4 10.6 22.6 16 17.2 21.4 22.6 22.6 21.4 17.2 16"/> + <filter id="i" color-interpolation-filters="sRGB"> + <feColorMatrix result="color1" type="hueRotate" values="180"/> + <feColorMatrix result="color2" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 -0.21 -0.72 -0.07 2 0 "/> </filter> - <filter - style="color-interpolation-filters:sRGB;" - inkscape:label="Invert" - id="filter3592"> - <feColorMatrix - type="hueRotate" - values="180" - result="color1" - id="feColorMatrix3594" /> - <feColorMatrix - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 -0.21 -0.72 -0.07 2 0 " - result="color2" - id="feColorMatrix3596" /> + <filter id="h" color-interpolation-filters="sRGB"> + <feColorMatrix result="color1" type="hueRotate" values="180"/> + <feColorMatrix result="color2" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 -0.21 -0.72 -0.07 2 0 "/> </filter> - <filter - style="color-interpolation-filters:sRGB;" - inkscape:label="Invert" - id="filter3598"> - <feColorMatrix - type="hueRotate" - values="180" - result="color1" - id="feColorMatrix3600" /> - <feColorMatrix - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 -0.21 -0.72 -0.07 2 0 " - result="color2" - id="feColorMatrix3602" /> + <filter id="g" color-interpolation-filters="sRGB"> + <feColorMatrix result="color1" type="hueRotate" values="180"/> + <feColorMatrix result="color2" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 -0.21 -0.72 -0.07 2 0 "/> </filter> - <filter - style="color-interpolation-filters:sRGB;" - inkscape:label="Invert" - id="filter3604"> - <feColorMatrix - type="hueRotate" - values="180" - result="color1" - id="feColorMatrix3606" /> - <feColorMatrix - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 -0.21 -0.72 -0.07 2 0 " - result="color2" - id="feColorMatrix3608" /> + <filter id="f" color-interpolation-filters="sRGB"> + <feColorMatrix result="color1" type="hueRotate" values="180"/> + <feColorMatrix result="color2" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 -0.21 -0.72 -0.07 2 0 "/> </filter> - <filter - style="color-interpolation-filters:sRGB;" - inkscape:label="Invert" - id="filter3610"> - <feColorMatrix - type="hueRotate" - values="180" - result="color1" - id="feColorMatrix3612" /> - <feColorMatrix - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 -0.21 -0.72 -0.07 2 0 " - result="color2" - id="feColorMatrix3614" /> + <filter id="e" color-interpolation-filters="sRGB"> + <feColorMatrix result="color1" type="hueRotate" values="180"/> + <feColorMatrix result="color2" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 -0.21 -0.72 -0.07 2 0 "/> </filter> - <filter - style="color-interpolation-filters:sRGB;" - inkscape:label="Invert" - id="filter3616"> - <feColorMatrix - type="hueRotate" - values="180" - result="color1" - id="feColorMatrix3618" /> - <feColorMatrix - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 -0.21 -0.72 -0.07 2 0 " - result="color2" - id="feColorMatrix3620" /> + <filter id="d" color-interpolation-filters="sRGB"> + <feColorMatrix result="color1" type="hueRotate" values="180"/> + <feColorMatrix result="color2" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 -0.21 -0.72 -0.07 2 0 "/> </filter> - <filter - style="color-interpolation-filters:sRGB;" - inkscape:label="Invert" - id="filter3622"> - <feColorMatrix - type="hueRotate" - values="180" - result="color1" - id="feColorMatrix3624" /> - <feColorMatrix - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 -0.21 -0.72 -0.07 2 0 " - result="color2" - id="feColorMatrix3626" /> + <filter id="c" color-interpolation-filters="sRGB"> + <feColorMatrix result="color1" type="hueRotate" values="180"/> + <feColorMatrix result="color2" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 -0.21 -0.72 -0.07 2 0 "/> </filter> - <filter - style="color-interpolation-filters:sRGB;" - inkscape:label="Invert" - id="filter3628"> - <feColorMatrix - type="hueRotate" - values="180" - result="color1" - id="feColorMatrix3630" /> - <feColorMatrix - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 -0.21 -0.72 -0.07 2 0 " - result="color2" - id="feColorMatrix3632" /> + <filter id="b" color-interpolation-filters="sRGB"> + <feColorMatrix result="color1" type="hueRotate" values="180"/> + <feColorMatrix result="color2" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 -0.21 -0.72 -0.07 2 0 "/> </filter> - <filter - style="color-interpolation-filters:sRGB;" - inkscape:label="Invert" - id="filter3634"> - <feColorMatrix - type="hueRotate" - values="180" - result="color1" - id="feColorMatrix3636" /> - <feColorMatrix - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 -0.21 -0.72 -0.07 2 0 " - result="color2" - id="feColorMatrix3638" /> + <filter id="a" color-interpolation-filters="sRGB"> + <feColorMatrix result="color1" type="hueRotate" values="180"/> + <feColorMatrix result="color2" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 -0.21 -0.72 -0.07 2 0 "/> </filter> </defs> - <g - id="icon-gear-default" - class="semi-transparent" - style="filter:url(#filter3586)"> - <use - xlink:href="#glyphShape-gear" - class="glyphShape-style" - id="use17" /> + <g id="icon-gear-default" class="semi-transparent" filter="url(#i)"> + <use class="glyphShape-style" xlink:href="#glyphShape-gear"/> </g> - <g - id="g19" - transform="translate(32)" - style="filter:url(#filter3592)"> - <use - xlink:href="#glyphShape-gear" - class="glyphShape-style-hover-gear" - id="use21" /> + <g transform="translate(32)" filter="url(#h)"> + <use class="glyphShape-style-hover-gear" xlink:href="#glyphShape-gear"/> </g> - <g - id="icon-pin-default" - transform="translate(64)" - class="default-transparent" - style="filter:url(#filter3598)"> - <use - xlink:href="#glyphShape-circle" - class="glyphShape-style-circle-dropshadow" - id="use24" /> - <use - xlink:href="#glyphShape-circle" - class="glyphShape-style-circle" - id="use26" /> - <use - xlink:href="#glyphShape-pin" - class="glyphShape-style" - id="use28" /> + <g id="icon-pin-default" class="default-transparent" transform="translate(64)" filter="url(#g)"> + <use class="glyphShape-style-circle-dropshadow" xlink:href="#glyphShape-circle"/> + <use class="glyphShape-style-circle" xlink:href="#glyphShape-circle"/> + <use class="glyphShape-style" xlink:href="#glyphShape-pin"/> </g> - <g - id="icon-delete-default" - transform="translate(160)" - class="default-transparent" - style="filter:url(#filter3604)"> - <use - xlink:href="#glyphShape-circle" - class="glyphShape-style-circle-dropshadow" - id="use45" /> - <use - xlink:href="#glyphShape-circle" - class="glyphShape-style-circle" - id="use47" /> - <use - xlink:href="#glyphShape-delete" - class="glyphShape-style" - id="use49" /> + <g id="icon-delete-default" class="default-transparent" transform="translate(160)" filter="url(#f)"> + <use class="glyphShape-style-circle-dropshadow" xlink:href="#glyphShape-circle"/> + <use class="glyphShape-style-circle" xlink:href="#glyphShape-circle"/> + <use class="glyphShape-style" xlink:href="#glyphShape-delete"/> </g> - <g - id="icon-delete-hover" - transform="translate(192)" - style="filter:url(#filter3610)"> - <use - xlink:href="#glyphShape-circle" - class="glyphShape-style-circle-dropshadow" - id="use52" /> - <use - xlink:href="#glyphShape-circle" - class="glyphShape-style-circle" - id="use54" /> - <use - xlink:href="#glyphShape-delete" - class="glyphShape-style-hover-delete" - id="use56" /> + <g id="icon-delete-hover" transform="translate(192)" filter="url(#e)"> + <use class="glyphShape-style-circle-dropshadow" xlink:href="#glyphShape-circle"/> + <use class="glyphShape-style-circle" xlink:href="#glyphShape-circle"/> + <use class="glyphShape-style-hover-delete" xlink:href="#glyphShape-delete"/> </g> - <g - id="icon-delete-hover-active" - transform="translate(224)" - class="active-grey" - style="filter:url(#filter3616)"> - <use - xlink:href="#glyphShape-circle" - class="glyphShape-style-circle-dropshadow" - id="use59" /> - <use - xlink:href="#glyphShape-circle" - class="glyphShape-style-circle" - id="use61" /> - <use - xlink:href="#glyphShape-delete" - class="glyphShape-style-hover-active" - id="use63" /> + <g id="icon-delete-hover-active" class="active-grey" transform="translate(224)" filter="url(#d)"> + <use class="glyphShape-style-circle-dropshadow" xlink:href="#glyphShape-circle"/> + <use class="glyphShape-style-circle" xlink:href="#glyphShape-circle"/> + <use class="glyphShape-style-hover-active" xlink:href="#glyphShape-delete"/> </g> - <g - id="g65" - transform="translate(256)" - style="filter:url(#filter3622)"> - <use - xlink:href="#glyphShape-pin" - class="glyphShape-style-pin" - id="use67" /> + <g transform="translate(256)" filter="url(#c)"> + <use class="glyphShape-style-pin" xlink:href="#glyphShape-pin"/> </g> - <g - id="icon-pin-hover" - transform="translate(96)" - class="default-transparent" - style="opacity:1;filter:url(#filter3628)"> - <use - xlink:href="#glyphShape-circle" - class="glyphShape-style-circle-dropshadow" - id="use31" - style="" /> - <use - xlink:href="#glyphShape-circle" - class="glyphShape-style-circle" - id="use33" - style="fill:#ffffff;fill-opacity:1" /> - <use - xlink:href="#glyphShape-pin" - class="glyphShape-style-hover-pin" - id="use35" - style="" /> + <g id="icon-pin-hover" class="default-transparent" transform="translate(96)" filter="url(#b)"> + <use class="glyphShape-style-circle-dropshadow" style="" xlink:href="#glyphShape-circle"/> + <use class="glyphShape-style-circle" fill="#ffffff" xlink:href="#glyphShape-circle"/> + <use class="glyphShape-style-hover-pin" style="" xlink:href="#glyphShape-pin"/> </g> - <g - id="icon-pin-hover-active" - transform="translate(128)" - class="active-grey" - style="filter:url(#filter3634)"> - <use - xlink:href="#glyphShape-circle" - class="glyphShape-style-circle-dropshadow" - id="use38" /> - <use - xlink:href="#glyphShape-circle" - class="glyphShape-style-circle" - id="use40" /> - <use - xlink:href="#glyphShape-pin" - class="glyphShape-style-hover-active" - id="use42" /> + <g id="icon-pin-hover-active" class="active-grey" transform="translate(128)" filter="url(#a)"> + <use class="glyphShape-style-circle-dropshadow" xlink:href="#glyphShape-circle"/> + <use class="glyphShape-style-circle" xlink:href="#glyphShape-circle"/> + <use class="glyphShape-style-hover-active" xlink:href="#glyphShape-pin"/> </g> </svg> diff --git a/src/chrome/browser/notification-16.png b/src/chrome/browser/notification-16.png Binary files differ. diff --git a/src/chrome/browser/notification-16.svg b/src/chrome/browser/notification-16.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"> + <path id="desktop-notification" d="m1 10a2 2 0 0 0 2 2h6.5l3.5 3.5v-3.5a2 2 0 0 0 2-2v-6a2 2 0 0 0-2-2h-10a2 2 0 0 0-2 2zm2.5-1a0.5 0.5 0 1 1 0-1h5a0.5 0.5 0 1 1 0 1zm0-2a0.5 0.5 0 1 1 0-1h7a0.5 0.5 0 1 1 0 1zm0-2a0.5 0.5 0 1 1 0-1h9a0.5 0.5 0 1 1 0 1z" fill="#9c9c9c"/> +</svg> diff --git a/src/chrome/browser/notification-64.png b/src/chrome/browser/notification-64.png Binary files differ. diff --git a/src/chrome/browser/page-livemarks.png b/src/chrome/browser/page-livemarks.png Binary files differ. diff --git a/src/chrome/browser/places/allBookmarks.png b/src/chrome/browser/places/allBookmarks.png Binary files differ. diff --git a/src/chrome/browser/places/bookmark.png b/src/chrome/browser/places/bookmark.png Binary files differ. diff --git a/src/chrome/browser/places/bookmark.svg b/src/chrome/browser/places/bookmark.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + #active:target + #stripe { + display: none; + } + </style> + <path d="m5.484 4.9912v10.045l4.0165-3.5157 4.0165 3.5157v-10.045a1.5062 1.5067 0 0 0-1.5062-1.5067h-5.0206a1.5062 1.5067 0 0 0-1.5062 1.5067z" fill="#75c8fe"/> + <path d="m5.484 4.9912v10.045l4.0165-3.5157 4.0165 3.5157v-10.045a1.5062 1.5067 0 0 0-1.5062-1.5067h-5.0206a1.5062 1.5067 0 0 0-1.5062 1.5067z" fill="none" stroke="#359bde"/> + <g id="active"/> + <g id="stripe" transform="matrix(1.0041 0 0 1.0045 -.038688 .97326)" stroke-width=".99571"> + <path d="m6.5 3v9l3-2.5 3 2.5v-9" fill="none" opacity=".37" stroke="#fff" stroke-width=".99571"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/places/bookmark48.svg b/src/chrome/browser/places/bookmark48.svg @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="48" height="48" viewBox="0 0 48 48"> + <style> + g { + fill: none; + stroke: #E6E6E6; + stroke-width: 2; + } + #highlight:target + g { + stroke: #fff; + fill: #fff; + } + </style> + <g id="highlight"/> + <g> + <path d="M 15,37.5 l 9.5,-7.8 l 9.5,7.8 v -22.9 a 3.6,3.6 0 0,0 -3.6,-3.6 h -11.8 a 3.6,3.6 0 0,0 -3.6,3.6 v 22.9 Z"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/places/bookmarked48.svg b/src/chrome/browser/places/bookmarked48.svg @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="48" height="48" viewBox="0 0 48 48"> + <style> + g { + fill: none; + stroke: #E6E6E6; + stroke-width: 2; + } + #brighttext:target + g { + stroke: #fff; + } + </style> + <g id="brighttext"/> + <g> + <path d="M 15,37.5 l 9.5,-7.8 l 9.5,7.8 v -22.9 a 3.6,3.6 0 0,0 -3.6,-3.6 h -11.8 a 3.6,3.6 0 0,0 -3.6,3.6 v 22.9 Z"/> + <path d="M 8,16 h 7 m 19,0 h 7"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/places/bookmarksMenu.png b/src/chrome/browser/places/bookmarksMenu.png Binary files differ. diff --git a/src/chrome/browser/places/bookmarksToolbar.png b/src/chrome/browser/places/bookmarksToolbar.png Binary files differ. diff --git a/src/chrome/browser/places/calendar.png b/src/chrome/browser/places/calendar.png Binary files differ. diff --git a/src/chrome/browser/places/downloads.png b/src/chrome/browser/places/downloads.png Binary files differ. diff --git a/src/chrome/browser/places/editBookmarkOverlay.css b/src/chrome/browser/places/editBookmarkOverlay.css @@ -13,8 +13,8 @@ } .folder-icon { - list-style-image: url("chrome://global/skin/icons/folder-item.png") !important; - -moz-image-region: rect(0px, 32px, 16px, 16px) !important; + list-style-image: url("chrome://browser/skin/places/places.svg"); + -moz-image-region: rect(2px, 198px, 18px, 182px); } @@ -33,11 +33,11 @@ } .expander-up { - list-style-image: url("chrome://global/skin/icons/collapse.png"); + list-style-image: url("chrome://global/skin/icons/expander.svg#collapse"); } .expander-down { - list-style-image: url("chrome://global/skin/icons/expand.png"); + list-style-image: url("chrome://global/skin/icons/expander.svg#expand"); } #editBookmarkPanelContent { @@ -63,18 +63,35 @@ #editBMPanel_folderMenuList[selectedIndex="0"], #editBMPanel_toolbarFolderItem { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important; - -moz-image-region: auto !important; + -moz-image-region: rect(2px, 138px, 18px, 122px); } #editBMPanel_folderMenuList[selectedIndex="1"], #editBMPanel_bmRootItem { - list-style-image: url("chrome://browser/skin/places/bookmarksMenu.png") !important; - -moz-image-region: auto !important; + -moz-image-region: rect(2px, 158px, 18px, 142px); } #editBMPanel_folderMenuList[selectedIndex="2"], #editBMPanel_unfiledRootItem { - list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png") !important; - -moz-image-region: auto !important; + -moz-image-region: rect(2px, 178px, 18px, 162px); +} + +menuitem.folder-icon[_moz-menuactive="true"] { + -moz-image-region: rect(2px, 358px, 18px, 342px); +} + +#editBMPanel_toolbarFolderItem[_moz-menuactive="true"] { + -moz-image-region: rect(2px, 298px, 18px, 282px); +} + +#editBMPanel_bmRootItem[_moz-menuactive="true"] { + -moz-image-region: rect(2px, 318px, 18px, 302px); +} + +#editBMPanel_unfiledRootItem[_moz-menuactive="true"] { + -moz-image-region: rect(2px, 338px, 18px, 322px); +} + +#editBMPanel_folderMenuList > .menulist-label-box > .menulist-icon{ + -moz-margin-end: 4px; } diff --git a/src/chrome/browser/places/history.png b/src/chrome/browser/places/history.png Binary files differ. diff --git a/src/chrome/browser/places/libraryToolbar.png b/src/chrome/browser/places/libraryToolbar.png Binary files differ. diff --git a/src/chrome/browser/places/libraryToolbar.svg b/src/chrome/browser/places/libraryToolbar.svg @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" + y="0" + width="16" + height="16" + viewBox="0 0 16 16"> + <style> + .t:not(:target){ + display: none; + } + path { + stroke-width: 1; + stroke: #fff; + fill: none; + } + </style> + <path id="organizeButton" class="t" + d="M 1.5,7.5 h 4 v .5 a 1.5,1.5 0 0,0 1.5,1.5 h 2 a 1.5,1.5 0 0,0 1.5,-1.5 v -.5 h 4 + v 5.5 a 1.5,1.5 0 0,1 -1.5,1.5 h -10 a 1.5,1.5 0 0,1 -1.5,-1.5 v -5.5 z + v -.5 l 2,-5.5 h 9 l 2,5.5 v .5 + m -10.5,-2 h 8 m -7,-2 h 6"/> + <path id="viewMenu" class="t" + d="M 2,4.5 h 2 m -2,-1 h 2 m 1,0 h 9 m -12,5 + h 2 m -2,-1 h 2 m 1,0 h 9 m -12,5 + h 2 m -2,-1 h 2 m 1,0 h 9"/> + <path id="maintenanceButton" class="t" + d="M 3.5,6.5 c .8,-5.4 9.2,-5.4 10,0 m 1.3,-3.2 l -1.1,3.2 l -3.2,-1.1 + M 13.5,9.5 c -.8,5.4 -9.2,5.4 -10,0 m -1.3,3.2 l 1.1,-3.2 l 3.2,1.1"/> + <path id="clearDownloadsButton" class="t" + d="M 3.5,4.5 h 9 v 9 a 1,1 0 0,1 -1,1 h -7 a 1,1 0 0,1 -1,-1 v -9 z m 3,.5 v 9 m 3,-9 v 9 + m -8,-11.5 h 13 m -9,-.5 a 1.5,1.5 0 0,1 1.5,-1.5 h 2 a 1.5,1.5 0 0,1 1.5,1.5"/> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/places/livemark-item.png b/src/chrome/browser/places/livemark-item.png Binary files differ. diff --git a/src/chrome/browser/places/organizer.css b/src/chrome/browser/places/organizer.css @@ -2,15 +2,9 @@ * 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/. */ - - - -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +:root { + --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg#toolbar"); +} /* Toolbar */ #placesToolbar { @@ -24,7 +18,7 @@ #back-button, #forward-button { - list-style-image: url("chrome://browser/skin/Toolbar.png"); + list-style-image: var(--toolbarbutton-image); } @@ -76,7 +70,7 @@ #placesMenu > menu > .menubar-text { -moz-padding-end: 8px; - background: url(chrome://global/skin/arrow/arrow-dn.gif) right center no-repeat; + background: url(chrome://global/skin/arrow/arrow-v.svg#dn) right center no-repeat; } #placesMenu > menu > .menubar-text:-moz-locale-dir(rtl) { @@ -84,37 +78,25 @@ } /* organize, view and maintenance buttons icons */ -#organizeButton, -#viewMenu, -#maintenanceButton { - list-style-image: url("chrome://browser/skin/places/libraryToolbar.png"); -} /* organize button */ #organizeButton { - -moz-image-region: rect(0px, 16px, 16px, 0px); -} -#organizeButton:hover, -#organizeButton[open="true"] { - -moz-image-region: rect(16px, 16px, 32px, 0px); + list-style-image: url("chrome://browser/skin/places/libraryToolbar.svg#organizeButton"); } /* view button */ #viewMenu { - -moz-image-region: rect(0px, 32px, 16px, 16px); -} -#viewMenu:hover, -#viewMenu[open="true"] { - -moz-image-region: rect(16px, 32px, 32px, 16px); + list-style-image: url("chrome://browser/skin/places/libraryToolbar.svg#viewMenu"); } /* maintenance button */ #maintenanceButton { - -moz-image-region: rect(0px, 48px, 16px, 32px); + list-style-image: url("chrome://browser/skin/places/libraryToolbar.svg#maintenanceButton"); } -#maintenanceButton:hover, -#maintenanceButton[open="true"] { - -moz-image-region: rect(16px, 48px, 32px, 32px); + +/* clear button */ +#clearDownloadsButton { + list-style-image: url("chrome://browser/skin/places/libraryToolbar.svg#clearDownloadsButton"); } /* Root View */ @@ -145,7 +127,6 @@ } #clearDownloadsButton { - -moz-appearance: none; -moz-padding-start: 9px; -moz-padding-end: 9px; } diff --git a/src/chrome/browser/places/place.svg b/src/chrome/browser/places/place.svg @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" + y="0" + width="16" + height="16" + viewBox="0 0 16 16"> + <style> + .t:not(:target){ + display: none; + } + use:not([class]) { + stroke-width: 1; + stroke: #fff; + fill: none; + } + .inside { + stroke-width: 0; + stroke: none; + fill: #fff; + } + .hiLiteOutline { + stroke-width: 1; + stroke: HighlightText; + fill: none; + opacity: .7; + } + </style> + <defs> + + <path id="default-shape" + d="M2,1.5h2m1.3,0h2m1.4,0h2m1.3,0h2m.5,.5v2m0,1.3v2m0,1.4v2m0,1.3v2m-.5,.5h-2m-1.3,0h-2m-1.4,0h-2m-1.3,0h-2m-.5-.5v-2m0-1.3v-2m0-1.4v-2m0-1.3v-2m.5-.5z"/> + + <g id="tag-shape"> + <path d="M 3,2.5 h 4 c .5,0 .5,0 1,.5 l 4.5,4.5 c 1.5,1.5 1.5,1.5 0,3 l -2,2 + c -1.5,1.5 -1.5,1.5 -3,0 l -4.5,-4.5 c -.5,-.5 -.5,-.5 -.5,-1 v -4 a .5,.5 0 0,1 .5,-.5 z"/> + <circle cx="5.6" cy="5.6" r=".5"/> + </g> + + </defs> + + <g id="defaultFavicon" class="t"> + <use xlink:href="#default-shape"/> + </g> + <g id="defaultFaviconHL" class="t"> + <use xlink:href="#default-shape" class="hiLiteOutline"/> + </g> + <g id="tag" class="t"> + <use xlink:href="#tag-shape"/> + </g> + <g id="tagHL" class="t"> + <use xlink:href="#tag-shape" class="hiLiteOutline"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/places/places.css b/src/chrome/browser/places/places.css @@ -22,8 +22,8 @@ /* Trees */ treechildren::-moz-tree-image(title) { - list-style-image: url("chrome://global/skin/icons/folder-item.png"); - -moz-image-region: rect(0px, 16px, 16px, 0px); + list-style-image: url(chrome://browser/skin/places/places.svg); + -moz-image-region: rect(2px, 396px, 18px, 380px); padding-right: 2px; margin: 0px 2px; width: 16px; @@ -31,12 +31,11 @@ treechildren::-moz-tree-image(title) { } treechildren::-moz-tree-image(title, livemarkItem) { - list-style-image: url("chrome://browser/skin/places/livemark-item.png"); - -moz-image-region: rect(0px, 16px, 16px, 0px); + -moz-image-region: rect(2px, 258px, 18px, 242px); } treechildren::-moz-tree-image(title, livemarkItem, visited) { - -moz-image-region: rect(0px, 32px, 16px, 16px); + -moz-image-region: rect(2px, 278px, 18px, 262px); } treechildren::-moz-tree-image(title, separator) { @@ -46,85 +45,72 @@ treechildren::-moz-tree-image(title, separator) { } treechildren::-moz-tree-image(title, container) { - list-style-image: url("chrome://global/skin/icons/folder-item.png"); - -moz-image-region: rect(0px, 32px, 16px, 16px); + -moz-image-region: rect(2px, 198px, 18px, 182px); } treechildren::-moz-tree-image(title, open) { - -moz-image-region: rect(16px, 32px, 32px, 16px); + -moz-image-region: rect(2px, 198px, 18px, 182px); } treechildren::-moz-tree-image(title, container, livemark) { - list-style-image: url("chrome://browser/skin/livemark-folder.png"); - -moz-image-region: auto; + -moz-image-region: rect(2px, 238px, 18px, 222px); } treechildren::-moz-tree-image(container, OrganizerQuery_AllBookmarks) { - list-style-image: url("chrome://browser/skin/places/allBookmarks.png"); - -moz-image-region: auto; + -moz-image-region: rect(2px, 118px, 18px, 102px); } treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksToolbar) { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png"); - -moz-image-region: auto; + -moz-image-region: rect(2px, 138px, 18px, 122px); } treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksMenu) { - list-style-image: url("chrome://browser/skin/places/bookmarksMenu.png"); - -moz-image-region: auto; + -moz-image-region: rect(2px, 158px, 18px, 142px); } treechildren::-moz-tree-image(container, OrganizerQuery_UnfiledBookmarks) { - list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); - -moz-image-region: auto; + -moz-image-region: rect(2px, 178px, 18px, 162px); } /* query-nodes should be styled even if they're not expandable */ treechildren::-moz-tree-image(title, query) { - list-style-image: url("chrome://browser/skin/places/query.png"); - -moz-image-region: auto; + -moz-image-region: rect(2px, 218px, 18px, 202px); } treechildren::-moz-tree-image(title, query, tagContainer), treechildren::-moz-tree-image(query, OrganizerQuery_Tags) { - list-style-image: url("chrome://browser/skin/places/tag.png"); - -moz-image-region: auto; + -moz-image-region: rect(2px, 98px, 18px, 82px); } treechildren::-moz-tree-image(query, OrganizerQuery_Downloads) { - list-style-image: url("chrome://browser/skin/places/downloads.png"); - -moz-image-region: auto; + -moz-image-region: rect(2px, 78px, 18px, 62px); } /* calendar icon for folders grouping items by date */ treechildren::-moz-tree-image(title, query, dayContainer) { - list-style-image: url("chrome://browser/skin/places/calendar.png"); - -moz-image-region: auto; + -moz-image-region: rect(2px, 58px, 18px, 42px); } treechildren::-moz-tree-image(title, query, hostContainer) { - list-style-image: url("chrome://global/skin/icons/folder-item.png"); - -moz-image-region: rect(0px, 32px, 16px, 16px); + -moz-image-region: rect(2px, 198px, 18px, 182px); } treechildren::-moz-tree-image(title, query, hostContainer, open) { - list-style-image: url("chrome://global/skin/icons/folder-item.png"); - -moz-image-region: rect(16px, 32px, 32px, 16px); + -moz-image-region: rect(2px, 198px, 18px, 182px); } treechildren::-moz-tree-image(title, query, OrganizerQuery_History) { - list-style-image: url("chrome://browser/skin/places/history.png"); + -moz-image-region: rect(2px, 38px, 18px, 22px); } /* We want some queries to look like ordinary folders. This must come after the (title, query) selector, or it would get overridden. */ treechildren::-moz-tree-image(title, query, folder) { - list-style-image: url("chrome://global/skin/icons/folder-item.png"); - -moz-image-region: rect(0px, 32px, 16px, 16px); + -moz-image-region: rect(2px, 198px, 18px, 182px); } treechildren::-moz-tree-image(title, query, folder, open) { - -moz-image-region: rect(16px, 32px, 32px, 16px); + -moz-image-region: rect(2px, 198px, 18px, 182px); } treechildren::-moz-tree-image(cutting) { @@ -156,4 +142,4 @@ treechildren::-moz-tree-cell-text(selected, focus) { height: auto; width: auto; -moz-margin-end: -3px; -} -\ No newline at end of file +} diff --git a/src/chrome/browser/places/places.svg b/src/chrome/browser/places/places.svg @@ -0,0 +1,255 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" + y="0" + width="396" + height="20" + viewBox="0 0 396 20"> + <style> + use:not([class]) { + stroke-width: 1; + stroke: #fff; + fill: none; + } + .inside { + stroke-width: 0; + stroke: none; + fill: #fff; + } + .complete { + stroke-width: 1; + stroke: #9C9C9C; + fill: #9C9C9C; + } + .grayOutline { + stroke-width: 1; + stroke: #808080; + fill: none; + } + .grayInside { + stroke-width: 0; + stroke: none; + fill: #808080; + } + .grayComplete { + stroke-width: 1; + stroke: #808080; + fill: #808080; + } + .hiLiteOutline { + stroke-width: 1; + stroke: HighlightText; + fill: none; + opacity: .6; + } + .hiLiteInside { + stroke-width: 0; + stroke: none; + fill: HighlightText; + opacity: .6; + } + .hiLiteComplete { + stroke-width: 1; + stroke: HighlightText; + fill: HighlightText; + opacity: .6; + } + </style> + <defs> + <linearGradient id="Ga"> + <stop offset="0" stop-color="#EAECE3"/> + <stop offset="1" stop-color="#FBFBF6"/> + </linearGradient> + <linearGradient x1="9" y1="13" x2="5" y2="3" id="Gb" xlink:href="#Ga" gradientUnits="userSpaceOnUse"/> + <linearGradient id="Gc"> + <stop offset="0" stop-color="#F58A1B"/> + <stop offset="1" stop-color="#F5AA1B"/> + </linearGradient> + <linearGradient x1="8" y1="14.5" x2="8" y2="1.5" id="Gd" xlink:href="#Gc" gradientUnits="userSpaceOnUse"/> + <linearGradient id="Ge"> + <stop offset="0" stop-color="#FF911A"/> + <stop offset="1" stop-color="#FFB31A"/> + </linearGradient> + <linearGradient x1="8.5" y1="11.5" x2="4.5" y2="4.5" id="Gf" xlink:href="#Ge" gradientUnits="userSpaceOnUse"/> + + + <path id="default-shape" + d="M2,1.5h2m1.3,0h2m1.4,0h2m1.3,0h2m.5,.5v2m0,1.3v2m0,1.4v2m0,1.3v2m-.5,.5h-2m-1.3,0h-2m-1.4,0h-2m-1.3,0h-2m-.5-.5v-2m0-1.3v-2m0-1.4v-2m0-1.3v-2m.5-.5z"/> + + <g id="history-shape"> + <circle cx="8" cy="8" r="6.5"/> + <path d="M 6.5,3 l 1,5.5 l 4.5,1"/> + </g> + + <g id="calendar-shape"> + <path d = "M 2,2.5 h 11 a 1.5,1.5 0 0,1 1.5,1.5 v 9 a 1.5,1.5 0 0,1 -1.5,1.5 + h -11 a 1.5,1.5 0 0,1 -1.5,-1.5 v -9 a 1.5,1.5 0 0,1 1.5,-1.5 z + M 1,5.5 h 13 M 4.5,1 v 3 M 10.5,1 v 3"/> + </g> + + <g id="downloads-shape"> + <path d="M 2.8,10 h 9.4 a 1.8,1.8 0 0,1 1.8,1.8 v 1.4 a 1.8,1.8 0 0,1 -1.8,1.8 h -9.4 a 1.8,1.8 0 0,1 -1.8,-1.8 v -1.4 a 1.8,1.8 0 0,1 1.8,-1.8 z + M 9,12 v 1 h 2 v -1 h -2 z" class="inside"/> + <path d="M 7.5,1 v7.5 m -3.5,-3.5 l 3.5,3.5 l 3.5,-3.5"/> + </g> + + <g id="tag-shape"> + <path d="M 3,2.5 h 4 c .5,0 .5,0 1,.5 l 4.5,4.5 c 1.5,1.5 1.5,1.5 0,3 l -2,2 + c -1.5,1.5 -1.5,1.5 -3,0 l -4.5,-4.5 c -.5,-.5 -.5,-.5 -.5,-1 v -4 a .5,.5 0 0,1 .5,-.5 z"/> + <circle cx="5.6" cy="5.6" r="1" class="inside"/> + </g> + + <g id="allBookmarks-shape"> + <path d="M 2.5,5 a .5,.5 0 0,1 .5,-.5 h 7.5 v 10 h -7.5 a .5,.5 0 0,1 -.5,-.5 v -9 z + c 0,-1.6 .6,-2.5 2.5,-2.5 h 7.5 v10 h -1.5"/> + </g> + + <g id="bookmarksToolbar-shape"> + <path d="M 2,2.5 h 12 a 1.5,1.5 0 0,1 1.5,1.5 v 8 a 1.5,1.5 0 0,1 -1.5,1.5 + h -12 a 1.5,1.5 0 0,1 -1.5,-1.5 v -8 a 1.5,1.5 0 0,1 1.5,-1.5 z"/> + <path class="complete" + d="M 5,3.5 h 3 a .5,.5 0 0,1 .5,.5 v 5 l -2,-1.8 l -2,1.8 v -5 a .5,.5 0 0,1 .5,-.5 z"/> + </g> + + <g id="toolbar-shape"> + <path d="M 2,2.5 h 12 a 1.5,1.5 0 0,1 1.5,1.5 v 8 a 1.5,1.5 0 0,1 -1.5,1.5 + h -12 a 1.5,1.5 0 0,1 -1.5,-1.5 v -8 a 1.5,1.5 0 0,1 1.5,-1.5 z"/> + </g> + + <g id="bookmarksBadge-shape"> + <path d="M 5,3.5 h 3 a .5,.5 0 0,1 .5,.5 v 5 l -2,-1.8 l -2,1.8 v -5 a .5,.5 0 0,1 .5,-.5 z"/> + </g> + + <g id="bookmarksMenu-shape"> + <path d="M .5,4 c .7,-2.2 6.3,-2.2 7,0 c .7,-2.2 6.3,-2.2 7,0 l 0,10 c -.7,-2.2 -6.3,-2.2 -7,0 v-10 v10 c -.7,-2.2 -6.3,-2.2 -7,0 l 0,-10 z"/> + </g> + + <g id="unsortedFront-shape"> + <path d="M 11.5,15 l -4.5,-3.5 l -4.5,3.5 v -11 a 1.5,1.5 0 0,1 1.5,-1.5 h 6 a 1.5,1.5 0 0,1 1.5,1.5 v 11 Z"/> + </g> + <g id="unsortedBack-shape"> + <path d="M 6,0.5 h 6 a 1.5,1.5 0 0,1 1.5,1.5 v 11 l -.005,-.005 M 6,0.5 h -.5 l .005,-.005"/> + </g> + + <g id="folderBack-shape"> + <path d="M 1,1.75 a 1.75,1.75 0 0,1 1.75,-1.75 h 3.5 a 1.75,1.75 0 0,1 1.75,1.75 v .25 h 5.25 a 1.75,1.75 0 0,1 1.75,1.75 v 1.75 + a 1.75,1.5 0 0,0 -1.75,-1.5 h -10.5 a 1.75,1.5 0 0,0 -1.75,1.5 v -3.75 z"/> + </g> + <g id="folderFront-shape"> + <path d="M 1.5,6.75 a 1.25,1.25 0 0,1 1.25,-1.25 h 10.5 a1.25,1.25 0 0,1 1.25,1.25 v 5.5 + a 1.25,1.25 0 0,1 -1.25,1.25 h -10.5 a1.25,1.25 0 0,1 -1.25,-1.25 v -5.5 z"/> + </g> + + <g id="queryLogo-shape"> + <circle cx="7.6" cy="8.4" r="2"/> + <line x1="9.014" y1="9.814" x2="11" y2="11.8"/> + </g> + + <g id="livemarkLogo-shape"> + <circle cx="5.5" cy="11.5" r="0.125"/> + <path d="M 5,9 a 3,3 0 0,1 3,3 m -3,-5.5 a 5.5,5.5 0 0,1 5.5,5.5"/> + </g> + + + <g id="livemarkItem-image"> + <rect x="1.4" y="1.4" width="13.2" height="13.2" rx="1.6" ry="1.6" stroke-width="1.4" fill="url(#Gb)" stroke="url(#Gd)"/> + <circle cx="5" cy="11" r="1" stroke-width="0" fill="#F5991B" stroke="url(#Gf)"/> + <path class="s" stroke-width="1.5" fill="none" stroke="url(#Gf)" + d="M 4,12 m 0,-4.5 a 4.5,4.5 0 0,1 4.5,4.5 m -4.5,-7.5 a 7.5,7.5 0 0,1 7.5,7.5"/> + </g> + + <g id="livemarkItemSeen-image"> + <circle cx="5" cy="11" r="1" class="inside"/> + <path stroke-width="1.5" fill="none" stroke="#9C9C9C" + d="M 4,12 m 0,-4.5 a 4.5,4.5 0 0,1 4.5,4.5 m -4.5,-7.5 a 7.5,7.5 0 0,1 7.5,7.5"/> + </g> + + <g id="item-shape"> + <polygon fill="#E4E4E4" points="2,0 2,14 14,14 14,6 8,6 8,0 " stroke="none"/> + <polygon fill="#E3E3E3" points="9.04,0 9.04,5.041 14,5.041 " stroke="none"/> + </g> + + </defs> + + <g id="defaultFavicon"> + <use xlink:href="#default-shape" x= "2" y="2"/> + </g> + <g id="history"> + <use xlink:href="#history-shape" x= "22" y="2"/> + </g> + <g id="calendar"> + <use xlink:href="#calendar-shape" x= "42" y="2"/> + </g> + <g id="downloads"> + <use xlink:href="#downloads-shape" x= "62" y="2"/> + </g> + <g id="tag"> + <use xlink:href="#tag-shape" x= "82" y="2"/> + </g> + <g id="allBookmarks"> + <use xlink:href="#allBookmarks-shape" x="102" y="2"/> + </g> + <g id="bookmarksToolbar"> + <use xlink:href="#toolbar-shape" x="122" y="2"/> + <use xlink:href="#bookmarksBadge-shape" x="122" y="2" class="complete"/> + </g> + <g id="bookmarksMenu"> + <use xlink:href="#bookmarksMenu-shape" x="142" y="2"/> + </g> + <g id="unsortedBookmarks"> + <use xlink:href="#unsortedFront-shape" x="162" y="2" class="complete"/> + <use xlink:href="#unsortedBack-shape" x="162" y="2"/> + </g> + <g id="folderItem"> + <use xlink:href="#folderBack-shape" x="182" y="2" class="styled" stroke-width="0" fill="#E3E3E3" stroke="none"/> + <use xlink:href="#folderFront-shape" x="182" y="2" class="styled" stroke-width="1" fill="#E4E4E4" stroke="#E4E4E4"/> + </g> + <g id="query"> + <use xlink:href="#folderBack-shape" x="202" y="2" class="styled" stroke-width="0" fill="#E3E3E3" stroke="none"/> + <use xlink:href="#folderFront-shape" x="202" y="2" class="styled" stroke-width="1" fill="#E4E4E4" stroke="#E4E4E4"/> + <use xlink:href="#queryLogo-shape" x="202" y="2" class="styled" stroke-width="1" fill="none" stroke="#8F8F8F"/> + </g> + <g id="livemarkFolder"> + <use xlink:href="#folderBack-shape" x="222" y="2" class="styled" stroke-width="0" fill="#E3E3E3" stroke="none"/> + <use xlink:href="#folderFront-shape" x="222" y="2" class="styled" stroke-width="1" fill="#E4E4E4" stroke="#E4E4E4"/> + <use xlink:href="#livemarkLogo-shape" x="222" y="2" class="styled" stroke-width="1" fill="none" stroke="#8F8F8F"/> + </g> + <g id="livemarkItem"> + <use xlink:href="#livemarkItem-image" x="242" y="2" class="styled"/> + </g> + <g id="livemarkItemSeen"> + <use xlink:href="#livemarkItemSeen-image" x="262" y="2" class="styled"/> + </g> + + <g id="bookmarksToolbarFocus"> + <use xlink:href="#toolbar-shape" x="282" y="2" class="grayOutline"/> + <use xlink:href="#bookmarksBadge-shape" x="282" y="2" class="grayComplete"/> + <use xlink:href="#toolbar-shape" x="282" y="2" class="hiLiteOutline"/> + <use xlink:href="#bookmarksBadge-shape" x="282" y="2" class="hiLiteComplete"/> + </g> + <g id="bookmarksMenuFocus"> + <use xlink:href="#bookmarksMenu-shape" x="302" y="2" class="grayOutline"/> + <use xlink:href="#bookmarksMenu-shape" x="302" y="2" class="hiLiteOutline"/> + </g> + <g id="unsortedBookmarksFocus"> + <use xlink:href="#unsortedFront-shape" x="322" y="2" class="grayComplete"/> + <use xlink:href="#unsortedBack-shape" x="322" y="2" class="grayOutline"/> + <use xlink:href="#unsortedFront-shape" x="322" y="2" class="hiLiteComplete"/> + <use xlink:href="#unsortedBack-shape" x="322" y="2" class="hiLiteOutline"/> + </g> + <g id="folderItemFocus"> + <use xlink:href="#folderBack-shape" x="342" y="2" class="grayInside"/> + <use xlink:href="#folderFront-shape" x="342" y="2" class="grayComplete"/> + <use xlink:href="#folderBack-shape" x="342" y="2" class="hiLiteInside"/> + <use xlink:href="#folderFront-shape" x="342" y="2" class="hiLiteComplete"/> + </g> + <g id="defaultFaviconFocus"> + <use xlink:href="#default-shape" x="362" y="2" class="grayOutline"/> + <use xlink:href="#default-shape" x="362" y="2" class="hiLiteOutline"/> + </g> + <g id="item"> + <use xlink:href="#item-shape" x="380" y="2"/> + </g> + +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/places/query.png b/src/chrome/browser/places/query.png Binary files differ. diff --git a/src/chrome/browser/places/starred48.png b/src/chrome/browser/places/starred48.png Binary files differ. diff --git a/src/chrome/browser/places/tag.png b/src/chrome/browser/places/tag.png Binary files differ. diff --git a/src/chrome/browser/places/unsortedBookmarks.png b/src/chrome/browser/places/unsortedBookmarks.png Binary files differ. diff --git a/src/chrome/browser/places/unstarred48.png b/src/chrome/browser/places/unstarred48.png Binary files differ. diff --git a/src/chrome/browser/pointer-lock.svg b/src/chrome/browser/pointer-lock.svg @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"> + <g transform="matrix(.51383 0 0 .47161 -.59683 .60179)" fill="#9c9c9c"> + <path d="m7 2 18 18h-8l6 8-4 2-6-8-6 6z" fill="#9c9c9c"/> + </g> +</svg> diff --git a/src/chrome/browser/pointerLock-16.png b/src/chrome/browser/pointerLock-16.png Binary files differ. diff --git a/src/chrome/browser/pointerLock-64.png b/src/chrome/browser/pointerLock-64.png Binary files differ. diff --git a/src/chrome/browser/preferences/Options-sync.png b/src/chrome/browser/preferences/Options-sync.png Binary files differ. diff --git a/src/chrome/browser/preferences/Options.png b/src/chrome/browser/preferences/Options.png Binary files differ. diff --git a/src/chrome/browser/preferences/Options.svg b/src/chrome/browser/preferences/Options.svg @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" + y="0" + width="32" + height="32" + viewBox="0 0 32 32"> + <style> + use:not(:target) { + display: none; + } + use { + fill: none; + stroke: #fff; + stroke-width: 1; + } + </style> + <defs style="display: none;"> + <g id="general-shape"> + <rect x="4.5" y="5.5" width="22" height="22" rx="1.5" ry="1.5"/> + <line x1="11.5" y1="10.0" x2="11.5" y2="23.0"/> + <line x1="19.5" y1="10.0" x2="19.5" y2="23.0"/> + <line x1="10.0" y1="13.5" x2="13.0" y2="13.5"/> + <line x1="18.0" y1="19.5" x2="21.0" y2="19.5"/> + </g> + <g id="tabs-shape"> + <path d="M 5,4.5 h 13 a 1.5,1.5 0 0,1 1.5,1.5 v 3.5 h 6.5"/> + <path d="M 5,4.5 h 9 a 1.5,1.5 0 0,1 1.5,1.5 v 3.5 h 10.5 a 1.5,1.5 0 0,1 1.5,1.5 v 15 a 1.5,1.5 0 0,1 -1.5,1.5 + h -21 a 1.5,1.5 0 0,1 -1.5,-1.5 v -20 a 1.5,1.5 0 0,1 1.5,-1.5 Z"/> + </g> + <g id="search-shape"> + <circle cx="13" cy="14" r="9.5"/> + <line x1="20" y1="21" x2="26.5" y2="26.5"/> + </g> + <g id="content-shape"> + <path d="M 6.5,3.5 v 24 h 20 v -17 l -7,-7 Z m 12,.5 v 7.5 h 7.5"/> + <path d="M 10.0,15.5 h 13 m -13,4 h 13 m -13,4 h 8"/> + </g> + <g id="applications-shape"> + <path d="M 14.5,11.5 a 2,2.75 0 0,1 4,0 v 2.5 a 2,1.85 0 0,1 -4,0 v -2.5 Z"/> + <path d="M 7.5,27.5 v -9 c 1,-1.5 1.5,-3 4,-4.5 a 5,12 0 0,1 5,-10.5 a 5,12 0 0,1 5,10.5 c 2.5,1.5 3,3 4,4.5 v 9 + c -5.5,-6 -4.5,-5 -5.5,-5 c -1.5,1.5 -5.5,1.5 -7,0 c 1,0 0,-1 -5.5,5 v -3"/> + <path d="M 14.5,23.5 c 0,1 1,6 2,7 c 1,-1 2,-6 2,-7"/> + </g> + <g id="privacy-shape"> + <path d="M 3.5,12.5 c 4,0 11,-2 11,-0.5 c 0.5,1 1.5,1 2,0 c 0,-1.5 7,0.5 11,0.5 + c 0,15 -9.5,12.5 -12,11 c -2.5,1.5 -12,4 -12,-11 Z"/> + <path d="M 14,19.5 c -0.25,0.125 -6,2 -6.5,-3 c 6.5,0 6.5,-.25 6.5,3 Z"/> + <path d="M 17,19.5 c 0.25,0.125 6,2 6.5,-3 c -6.5,0 -6.5,-.25 -6.5,3 Z"/> + </g> + <g id="security-shape"> + <rect x="5.5" y="13.5" width="21" height="14" rx="1.5" ry="1.5"/> + <path d="M 9.5,13.5 v -4.5 a 6.5,6.5 0 0,1 13,0 v 4.5"/> + </g> + <g id="sync-shape"> + <path d="M 18.5,18.5 v 7 h 7" transform="rotate(20,18.5,25.5)"/> + <path d="M 6.5,6.5 h 7 v 7" transform="rotate(20,13.5,6.5)"/> + <path d="M 13.5,6.5 a 12,10.25 0 0,0 -1,19 + M 19.5,6.5 a 12,10.25 0 0,1 -1,19"/> + </g> + <g id="advanced-shape"> + <circle cx="15.5" cy="15.5" r="12"/> + <path d="M 15.5,15.5 m 4,0 l 5.5,0 a 9.5,9.5 0 0,0 -4.75,-8.227 l -2.75,4.763 a 4,4 0 0,1 2,3.464 Z"/> + <path d="M 15.5,15.5 m -4,0 l -5.5,0 a 9.5,9.5 0 0,1 4.75,-8.227 l 2.75,4.763 a 4,4 0 0,0 -2,3.464 Z"/> + <path d="M 15.5,15.5 m 2,3.464 l 2.75,4.763 a 9.5,9.5 0 0,1 -9.5,0 l 2.75,-4.763 a 4,4 0 0,0 4,0 Z"/> + <circle cx="15.5" cy="15.5" r="2"/> + </g> + </defs> + <use id="general" xlink:href="#general-shape"/> + <use id="tabs" xlink:href="#tabs-shape"/> + <use id="search" xlink:href="#search-shape"/> + <use id="content" xlink:href="#content-shape"/> + <use id="applications" xlink:href="#applications-shape"/> + <use id="privacy" xlink:href="#privacy-shape"/> + <use id="security" xlink:href="#security-shape"/> + <use id="sync" xlink:href="#sync-shape"/> + <use id="advanced" xlink:href="#advanced-shape"/> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/preferences/aboutPermissions.css b/src/chrome/browser/preferences/aboutPermissions.css @@ -80,7 +80,7 @@ } .pref-icon[type="password"] { - list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png); + list-style-image: url(chrome://mozapps/skin/passwordmgr/key.svg#large); } .pref-icon[type="image"] { list-style-image: url(chrome://global/skin/icons/question-16.svg); @@ -92,25 +92,25 @@ list-style-image: url(chrome://global/skin/icons/question-16.svg); } .pref-icon[type="desktop-notification"] { - list-style-image: url(chrome://browser/skin/notification-64.png); + list-style-image: url(chrome://global/skin/alerts/notification.svg); } .pref-icon[type="install"] { - list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-48.png); + list-style-image: url(chrome://mozapps/skin/extensions/addons.svg#extensionGeneric); } .pref-icon[type="geo"] { - list-style-image: url(chrome://browser/skin/Geolocation-64.png); + list-style-image: url(chrome://browser/skin/Geolocation-16.svg); } .pref-icon[type="indexedDB"] { list-style-image: url(chrome://global/skin/icons/question-16.svg); } .pref-icon[type="plugins"] { - list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric-48.png); + list-style-image: url(chrome://mozapps/skin/extensions/addons.svg#pluginGeneric); } .pref-icon[type="fullscreen"] { list-style-image: url(chrome://global/skin/icons/question-16.svg); } .pref-icon[type="pointerLock"] { - list-style-image: url(chrome://browser/skin/pointerLock-64.png); + list-style-image: url(chrome://global/skin/icons/question-16.svg); } .pref-title { diff --git a/src/chrome/browser/preferences/alwaysAsk.png b/src/chrome/browser/preferences/alwaysAsk.png Binary files differ. diff --git a/src/chrome/browser/preferences/application.png b/src/chrome/browser/preferences/application.png Binary files differ. diff --git a/src/chrome/browser/preferences/applications.css b/src/chrome/browser/preferences/applications.css @@ -32,22 +32,22 @@ richlistitem[appHandlerIcon="ask"], menuitem[appHandlerIcon="ask"] { - list-style-image: url("chrome://browser/skin/preferences/alwaysAsk.png"); + list-style-image: url("chrome://global/skin/icons/question-16.svg"); } richlistitem[appHandlerIcon="save"], menuitem[appHandlerIcon="save"] { - list-style-image: url("chrome://browser/skin/preferences/application.png"); + list-style-image: url("chrome://browser/skin/toolbar/new-window.svg"); } richlistitem[appHandlerIcon="feed"], menuitem[appHandlerIcon="feed"] { - list-style-image: url("chrome://browser/skin/page-livemarks.png"); + list-style-image: url("chrome://browser/skin/feeds/feedIcon16.svg"); } richlistitem[appHandlerIcon="plugin"], menuitem[appHandlerIcon="plugin"] { - list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png"); + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.svg"); } .actionsMenu .menulist-icon { diff --git a/src/chrome/browser/preferences/in-content/preferences.css b/src/chrome/browser/preferences/in-content/preferences.css @@ -1,193 +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/. */ - -@import url("chrome://global/skin/inContentUI.css"); - -@namespace html "http://www.w3.org/1999/xhtml"; - -#header { - margin-bottom: 18px; -} - -caption { - font-size: 1.667rem; -} - -.main-content { - max-width: 800px; -} - -prefpane > .content-box { - overflow: auto; -} - -/* Category List */ - -#categories { - -moz-appearance: none; - border: none; - -moz-margin-end: -1px; - background-color: transparent; - position: relative; - margin-top: 31px; -} - -.category { - -moz-appearance: none; - background-color: transparent; - color: #252F3B; - padding: 10px 4px; - border-width: 1px; - border-style: solid; - border-color: transparent; - -moz-padding-end: 8px; - -moz-box-align: center; - overflow: hidden; - min-height: 0; - height: 52px; -} - -.category:-moz-locale-dir(ltr) { - border-top-left-radius: 5px; - border-bottom-left-radius: 5px; -} - -.category:-moz-locale-dir(rtl) { - border-top-right-radius: 5px; - border-bottom-right-radius: 5px; -} - -.category[selected] { - background-color: rgba(255, 255, 255, 0.4); - color: #252F3B; - border-color: #C3CEDF; - -moz-border-end-color: #E2E9F2; -} - -.category-name { - font-size: 1.5rem; - -moz-padding-end: 24px; -} - -/* Maximize the size of the viewport when the window is small */ -@media (max-width: 800px) { - .category-name { - display: none; - } -} - -.category-icon { - width: 32px; - height: 32px; - margin: 0 6px; - -moz-margin-start: 6px; - -moz-margin-end: 5px; - list-style-image: url("chrome://browser/skin/preferences/Options.png"); -} - -#category-general > .category-icon { - -moz-image-region: rect(0, 32px, 32px, 0); -} - -#category-content > .category-icon { - -moz-image-region: rect(0, 96px, 32px, 64px) -} - -#category-application > .category-icon { - -moz-image-region: rect(0, 128px, 32px, 96px) -} - -#category-privacy > .category-icon { - -moz-image-region: rect(0, 160px, 32px, 128px) -} - -#category-security > .category-icon { - -moz-image-region: rect(0, 192px, 32px, 160px) -} - -#category-advanced > .category-icon { - -moz-image-region: rect(0, 224px, 32px, 192px) -} - -#category-sync > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/Options-sync.png"); -} - -/* Applications Pane Styles */ - -#applications-content { - padding: 15px; -} - -#handlersView { - -moz-appearance: none; - border: 1px solid rgba(31,64,100,0.4); - overflow-y: auto; -} - -/* XXX This style is for bug 740213 and should be removed once that - bug has a solution. */ -description > html|a { - cursor: pointer; -} - -/* XXX Styles Below can be removed once bug 660726 lands */ -.nav-button { - list-style-image: url(chrome://mozapps/skin/extensions/navigation.png); -} - -#forward-btn { - -moz-border-start: none; -} - -#back-btn:-moz-locale-dir(ltr), -#forward-btn:-moz-locale-dir(rtl) { - -moz-image-region: rect(0, 18px, 18px, 0); - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -#back-btn:-moz-locale-dir(rtl), -#forward-btn:-moz-locale-dir(ltr) { - -moz-image-region: rect(0, 36px, 18px, 18px); - border-top-left-radius: 0; - border-bottom-left-radius: 0; -} - -.header-button[disabled="true"] { - opacity: 0.8; -} - -.header-button { - -moz-appearance: none; - padding: 1px 3px; - color: #444; - text-shadow: 0 0 3px white; - background: linear-gradient( - rgba(251,252,253,0.95), - rgba(246,247,248,0) 49%, - rgba(211,212,213,0.45) 51%, - rgba(225,226,229, 0.3)); - background-clip: padding-box; - border-radius: 2.5px; - border: 1px solid rgba(31,64,100,0.4); - border-top-color: rgba(31,64,100,0.3); - box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.25) inset, - 0 0 2px 1px rgba(255, 255, 255, 0.25) inset; -} - -.header-button[disabled="true"] > .toolbarbutton-icon { - opacity: 0.4; -} - -.header-button:not([disabled="true"]):active:hover, -.header-button[open="true"] { - background-color: rgba(61, 76, 92, 0.2); - border-color: rgba(39, 53, 68, 0.5); - box-shadow: 0 0 3px 1px rgba(39, 53, 68, 0.2) inset; -} - -.header-button > .toolbarbutton-text { - display: none; -} diff --git a/src/chrome/browser/preferences/mail.png b/src/chrome/browser/preferences/mail.png Binary files differ. diff --git a/src/chrome/browser/preferences/mail.svg b/src/chrome/browser/preferences/mail.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <rect x="1.5" y="3.5" width="15" height="11" rx="1.4" ry="1.4"/> + <path d="M 2.07,4.5 l 6.5,6.5 a .707,.707 0 0,0 1,0 l 6.5,-6.5"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/preferences/preferences.css b/src/chrome/browser/preferences/preferences.css @@ -7,40 +7,39 @@ /* Global Styles */ #BrowserPreferences radio[pane] { - list-style-image: url("chrome://browser/skin/preferences/Options.png"); padding: 5px 3px 1px; } radio[pane=paneMain] { - -moz-image-region: rect(0, 32px, 32px, 0); + list-style-image: url("chrome://browser/skin/preferences/Options.svg#general"); } radio[pane=paneTabs] { - -moz-image-region: rect(0, 64px, 32px, 32px); + list-style-image: url("chrome://browser/skin/preferences/Options.svg#tabs"); } radio[pane=paneContent] { - -moz-image-region: rect(0, 96px, 32px, 64px); + list-style-image: url("chrome://browser/skin/preferences/Options.svg#content"); } radio[pane=paneApplications] { - -moz-image-region: rect(0, 128px, 32px, 96px); + list-style-image: url("chrome://browser/skin/preferences/Options.svg#applications"); } radio[pane=panePrivacy] { - -moz-image-region: rect(0, 160px, 32px, 128px); + list-style-image: url("chrome://browser/skin/preferences/Options.svg#privacy"); } radio[pane=paneSecurity] { - -moz-image-region: rect(0, 192px, 32px, 160px); + list-style-image: url("chrome://browser/skin/preferences/Options.svg#security"); } -radio[pane=paneAdvanced] { - -moz-image-region: rect(0, 224px, 32px, 192px); +radio[pane=paneSync] { + list-style-image: url("chrome://browser/skin/preferences/Options.svg#sync"); } -radio[pane=paneSync] { - list-style-image: url("chrome://browser/skin/preferences/Options-sync.png") !important; +radio[pane=paneAdvanced] { + list-style-image: url("chrome://browser/skin/preferences/Options.svg#advanced"); } /* Applications Pane */ @@ -83,16 +82,37 @@ radio[pane=paneSync] { width: 16px; height: 16px; margin: 0 2px; - list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png") !important; + list-style-image: url(chrome://browser/skin/places/places.svg); + -moz-image-region: rect(2px, 18px, 18px, 2px); /* defaultFavicon */ } #cookiesChildren::-moz-tree-image(domainCol, container) { - list-style-image: url("chrome://global/skin/icons/folder-item.png") !important; - -moz-image-region: rect(0, 32px, 16px, 16px); + -moz-image-region: rect(2px, 198px, 18px, 182px); /* folderItem */ } #cookiesChildren::-moz-tree-image(domainCol, container, open) { - -moz-image-region: rect(16px, 32px, 32px, 16px); + -moz-image-region: rect(2px, 198px, 18px, 182px); /* folderItem */ +} + +#cookiesChildren::-moz-tree-image(selected,focus,domainCol) { + -moz-image-region: rect(2px, 378px, 18px, 362px); /* defaultFaviconFocus */ +} +#cookiesChildren::-moz-tree-image(selected,focus,domainCol,container) { + -moz-image-region: rect(2px, 358px, 18px, 342px); /* folderItemFocus */ +} + +#cookiesChildren::-moz-tree-twisty(selected,focus) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-focus"); +} +#cookiesChildren::-moz-tree-twisty(selected,focus,open) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#open-focus"); +} + +#cookiesChildren:-moz-locale-dir(rtl)::-moz-tree-twisty(selected,focus) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-focus-rtl"); +} +#cookiesChildren:-moz-locale-dir(rtl)::-moz-tree-twisty(selected,focus,open) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#open-focus-rtl"); } #cookieInfoBox { diff --git a/src/chrome/browser/preferences/saveFile.png b/src/chrome/browser/preferences/saveFile.png Binary files differ. diff --git a/src/chrome/browser/privatebrowsing-dark.png b/src/chrome/browser/privatebrowsing-dark.png Binary files differ. diff --git a/src/chrome/browser/privatebrowsing-light.png b/src/chrome/browser/privatebrowsing-light.png Binary files differ. diff --git a/src/chrome/browser/reload-stop-go.png b/src/chrome/browser/reload-stop-go.png Binary files differ. diff --git a/src/chrome/browser/searchbar-dropdown-arrow.png b/src/chrome/browser/searchbar-dropdown-arrow.png Binary files differ. diff --git a/src/chrome/browser/searchbar.css b/src/chrome/browser/searchbar.css @@ -20,8 +20,8 @@ .searchbar-engine-image { height: 16px; width: 16px; - list-style-image: url("chrome://global/skin/icons/folder-item.png"); - -moz-image-region: rect(0px, 16px, 16px, 0px); + list-style-image: url(chrome://browser/skin/places/places.svg); + -moz-image-region: rect(2px, 396px, 18px, 380px); -moz-margin-start: 2px; } @@ -43,12 +43,12 @@ } .searchbar-dropmarker-image { - list-style-image: url("chrome://browser/skin/searchbar-dropdown-arrow.png"); - -moz-image-region: rect(0, 13px, 11px, 0); + list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.svg"); + opacity: 0.25; } .searchbar-engine-button[open="true"] > .searchbar-dropmarker-image { - -moz-image-region: rect(0, 26px, 11px, 13px); + opacity: 1; } diff --git a/src/chrome/browser/social/chat-icons.png b/src/chrome/browser/social/chat-icons.png Binary files differ. diff --git a/src/chrome/browser/social/services-16.png b/src/chrome/browser/social/services-16.png Binary files differ. diff --git a/src/chrome/browser/social/services-64.png b/src/chrome/browser/social/services-64.png Binary files differ. diff --git a/src/chrome/browser/social/share-button-active.png b/src/chrome/browser/social/share-button-active.png Binary files differ. diff --git a/src/chrome/browser/social/share-button.png b/src/chrome/browser/social/share-button.png Binary files differ. diff --git a/src/chrome/browser/statusbar/downloads.svg b/src/chrome/browser/statusbar/downloads.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="32" height="32" viewBox="0 0 32 32"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #hihglighttext:target + g { + stroke: #000; + } + #highlight:target ~ g { + stroke: #0082f0; + } + #highlight:target ~ g > rect { + fill: #bcf5ff; + } + </style> + <g id="highlight"/> + <g id="highlighttext"/> + <g> + <rect x="3.5" y="21.5" width="24" height="8" rx="3" ry="3"/> + <path d="M 19,25.5 h4"/> + <path d="M 15.5,2 v16 M 8,11 l 7.5,7.5 l 7.5,-7.5"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/statusbar/dynamic.css b/src/chrome/browser/statusbar/dynamic.css @@ -6,31 +6,17 @@ /* Progress bar/line styles */ -#urlbar[s4estyle="true"] > #urlbar-progress-alt > .progress-bar -{ +#status4evar-progress-bar[s4estyle="true"] > .progress-bar { -moz-appearance: none; - background: #33FF33; -} - -#status4evar-progress-bar[s4estyle="true"] > .progress-bar -{ - -moz-appearance: none; - background: #33FF33; + background: #333399; border-radius: 3px; } -.urlbar-over-link-box -{ - color: GrayText; -} - -#status4evar-download-progress-bar[pmType^="active"] > .progress-bar -{ - background-color: #33FF33; +#status4evar-download-progress-bar[pmType^="active"] > .progress-bar { + background-color: #333399; } -#status4evar-download-progress-bar[pmType^="paused"] > .progress-bar -{ +#status4evar-download-progress-bar[pmType^="paused"] > .progress-bar { background-color: gray; } diff --git a/src/chrome/browser/statusbar/overlay.css b/src/chrome/browser/statusbar/overlay.css @@ -10,24 +10,20 @@ */ #status4evar-status-widget, -#status4evar-progress-widget -{ +#status4evar-progress-widget { -moz-box-align: center; } -[forcevisible="true"] -{ +[forcevisible="true"] { visibility: visible !important; } #wrapper-status4evar-progress-widget progressmeter, -#wrapper-status4evar-download-button toolbarbutton -{ +#wrapper-status4evar-download-button toolbarbutton { visibility: visible; } -#wrapper-status4evar-status-widget toolbaritem label -{ +#wrapper-status4evar-status-widget toolbaritem label { background-color: rgba(0,0,0,0.2); padding: 2px 4px; } @@ -36,13 +32,11 @@ * Options button */ -#status4evar-options-button -{ +#status4evar-options-button { list-style-image: url("chrome://browser/skin/statusbar/pms24.png"); } -toolbar[iconsize="small"] #status4evar-options-button -{ +toolbar[iconsize="small"] #status4evar-options-button { list-style-image: url("chrome://browser/skin/statusbar/pms16.png"); } @@ -51,18 +45,15 @@ toolbar[iconsize="small"] #status4evar-options-button */ toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"], -toolbar[mode="text"] #status4evar-download-button -{ +toolbar[mode="text"] #status4evar-download-button { -moz-box-orient: horizontal !important; } -toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label -{ +toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label { display: -moz-box !important; } -#status4evar-download-progress-bar -{ +#status4evar-download-progress-bar { border: 1px solid gray; -moz-appearance: none; margin: 0px; @@ -70,19 +61,16 @@ toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label min-width: 0px; } -#status4evar-download-progress-bar > * -{ +#status4evar-download-progress-bar > * { -moz-appearance: none; background: #FFFFFF; } -#status4evar-download-progress-bar[pmType$="unknown"] > .progress-bar -{ +#status4evar-download-progress-bar[pmType$="unknown"] > .progress-bar { background-image: url("chrome://browser/skin/statusbar/pulse.png"); } -#status4evar-download-notification-container -{ +#status4evar-download-notification-container { min-height: 1px; min-width: 1px; height: 1px; @@ -91,8 +79,7 @@ toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label z-index: 5; } -#status4evar-download-notification-icon -{ +#status4evar-download-notification-icon { opacity: 0; background-size: 16px; background-position: center; @@ -101,30 +88,25 @@ toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label height: 16px; } -#status4evar-download-button #status4evar-download-icon -{ - background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), 0, 108, 18, 90) center no-repeat; +#status4evar-download-button #status4evar-download-icon { + background: -moz-image-rect(var(--toolbarbutton-image), 0, 108, 18, 90) center no-repeat; } -#status4evar-download-button:-moz-lwtheme-brighttext #status4evar-download-icon -{ - background: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"), 0, 108, 18, 90) center no-repeat; +toolbar:not([brighttext]) #status4evar-download-button #status4evar-download-icon { + background: -moz-image-rect(var(--toolbarbutton-inverted-image), 0, 108, 18, 90) center no-repeat; } -#status4evar-download-button[attention] #status4evar-download-icon -{ +#status4evar-download-button[attention] #status4evar-download-icon { background-image: url("chrome://browser/skin/downloads/download-glow.png"); } -@keyframes status4evar-download-notification-finish -{ +@keyframes status4evar-download-notification-finish { from { opacity: 0; transform: scale(1); } 20% { opacity: .65; animation-timing-function: ease-in; } to { opacity: 0; transform: scale(8); } } -#status4evar-download-notification-anchor[notification="finish"][forcevisible="true"] #status4evar-download-notification-icon -{ +#status4evar-download-notification-anchor[notification="finish"][forcevisible="true"] #status4evar-download-notification-icon { background-image: url("chrome://browser/skin/downloads/download-notification-finish.png"); animation-name: status4evar-download-notification-finish; animation-duration: 1s; @@ -134,219 +116,44 @@ toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label * Splitter */ -splitter.status4evar-status-splitter -{ +splitter.status4evar-status-splitter { -moz-appearance: splitter; border: none; background: transparent; position: relative; } -splitter.status4evar-status-splitter:not(:hover) -{ +splitter.status4evar-status-splitter:not(:hover) { -moz-appearance: none; } /* - * Location bar progress - */ - -#urlbar-progress-alt -{ - margin: 0px; - -moz-appearance: none; - min-height: 0px; - height: 3px; - border: none; - background-color: transparent; -} - -#urlbar[pmpack="center"] #urlbar-progress-alt -{ - -moz-box-flex: 1; -} - -#urlbar:not([pmpack="center"]) #urlbar-progress-alt > * -{ - border-top: 1px solid rgba(0,0,0,.1); - border-bottom: 1px solid rgba(0,0,0,.1); -} - -#urlbar-container:not([combined]) #urlbar:not([pmpack="begin"]) #urlbar-progress-alt, -#urlbar-container:not([combined]) #urlbar:not([pmpack="begin"]) #urlbar-progress-alt > * -{ - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; -} - -#urlbar-container:not([combined]) #urlbar:not([pmpack="end"]) #urlbar-progress-alt, -#urlbar-container:not([combined]) #urlbar:not([pmpack="end"]) #urlbar-progress-alt > * -{ - border-top-left-radius: 3px; - border-top-right-radius: 3px; -} - -/* * General progress */ -#urlbar-progress-alt > *, -#status4evar-progress-bar[s4estyle="true"] > * -{ +#status4evar-progress-bar[s4estyle="true"] > * { border: none; } -#urlbar-progress-alt > .progress-remainder, -#status4evar-progress-bar > .progress-remainder -{ +#status4evar-progress-bar > .progress-remainder { background-image: none; background-color: transparent; } -#urlbar[s4estyle="true"] > #urlbar-progress-alt > .progress-bar, -#status4evar-progress-bar[s4estyle="true"] > .progress-bar -{ +#status4evar-progress-bar[s4estyle="true"] > .progress-bar { border-right: 1px solid rgba(0,0,0,.2); } -#urlbar[s4estyle="true"] > #urlbar-progress-alt[value="0"] > .progress-bar, -#urlbar[s4estyle="true"] > #urlbar-progress-alt[value="100"] > .progress-bar, #status4evar-progress-bar[s4estyle="true"][value="0"] > .progress-bar, -#status4evar-progress-bar[s4estyle="true"][value="100"] > .progress-bar -{ +#status4evar-progress-bar[s4estyle="true"][value="100"] > .progress-bar { border-right: none; } /* - * Location bar status transisions - */ - -#urlbar .urlbar-over-link-layer -{ - opacity: 0; -} - -#urlbar .urlbar-input-layer[overlinkstate="fade-in"], -#urlbar .urlbar-input-layer[overlinkstate="fade-in"] html|input.urlbar-input::-moz-placeholder -{ - -moz-transition-property: color; - -moz-transition-duration: 150ms; - color: transparent; -} - -#urlbar .urlbar-input-layer[overlinkstate="fade-out"], -#urlbar .urlbar-input-layer[overlinkstate="fade-out"] html|input.urlbar-input::-moz-placeholder -{ - -moz-transition-property: color; - -moz-transition-duration: 150ms; - -moz-transition-timing-function: cubic-bezier(0.0, 1.0, 1.0, 1.0); -} - -#urlbar .urlbar-input-layer[overlinkstate="showing"], -#urlbar .urlbar-input-layer[overlinkstate="showing"] html|input.urlbar-input::-moz-placeholder -{ - color: transparent; -} - -#urlbar .urlbar-over-link-layer[overlinkstate="fade-in"] -{ - -moz-transition-property: opacity; - -moz-transition-duration: 150ms; - opacity: 1; -} - -#urlbar .urlbar-over-link-layer[overlinkstate="fade-out"] -{ - -moz-transition-property: opacity; - -moz-transition-duration: 150ms; - -moz-transition-timing-function: cubic-bezier(0.0, 1.0, 1.0, 1.0); -} - -#urlbar .urlbar-over-link-layer[overlinkstate="showing"] -{ - opacity: 1; -} - -#urlbar .urlbar-input-layer-children[overlinkstate="fade-in"] -{ - -moz-transition-property: opacity; - -moz-transition-duration: 150ms; - opacity: 0; -} - -#urlbar .urlbar-input-layer-children[overlinkstate="fade-out"] -{ - -moz-transition-property: opacity; - -moz-transition-duration: 150ms; - -moz-transition-timing-function: cubic-bezier(0.0, 1.0, 1.0, 1.0); -} - -#urlbar .urlbar-input-layer-children[overlinkstate="showing"] -{ - opacity: 0; -} - -/* - * Location bar status layout - */ - -#urlbar[s4esalign="left"] .urlbar-origin-box -{ - display: none; -} - -#urlbar .urlbar-origin-label -{ - -moz-padding-start: 1px; -} - -#urlbar .urlbar-origin-label, -#urlbar .urlbar-over-link-host-label, -#urlbar .urlbar-over-link-path-label -{ - padding: 0; - margin: 0; - border: none; -} - -#urlbar .urlbar-over-link-box:-moz-locale-dir(ltr) -{ - -moz-padding-start: 18px; - -moz-padding-end: 2px; -} - -#urlbar .urlbar-over-link-box:-moz-locale-dir(rtl) -{ - -moz-padding-end: 18px; - -moz-padding-start: 2px; -} - -#urlbar[s4esalign="left"] .urlbar-over-link-box:-moz-locale-dir(ltr) -{ - -moz-padding-start: 1px; -} - -#urlbar[s4esalign="left"] .urlbar-over-link-box:-moz-locale-dir(rtl) -{ - -moz-padding-end: 1px; -} - -#urlbar:not([s4esalign="left"]) .urlbar-over-link-box:-moz-locale-dir(ltr) -{ - background: url(chrome://browser/skin/statusbar/urlbar-over-link-arrow.png) no-repeat left center; -} - -#urlbar:not([s4esalign="left"]) .urlbar-over-link-box:-moz-locale-dir(rtl) -{ - background: url(chrome://browser/skin/statusbar/urlbar-over-link-arrow-rtl.png) no-repeat right center; -} - -/* * Status bar */ -#status-bar > .statusbar-resizerpanel -{ +#status-bar > .statusbar-resizerpanel { display: none !important; } @@ -356,8 +163,7 @@ splitter.status4evar-status-splitter:not(:hover) */ #status4evar-status-text, -#status4evar-progress-bar -{ +#status4evar-progress-bar { margin: 0px 3px; } @@ -365,19 +171,16 @@ splitter.status4evar-status-splitter:not(:hover) * Download status */ -#status4evar-download-progress-bar -{ +#status4evar-download-progress-bar { height: 4px; } -#status4evar-download-button #status4evar-download-icon -{ +#status4evar-download-button #status4evar-download-icon { min-width: 18px; min-height: 18px; } -toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label -{ +toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label { -moz-margin-start: 5px !important; } @@ -385,8 +188,7 @@ toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label * Splitter */ -splitter.status4evar-status-splitter -{ +splitter.status4evar-status-splitter { width: 6px; margin: 0px -3px; } @@ -395,8 +197,7 @@ splitter.status4evar-status-splitter * Location bar */ -#urlbar-progress-alt -{ +#urlbar-progress-alt { -moz-margin-end: -2px; } @@ -404,20 +205,18 @@ splitter.status4evar-status-splitter * Status bar */ -#browser-bottombox[s4eboarder="true"] :-moz-any(#status4evar-status-bar, #addon-bar) -{ +#browser-bottombox[s4eboarder="true"] :-moz-any(#status4evar-status-bar, #addon-bar) { -moz-appearance: none; } -#browser-bottombox[s4eboarder="true"] > *:not([hidden="true"]):not([collapsed="true"]) -{ +#browser-bottombox[s4eboarder="true"] > *:not([hidden="true"]):not([collapsed="true"]) { box-shadow: none !important; border: none !important; border-top: 2px solid !important; -moz-border-top-colors: ThreeDShadow ThreeDHighlight !important; } -#browser-bottombox[s4eboarder="true"] > *:not([hidden="true"]):not([collapsed="true"]) ~ * -{ +#browser-bottombox[s4eboarder="true"] > *:not([hidden="true"]):not([collapsed="true"]) ~ * { border: none !important; } + diff --git a/src/chrome/browser/statusbar/prefs.css b/src/chrome/browser/statusbar/prefs.css @@ -9,35 +9,21 @@ } radio[pane="status4evar-pane-status"] { - list-style-image: url("chrome://browser/skin/statusbar/status.png"); + list-style-image: url("chrome://global/skin/icons/info-24.svg"); } radio[pane="status4evar-pane-progress"] { - list-style-image: url("chrome://browser/skin/statusbar/progress.png"); + list-style-image: url("chrome://browser/skin/statusbar/progress.svg"); } radio[pane="status4evar-pane-download"] { - list-style-image: url("chrome://abouthome/skin/downloads.png"); + list-style-image: url("chrome://browser/skin/statusbar/downloads.svg"); } radio[pane="status4evar-pane-addonbar"] { - list-style-image: url("chrome://browser/skin/statusbar/statusbar.png"); + list-style-image: url("chrome://browser/skin/statusbar/statusbar.svg"); } radio[pane="status4evar-pane-advanced"] { - list-style-image: url("chrome://browser/skin/preferences/Options.png"); - -moz-image-region: rect(0px, 224px, 32px, 192px); + list-style-image: url("chrome://browser/skin/preferences/Options.svg#advanced"); } - -#status4evar-advanced-urlbar-forceBinding-desc { - -moz-appearance: none; - pointer-events: none; - background-color: transparent; - border: none; - padding: 0px; -} - -#warningInnerBox { - max-width: 25em; -} - diff --git a/src/chrome/browser/statusbar/progress.png b/src/chrome/browser/statusbar/progress.png Binary files differ. diff --git a/src/chrome/browser/statusbar/progress.svg b/src/chrome/browser/statusbar/progress.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="32" height="32" viewBox="0 0 32 32"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + </style> + <g> + <path d="M 23,7.067 A 12.5,12.5 0 1,0 28.25,17.25"/> + <path d="M 16,7.442 h 7.5 v -7.5" transform="rotate(-25,23.5,7.442)"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/statusbar/status.png b/src/chrome/browser/statusbar/status.png Binary files differ. diff --git a/src/chrome/browser/statusbar/statusbar.png b/src/chrome/browser/statusbar/statusbar.png Binary files differ. diff --git a/src/chrome/browser/statusbar/statusbar.svg b/src/chrome/browser/statusbar/statusbar.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"> + <style>g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + }</style> + <g transform="matrix(1,0,0,-1,0,32)"> + <rect x="1.5" y="3.5" width="29" height="25" rx="3" ry="3"/> + <rect x="19.5" y="5.5" width="6.0005" height="1" stroke-width="1.0325"/> + <path d="m1.5 9.5h29"/> + </g> +</svg> diff --git a/src/chrome/browser/statusbar/urlbar-over-link-arrow-rtl.png b/src/chrome/browser/statusbar/urlbar-over-link-arrow-rtl.png Binary files differ. diff --git a/src/chrome/browser/statusbar/urlbar-over-link-arrow.png b/src/chrome/browser/statusbar/urlbar-over-link-arrow.png Binary files differ. diff --git a/src/chrome/browser/syncCommon.css b/src/chrome/browser/syncCommon.css @@ -4,7 +4,7 @@ /* The following are used by both sync/setup.xul and sync/genericChange.xul */ .status { - color: #fff; + color: -moz-dialogtext; } .statusIcon { diff --git a/src/chrome/browser/syncSetup.css b/src/chrome/browser/syncSetup.css @@ -7,8 +7,7 @@ wizard { width: 55em; height: 45em; padding: 0; - background-color: rgb(43,43,43); - color: #fff; + background-color: Window; } .wizard-page-box { @@ -23,7 +22,7 @@ wizardpage { -moz-box-align: center; margin: 0; padding: 0 6em; - background-color: rgb(43,43,43); + background-color: Window; } .wizard-header { @@ -55,7 +54,7 @@ wizardpage { } .confirm { - border: 1px solid rgb(75,75,75); + border: 1px solid black; padding: 1em; border-radius: 5px; } diff --git a/src/chrome/browser/tabbrowser/alltabs-inverted.png b/src/chrome/browser/tabbrowser/alltabs-inverted.png Binary files differ. diff --git a/src/chrome/browser/tabbrowser/alltabs.png b/src/chrome/browser/tabbrowser/alltabs.png Binary files differ. diff --git a/src/chrome/browser/tabbrowser/alltabs.svg b/src/chrome/browser/tabbrowser/alltabs.svg @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="14" height="16" viewBox="0 0 14 16"> + <style> + use:not(:target) { + display: none; + } + use { + fill: none; + stroke: #fff; + } + use[id="active"] { + stroke: #00AEFF; + } + use[id="darktext"] { + stroke: #000; + } + </style> + <defs> + <g id="alltabs-shape"> + <rect x="1.5" y="2.5" width="4" height="4"/> + <rect x="8.5" y="2.5" width="4" height="4"/> + <rect x="1.5" y="9.5" width="4" height="4"/> + <rect x="8.5" y="9.5" width="4" height="4"/> + </g> + </defs> + <use id="alltabs" xlink:href="#alltabs-shape"/> + <use id="active" xlink:href="#alltabs-shape"/> + <use id="darktext" xlink:href="#alltabs-shape"/> +</svg> diff --git a/src/chrome/browser/tabbrowser/newtab-inverted.png b/src/chrome/browser/tabbrowser/newtab-inverted.png Binary files differ. diff --git a/src/chrome/browser/tabbrowser/newtab.png b/src/chrome/browser/tabbrowser/newtab.png Binary files differ. diff --git a/src/chrome/browser/tabbrowser/tab-arrow-left-inverted.png b/src/chrome/browser/tabbrowser/tab-arrow-left-inverted.png Binary files differ. diff --git a/src/chrome/browser/tabbrowser/tab-arrow-left.png b/src/chrome/browser/tabbrowser/tab-arrow-left.png Binary files differ. diff --git a/src/chrome/browser/tabbrowser/tab-arrow.svg b/src/chrome/browser/tabbrowser/tab-arrow.svg @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" + y="0" + width="15" + height="17" + viewBox="0 0 15 17"> + <style> + .t:not(:target){ + display: none; + } + use { + stroke-width: 0; + fill: #e5e5e5; + } + g[id$="inverted"] use { + fill: #333; + } + g .glow { + stroke-width: 0; + fill: #fff; + filter: url(#blur-filter); + opacity: .28; + } + g[id$="inverted"] .glow { + fill: #000; + } + </style> + <defs> + <filter id="blur-filter"> + <feGaussianBlur stdDeviation=".5"/> + </filter> + <path id="left-shape" d="M 10,5 v 8 l -6,-4 l 6,-4 z"/> + <path id="left-glow-shape" d="M 10.7,5 v 8 l -1.1,.9 l -6.4,-4.9 l 6.4,-4.9 l 1.1,.9 z"/> + </defs> + <g id="left" class="t"> + <use xlink:href="#left-glow-shape" class="glow"/> + <use xlink:href="#left-shape"/> + </g> + <g id="left-inverted" class="t"> + <use xlink:href="#left-glow-shape" class="glow"/> + <use xlink:href="#left-shape"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/tabbrowser/tab-overflow-border.png b/src/chrome/browser/tabbrowser/tab-overflow-border.png Binary files differ. diff --git a/src/chrome/browser/tabbrowser/tab.png b/src/chrome/browser/tabbrowser/tab.png Binary files differ. diff --git a/src/chrome/browser/tabbrowser/tabDragIndicator.png b/src/chrome/browser/tabbrowser/tabDragIndicator.png Binary files differ. diff --git a/src/chrome/browser/toolbar/back.svg b/src/chrome/browser/toolbar/back.svg @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M 12.5,1.5 l -7,7 l 7,7"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/bookmark.svg b/src/chrome/browser/toolbar/bookmark.svg @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M 5.5,15 l 4,-3.5 l 4,3.5 v -10.1 a 1.4,1.4 0 0,0 -1.4,-1.4 h -5.2 a 1.4,1.4 0 0,0 -1.4,1.4 v 10.1 Z"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/bookmarked.svg b/src/chrome/browser/toolbar/bookmarked.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M 5.5,15 l 4,-3.5 l 4,3.5 v -10.1 a 1.4,1.4 0 0,0 -1.4,-1.4 h -5.2 a 1.4,1.4 0 0,0 -1.4,1.4 v 10.1 Z"/> + <path d="M 2,5.5 h 3 m 9,0 h 3"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/bookmarks.svg b/src/chrome/browser/toolbar/bookmarks.svg @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M 2.5,5 c .7,-2.2 6.3,-2.2 7,0 c .7,-2.2 6.3,-2.2 7,0 l 0,10 c -.7,-2.2 -6.3,-2.2 -7,0 v-10 v10 c -.7,-2.2 -6.3,-2.2 -7,0 l 0,-10 z"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/copy.svg b/src/chrome/browser/toolbar/copy.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M 8.5,11.5 h -6 v -9 h 4.3 l 2.7,2.7 v 1.3 m 0,-1 h -3 v -3 + M 12.8,6.5 h -4.3 v 9 h 7 v -6.3 l -2.7,-2.7 z m -0.3,0 v 3 h 3"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/cut.svg b/src/chrome/browser/toolbar/cut.svg @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M 5.25,3.25 l 6.034,7 + M 12.75,3.25 l -6.25,7.25 + M 6.5,10.5 a 2.75,1.25 -49.236 0,0 -3.602,4.156 + a 2.75,1.25 -49.236 0,0 3.602,-4.156 + M 11.234,10.25 a 3,1.25 49.236 0,0 3.930,4.534 + a 3,1.25 49.236 0,0 -3.930,-4.534"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/downloads.svg b/src/chrome/browser/toolbar/downloads.svg @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + #highlight:target ~ g { + stroke: #0082f0; + } + #highlight:target ~ g > rect { + fill: #bcf5ff; + } + </style> + <g id="highlight"/> + <g id="darktext"/> + <g> + <rect x="2.5" y="11.5" width="12" height="4" rx="1.4" ry="1.4"/> + <path d="M 10,13.5 h2"/> + <path d="M 8.5,2 v7.5 m -3.5,-3.5 l 3.5,3.5 l 3.5,-3.5"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/forward.svg b/src/chrome/browser/toolbar/forward.svg @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M 5.5,1.5 l 7,7 l -7,7"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/fullscreen.svg b/src/chrome/browser/toolbar/fullscreen.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M 1.5,2.5 h 5.5 m 4,0 h 5.5 v 4.5 m 0,4 v 4.5 h -5.5 m -4,0 h -5.5 v -4.5 m 0,-4 v -4.5 h 2"/> + <rect x="3.5" y="4.5" width="11" height="9" rx="1.5" ry="1.5"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/history.svg b/src/chrome/browser/toolbar/history.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <circle cx="9" cy="9" r="6.6"/> + <path d="M 7.5,4 l 1,5.5 l 4.5,1"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/home.svg b/src/chrome/browser/toolbar/home.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M 4.5,15.5 h 9 v -7 h 1.9 l -6.4,-6.4 l -6.4,6.4 h 1.9 v 7 Z"/> + <path d="M 9.5,11.5 h 2 v -2 h -2 v 2 Z"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/media.svg b/src/chrome/browser/toolbar/media.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + </style> + <g> + <path d="M 11.5,8 l 4,-3 v 8 l -4,-3"/> + <rect x="2.5" y="4.5" width="9" height="9" rx="1.4" ry="1.4"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/menu.svg b/src/chrome/browser/toolbar/menu.svg @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M 2,3.5 h 14 m -14,5 h14 m -14,5 h14"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/new-tab.svg b/src/chrome/browser/toolbar/new-tab.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M 2.5,15.5 h 14 v -9.7 a 2.3,2.3 0 0,0 -2.3,-2.3 h -9.4 a 2.3,2.3 0 0,0 -2.3,2.3 v 9.7 Z + M 9.5,6 v 7 M 6,9.5 h 7"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/new-window.svg b/src/chrome/browser/toolbar/new-window.svg @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <rect x="1.5" y="2.5" width="15" height="13" rx="1.4" ry="1.4"/> + <rect x="14.5" y="3.5" width="0.001" height="0.001"/> + <path d="M 1.5,5.5 h 15"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/open.svg b/src/chrome/browser/toolbar/open.svg @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M 2.5,3.9 v 10.2 a 1.4,1.4 0 0,0 1.4,1.4 h 10.2 a 1.4,1.4 0 0,0 1.4,-1.4 v -8.2 + a 1.4,1.4 0 0,0 -1.4,-1.4 h -5.6 + v -.6 a 1.4,1.4 0 0,0 -1.4,-1.4 h -3.2 a 1.4,1.4 0 0,0 -1.4,1.4 Z + M 2.5,9.1 a 2.6,2.6 0 0,1 2.6,-2.6 h 7.8 a2.6,2.6 0 0,1 2.6,2.6"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/options.svg b/src/chrome/browser/toolbar/options.svg @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <circle cx="9" cy="9" r="2.5"/> + <path d="M 9,9 m 6.388,1.204 + l -1.094,0.287 a 5.5,5.5 0 0,1 -0.496,1.198 l 0.570,0.977 a 6.5,6.5 0 0,1 -1.702,1.702 + l -0.977,-0.570 a 5.5,5.5 0 0,1 -1.198,0.496 l -0.287,1.094 a 6.5,6.5 0 0,1 -2.408,0 + l -0.287,-1.094 a 5.5,5.5 0 0,1 -1.198,-0.496 l -0.977,0.570 a 6.5,6.5 0 0,1 -1.702,-1.702 + l 0.570,-0.977 a 5.5,5.5 0 0,1 -0.496,-1.198 l -1.094,-0.287 a 6.5,6.5 0 0,1 0,-2.408 + l 1.094,-0.287 a 5.5,5.5 0 0,1 0.496,-1.198 l -0.570,-0.977 a 6.5,6.5 0 0,1 1.702,-1.702 + l 0.977,0.570 a 5.5,5.5 0 0,1 1.198,-0.496 l 0.287,-1.094 a 6.5,6.5 0 0,1 2.408,0 + l 0.287,1.094 a 5.5,5.5 0 0,1 1.198,0.496 l 0.977,-0.570 a 6.5,6.5 0 0,1 1.702,1.702 + l -0.570,0.977 a 5.5,5.5 0 0,1 0.496,1.198 l 1.094,0.287 a 6.5,6.5 0 0,1 0,2.408 + Z"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/paste.svg b/src/chrome/browser/toolbar/paste.svg @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M 7.5,13.5 h -3 a 1,1 0 0,1 -1,-1 v -8 a 1,1 0 0,1 1,-1 h 1 m 5,0 h 1 a 1,1 0 0,1 1,1 v 3 + M 6,2.5 h 4 a .5,.5 0 0,1 .5,.5 v 2 a .5,.5 0 0,1 -.5,.5 h -4 a .5,.5 0 0,1 -.5,-.5 v -2 a .5,.5 0 0,1 .5,-.5 z + M 11.8,6.5 h -4.3 v 9 h 7 v -6.3 l -2.7,-2.7 z m -0.3,0 v 3 h 3"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/print.svg b/src/chrome/browser/toolbar/print.svg @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M 3.5,13.5 h -.6 a 1.4,1.4 0 0,1 -1.4,-1.4 v -4.2 a 1.4,1.4 0 0,1 1.4,-1.4 h 12.2 a 1.4,1.4 0 0,1 1.4,1.4 v 4.2 a 1.4,1.4 0 0,1 -1.4,1.4 h-.6"/> + <path d="M 4.5,12.5 l -1,3 h 11 l -1,-3 h -9 Z"/> + <path d="M 4.5,6.5 v -4 h 9 v 4"/> + <rect x="13.5" y="8.5" width=".001" height=".001"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/private.svg b/src/chrome/browser/toolbar/private.svg @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M 1.5,6 c 1.5,0.35 4.2,-1.5 7.2,0 t .6,0 c 3,-1.5 5.7,0.35 7.2,0 + c 0.25,9 -6,8 -7,7 c -.5,-.5 -.5,-.5 -1,0 c -1,1 -7.25,2 -7,-7 Z"/> + <path d="M 7.5,10.5 c -2.3,0 -3,0.25 -3.5,-2 c 2.5,0 3.5,-.5 3.5,2 Z"/> + <path d="M 10.5,10.5 c 2.3,0 3,0.25 3.5,-2 c -2.5,0 -3.5,-.5 -3.5,2 Z"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/quit.svg b/src/chrome/browser/toolbar/quit.svg @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <rect x="5.5" y="5.5" width="7" height="7"/> + <line x1="5.5" y1="5.5" x2="12.5" y2="12.5"/> + <line x1="5.5" y1="12.5" x2="12.5" y2="5.5"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/reload.svg b/src/chrome/browser/toolbar/reload.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M 9.5,9.5 m 3,-5.196 a 6,6 0 1,0 2.916,6.196"/> + <path d="M 9,4.627 h 4 v -4" transform="rotate(-25,13,4.627)"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/stop.svg b/src/chrome/browser/toolbar/stop.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <line x1="3" y1="3" x2="15" y2="15"/> + <line x1="3" y1="15" x2="15" y2="3"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/sync.svg b/src/chrome/browser/toolbar/sync.svg @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M 10,11 v 3.5 h 3.5" transform="rotate(20,10,14.5)"/> + <path d="M 3.5,3.5 h 3.5 v 3.5" transform="rotate(20,7,3.5)"/> + <path d="M 7,3.5 a 7,6 0 0,0 -1,11 + M 11,4 a 8,6 0 0,1 -1,10.5"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/zoom-in.svg b/src/chrome/browser/toolbar/zoom-in.svg @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + #dim:target ~ g { + stroke: #c2c2c2; + stroke-width: 1; + } + #darktext-dim:target ~ g { + stroke: #0f0f0f; + stroke-width: 1; + } + </style> + <g id="darktext-dim"/> + <g id="dim"/> + <g id="darktext"/> + <g> + <path d="M 4,8.5 h 9 m -4.5 -4.5 v 9"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbar/zoom-out.svg b/src/chrome/browser/toolbar/zoom-out.svg @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M 4,8.5 h 9"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/browser/toolbarbutton-dropdown-arrow-inverted.png b/src/chrome/browser/toolbarbutton-dropdown-arrow-inverted.png Binary files differ. diff --git a/src/chrome/browser/toolbarbutton-dropdown-arrow.png b/src/chrome/browser/toolbarbutton-dropdown-arrow.png Binary files differ. diff --git a/src/chrome/browser/toolbarbutton-dropdown-arrow.svg b/src/chrome/browser/toolbarbutton-dropdown-arrow.svg @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="9" height="7" version="1.1" viewBox="0 0 9 7" xmlns="http://www.w3.org/2000/svg"> + <style> + g { + fill: #fff; + } + #darktext:target + g { + fill: #000; + } + </style> + <g id="darktext"/> + <g> + <polygon points="1,1 8,1 4.5,5"/> + </g> +</svg> diff --git a/src/chrome/browser/urlbar-arrow.png b/src/chrome/browser/urlbar-arrow.png Binary files differ. diff --git a/src/chrome/browser/urlbar-arrow.svg b/src/chrome/browser/urlbar-arrow.svg @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="8" height="26" version="1.1" viewBox="0 0 2.1167 6.8792" xmlns="http://www.w3.org/2000/svg"> + <g transform="translate(0 -290.12)"> + <path d="m0.11883 290.05 1.7186 3.5119-1.7186 3.5119" fill="none" opacity=".145" stroke="#fff" stroke-width=".26458px"/> + </g> +</svg> diff --git a/src/chrome/browser/urlbar-history-dropmarker.png b/src/chrome/browser/urlbar-history-dropmarker.png Binary files differ. diff --git a/src/chrome/global/aboutReader.css b/src/chrome/global/aboutReader.css @@ -0,0 +1,181 @@ +/* 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 { + padding: 64px 51px; +} + +@media print { + #container { + max-width: 100% !important; + font-size: 14px !important; + font-family: Georgia, "Times New Roman", serif !important; + } + + body { + padding-top: 0px; + padding-bottom: 0px; + } +} + +body.loaded { + transition: color 0.4s, background-color 0.4s; +} + +body.light { + color: #333333; + background-color: #ffffff; +} + +body.dark { + color: #eeeeee; + background-color: #333333; +} + +body.dark *::-moz-selection { + background-color: #FFFFFF; + color: #0095DD; +} +body.dark a::-moz-selection { + color: #DD4800; +} + +body.sepia { + color: #5b4636; + background-color: #f4ecd8; +} + +body.sans-serif, +body.sans-serif .remove-button { + font-family: Helvetica, Arial, sans-serif; +} + +body.serif, +body.serif .remove-button { + font-family: Georgia, "Times New Roman", serif; +} + +#container { + max-width: 30em; + margin: 0 auto; +} + +#container.font-size1 { + font-size: 12px; +} + +#container.font-size2 { + font-size: 14px; +} + +#container.font-size3 { + font-size: 16px; +} + +#container.font-size4 { + font-size: 18px; +} + +#container.font-size5 { + font-size: 20px; +} + +#container.font-size6 { + font-size: 22px; +} + +#container.font-size7 { + font-size: 24px; +} + +#container.font-size8 { + font-size: 26px; +} + +#container.font-size9 { + font-size: 28px; +} + +#container.content-width1 { + max-width: 20em; +} + +#container.content-width2 { + max-width: 25em; +} + +#container.content-width3 { + max-width: 30em; +} + +#container.content-width4 { + max-width: 35em; +} + +#container.content-width5 { + max-width: 40em; +} + +#container.content-width6 { + max-width: 45em; +} + +#container.content-width7 { + max-width: 50em; +} + +#container.content-width8 { + max-width: 55em; +} + +#container.content-width9 { + max-width: 60em; +} + +/* Override some controls and content styles based on color scheme */ + +body.light > .container > .header > .domain { + border-bottom-color: #333333 !important; +} + +body.sepia > .container > .header > .domain { + border-bottom-color: #5b4636 !important; +} + +body.dark > .container > .header > .domain { + border-bottom-color: #eeeeee !important; +} + +body.sepia > .container > .footer { + background-color: #dedad4 !important; +} + +body.light blockquote { + -moz-border-start: 2px solid #333333 !important; + border-inline-start: 2px solid #333333 !important; +} + +body.sepia blockquote { + -moz-border-start: 2px solid #5b4636 !important; + border-inline-start: 2px solid #5b4636 !important; +} + +body.dark blockquote { + -moz-border-start: 2px solid #eeeeee !important; + border-inline-start: 2px solid #eeeeee !important; +} + +/* Add toolbar transition base on loaded class */ + +body.loaded .toolbar { + transition: transform 0.3s ease-out; +} + +body:not(.loaded) .toolbar:-moz-locale-dir(ltr) { + transform: translateX(-100%); +} + +body:not(.loaded) .toolbar:-moz-locale-dir(rtl) { + transform: translateX(100%); +} diff --git a/src/chrome/global/aboutReaderContent.css b/src/chrome/global/aboutReaderContent.css @@ -0,0 +1,180 @@ +/* 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/. */ + +#moz-reader-content { + display: none; + font-size: 1em; + line-height: 1.6em; +} + +#moz-reader-content.line-height1 { + line-height: 1em; +} + +#moz-reader-content.line-height2 { + line-height: 1.2em; +} + +#moz-reader-content.line-height3 { + line-height: 1.4em; +} + +#moz-reader-content.line-height4 { + line-height: 1.6em; +} + +#moz-reader-content.line-height5 { + line-height: 1.8em; +} + +#moz-reader-content.line-height6 { + line-height: 2.0em; +} + +#moz-reader-content.line-height7 { + line-height: 2.2em; +} + +#moz-reader-content.line-height8 { + line-height: 2.4em; +} + +#moz-reader-content.line-height9 { + line-height: 2.6em; +} + +@media print { + p, + code, + pre, + blockquote, + ul, + ol, + li, + figure, + .wp-caption { + margin: 0 0 10px 0 !important; + } +} + +h1, +h2, +h3 { + font-weight: bold; +} + +h1 { + font-size: 1.6em; + line-height: 1.25em; +} + +h2 { + font-size: 1.2em; + line-height: 1.51em; +} + +h3 { + font-size: 1em; + line-height: 1.66em; +} + +a:link { + text-decoration: underline; + font-weight: normal; +} + +a:link, +a:link:hover, +a:link:active { + color: #0095dd; +} + +a:visited { + color: #c2e; +} + +* { + max-width: 100%; + height: auto; +} + +p, +code, +pre, +blockquote, +ul, +ol, +li, +figure, +.wp-caption { + margin: -10px -10px 20px -10px; + padding: 10px; + border-radius: 5px; +} + +li { + margin-bottom: 0; +} + +li > ul, +li > ol { + margin-bottom: -10px; +} + +p > img:only-child, +p > a:only-child > img:only-child, +.wp-caption img, +figure img { + display: block; +} + +img[moz-reader-center] { + margin-left: auto; + margin-right: auto; +} + +.caption, +.wp-caption-text, +figcaption { + font-size: 0.9em; + line-height: 1.48em; + font-style: italic; +} + +code, +pre { + white-space: pre-wrap; +} + +blockquote { + padding: 0; + -moz-padding-start: 16px; + padding-inline-start: 16px; +} + +ul, +ol { + padding: 0; +} + +ul { + -moz-padding-start: 30px; + padding-inline-start: 30px; + list-style: disc; +} + +ol { + -moz-padding-start: 30px; + padding-inline-start: 30px; + list-style: decimal; +} + +/* Hide elements with common "hidden" class names */ +.visually-hidden, +.visuallyhidden, +.hidden, +.invisible, +.sr-only { + display: none; +} diff --git a/src/chrome/global/aboutReaderControls.css b/src/chrome/global/aboutReaderControls.css @@ -0,0 +1,417 @@ +/* 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/. */ + +.light-button { + color: #333333; + background-color: #ffffff; +} + +.dark-button { + color: #eeeeee; + background-color: #333333; +} + +.sepia-button { + color: #5b4636; + background-color: #f4ecd8; +} + +.sans-serif-button { + font-family: Helvetica, Arial, sans-serif; +} + +.serif-button { + font-family: Georgia, "Times New Roman", serif; +} + +/* Loading/error message */ + +#reader-message { + margin-top: 40px; + display: none; + text-align: center; + width: 100%; + font-size: 0.9em; +} + +/* Header */ + +.header { + text-align: start; + display: none; +} + +.domain { + font-size: 0.9em; + line-height: 1.48em; + padding-bottom: 4px; + font-family: Helvetica, Arial, sans-serif; + text-decoration: none; + border-bottom: 1px solid; + color: #0095dd; +} + +.header > h1 { + font-size: 1.6em; + line-height: 1.25em; + width: 100%; + margin: 30px 0; + padding: 0; +} + +.header > .credits { + font-size: 0.9em; + line-height: 1.48em; + margin: 0 0 30px 0; + padding: 0; + font-style: italic; +} + +/*======= Controls toolbar =======*/ + +.toolbar { + font-family: Helvetica, Arial, sans-serif; + position: fixed; + height: 100%; + top: 0; + left: 0; + margin: 0; + padding: 0; + list-style: none; + background-color: #fbfbfb; + -moz-user-select: none; + border-right: 1px solid #b5b5b5; +} + +.button { + display: block; + background-size: 24px 24px; + background-repeat: no-repeat; + color: #333; + background-color: #fbfbfb; + height: 40px; + padding: 0; +} + +.toolbar .button { + width: 40px; + background-position: center; + margin-right: -1px; + border-top: 0; + border-left: 0; + border-right: 1px solid #b5b5b5; + border-bottom: 1px solid #c1c1c1; +} + +.button[hidden] { + display: none; +} + +.dropdown { + text-align: center; + list-style: none; + margin: 0; + padding: 0; +} + +.dropdown li { + margin: 0; + padding: 0; +} + +/*======= Popup =======*/ + +.dropdown-popup { + min-width: 300px; + text-align: start; + position: absolute; + left: 48px; /* offset to account for toolbar width */ + z-index: 1000; + background-color: #fbfbfb; + visibility: hidden; + border-radius: 4px; + border: 1px solid #b5b5b5; + border-bottom-width: 0; + box-shadow: 0 1px 12px #666; +} + +.keep-open .dropdown-popup { + z-index: initial; +} + +.dropdown-popup > hr { + display: none; +} + +.open > .dropdown-popup { + visibility: visible; +} + +.dropdown-arrow { + position: absolute; + top: 30px; /* offset arrow from top of popup */ + left: -16px; + width: 24px; + height: 24px; + background-image: url("chrome://global/skin/reader/RM-Type-Controls-Arrow.svg"); + display: block; +} + +/*======= Font style popup =======*/ + +#font-type-buttons, +#font-size-buttons, +#color-scheme-buttons, +#content-width-buttons, +#line-height-buttons { + display: flex; + flex-direction: row; +} + +#font-type-buttons > button:first-child { + border-top-left-radius: 3px; +} +#font-type-buttons > button:last-child { + border-top-right-radius: 3px; +} +#color-scheme-buttons > button:first-child { + border-bottom-left-radius: 3px; +} +#color-scheme-buttons > button:last-child { + border-bottom-right-radius: 3px; +} + +#font-type-buttons > button, +#font-size-buttons > button, +#color-scheme-buttons > button, +#content-width-buttons > button, +#line-height-buttons > button { + text-align: center; + border: 0; +} + +#font-type-buttons > button, +#font-size-buttons > button, +#content-width-buttons > button, +#line-height-buttons > button { + width: 50%; + background-color: transparent; + border-left: 1px solid #B5B5B5; + border-bottom: 1px solid #B5B5B5; +} + +#color-scheme-buttons > button { + width: 33.33%; + font-size: 14px; +} + +#color-scheme-buttons > .dark-button { + margin-top: -1px; + height: 61px; +} + +#font-type-buttons > button:first-child, +#font-size-buttons > button:first-child, +#content-width-buttons > button:first-child, +#line-height-buttons > button:first-child { + border-left: 0; +} + +#font-type-buttons > button { + display: inline-block; + font-size: 62px; + height: 100px; +} + +#font-size-buttons > button, +#color-scheme-buttons > button, +#content-width-buttons > button, +#line-height-buttons > button { + height: 60px; +} + +#font-type-buttons > button:active:hover, +#font-type-buttons > button.selected, +#color-scheme-buttons > button:active:hover, +#color-scheme-buttons > button.selected { + box-shadow: inset 0 -3px 0 0 #fc6420; +} + +#font-type-buttons > button:active:hover, +#font-type-buttons > button.selected { + border-bottom: 1px solid #FC6420; +} + +/* Make the serif button content the same size as the sans-serif button content. */ +#font-type-buttons > button > .description { + color: #666; + font-size: 12px; + margin-top: -5px; +} + +/* Font sizes are different per-platform, so we need custom CSS to line them up. */ +#font-type-buttons > .sans-serif-button > .name { + margin-top: 2px; +} + +#font-type-buttons > .sans-serif-button > .description { + margin-top: -4px; +} + +#font-type-buttons > .serif-button > .name { + font-size: 63px; +} + +.button:hover, +#font-size-buttons > button:hover, +#font-type-buttons > button:hover, +#content-width-buttons > button:hover, +#line-height-buttons > button:hover { + background-color: #ebebeb; +} + +.dropdown.open, +.button:active, +#font-size-buttons > button:active, +#font-size-buttons > button.selected, +#content-width-buttons > button:active, +#content-width-buttons > button.selected, +#line-height-buttons > button:active, +#line-height-buttons > button.selected { + background-color: #dadada; +} + +/* Only used on Android */ +#font-size-sample { + display: none; +} + +.minus-button, +.plus-button, +.content-width-minus-button, +.content-width-plus-button, +.line-height-minus-button, +.line-height-plus-button { + background-color: transparent; + border: 0; + background-size: 18px 18px; + background-repeat: no-repeat; + background-position: center; +} + +.footer { + height: 64px; + background-color: #ebebeb; + position: absolute; + left: 0; + width: 100%; + text-align: center; + padding: 12px 0; + box-sizing: border-box; + box-shadow: 0 3px 3px -3px rgba(0, 0, 0, 0.35) inset; +} + +.remove-button { + background-image: url("chrome://global/skin/reader/RM-Delete-24x24.svg"); + margin: 0 auto; + border: 1px solid #c1c1c1; + background-position: 10px 7px; + padding-left: 42px; + padding-right: 10px; + border-radius: 2px; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1); + font-size: 18px; +} + + +/*======= Toolbar icons =======*/ + +/* Android-only controls */ +.share-button { + display: none; +} + +.close-button { + background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg#close"); + height: 68px; + background-position: center 8px; +} + +.close-button:hover { + background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg#close-hover"); + background-color: #d94141; + border-bottom: 1px solid #d94141; + border-right: 1px solid #d94141; +} + +.close-button:hover:active { + background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg#close-hover"); + background-color: #AE2325; + border-bottom: 1px solid #AE2325; + border-right: 1px solid #AE2325; +} + +.style-button { + background-image: url("chrome://global/skin/reader/RM-Type-Controls-24x24.svg"); +} + +.toggle-button.on { + background-image: url("chrome://global/skin/reader/RM-Delete-24x24.svg"); +} + +.toggle-button { + background-image: url("chrome://global/skin/reader/RM-Add-24x24.svg"); +} + +.list-button { + background-image: url("chrome://global/skin/reader/RM-Reading-List-24x24.svg"); +} +.list-button.on { + background-color: #d9d9d9; +} + +.minus-button { + background-image: url("chrome://global/skin/reader/RM-Minus-24x24.svg"); +} + +.plus-button { + background-image: url("chrome://global/skin/reader/RM-Plus-24x24.svg"); +} + +.content-width-minus-button { + background-size: 42px 16px; + background-image: url("chrome://global/skin/reader/RM-Content-Width-Minus-42x16.svg"); +} + +.content-width-plus-button { + background-size: 44px 16px; + background-image: url("chrome://global/skin/reader/RM-Content-Width-Plus-44x16.svg"); +} + +.line-height-minus-button { + background-size: 34px 14px; + background-image: url("chrome://global/skin/reader/RM-Line-Height-Minus-38x14.svg"); +} + +.line-height-plus-button { + background-size: 34px 24px; + background-image: url("chrome://global/skin/reader/RM-Line-Height-Plus-38x24.svg"); +} + +#pocket-button { + background-image: url("chrome://global/skin/reader/pocket.svg#pocket-mark"); +} + +#pocket-button:hover:active { + background-image: url("chrome://global/skin/reader/pocket.svg#pocket-mark-added"); +} + +@media print { + .toolbar { + display: none !important; + } + .footer { + display: none !important; + } +} diff --git a/src/chrome/global/aboutSupport.css b/src/chrome/global/aboutSupport.css @@ -1,127 +1 @@ -/* 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/. */ - -html { - background-color: rgb(43,43,43); - color: #fff; - font: message-box; -} - -body { - width: 90%; - margin-left: 5%; - margin-right: 5%; -} - -.page-subtitle { - margin-bottom: 3em; -} - -.major-section { - margin-top: 2em; - margin-bottom: 1em; - font-size: large; - text-align: start; - font-weight: bold; -} - -table { - background-color: rgb(75,75,75); - color: #fff; - font: message-box; - text-align: start; - width: 100%; - border: 1px solid rgb(50,50,50); - border-spacing: 0px; -} - -th, td { - border: 1px dotted rgb(50,50,50); - padding: 3px; -} - -thead th { - text-align: center; -} - -th { - text-align: start; - background-color: rgb(110,110,110); - color: #fff; -} - -th.column { - white-space: nowrap; - width: 0px; -} - -td { - text-align: start; - border-top: 1px dotted rgb(50,50,50); -} - -.prefs-table { - width: 100%; - table-layout: fixed; -} - -.pref-name { - width: 70%; - white-space: nowrap; - overflow: hidden; -} - -.pref-value { - width: 30%; - white-space: nowrap; - overflow: hidden; -} - -#action-box { - background-color: rgb(75,75,75); - border: 1px solid rgb(50,50,50); - color: #fff; - float: right; - margin-top: 2em; - margin-bottom: 20px; - -moz-margin-start: 20px; - -moz-margin-end: 0; - padding: 16px; - width: 30%; -} - -#contents { - clear: right; -} - -#action-box, -#reset-box, -#safe-mode-box { - display: none; -} - -#action-box:-moz-dir(rtl) { - float: left; -} - -#reset-box > h3 { - margin-top: 0; -} - -#action-box button { - display: block; -} - -#verify-place-result { - max-height: 200px; - overflow: auto; -} - -.block { - display: block; -} - -.hidden { - display: none; -} -\ No newline at end of file +@import url("chrome://appver/skin/aboutSupport.css"); +\ No newline at end of file diff --git a/src/chrome/global/alerts/alert-common.css b/src/chrome/global/alerts/alert-common.css @@ -0,0 +1,147 @@ +/* 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/. */ + +/* ===== alert.css ===================================================== + == Shared styles specific to the alerts dialog. + ======================================================================= */ + +@import url("chrome://global/skin/"); + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +#alertBox[animate] { + animation-timing-function: cubic-bezier(.12,1.23,.48,1.09); +} + +#alertBox[animate][clicked] { + animation-duration: .6s; + animation-name: alert-clicked-animation; +} + +/* This is used if the close button is clicked + before the animation has finished. */ +#alertBox[animate][closing] { + animation-duration: .6s; + animation-name: alert-closing-animation; +} + +@keyframes alert-animation { + from { + opacity: 0; + } + 5% { + opacity: 1; + } + 95% { + opacity: 1; + } + to { + opacity: 0; + } +} + +@keyframes alert-clicked-animation { + to { + opacity: 0; + } +} + +@keyframes alert-closing-animation { + to { + opacity: 0; + } +} + +#alertIcon { + margin-top: 6px; + margin-inline-start: 8px; + margin-inline-end: 0; + margin-bottom: 0; + width: 16px; + min-height: 16px; + max-height: 16px; +} + +#alertImage { + width: 80px; + height: 80px; + max-width: 80px; + max-height: 80px; + object-fit: scale-down; + margin: 0 7px 7px; +} + +.alertTextBox { + padding-top: 4px; + /* The text box width is increased to make up for the lack of image when one + is not provided. 349px is the text box width when a picture is present, + 255px, plus the width of the image, 80px, and the margins, 7px each. */ + width: 349px; +} + +#alertBox[hasImage] > box > #alertTextBox { + width: 255px; +} + +#alertBox:not([hasImage]) > box > #alertTextBox { + padding-inline-start: 8px; +} + +#alertTextLabel { + padding-inline-end: 8px; +} + +.alertTitle { + -moz-box-flex: 1; + font-weight: bold; + padding: 6px 8px 0; + width: 255px; +} + +#alertFooter { + -moz-box-align: start; +} + +#alertBox:not([hasOrigin]) > box > #alertTextBox, +#alertFooter { + padding-bottom: 5px; +} + +#alertSourceLabel { + -moz-box-flex: 1; + font-size: 83.334%; + color: GrayText; +} + +#alertSettings { + -moz-appearance: none; + background-color: transparent; + border-width: 0; + min-width: 0; + list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities"); + margin-inline-end: 0; + margin-bottom: 0; +} + +#alertSettings > .button-box { + padding: 0; +} + +#alertSettings:hover { + list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities-grayscale"); +} + +#alertSettings[open], +#alertSettings:hover:active { + list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities-blue"); +} + +#alertSettings[focusedViaMouse]:-moz-focusring > .button-box { + border-color: transparent; +} + +#alertSettings > .button-box > .button-menu-dropmarker, +#alertSettings > .button-box > .box-inherit > .button-text { + display: none; +} diff --git a/src/chrome/global/alerts/alert.css b/src/chrome/global/alerts/alert.css @@ -1,81 +1 @@ -/* 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/. */ - -/* ===== alert.css ===================================================== - == Styles specific to the alerts dialog. - ======================================================================= */ - -@import url("chrome://global/skin/"); - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -.alertBox { - border: 1px solid rgb(75,75,75); - border-radius: 3px; - background-color: rgb(43,43,43); -} - -.alertImageBox { - padding: 8px 0; - width: 64px; -} - -.alertTextBox { - padding: 8px; - -moz-padding-start: 16px; - width: 255px; -} - -.alertTitle { - font-weight: bold; - font-size: 110%; -} - -#alertImage { - max-width: 48px; - max-height: 48px; - list-style-image: url(chrome://global/skin/alerts/notification-48.png); -} - -#alertNotification[clickable="true"] { - cursor: pointer; -} - -label { - cursor: inherit; -} - -.alertText[clickable="true"] { - color: #fff; - text-decoration: underline; -} - -.alertText[clickable="true"]:hover:active { - color: rgb(219,219,219); -} - -@keyframes alert-animation { - from { - opacity: 0; - } - 6.25% { - opacity: 1; - } - 93.75% { - opacity: 1; - } - to { - opacity: 0; - } -} - -.alertCloseButton { - -moz-appearance: none; - padding: 4px 2px; - border: none !important; -} - -.alertCloseButton > .toolbarbutton-text { - display: none; -} +@import url("chrome://appver/skin/alert.css"); +\ No newline at end of file diff --git a/src/chrome/global/alerts/notification-48.png b/src/chrome/global/alerts/notification-48.png Binary files differ. diff --git a/src/chrome/global/alerts/notification.svg b/src/chrome/global/alerts/notification.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"> + <path id="desktop-notification" d="m2 19a4 4 0 0 0 4 4h13l7 7v-7a4 4 0 0 0 4-4v-12a4 4 0 0 0-4-4h-20a4 4 0 0 0-4 4zm5-2a1 1 0 1 1 0-2h10a1 1 0 1 1 0 2zm0-4a1 1 0 1 1 0-2h14a1 1 0 1 1 0 2zm0-4a1 1 0 1 1 0-2h18a1 1 0 1 1 0 2z" fill="#9c9c9c"/> +</svg> diff --git a/src/chrome/global/arrow.css b/src/chrome/global/arrow.css @@ -1,46 +1,38 @@ +/* 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/. */ + @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); .up { min-width: 0px; - list-style-image: url("chrome://global/skin/arrow/arrow-up.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#up"); } -.up:hover { - list-style-image: url("chrome://global/skin/arrow/arrow-up-hov.gif"); -} .up[disabled="true"] { - list-style-image: url("chrome://global/skin/arrow/arrow-up-dis.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#up-dis"); } .down { min-width: 0px; - list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); -} -.down:hover { - list-style-image: url("chrome://global/skin/arrow/arrow-dn-hov.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#dn"); } .down[disabled="true"] { - list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#dn-dis"); } .left { min-width: 0px; - list-style-image: url("chrome://global/skin/arrow/arrow-lft.gif"); -} -.left:hover { - list-style-image: url("chrome://global/skin/arrow/arrow-lft-hov.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-h.svg#lft"); } .left[disabled="true"] { - list-style-image: url("chrome://global/skin/arrow/arrow-lft-dis.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-h.svg#lft-dis"); } .right { min-width: 0px; - list-style-image: url("chrome://global/skin/arrow/arrow-rit.gif"); -} -.right:hover { - list-style-image: url("chrome://global/skin/arrow/arrow-rit-hov.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-h.svg#rit"); } .right[disabled="true"] { - list-style-image: url("chrome://global/skin/arrow/arrow-rit-dis.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-h.svg#rit-dis"); } diff --git a/src/chrome/global/arrow/arrow-h.svg b/src/chrome/global/arrow/arrow-h.svg @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" + y="0" + width="3" + height="5" + viewBox="0 0 3 5"> + <style> + .t { + fill: #fff; + } + .t:not(:target){ + display: none; + } + [id$=dis] { + opacity: .4; + } + </style> + <g id="lft" class="t"> + <path class="main" d="M3,4.8l-2.65-2.3l2.65-2.3z"/> + </g> + <g id="lft-dis" class="t"> + <path class="main" d="M3,4.8l-2.65-2.3l2.65-2.3z"/> + </g> + <g id="rit" class="t"> + <path class="main" d="M0,.2l2.65,2.3l-2.65,2.3z"/> + </g> + <g id="rit-dis" class="t"> + <path class="main" d="M0,.2l2.65,2.3l-2.65,2.3z"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/global/arrow/arrow-v.svg b/src/chrome/global/arrow/arrow-v.svg @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" + y="0" + width="5" + height="3" + viewBox="0 0 5 3"> + <style> + .t { + fill: #fff; + } + .t:not(:target){ + display: none; + } + [id$=dis] { + opacity: .4; + } + </style> + <g id="dn" class="t"> + <path class="main" d="M4.8,0l-2.3,2.65l-2.3-2.65z"/> + </g> + <g id="dn-dis" class="t"> + <path class="main" d="M4.8,0l-2.3,2.65l-2.3-2.65z"/> + </g> + <g id="up" class="t"> + <path class="main" d="M.2,3l2.3-2.65l2.3,2.65z"/> + </g> + <g id="up-dis" class="t"> + <path class="main" d="M.2,3l2.3-2.65l2.3,2.65z"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/global/autocomplete.css b/src/chrome/global/autocomplete.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/. */ - /* ===== autocomplete.css ================================================= == Styles used by the autocomplete widget. ======================================================================= */ @@ -25,7 +21,8 @@ textbox[nomatch="true"][highlightnonmatches="true"] { color: red; } -.autocomplete-textbox-container { +.autocomplete-textbox-container, +.private-autocomplete-textbox-container { -moz-box-align: center; } @@ -41,7 +38,10 @@ textbox:not(.padded) .textbox-input-box { panel[type="autocomplete"], panel[type="autocomplete-richlistbox"], -.autocomplete-history-popup { +.autocomplete-history-popup, +panel[type="private-autocomplete"], +panel[type="private-autocomplete-richlistbox"], +.private-autocomplete-history-popup { -moz-appearance: none; border-width: 1px; -moz-border-top-colors: rgb(50,50,50); @@ -52,19 +52,22 @@ panel[type="autocomplete-richlistbox"], background-color: rgb(75,75,75); } -.autocomplete-history-popup { +.autocomplete-history-popup, +.private-autocomplete-history-popup { max-height: 180px; } /* ::::: tree ::::: */ -.autocomplete-tree { +.autocomplete-tree, +.private-autocomplete-tree { -moz-appearance: none !important; border: none !important; background-color: transparent !important; } -.autocomplete-treecol { +.autocomplete-treecol, +.private-autocomplete-treecol { -moz-appearance: none !important; margin: 0 !important; border: none !important; @@ -72,40 +75,48 @@ panel[type="autocomplete-richlistbox"], } /* GTK calculates space for a sort arrow */ -.autocomplete-treecol > .treecol-sortdirection { +.autocomplete-treecol > .treecol-sortdirection, +.private-autocomplete-treecol > .treecol-sortdirection { -moz-appearance: none !important; } -.autocomplete-treebody::-moz-tree-cell-text { +.autocomplete-treebody::-moz-tree-cell-text, +.private-autocomplete-treebody::-moz-tree-cell-text { -moz-padding-start: 8px; } -treechildren.autocomplete-treebody::-moz-tree-row(selected) { - background-color: rgb(110,110,110); +treechildren.autocomplete-treebody::-moz-tree-row(selected), +treechildren.private-autocomplete-treebody::-moz-tree-row(selected) { + background-color: rgb(110,110,110); } -treechildren.autocomplete-treebody::-moz-tree-cell-text(selected) { +treechildren.autocomplete-treebody::-moz-tree-cell-text(selected), +treechildren.private-autocomplete-treebody::-moz-tree-cell-text(selected) { color: #fff !important; } -.autocomplete-treebody::-moz-tree-image(treecolAutoCompleteValue) { +.autocomplete-treebody::-moz-tree-image(treecolAutoCompleteValue), +.private-autocomplete-treebody::-moz-tree-image(treecolAutoCompleteValue) { max-width: 16px; height: 16px; } /* ::::: richlistbox autocomplete ::::: */ -.autocomplete-richlistbox { +.autocomplete-richlistbox, +.private-autocomplete-richlistbox { -moz-appearance: none; margin: 0; } -.autocomplete-richlistitem { +.autocomplete-richlistitem, +.private-autocomplete-richlistitem { padding: 1px; } -.autocomplete-richlistitem[selected="true"] { - color: rgb(0,0,0); +.autocomplete-richlistitem[selected="true"], +.private-autocomplete-richlistitem[selected="true"] { + color: #fff; background-color: rgb(110,110,110); } diff --git a/src/chrome/global/button.css b/src/chrome/global/button.css @@ -141,11 +141,11 @@ button[type="disclosure"] { margin: 0px !important; padding: 0px !important; -moz-appearance: none; - list-style-image: url("chrome://global/skin/tree/twisty-clsd.png"); + list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd"); min-width: 0px !important; background-color: transparent; } button[type="disclosure"][open="true"] { - list-style-image: url("chrome://global/skin/tree/twisty-open.png"); + list-style-image: url("chrome://global/skin/tree/twisty.svg#open"); } diff --git a/src/chrome/global/checkbox.css b/src/chrome/global/checkbox.css @@ -72,10 +72,10 @@ checkbox:hover:active > .checkbox-check { /* ..... checked state ..... */ checkbox[checked="true"] > .checkbox-check { - background-image: url("chrome://global/skin/checkbox/cbox-check.gif"); + background-image: url("chrome://global/skin/checkbox/cbox-check.svg#check"); } checkbox[checked="true"][disabled="true"] > .checkbox-check { - background-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif") !important + background-image: url("chrome://global/skin/checkbox/cbox-check.svg#check-dis") !important } diff --git a/src/chrome/global/checkbox/cbox-check.svg b/src/chrome/global/checkbox/cbox-check.svg @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="7" height="7" version="1.1" viewBox="0 0 7 7" xmlns="http://www.w3.org/2000/svg"> + <style> + g { + fill: #fff; + } + #check-dis:target + g { + opacity: .4; + } + </style> + <g id="check-dis"/> + <g id="check"> + <path d="m3 4.5244 2.8333-4.5244 1.1667 1.1951-3.6667 5.8049-3.3333-3.4146 0.91667-0.93902z"/> + </g> +</svg> diff --git a/src/chrome/global/commonDialog.css b/src/chrome/global/commonDialog.css @@ -1,4 +1,10 @@ +/* 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/. */ + #filler { -moz-margin-start: -8px; -moz-margin-end: -10px; + margin-inline-start: -8px; + margin-inline-end: -10px; } diff --git a/src/chrome/global/config.css b/src/chrome/global/config.css @@ -1,76 +1 @@ - -@import url("chrome://global/skin/"); -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - - -#warningScreen -{ - background-color: rgb(23,23,23); -} - -#warningBox -{ - background-color: rgb(43,43,43); - color: #fff; - border: 1px solid rgb(50,50,50); - border-radius: 10px; - padding: 3em; - -moz-padding-start: 30px; - margin-left: 1em; - margin-right: 1em; -} - -#warningInnerBox -{ - max-width: 50em; -} - -#warningTitle -{ - margin: 0 0 .6em 0; - font-size: 160%; - border-bottom: 1px solid rgb(50,50,50); -} - -#warningText -{ - font-size: 110%; - margin-left: 0; -} - -#warningButton -{ - margin-top: 0.6em; -} - -#showWarningNextTime -{ - margin-top: 0.6em; -} - -#exclam -{ - list-style-image: url("chrome://global/skin/icons/warning-large.png"); - -moz-margin-end: 3em; -} - -#configTreeBody::-moz-tree-cell-text(user) -{ - font-weight: bold; -} - -#configTreeBody::-moz-tree-cell-text(locked) -{ - font-style: italic; -} - -#configTree -{ - margin-top: 5px; - margin-bottom: 5px; -} - -#filterRow -{ - margin-top: 5px; -} +@import url("chrome://appver/skin/config.css"); +\ No newline at end of file diff --git a/src/chrome/global/console/itemSelected.png b/src/chrome/global/console/itemSelected.png Binary files differ. diff --git a/src/chrome/global/devtools/debugging-addons.svg b/src/chrome/global/devtools/debugging-addons.svg @@ -0,0 +1,7 @@ +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg height="32" width="32" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" fill="none" stroke-width="1" stroke="#fff"> + <path d="M 2.5,20.5 v 6 a 3,3 0 0,0 3,3 h 6.75 v -.1 a 3.1,3.1 0 1,1 5,0 v .1 h 4.25 a 3,3 0 0,0 3,-3 v -6.25 h .1 a 3.7,3.7 0 1,0 0,-6 h-.1 + v -3.75 a 3,3 0 0,0 -3,-3 h -3.75 v -.1 a 3.7,3.7 0 1,0 -6,0 v .1 h -6.25 a 3,3 0 0,0 -3,3 v 4.25 h .1 a 3.1,3.1 0 1,1 0,5 h-.1 v.75 Z"/> +</svg> diff --git a/src/chrome/global/devtools/debugging-devices.svg b/src/chrome/global/devtools/debugging-devices.svg @@ -0,0 +1,7 @@ +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="#fff"> + <path d="M10.7,14.4H5.3c-1.2,0-1.5-0.4-1.5-1.2V2.8c0-0.9,0.3-1.2,1.5-1.2h5.3c1.1,0,1.5,0.3,1.5,1.2v10.3 + C12.2,14.1,11.8,14.4,10.7,14.4z M5,12.6h6V3.5H5V12.6z"/> +</svg> diff --git a/src/chrome/global/devtools/debugging-tabs.svg b/src/chrome/global/devtools/debugging-tabs.svg @@ -0,0 +1,4 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"> + <path d="M 2.5,26.5 h 26 v -18.5 a 3.5,3.5 0 0,0 -3.5,-3.5 h -19 a 3.5,3.5 0 0,0 -3.5,3.5 v 18.5 Z" stroke="#fff" stroke-width="1" fill="none"/> + <path d="M 10,18 h 2 m 3,0 h 2 m 3,0 h 2" stroke="#fff" stroke-width="2" fill="none"/> +</svg> diff --git a/src/chrome/global/devtools/debugging-workers-generic.svg b/src/chrome/global/devtools/debugging-workers-generic.svg @@ -0,0 +1,21 @@ +<!-- 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 height="16" width="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" stroke="#A60303" fill="#CF2036" stroke-width="0"> +<path d="M14.6,6.1 l-1.1,-1.1 l0,0 c0.3-0.2,0.3-1 0-1.2 l-0.4-0.4 c-0.3-0.3-0.8-0.3-1.1,0 l0,0 + l-1.5,-1.4 c-0.2-0.3-.8-.3-1,0 + l-1.2,1.2 + c-.2,.1 -.3,.7 0,.9 + l1.6,1.6 + l-2.1,2.1 + l-2.2,-2.1 l1.5-1.5 + c.3,-.4 .4,-.9 0.1-1.2 l-1-1 + c-.4,-.3 -.9,-.3 -1.2,0 + l-4.1,4.1 + c-.3,.4 -.4,.9 -.1,1.2 + l1,1 c0.3,0.3,0.9,0.3,1.2,0 l1.4-1.4 l2,2.1 l-3.4,3.3 c-0.3,0.3-0.3,0.8,0,1.1 l0.3,0.3 c0.3,0.3,0.8,0.3,1.1,0 + l3.3-3.4 l3.3,3.4 c0.3,0.3,.9,.3 1.2,0 l0.3-0.3 c0.3-0.3,0.3-0.8,0-1.1 + l-3.5,-3.3 l2-2.1 l1.4,1.4 + c0.1,0.1,2.3,1.1,2.7,0.7 + c.4,-.4 -.3,-2.7 -.5,-2.9 z"/> +</svg> diff --git a/src/chrome/global/devtools/debugging-workers.svg b/src/chrome/global/devtools/debugging-workers.svg @@ -0,0 +1,21 @@ +<!-- 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 height="16" width="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none" stroke="#fff" stroke-width=".5"> +<path d="M14.6,6.1 l-1.1,-1.1 l0,0 c0.3-0.2,0.3-1 0-1.2 l-0.4-0.4 c-0.3-0.3-0.8-0.3-1.1,0 l0,0 + l-1.5,-1.4 c-0.2-0.3-.8-.3-1,0 + l-1.2,1.2 + c-.2,.1 -.3,.7 0,.9 + l1.6,1.6 + l-2.1,2.1 + l-2.2,-2.1 l1.5-1.5 + c.3,-.4 .4,-.9 0.1-1.2 l-1-1 + c-.4,-.3 -.9,-.3 -1.2,0 + l-4.1,4.1 + c-.3,.4 -.4,.9 -.1,1.2 + l1,1 c0.3,0.3,0.9,0.3,1.2,0 l1.4-1.4 l2,2.1 l-3.4,3.3 c-0.3,0.3-0.3,0.8,0,1.1 l0.3,0.3 c0.3,0.3,0.8,0.3,1.1,0 + l3.3-3.4 l3.3,3.4 c0.3,0.3,.9,.3 1.2,0 l0.3-0.3 c0.3-0.3,0.3-0.8,0-1.1 + l-3.5,-3.3 l2-2.1 l1.4,1.4 + c0.1,0.1,2.3,1.1,2.7,0.7 + c.4,-.4 -.3,-2.7 -.5,-2.9 z"/> +</svg> diff --git a/src/chrome/global/devtools/filetype-dir-close.svg b/src/chrome/global/devtools/filetype-dir-close.svg @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#0A0805" width="16" height="16"> <path d="M 0.00,160.00 L 512.00,160.00 L 480.00,480.00 L 32.00,480.00 L 0.00,160.00 Z M 464.00,96.00 L 480.00,128.00 L 32.00,128.00 L 64.00,64.00 L 240.00,64.00 L 256.00,96.00 L 464.00,96.00 Z"/> -</svg> -\ No newline at end of file +</svg> diff --git a/src/chrome/global/devtools/filetype-dir-open.svg b/src/chrome/global/devtools/filetype-dir-open.svg @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#0A0805" width="16" height="16"> <path d="M 416.00,480.00L 512.00,224.00L 96.00,224.00L0.00,480.00 zM 64.00,192.00 L 0.00,480.00 L 0.00,64.00 L 144.00,64.00 L 208.00,128.00 L 416.00,128.00 L 416.00,192.00 Z"/> -</svg> -\ No newline at end of file +</svg> diff --git a/src/chrome/global/devtools/filetype-globe.svg b/src/chrome/global/devtools/filetype-globe.svg @@ -1,3 +1,3 @@ <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18" height="20" viewBox="0 0 878 1024"> <path fill="#0A0805" d="M438.857 73.143q119.429 0 220.286 58.857t159.714 159.714 58.857 220.286-58.857 220.286-159.714 159.714-220.286 58.857-220.286-58.857-159.714-159.714-58.857-220.286 58.857-220.286 159.714-159.714 220.286-58.857zM595.429 370.857q-1.143 0.571-5.429 5.429t-7.714 5.429q1.143 0 2.571-2.857t2.857-6.286 2-4q3.429-4 12.571-8.571 8-3.429 29.714-6.857 19.429-4.571 29.143 6.286-1.143-1.143 5.429-7.429t8.286-6.857q1.714-1.143 8.571-2.571t8.571-4.286l1.143-12.571q-6.857 0.571-10-4t-3.714-12q0 1.143-3.429 4.571 0-4-2.571-4.571t-6.571 0.571-5.143 0.571q-5.714-1.714-8.571-4.286t-4.571-9.429-2.286-8.571q-1.143-2.857-5.429-6t-5.429-6q-0.571-1.143-1.429-3.143t-1.714-3.714-2.286-3.143-3.143-1.429-4 2.857-4.286 5.714-2.571 2.857q-1.714-1.143-3.429-0.857t-2.571 0.571-2.571 1.714-2.857 2q-1.714 1.143-4.857 1.714t-4.857 1.143q8.571-2.857-0.571-6.286-5.714-2.286-9.143-1.714 5.143-2.286 4.286-6.857t-4.857-8h2.857q-0.571-2.286-4.857-4.857t-10-4.857-7.429-3.429q-4.571-2.857-19.429-5.429t-18.857-0.286q-2.857 3.429-2.571 6t2.286 8 2 7.143q0.571 3.429-3.143 7.429t-3.714 6.857q0 4 8 8.857t5.714 12.286q-1.714 4.571-9.143 9.143t-9.143 6.857q-2.857 4.571-0.857 10.571t6 9.429q1.143 1.143 0.857 2.286t-2 2.571-3.143 2.286-3.714 2l-1.714 1.143q-6.286 2.857-11.714-3.429t-7.714-14.857q-4-14.286-9.143-17.143-13.143-4.571-16.571 0.571-2.857-7.429-23.429-14.857-14.286-5.143-33.143-2.286 3.429-0.571 0-8.571-4-8.571-10.857-6.857 1.714-3.429 2.286-10t0.571-7.714q1.714-7.429 6.857-13.143 0.571-0.571 4-4.857t5.429-7.714 0.286-3.429q20 2.286 28.571-6.286 2.857-2.857 6.571-9.714t6-9.714q5.143-3.429 8-3.143t8.286 3.143 8.286 2.857q8 0.571 8.857-6.286t-4.286-11.429q6.857 0.571 1.714-9.714-2.857-4-4.571-5.143-6.857-2.286-15.429 2.857-4.571 2.286 1.143 4.571-0.571-0.571-5.429 6t-9.429 10-9.143-2.857q-0.571-0.571-3.143-7.714t-5.429-7.714q-4.571 0-9.143 8.571 1.714-4.571-6.286-8.571t-13.714-4.571q10.857-6.857-4.571-15.429-4-2.286-11.714-2.857t-11.143 2.286q-2.857 4-3.143 6.571t2.857 4.571 6 3.143 6.571 2.286 4.857 1.714q8 5.714 4.571 8-1.143 0.571-4.857 2t-6.571 2.571-3.429 2.286q-1.714 2.286 0 8t-1.143 8q-2.857-2.857-5.143-10t-4-9.429q4 5.143-14.286 3.429l-5.714-0.571q-2.286 0-9.143 1.143t-11.714 0.571-7.714-4.571q-2.286-4.571 0-11.429 0.571-2.286 2.286-1.143-2.286-1.714-6.286-5.429t-5.714-4.857q-26.286 8.571-53.714 23.429 3.429 0.571 6.857-0.571 2.857-1.143 7.429-3.714t5.714-3.143q19.429-8 24-4l2.857-2.857q8 9.143 11.429 14.286-4-2.286-17.143-0.571-11.429 3.429-12.571 6.857 4 6.857 2.857 10.286-2.286-1.714-6.571-5.714t-8.286-6.286-8.571-2.857q-9.143 0-12.571 0.571-83.429 45.714-134.286 126.857 4 4 6.857 4.571 2.286 0.571 2.857 5.143t1.429 6.286 6.571-1.714q5.143 4.571 1.714 10.857 0.571-0.571 25.143 15.429 10.857 9.714 12 12 1.714 6.286-5.714 10.286-0.571-1.143-5.143-5.143t-5.143-2.286q-1.714 2.857 0.286 10.571t6 7.143q-4 0-5.429 9.143t-1.429 20.286-0.571 13.429l1.143 0.571q-1.714 6.857 3.143 19.714t12.286 11.143q-7.429 1.714 11.429 24.571 3.429 4.571 4.571 5.143 1.714 1.143 6.857 4.286t8.571 5.714 5.714 6q2.286 2.857 5.714 12.857t8 13.429q-1.143 3.429 5.429 11.429t6 13.143q-0.571 0-1.429 0.571t-1.429 0.571q1.714 4 8.857 8t8.857 7.429q0.571 1.714 1.143 5.714t1.714 6.286 4.571 1.143q1.143-11.429-13.714-35.429-8.571-14.286-9.714-16.571-1.714-2.857-3.143-8.857t-2.571-8.286q1.143 0 3.429 0.857t4.857 2 4.286 2.286 1.143 1.714q-1.714 4 1.143 10t6.857 10.571 9.714 10.857 6.857 7.429q3.429 3.429 8 11.143t0 7.714q5.143 0 11.429 5.714t9.714 11.429q2.857 4.571 4.571 14.857t2.857 13.714q1.143 4 4.857 7.714t7.143 5.429l9.143 4.571t7.429 4q2.857 1.143 10.571 6t12.286 6.571q5.714 2.286 9.143 2.286t8.286-1.429 7.714-2q8.571-1.143 16.571 8.571t12 12q20.571 10.857 31.429 6.286-1.143 0.571 0.286 4.286t4.571 8.857 5.143 8.286 3.143 4.857q2.857 3.429 10.286 8.571t10.286 8.571q3.429-2.286 4-5.143-1.714 4.571 4 11.429t10.286 5.714q8-1.714 8-18.286-17.714 8.571-28-10.286 0-0.571-1.429-3.143t-2.286-4.857-1.429-4.857 0-4.286 2.857-1.714q5.143 0 5.714-2t-1.143-7.143-2.286-7.429q-0.571-4.571-6.286-11.429t-6.857-8.571q-2.857 5.143-9.143 4.571t-9.143-5.143q0 0.571-0.857 3.143t-0.857 3.714q-7.429 0-8.571-0.571 0.571-1.714 1.429-10t2-12.857q0.571-2.286 3.143-6.857t4.286-8.286 2.286-7.143-2.571-5.429-10-1.429q-10.857 0.571-14.857 11.429-0.571 1.714-1.714 6t-2.857 6.571-5.143 4q-4 1.714-13.714 1.143t-13.714-2.857q-7.429-4.571-12.857-16.571t-5.429-21.143q0-5.714 1.429-15.143t1.714-14.286-3.143-14q1.714-1.143 5.143-5.429t5.714-6q1.143-0.571 2.571-0.857t2.571 0 2.286-0.857 1.714-3.429q-0.571-0.571-2.286-1.714-1.714-1.714-2.286-1.714 4 1.714 16.286-0.857t15.714 0.857q8.571 6.286 12.571-1.143 0-0.571-1.429-5.429t-0.286-7.714q2.857 15.429 16.571 5.143 1.714 1.714 8.857 2.857t10 2.857q1.714 1.143 4 3.143t3.143 2.571 2.857-0.286 4.857-3.714q5.714 8 6.857 13.714 6.286 22.857 10.857 25.143 4 1.714 6.286 1.143t2.571-5.429 0-8-0.857-7.143l-0.571-4.571v-10.286l-0.571-4.571q-8.571-1.714-10.571-6.857t0.857-10.571 8.571-10.571q0.571-0.571 4.571-2t8.857-3.714 7.143-4.571q12-10.857 8.571-20 4 0 6.286-5.143-0.571 0-2.857-1.714t-4.286-2.857-2.571-1.143q5.143-2.857 1.143-9.143 2.857-1.714 4.286-6.286t4.286-5.714q5.143 6.857 12 1.143 4-4.571 0.571-9.143 2.857-4 11.714-6t10.571-5.429q4 1.143 4.571-1.143t0.571-6.857 1.714-6.857q2.286-2.857 8.571-5.143t7.429-2.857l9.714-6.286q1.714-2.286 0-2.286 10.286 1.143 17.714-6.286 5.714-6.286-3.429-11.429 1.714-3.429-1.714-5.429t-8.571-3.143q1.714-0.571 6.571-0.286t6-0.857q8.571-5.714-4-9.143-9.714-2.857-24.571 6.857zM502.286 872q117.714-20.571 200.571-108-1.714-1.714-7.143-2.571t-7.143-2q-10.286-4-13.714-4.571 0.571-4-1.429-7.429t-4.571-5.143-7.143-4.571-6.286-4q-1.143-1.143-4-3.429t-4-3.143-4.286-2.571-4.857-1.143-5.714 0.571l-1.714 0.571q-1.714 0.571-3.143 1.429t-3.143 1.714-2.286 1.714 0 1.429q-12-9.714-20.571-12.571-2.857-0.571-6.286-3.143t-6-4-5.714-0.857-6.571 4q-2.857 2.857-3.429 8.571t-1.143 7.429q-4-2.857 0-10t1.143-10.571q-1.714-3.429-6-2.571t-6.857 2.571-6.571 4.857-5.143 3.714-4.857 3.143-4.857 4.286q-1.714 2.286-3.429 6.857t-2.857 6.286q-1.143-2.286-6.571-3.714t-5.429-3.143q1.143 5.714 2.286 20t2.857 21.714q4 17.714-6.857 27.429-15.429 14.286-16.571 22.857-2.286 12.571 6.857 14.857 0 4-4.571 11.714t-4 12.286q0 3.429 1.143 9.143z"/> -</svg> -\ No newline at end of file +</svg> diff --git a/src/chrome/global/devtools/filetype-store.svg b/src/chrome/global/devtools/filetype-store.svg @@ -4,4 +4,4 @@ <path d="m14.7,3.4c0-1.4-3-2.5-6.7-2.5s-6.7,1.1-6.7,2.5c0,.2 0,.3 .1,.5-.1-.3-.1-.4-.1-.4v1.5c0,0 0,2.7 6.7,2.7 6.7,0 6.8-2.7 6.8-2.7v-1.6c0,.1 0,.2-.1,.5-0-.2-0-.3-0-.5z"/> <path d="m1.3,8.7v-2.4c0,0 0,2.5 6.7,2.5 6.7,0 6.7-2.5 6.7-2.5v2.4c0,0 0,2.7-6.8,2.7-6.6-0-6.6-2.7-6.6-2.7z"/> </g> -</svg> -\ No newline at end of file +</svg> diff --git a/src/chrome/global/devtools/filters.svg b/src/chrome/global/devtools/filters.svg @@ -17,4 +17,4 @@ <stop offset="0%" stop-color="#343c45"/> <!-- theme-toolbar-background --> <stop offset="50%" stop-color="transparent"/> </linearGradient> -</svg> -\ No newline at end of file +</svg> diff --git a/src/chrome/global/devtools/netmonitor.css b/src/chrome/global/devtools/netmonitor.css @@ -84,29 +84,36 @@ transition: background-color 0.1s ease-in-out; } -.requests-menu-header-button:hover { - background: rgba(0,0,0,0.10); +.requests-menu-header-button:not([sorted]):hover { + background-color: rgba(0,0,0,0.10); } -.requests-menu-header-button:hover:active { - background: rgba(0,0,0,0.25); +.requests-menu-header-button[sorted] { + background-color: var(--theme-selection-background); + color: var(--theme-selection-color); + background-position: right 6px center; } -.requests-menu-header-button:not(:active)[sorted] { - background: rgba(0,0,0,0.15); +.requests-menu-header-button[sorted]:-moz-locale-dir(rtl) { + background-position: left 6px center; } -.requests-menu-header-button:not(:active)[sorted=ascending] { - background-image: radial-gradient(farthest-side at center top, hsla(200,100%,70%,.7), hsla(200,100%,70%,0.3)); - background-size: 100% 1px; - background-repeat: no-repeat; +.requests-menu-status[sorted] { + background-position: right 1px top 1px; +} + +.requests-menu-status[sorted]:-moz-locale-dir(rtl) { + background-position: left 1px top 1px; } -.requests-menu-header-button:not(:active)[sorted=descending] { - background-image: radial-gradient(farthest-side at center bottom, hsla(200,100%,70%,.7), hsla(200,100%,70%,0.3)); - background-size: 100% 1px; +.requests-menu-header-button[sorted=ascending] { + background-image: url("chrome://global/skin/devtools/sort-arrows.svg#ascending"); + background-repeat: no-repeat; +} + +.requests-menu-header-button[sorted=descending] { + background-image: url("chrome://global/skin/devtools/sort-arrows.svg#descending"); background-repeat: no-repeat; - background-position: bottom; } /* Network requests table: specific column dimensions */ @@ -692,6 +699,28 @@ label.requests-menu-status-code { font-weight: 600; } +#requests-menu-filter-freetext-text { + transition-property: max-width, -moz-padding-end, -moz-padding-start; + transition-duration: 250ms; + transition-timing-function: ease; +} + +#requests-menu-filter-freetext-text:not([focused]):not([filled]) > .textbox-input-box { + overflow: hidden; +} + +#requests-menu-filter-freetext-text:not([focused]):not([filled]) { + max-width: 20px !important; + -moz-padding-end: 5px; + -moz-padding-start: 22px; + background-position: 8px center, top left, top left; +} + +#requests-menu-filter-freetext-text[focused], +#requests-menu-filter-freetext-text[filled] { + max-width: 200px !important; +} + /* Performance analysis buttons */ #requests-menu-network-summary-button { diff --git a/src/chrome/global/devtools/sort-arrows.svg b/src/chrome/global/devtools/sort-arrows.svg @@ -0,0 +1,12 @@ +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" width="7" height="4" fill="#edf0f1" fill-opacity="0.8"> + <style> + polygon:not(:target) { + display: none; + } + </style> + <polygon points="0,4 3.5,0 7,4" id="ascending"/> + <polygon points="0,0 3.5,4 7,0" id="descending"/> +</svg> diff --git a/src/chrome/global/devtools/storage.css b/src/chrome/global/devtools/storage.css @@ -8,6 +8,9 @@ min-width: 220px; max-width: 500px; overflow: auto; +} + +#storage-tree { background: var(--theme-sidebar-background); } diff --git a/src/chrome/global/devtools/widgets.css b/src/chrome/global/devtools/widgets.css @@ -1,3 +1,7 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + /* 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 @@ -166,12 +170,12 @@ } #breadcrumb-separator-before, -#breadcrumb-separator-after::after { +#breadcrumb-separator-after:after { background: var(--theme-selection-background); } #breadcrumb-separator-after, -#breadcrumb-separator-before::after { +#breadcrumb-separator-before:after { background: var(--theme-toolbar-background); } @@ -185,8 +189,8 @@ } /* Fake a triangle by rotating a rectangle inside the elements */ -#breadcrumb-separator-before::after, -#breadcrumb-separator-after::after { +#breadcrumb-separator-before:after, +#breadcrumb-separator-after:after { content: ""; display: block; width: 25px; @@ -251,8 +255,8 @@ transform: scaleX(-1); } -#breadcrumb-separator-before:-moz-locale-dir(rtl)::after, -#breadcrumb-separator-after:-moz-locale-dir(rtl)::after { +#breadcrumb-separator-before:-moz-locale-dir(rtl):after, +#breadcrumb-separator-after:-moz-locale-dir(rtl):after { transform: translateX(-5px) rotate(45deg); } @@ -1176,46 +1180,45 @@ } /* Table widget column header colors are taken from netmonitor.inc.css to match - the look of both the tables. This needs to be updated along with netmonitor - header colors in bug 951714 */ + the look of both the tables. */ .table-widget-column-header { - background: rgba(0,0,0,0); position: sticky; top: 0; width: 100%; + margin: 0; padding: 5px 0 0 !important; color: inherit; text-align: center; font-weight: inherit !important; transition: background-color 0.1s ease-in-out; + border-bottom: 1px solid var(--theme-splitter-color); + border-image: linear-gradient(transparent 15%, var(--theme-splitter-color) 15%, var(--theme-splitter-color) 85%, transparent 85%) 1 1; + background-repeat: no-repeat; } -.table-widget-column-header:hover { - background-image: linear-gradient(rgba(0,0,0,0.10), rgba(0,0,0,0.10)); +.table-widget-column-header:not([sorted]):hover { + background-image: linear-gradient(rgba(0,0,0,0.10),rgba(0,0,0,0.10)); } -.table-widget-column-header:hover:active { - background-image: linear-gradient(rgba(0,0,0,0.25), rgba(0,0,0,0.25)); +.table-widget-column-header[sorted] { + background-color: var(--theme-selection-background); + color: var(--theme-selection-color); + border-image: linear-gradient(var(--theme-splitter-color), var(--theme-splitter-color)) 1 1; + box-shadow: -0.5px 0px 0px 0.5px var(--theme-splitter-color); + background-position: right 6px center; } -.table-widget-column-header:not(:active)[sorted] { - background-image: linear-gradient(rgba(0,0,0,0.15), rgba(0,0,0,0.15)); +.table-widget-column-header[sorted]:-moz-locale-dir(rtl) { + background-position: left 6px center; } -.table-widget-column-header:not(:active)[sorted=ascending] { - background-image: radial-gradient(farthest-side at center top, hsla(200,100%,70%,.7), hsla(200,100%,70%,0.3)), - linear-gradient(rgba(0,0,0,0.15), rgba(0,0,0,0.15)); - background-size: 100% 1px, auto; - background-repeat: no-repeat, repeat; +.table-widget-column-header[sorted=ascending] { + background-image: url("chrome://global/skin/devtools/sort-arrows.svg#ascending"); } -.table-widget-column-header:not(:active)[sorted=descending] { - background-image: radial-gradient(farthest-side at center bottom, hsla(200,100%,70%,.7), hsla(200,100%,70%,0.3)), - linear-gradient(rgba(0,0,0,0.15), rgba(0,0,0,0.15)); - background-size: 100% 1px, auto; - background-repeat: no-repeat, repeat; - background-position: bottom; +.table-widget-column-header[sorted=descending] { + background-image: url("chrome://global/skin/devtools/sort-arrows.svg#descending"); } /* Cells */ @@ -1378,7 +1381,7 @@ } @media (min-resolution: 2dppx) { - .tree-widget-item::before { + .tree-widget-item:before { background-image: url("chrome://global/skin/devtools/controls@2x.png"); } } diff --git a/src/chrome/global/dropmarker.css b/src/chrome/global/dropmarker.css @@ -9,20 +9,25 @@ dropmarker { -moz-border-right-colors: rgb(75,75,75); -moz-border-bottom-colors: rgb(75,75,75); -moz-border-left-colors: rgb(75,75,75); - background-color: rgb(50,50,50); padding: 1px; - list-style-image: url("chrome://global/skin/arrow/arrow-dn-sharp.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#dn"); -moz-image-region: auto; } +dropmarker > image { + width: 9px; +} + dropmarker:hover:active:not([disabled="true"]) { background-color: rgb(110,110,110); padding-top: 2px; padding-bottom: 0px; -moz-padding-start: 2px; -moz-padding-end: 0px; + padding-inline-start: 2px; + padding-inline-end: 0px; } dropmarker[disabled="true"] { - background-color: rgb(62,62,62); + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#dn-dis"); } diff --git a/src/chrome/global/globalBindings.xml b/src/chrome/global/globalBindings.xml @@ -1,4 +1,7 @@ <?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/. --> <bindings id="globalBindings" xmlns="http://www.mozilla.org/xbl" diff --git a/src/chrome/global/icons/blocked.svg b/src/chrome/global/icons/blocked.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" + y="0" + width="45" + height="45" + viewBox="0 0 45 45"> + <style> + use { + fill: none; + stroke: #fff; + stroke-width: 1; + } + </style> + <defs style="display: none;"> + <g id="blockedPage-shape"> + <path d="M 11.5,8.5 v 27 h 22 v -20 l -7,-7 Z m 15,.5 v 7.5 h 7.5"/> + <circle cx="22.5" cy="22.5" r="22"/> + <line x1="6.944" y1="6.944" x2="38.056" y2="38.056"/> + </g> + </defs> + <use xlink:href="#blockedPage-shape"/> +</svg> +\ No newline at end of file diff --git a/src/chrome/global/icons/close-bright.png b/src/chrome/global/icons/close-bright.png Binary files differ. diff --git a/src/chrome/global/icons/error-16.svg b/src/chrome/global/icons/error-16.svg @@ -6,6 +6,6 @@ width="16" height="16" viewBox="0 0 16 16"> - <circle cx="7.5" cy="7.5" r="7" stroke-width="1" stroke="#ffffff" fill="none"/> - <line x1="2.6" y1="2.6" x2="12.1" y2="12.1" stroke-width="1" stroke="#ffffff"/> + <circle cx="7.5" cy="7.5" r="7" stroke-width="1" stroke="#fff" fill="none"/> + <line x1="2.6" y1="2.6" x2="12.1" y2="12.1" stroke-width="1" stroke="#fff"/> </svg> \ No newline at end of file diff --git a/src/chrome/global/icons/expander.svg b/src/chrome/global/icons/expander.svg @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" + y="0" + width="16" + height="16" + viewBox="0 0 16 16"> + <style> + .t:not(:target){ + display: none; + } + path.main { + stroke-width: 0; + stroke: #fff; + fill: #fff; + } + path.glow { + stroke-width 0; + fill: #000; + filter: url(#blur-filter); + } + </style> + <defs> + <filter id="blur-filter"> + <feGaussianBlur stdDeviation="1.25"/> + </filter> + </defs> + <g id="expand" class="t"> + <path class="glow" d="M 2,5 h 3 l 3,3 l 3,-3 h 3 l -6,6 l -6,-6 z"/> + <path class="main" d="M 2.2,5 h 2.6 l 3.2,3.2 l 3.2,-3.2 h 2.6 l -5.8,5.8 l -5.8,-5.8 z"/> + </g> + <g id="collapse" class="t"> + <path class="glow" d="M 2,11 l 6,-6 l 6,6 h -3 l -3,-3 l -3,3 h -3 z"/> + <path class="main" d="M 2.2,11 l 5.8,-5.8 l 5.8,5.8 h -2.6 l -3.2,-3.2 l -3.2,3.2 h -2.6 z"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/global/icons/info-24.svg b/src/chrome/global/icons/info-24.svg @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" + y="0" + width="24" + height="24" + viewBox="0 0 24 24"> + <style> + g:not(:empty) { + fill: none; + stroke: #a5a5a5; + stroke-width: 1; + } + #filled:target + g > circle { + fill: #ff0; + } + </style> + <g id="filled"/> + <g> + <circle cx="11.5" cy="11.5" r="11.25"/> + <line x1="11.5" y1="4" x2="11.5" y2="6.5"/> + <line x1="11.5" y1="8" x2="11.5" y2="18.5"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/global/icons/info.svg b/src/chrome/global/icons/info.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" + y="0" + width="45" + height="45" + viewBox="0 0 45 45"> + <style> + use { + fill: none; + stroke: #a5a5a5; + stroke-width: 1; + } + </style> + <defs style="display: none;"> + <g id="info-shape"> + <circle cx="22.5" cy="22.5" r="22"/> + <line x1="22.5" y1="8" x2="22.5" y2="13"/> + <line x1="22.5" y1="16" x2="22.5" y2="37"/> + </g> + </defs> + <use xlink:href="#info-shape"/> +</svg> +\ No newline at end of file diff --git a/src/chrome/global/icons/information-16.svg b/src/chrome/global/icons/information-16.svg @@ -6,6 +6,6 @@ width="16" height="16" viewBox="0 0 16 16"> - <circle cx="7.5" cy="7.5" r="7" stroke-width="1" stroke="#ffffff" fill="none"/> - <path d="m 7.5,3 l 0,2.25 m 0,.75 l 0,6" stroke-width="1" stroke="#ffffff" fill="none"/> + <circle cx="7.5" cy="7.5" r="7" stroke-width="1" stroke="#fff" fill="none"/> + <path d="m 7.5,3 l 0,2.25 m 0,.75 l 0,6" stroke-width="1" stroke="#fff" fill="none"/> </svg> \ No newline at end of file diff --git a/src/chrome/global/icons/invert.svg b/src/chrome/global/icons/invert.svg @@ -1,7 +0,0 @@ -<svg height='0' - xmlns='http://www.w3.org/2000/svg'> - - <filter id='invert'> - <feColorMatrix values='-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0'/> - </filter> -</svg> -\ No newline at end of file diff --git a/src/chrome/global/icons/question-16.svg b/src/chrome/global/icons/question-16.svg @@ -6,6 +6,6 @@ width="16" height="16" viewBox="0 0 16 16"> - <circle cx="7.5" cy="7.5" r="7" stroke-width="1" stroke="#ffffff" fill="none"/> - <path d="m 4.5,6 c 0,-2.3 1,-3.5 3,-3.5 c 1.8,0 3,1 3,2.5 c 0,2 -3,2 -3,4 l 0,1 m 0,1 l 0,1.25" stroke-width="1" stroke="#ffffff" fill="none"/> + <circle cx="7.5" cy="7.5" r="7" stroke-width="1" stroke="#fff" fill="none"/> + <path d="m 4.5,6 c 0,-2.3 1,-3.5 3,-3.5 c 1.8,0 3,1 3,2.5 c 0,2 -3,2 -3,4 l 0,1 m 0,1 l 0,1.25" stroke-width="1" stroke="#fff" fill="none"/> </svg> \ No newline at end of file diff --git a/src/chrome/global/icons/warning-16.svg b/src/chrome/global/icons/warning-16.svg @@ -6,6 +6,6 @@ width="16" height="16" viewBox="0 0 16 16"> - <path d="m 0,13.5 m 2,0 c -1.4,0 -1.7,-0.52 -1,-1.73 l 5.5,-9.53 c .7,-1.21 1.3,-1.21 2,0 l 5.5,9.53 c .7,1.21 0.4,1.73 -1,1.73 l -11,0" stroke-width="1" stroke="#ffffff" fill="none"/> - <path d="m 7.5,4.75 l 0,5.25 m 0,.75 l 0,1.5" stroke-width="1" stroke="#ffffff" fill="none"/> + <path d="m 0,13.5 m 2,0 c -1.4,0 -1.7,-0.52 -1,-1.73 l 5.5,-9.53 c .7,-1.21 1.3,-1.21 2,0 l 5.5,9.53 c .7,1.21 0.4,1.73 -1,1.73 l -11,0" stroke-width="1" stroke="#fff" fill="none"/> + <path d="m 7.5,4.75 l 0,5.25 m 0,.75 l 0,1.5" stroke-width="1" stroke="#fff" fill="none"/> </svg> \ No newline at end of file diff --git a/src/chrome/global/icons/warning.svg b/src/chrome/global/icons/warning.svg @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 60 60" enable-background="new 0 0 60 60"> + <path fill="#c6c6c6" d="M49.316,42.867L33.829,12.7c-0.879-1.715-2.274-2.7-3.828-2.7c-1.554,0-2.949,0.985-3.829,2.702 + L10.685,42.864c-0.869,1.69-0.913,3.482-0.121,4.909C11.35,49.187,12.817,50,14.591,50h30.82c1.772,0,3.24-0.81,4.023-2.224 + C50.227,46.349,50.185,44.56,49.316,42.867z M32.176,22.304l-0.48,14.304h-3.424L27.76,22.304H32.176z M30,44.896 + c-1.44,0-2.592-1.184-2.592-2.592c0-1.44,1.152-2.592,2.592-2.592c1.472,0,2.592,1.152,2.592,2.592 + C32.592,43.712,31.472,44.896,30,44.896z"/> +</svg> +\ No newline at end of file diff --git a/src/chrome/global/in-content/check-partial.svg b/src/chrome/global/in-content/check-partial.svg @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" + y="0" + width="21" + height="21" + viewBox="0 0 21 21"> + <style> + use:not(:target) { + display: none; + } + use { + fill: #fff; + stroke: #0095dd; + stroke-width: 0.5; + } + use[id$="-inverted"] { + fill: #2292d0; + } + use[id$="-native"] { + fill: -moz-dialogText; + } + </style> + <defs style="display: none;"> + <rect id="check-shape" x="3" y="9" width="15" height="3"/> + </defs> + <use id="check-partial" xlink:href="#check-shape"/> + <use id="check-partial-inverted" xlink:href="#check-shape"/> + <use id="check-partial-native" xlink:href="#check-shape"/> +</svg> +\ No newline at end of file diff --git a/src/chrome/global/in-content/check.svg b/src/chrome/global/in-content/check.svg @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" + y="0" + width="21" + height="21" + viewBox="0 0 21 21"> + <style> + path { + fill: context-fill; + stroke: context-stroke; + stroke-width: 0.5; + } + #check:target ~ path { + fill: #fff; + stroke: initial; + stroke-width: initial; + } + #check-inverted:target ~ path { + fill: #424e5a; + stroke: #0095dd; + } + #check-native:target ~ path { + fill: -moz-dialogText; + stroke: initial; + stroke-width: initial; + } + </style> + + <g id="check"/> + <g id="check-inverted"/> + <g id="check-native"/> + <path id="check-shape" d="M 9.39,16.5 16.28,6 14.77,4.5 9.37,12.7 6.28,9.2 4.7,10.7 z"/> + +</svg> +\ No newline at end of file diff --git a/src/chrome/global/in-content/common.css b/src/chrome/global/in-content/common.css @@ -0,0 +1,1267 @@ +/* - 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/. */ + +@namespace html "http://www.w3.org/1999/xhtml"; +@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; + +*|*:root { + --in-content-page-color: #fff; + --in-content-page-background: rgb(23,23,23); + --in-content-frame-background: rgb(23,23,23); + --in-content-main-border-color: rgb(50,50,50); + --in-content-main-background-color: rgb(43,43,43); + --in-content-main-background-image: transparent; + --in-content-text-color: #fff; + --in-content-selected-text: #fff; + --in-content-header-border-color: rgb(50,50,50); + --in-content-box-background: rgb(50,50,50); + --in-content-box-background-odd: #f3f6fa; + --in-content-box-background-hover: rgb(75,75,75); + --in-content-box-background-active: rgb(23,23,23); + --in-content-box-border-color: rgb(75,75,75); + --in-content-item-hover: rgb(110,110,110); + --in-content-item-selected: rgb(110,110,110); + --in-content-border-highlight: #ff9500; + --in-content-border-focus: rgb(75,75,75); + --in-content-border-hover: rgb(75,75,75); + --in-content-border-color: rgb(50,50,50); + --in-content-category-text: #fff; + --in-content-category-border-focus: 1px dotted #fff; + --in-content-category-text-selected: #f2f2f2; + --in-content-category-background: #424f5a; + --in-content-category-background-hover: #5e6972; + --in-content-category-background-active: #343f48; + --in-content-tab-color: #424f5a; + --in-content-link-color: #fff; + --in-content-link-color-hover: rgb(219,219,219); + --in-content-link-color-active: rgb(219,219,219); + --in-content-link-color-visited: #551a8b; + --in-content-primary-button-background: rgb(75,75,75); + --in-content-primary-button-background-hover: rgb(110,110,110); + --in-content-primary-button-background-active: rgb(43,43,43); + --in-content-table-border-dark-color: rgb(50,50,50); + --in-content-table-header-background: rgb(110,110,110); +} + +html|html, +html|body, +xul|page, +xul|window { + font: message-box; + -moz-appearance: none; + background-color: var(--in-content-page-background); + color: var(--in-content-page-color); +} + +html|body { + font-size: 15px; + font-weight: normal; + margin: 0; +} + +html|h1 { + font-size: 2.5em; + font-weight: lighter; + line-height: 1.2; + color: var(--in-content-text-color); + margin: 0; + margin-bottom: .5em; +} + +html|hr { + border-style: solid none none none; + border-color: var(--in-content-border-color); +} + +xul|caption { + -moz-appearance: none; + margin: 0; +} + +html|h2 { + font-size: 1.3rem; + font-weight: bold; + line-height: 22px; +} + +xul|caption > xul|checkbox, +xul|caption > xul|label { + font-size: 1.3rem; + font-weight: bold; + line-height: 22px; + margin: 0 !important; +} + +xul|description { + -moz-margin-start: 0; +} + + +/* something goes here! */ + + +*|*.main-content { + border: 1px solid var(--in-content-main-border-color); + border-radius: 5px; + background-color: var(--in-content-main-background-color); + background-image: var(--in-content-main-background-image); + padding-top: 25px; + -moz-padding-end: 44px; /* compensate the 4px margin of child elements */ + padding-bottom: 40px; + -moz-padding-start: 48px; + overflow: auto; +} + +xul|prefpane > xul|*.content-box { + overflow: visible; +} + +/* groupboxes */ + +xul|groupbox { + -moz-appearance: none; + border: none; + margin: 15px 0 0; + -moz-padding-start: 0; + -moz-padding-end: 0; + font-size: 1.25rem; +} + +xul|groupbox xul|label { + /* !important needed to override toolkit !important rule */ + -moz-margin-start: 0 !important; + -moz-margin-end: 0 !important; +} + +/* tabpanels and tabs */ + +xul|tabpanels { + -moz-appearance: none; + font-size: 1.25rem; + line-height: 22px; + border: none; + padding: 0; + background-color: transparent; + color: inherit; +} + +xul|tabs { + position:relative; + margin: 8px 0 15px; + -moz-margin-end: 4px; + border: 0; + border-bottom: 1px solid #c1c1c1; +} + +xul|*.tabs-left, +xul|*.tabs-right { + border-bottom: none; +} + +xul|tab { + -moz-appearance: none; + position: relative; + margin-top: 0; + -moz-margin-end: -1px; + padding: 4px 20px; + min-height: 44px; + max-height: 45px; + height: 45px; + color: #6d6d6d; + background-color: transparent; + border: 1px solid transparent; + border-bottom-width: 0; + border-radius: 0; + transition: background-color 50ms ease 0s, + border-color 150ms ease 0s; +} +xul|tab:last-of-type{ + -moz-margin-end: 0; +} + +xul|tab::before{ + display: block; + margin: calc(.5em - 4px); + -moz-margin-start: -21px; + -moz-margin-end: 20px; + height: calc(44px - 1em); + border-right: 1px solid #c1c1c1; + transition: border-color 150ms ease 0s; + content: ""; /* just show a border! */ +} +xul|tab:first-of-type::before{ + border-color: transparent; +} +xul|tabs:hover > tab::before{ + border-color: transparent; +} + +xul|tabs:hover > tab:-moz-locale-dir(ltr){ + border-left-color: #c1c1c1; + border-top-color: #c1c1c1; +} +xul|tabs:hover > tab:-moz-locale-dir(rtl){ + border-right-color: #c1c1c1; + border-top-color: #c1c1c1; +} +xul|tabs:hover > tab:last-of-type:-moz-locale-dir(ltr){ + border-right-color: #c1c1c1; +} +xul|tabs:hover > tab:last-of-type:-moz-locale-dir(rtl){ + border-left-color: #c1c1c1; +} + +xul|tab:hover { + background-color: #ebebeb; +} + +xul|tab[selected] { + z-index: 2; + background-color: #ebebeb; + color: var(--in-content-page-color); + border-color: #c1c1c1; + transition: background-color 50ms ease 0s, + border-color 0ms ease 0s; +} +xul|tab[selected]::before, +xul|tab[selected] + tab::before{ + border-color: transparent; + transition: border-color 0ms ease 0s; +} + +xul|tab[selected] + tab:-moz-locale-dir(ltr){ + border-left-color: transparent; + transition: background-color 50ms ease 0s, + border-left-color 0ms ease 0s, + border-color 150ms ease 0s; +} +xul|tab[selected] + tab:-moz-locale-dir(rtl){ + border-left-color: transparent; + transition: background-color 50ms ease 0s, + border-right-color 0ms ease 0s, + border-color 150ms ease 0s; +} + +xul|*.tab-text { + font-size: 1.4rem; + font-weight: 600; /* semi-bold --johnGraciliano */ + line-height: 22px; +} + + +/* html buttons */ + +html|button { + padding: 3px; + /* override forms.css */ + font: inherit; +} + +/* xul buttons and menulists */ + +*|button, +xul|colorpicker[type="button"], +xul|menulist { + -moz-appearance: none; + min-height: 30px; /* Testing! This was "height: 30px;" --johnGraciliano */ + color: var(--in-content-text-color); + line-height: 20px; /* This keeps the single line text button height to 30px */ + border: 1px solid var(--in-content-box-border-color); + -moz-border-top-colors: none !important; + -moz-border-right-colors: none !important; + -moz-border-bottom-colors: none !important; + -moz-border-left-colors: none !important; + border-radius: 2px; + background-color: var(--in-content-box-background); +} + +html|button:not(.category):enabled:hover, +xul|button:not([disabled="true"]):hover, +xul|colorpicker[type="button"]:not([disabled="true"]):hover, +xul|menulist:not([disabled="true"]):hover { + background-color: var(--in-content-box-background-hover); +} + +html|button:not(.category):enabled:hover:active, +xul|button:not([disabled="true"]):hover:active, +xul|colorpicker[type="button"]:not([disabled="true"]):hover:active, +xul|menulist[open="true"]:not([disabled="true"]) { + background-color: var(--in-content-box-background-active); +} + +html|button:disabled, +xul|button[disabled="true"], +xul|colorpicker[type="button"][disabled="true"], +xul|menulist[disabled="true"] { + cursor: not-allowed; + opacity: 0.5; +} + +*|button.primary { + background-color: var(--in-content-primary-button-background); + border-color: transparent; + color: var(--in-content-selected-text); +} + +html|button.primary:enabled:hover, +xul|button.primary:not([disabled="true"]):hover { + background-color: var(--in-content-primary-button-background-hover); +} + +html|button.primary:enabled:hover:active, +xul|button.primary:not([disabled="true"]):hover:active { + background-color: var(--in-content-primary-button-background-active); +} + +xul|colorpicker[type="button"] { + padding: 6px; + width: 50px; +} + +xul|button > xul|*.button-box, +xul|menulist > xul|*.menulist-label-box { + padding-right: 10px !important; + padding-left: 10px !important; +} + +xul|menulist > xul|*.menulist-label-box > xul|*.menulist-icon[src] { + -moz-margin-end: 5px; +} + +xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker { + -moz-appearance: none; + margin: 1px 0; + -moz-margin-start: 10px; + padding: 0; + width: 10px; + height: 16px; + border: none; + background-color: transparent; + list-style-image: url("chrome://global/skin/in-content/dropdown.svg#dropdown"); +} + +xul|*.help-button { + min-width: 16px; + -moz-margin-end: 0; + border-width: 0; + background-image: none; + /* Override default button background */ + background-color: transparent; + box-shadow: none; + list-style-image: url("chrome://global/skin/in-content/help-glyph.svg"); +} + +xul|*.help-button:not([disabled="true"]):hover { + background-image: none; + /* Override default button background */ + background-color: transparent; + list-style-image: url("chrome://global/skin/in-content/help-glyph.svg#hover"); +} + +xul|*.help-button:not([disabled="true"]):hover:active { + background-image: none; + /* Override default button background */ + background-color: transparent; + list-style-image: url("chrome://global/skin/in-content/help-glyph.svg#active"); +} + +xul|*.close-icon > xul|*.button-box, +xul|*.help-button > xul|*.button-box { + padding-top: 0; + padding-bottom: 0; + padding-right: 0 !important; + padding-left: 0 !important; +} + +xul|*.help-button > xul|*.button-box > xul|*.button-icon { + width: 18px; + height: 18px; +} + +xul|*.help-button > xul|*.button-box > xul|*.button-text { + display: none; +} + +html|*.help-button { + width: 18px; + height: 18px; + border: 0; + padding: 0; + display: inline-block; + background-image: url("chrome://global/skin/in-content/help-glyph.svg"); + background-repeat: no-repeat; + background-position: center center; + background-size: contain; +} + +html|*.help-button:hover { + background-image: url("chrome://global/skin/in-content/help-glyph.svg#hover"); +} + +html|*.help-button:hover:active { + background-image: url("chrome://global/skin/in-content/help-glyph.svg#active"); +} + +/* Special dimensions for the help button in the options page --johnGraciliano */ +script[src$="preferences.js"] ~ stack *|button.help-button { + position: relative; + z-index: 1; + height: auto; + min-height: unset; + margin: -1px; + -moz-margin-end: 0; +} + +/* Reposition the help buttom from the bottom to the top of the options page --johnGraciliano */ +script[src$="preferences.js"] ~ stack .main-content{ + position: relative; +} +script[src$="preferences.js"] ~ stack .main-content > hbox:last-child { + display: flex; + justify-content: flex-end; + position: absolute; + top: 15px; + max-width: calc(100% - 96px); + width: 796px ; +} + +xul|*.spinbuttons-button { + min-height: initial; + -moz-margin-start: 10px !important; + -moz-margin-end: 2px !important; +} + +xul|*.spinbuttons-up { + margin-top: 2px !important; + border-radius: 1px 1px 0 0; +} + +xul|*.spinbuttons-down { + margin-bottom: 2px !important; + border-radius: 0 0 1px 1px; +} + +xul|*.spinbuttons-button > xul|*.button-box { + padding: 1px 5px 2px !important; +} + +xul|*.spinbuttons-up > xul|*.button-box > xul|*.button-icon { + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#ip"); +} + +xul|*.spinbuttons-up[disabled="true"] > xul|*.button-box > xul|*.button-icon { + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#up-dis"); +} + +xul|*.spinbuttons-down > xul|*.button-box > xul|*.button-icon { + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#dn"); +} + +xul|*.spinbuttons-down[disabled="true"] > xul|*.button-box > xul|*.button-icon { + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#dn-dis"); +} + +xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker { + -moz-appearance: none; + -moz-margin-end: 4px; + padding: 0; + border: none; + background-color: transparent; + list-style-image: url("chrome://global/skin/in-content/dropdown.svg#dropdown"); +} + +xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker > xul|*.dropmarker-icon { + width: 18px; + height: 18px; +} + +xul|menulist[disabled="true"]:not([editable="true"]) > xul|*.menulist-dropmarker { + list-style-image: url("chrome://global/skin/in-content/dropdown.svg#dropdown-disabled") +} + +xul|menulist > xul|menupopup, +xul|button[type="menu"] > xul|menupopup { + -moz-appearance: none; + border: 1px solid var(--in-content-box-border-color); + border-radius: 2px; + background-color: var(--in-content-box-background); +} + +xul|menulist > xul|menupopup xul|menu, +xul|menulist > xul|menupopup xul|menuitem, +xul|button[type="menu"] > xul|menupopup xul|menu, +xul|button[type="menu"] > xul|menupopup xul|menuitem { + -moz-appearance: none; + font-size: 1em; + color: var(--in-content-text-color); + padding-top: 0.2em; + padding-bottom: 0.2em; + -moz-padding-start: 10px; + -moz-padding-end: 30px; +} + +xul|menulist > xul|menupopup > xul|menu[_moz-menuactive="true"], +xul|menulist > xul|menupopup > xul|menuitem[_moz-menuactive="true"], +xul|button[type="menu"] > xul|menupopup > xul|menu[_moz-menuactive="true"], +xul|button[type="menu"] > xul|menupopup > xul|menuitem[_moz-menuactive="true"] { + color: var(--in-content-text-color); + background-color: var(--in-content-item-hover); +} + +xul|menulist > xul|menupopup > xul|menu[selected="true"], +xul|menulist > xul|menupopup > xul|menuitem[selected="true"], +xul|button[type="menu"] > xul|menupopup > xul|menu[selected="true"], +xul|button[type="menu"] > xul|menupopup > xul|menuitem[selected="true"] { + color: var(--in-content-selected-text); + background-color: var(--in-content-item-selected); +} + +xul|menulist > xul|menupopup xul|menuseparator, +xul|button[type="menu"] > xul|menupopup xul|menuseparator { + -moz-appearance: none; + margin: 0; + padding: 0; + border-top: 1px solid var(--in-content-box-border-color); + border-bottom: none; +} + +/* textboxes */ + +html|input[type="text"], +html|textarea, +*|textbox { + -moz-appearance: none; + box-sizing: border-box; + height: 30px; /* These may only be for xul|textbox */ + color: var(--in-content-text-color); + line-height: 20px; /* These may only be for xul|textbox */ + padding-right: 10px; /* These may only be for xul|textbox */ + padding-left: 10px; /* These may only be for xul|textbox */ + border: 1px solid var(--in-content-box-border-color); + -moz-border-top-colors: none !important; + -moz-border-right-colors: none !important; + -moz-border-bottom-colors: none !important; + -moz-border-left-colors: none !important; + border-radius: 2px; + background-color: var(--in-content-box-background); +} + +xul|textbox { + min-height: 30px; /* Possibly, this should be part of the rule above */ + /* padding-right: 10px; ** These are applied above */ + /* padding-left: 10px; ** These are applied above */ +} + +html|input[type="text"], +html|textarea { + font-family: inherit; + font-size: inherit; + padding: 3px 10px; /* in the default theme it's 5px 10px --johnGraciliano */ +} + +html|input[type="text"]:not(:disabled):not(:focus):hover, +html|textarea:not(:disabled):not(:focus):hover, +html|textbox:not(:disabled):not(:focus):hover, +xul|textbox:not([disabled="true"]):not([focused]):hover { + border-color: var(--in-content-border-hover); +} + +html|input[type="text"]:disabled, +html|textarea:disabled, +html|textbox:disabled, +xul|textbox[disabled="true"] { + opacity: 0.5; +} + +/* Links */ + +html|a, +.text-link, +.inline-link { + line-height: 22px; + color: var(--in-content-link-color); + text-decoration: none; +} + +html|a:hover, +.text-link:hover, +.inline-link:hover { + color: var(--in-content-link-color-hover); + text-decoration: underline; +} + +html|a:hover:active, +.text-link:hover:active, +.inline-link:hover:active { + color: var(--in-content-link-color-active); + text-decoration: none; +} + +/* Checkboxes and radio buttons */ + +/* Hide the actual checkbox */ +html|input[type="checkbox"] { + opacity: 0; + width: 0; + /*visibility: hidden; */ + pointer-events: none; /* It is really see thru! */ + position: absolute; + /* z-index: -1; /* This will prevent it from being top, even invisible*/ +} + +/* Create a box to style as the checkbox */ +html|input[type="checkbox"] + html|label:before { + display: inline-block; + content: ""; + vertical-align: middle; +} + +html|input[type="checkbox"] + html|label { + line-height: 0px; +} + +xul|checkbox { + -moz-margin-start: 0; +} + +xul|*.checkbox-check, +html|input[type="checkbox"] + html|label:before { + -moz-appearance: none; + box-sizing: border-box; + width: 23px; + height: 23px; + border-radius: 2px; + border: 1px solid var(--in-content-box-border-color); + -moz-margin-end: 10px; + background: initial !important; /* !important needed to override toolkit checked !important rule */ +} + +xul|checkbox:not([disabled="true"]):hover > xul|*.checkbox-check, +html|input[type="checkbox"]:not(:disabled) + html|label:hover:before { + border-color: var(--in-content-border-hover); +} + +xul|*.checkbox-check[checked] { + list-style-image: url("chrome://global/skin/in-content/check.svg#check"); +} + +html|input[type="checkbox"]:checked + html|label:before { + background-image: url("chrome://global/skin/in-content/check.svg#check") !important; +} + +xul|checkbox[disabled="true"] > xul|*.checkbox-check, +html|input[type="checkbox"]:disabled + html|label { + opacity: 0.5; +} + +xul|*.checkbox-label-box { + -moz-margin-start: -1px; /* negative margin for the transparent border */ + -moz-padding-start: 0; +} + +xul|richlistitem > xul|*.checkbox-check { + margin: 3px 6px; +} + +xul|radio { + -moz-margin-start: 0; +} + +xul|*.radio-check { + -moz-appearance: none; + width: 23px; + height: 23px; + border: 1px solid var(--in-content-box-border-color); + border-radius: 50%; + -moz-margin-end: 10px; + background: initial; +} + +xul|radio:not([disabled="true"]):hover > xul|*.radio-check { + border-color: var(--in-content-border-hover); +} + +xul|*.radio-check[selected] { + list-style-image: url("chrome://global/skin/in-content/radio.svg#radio"); +} + +xul|radio[disabled="true"] > xul|*.radio-check { + opacity: 0.5; +} + +xul|*.radio-label-box { + -moz-margin-start: -1px; /* negative margin for the transparent border */ + -moz-margin-end: 10px; + -moz-padding-start: 0; +} + +/* Category List */ + +*|*#categories { + -moz-appearance: none; + position: relative; + z-index: 1; + background-color: transparent; + margin: 0; + -moz-margin-start: 4px; + -moz-margin-end: -1px; + margin-top: 74px; + margin-bottom: 7px; + border-width: 0; +} + +*|*.category { + -moz-appearance: none; + box-sizing: border-box; + background-color: transparent; + color: #fff; + -moz-padding-start: 4px; + -moz-padding-end: 27px; + border: 1px solid transparent; + min-height: 0; + height: 52px; + -moz-box-align: center; + align-items: center; + overflow: hidden; + transition: background-color 150ms; +} +button.category { /* With tag "button" to override chrome://devtools/content/aboutdebugging/aboutdebugging.css in Firefox 57 */ + border-width: 1px; + margin-left: 0; + margin-right: 0; +} + +*|*.category:-moz-locale-dir(ltr) { + border-top-left-radius: 5px; + border-bottom-left-radius: 5px; +} +*|*.category:-moz-locale-dir(rtl) { + border-top-right-radius: 5px; + border-bottom-right-radius: 5px; +} + +html|*.category.selected, +*|*.category[selected] { + background-color: rgb(110,110,110); + border-color: var(--in-content-main-border-color); + -moz-border-end-color: rgb(75,75,75); +} + +*|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[current] { + border: 1px #999 dotted; + -moz-border-end: 1px solid rgb(75,75,75); +} + +*|*.category-name { + line-height: -moz-use-system-font; + font-size: 1.5rem; + padding: 0; + margin: 1px 5px 2px; + -moz-margin-start: 6px; + -moz-user-select: none; + white-space: nowrap; + text-overflow: ellipsis; +} +/* Allow more space to the .main-content when the window is narrow */ +@media (max-width: 800px) { + *|*.category-name { + display: none; + } +} + +*|*.category-icon { + width: 32px; + height: 32px; + -moz-margin-start: 6px; +} + +/* header */ + +*|*.header { + border-bottom: 1px solid var(--in-content-header-border-color); + -moz-margin-end: 4px; /* add the 4px end-margin of other elements */ + margin-bottom: 15px; + padding-bottom: 15px; + -moz-box-align: baseline; +} + +*|*.header-name { + font-size: 2.5rem; + font-weight: normal; + line-height: 40px; + margin: 0; + -moz-user-select: none; +} + +/* No text headers in the options page, but a smaller space for the help button --johnGraciliano */ +script[src$="preferences.js"] ~ stack .header{ + border: none; + margin: -10px 0 -7px; + -moz-margin-end: 4px; /* add the 4px end-margin of other elements */ + padding-bottom: 0; +} +script[src$="preferences.js"] ~ stack .header-name{ + height: 18px; + font-size: 0; + line-height: 0; + color: transparent; +} + +/* File fields */ + +xul|filefield { + -moz-appearance: none; + background-color: transparent; + border: none; + padding: 0; +} + +xul|*.fileFieldContentBox { + background-color: transparent; +} + +xul|*.fileFieldIcon { + -moz-margin-start: 10px; + -moz-margin-end: 0; +} + +xul|*.fileFieldLabel { + -moz-margin-start: -26px; + -moz-padding-start: 36px; +} + +/* List boxes */ + +xul|richlistbox, +xul|listbox { + -moz-appearance: none; + -moz-margin-start: 0; + background-color: var(--in-content-box-background); + border: 1px solid var(--in-content-box-border-color); + color: var(--in-content-text-color); +} + +xul|treechildren::-moz-tree-row, +xul|listbox xul|listitem { + padding: 0.3em; + margin: 0; + border: none; + border-radius: 0; + background-image: none; +} + +xul|treechildren::-moz-tree-row(hover), +xul|listbox xul|listitem:hover { + background-color: var(--in-content-item-hover); +} + +xul|treechildren::-moz-tree-row(selected), +xul|listbox xul|listitem[selected="true"] { + background-color: var(--in-content-item-selected); + color: var(--in-content-selected-text); +} + +/* Trees */ + +xul|tree { + -moz-appearance: none; + font-size: 1em; + border: 1px solid var(--in-content-box-border-color); + margin: 0; +} + +xul|tree:-moz-focusring, +xul|richlistbox:-moz-focusring { + border: 1px dotted var(--in-content-border-focus); +} + +xul|listheader, +xul|treecols { + -moz-appearance: none; + border: none; + border-bottom: 1px solid var(--in-content-border-color); + padding: 0; +} + +xul|treecol:not([hideheader="true"]), +xul|treecolpicker { + -moz-appearance: none; + border: none; + background-color: var(--in-content-box-background-hover); + color: #fff; + padding: 5px 10px; +} + +xul|treecol:not([hideheader="true"]):not([sortable="false"]):hover, +xul|treecolpicker:hover { + background-color: var(--in-content-box-background-active); + color: var(--in-content-text-color); +} + +xul|treecol:not([hideheader="true"]):not(:first-child), +xul|treecolpicker { + -moz-border-start-width: 1px; + -moz-border-start-style: solid; + border-image: linear-gradient(transparent 0%, transparent 20%, #c1c1c1 20%, #c1c1c1 80%, transparent 80%, transparent 100%) 1 1; +} + +xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection] { + list-style-image: url("chrome://global/skin/in-content/dropdown.svg#dropdown"); + width: 18px; + height: 18px; +} + +xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection="ascending"] { + transform: scaleY(-1); +} + +/* This is the only way to increase the height of a tree row unfortunately */ +xul|treechildren::-moz-tree-row { + min-height: 2em; +} + +/* Color needs to be set on tree cell in order to be applied */ +xul|treechildren::-moz-tree-cell-text { + color: var(--in-content-text-color); +} + +xul|treechildren::-moz-tree-cell-text(selected) { + color: var(--in-content-selected-text); +} + + +@supports not (-moz-osx-font-smoothing: auto) { /* This matches any OS except mac OS X 10.6+, thus Windows or Linux (or not Darwin) */ + + xul|caption { + background-color: transparent; + } + + xul|button, + html|button, + xul|colorpicker[type="button"], + xul|menulist { + margin: 2px 4px; + } + + /* The start margin should get clear at the beginning of a line */ + hbox > xul|button:first-child { + -moz-margin-start: 0; + margin-inline-start: 0; + } + /* Not in this special cases */ + hbox > vbox > hbox > xul|button:first-child, + :-moz-any(row, hbox) > hbox > xul|button:first-child { + -moz-margin-start: 4px; + margin-inline-start: 4px; + } + + xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker { + margin-top: 1px; + margin-bottom: 1px; + } + + xul|checkbox { + -moz-padding-start: 0; + } + + @media not all and (-moz-windows-default-theme) { + xul|*.checkbox-check { + background-image: none !important; + } + + xul|*.checkbox-check[checked] { + list-style-image: url("chrome://global/skin/in-content/check.svg#check-native"); + background-color: -moz-dialog; + } + } + + xul|radio { + -moz-binding: url("chrome://global/content/bindings/radio.xml#radio"); + -moz-padding-start: 0; + } + + @media not all and (-moz-windows-default-theme) { + xul|*.radio-check { + background-image: none; + } + + xul|*.radio-check[selected] { + list-style-image: url("chrome://global/skin/in-content/radio.svg#radio-native"); + background-color: -moz-dialog; + } + } + + xul|*.radio-icon, + xul|*.checkbox-icon { + -moz-margin-end: 0; + } + + /* Never draw a border for the focusring, use outline instead */ + xul|*.button-box, + xul|*.menulist-label-box, + xul|*.radio-label-box, + xul|*.checkbox-label-box { + border-style: none; + } + + xul|*.inline-link:-moz-focusring, + xul|button:-moz-focusring > xul|*.button-box, + xul|menulist:-moz-focusring > xul|*.menulist-label-box, + xul|radio[focused="true"] > xul|*.radio-label-box, + html|input[type="checkbox"]:-moz-focusring + html|label:before, + xul|checkbox:-moz-focusring > xul|*.checkbox-label-box { + outline: 1px dotted; + } + + /* Use a 2px border so that selected row highlight is still visible behind + an existing high-contrast border that uses the background color */ + @media not all and (-moz-windows-default-theme) { + xul|treechildren::-moz-tree-row(selected), + xul|listbox xul|listitem[selected="true"] { + border: 2px dotted Highlight; + } + } + +} + + +@supports (-moz-osx-font-smoothing: auto) { /* This matches mac OS X 10.6+ (all supported Darwin) */ + + /* Remove the gray background from the groupbox bodies in the Options page for the mac --johnGraciliano */ + /* xul|page[title="Options"] > */ script[src$="preferences.js"] ~ stack .groupbox-body { + -moz-appearance: none; + } + + xul|tabs { + padding-right: 0; + padding-left: 0; + } + + xul|tab[visuallyselected] { + text-shadow: none; + } + + xul|button, + html|button, + xul|colorpicker[type="button"], + xul|menulist { + margin-top: 3px; + } + + xul|button, + html|button { + /* use the same margin of other elements for the alignment */ + margin-left: 4px; + margin-right: 4px; + } + + /* The start margin should get clear at the beginning of a line */ + hbox > xul|button:first-child { + -moz-margin-start: 0; + margin-inline-start: 0; + } + /* Not in this special cases */ + hbox > vbox > hbox > xul|button:first-child, + :-moz-any(row, hbox) > hbox > xul|button:first-child { + -moz-margin-start: 4px; + margin-inline-start: 4px; + } + + xul|caption { + -moz-padding-start: 0; + } + + xul|groupbox > xul|*.groupbox-body { + padding: 0; + } + + xul|menulist:not([editable="true"]) > xul|menupopup > xul|menuitem[checked="true"]::before, + xul|menulist:not([editable="true"]) > xul|menupopup > xul|menuitem[selected="true"]::before { + display: none; + } + + xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker { + display: -moz-box; + margin-top: 1px; + margin-bottom: 1px; + } + + xul|menulist > xul|menupopup xul|menu, + xul|menulist > xul|menupopup xul|menuitem, + xul|button[type="menu"] > xul|menupopup xul|menu, + xul|button[type="menu"] > xul|menupopup xul|menuitem { + -moz-padding-end: 34px; + } + + xul|*.help-button > xul|*.button-box > xul|*.button-icon { + -moz-margin-start: 0; + } + + xul|*.checkbox-icon { + margin-right: 0; + } + + xul|*.radio-icon { + -moz-margin-end: 0; + } + + xul|*.numberbox-input-box { + -moz-appearance: none; + border-width: 0; + } + + xul|description { + font-size: 1.25rem; + line-height: 22px; + } + + html|a:-moz-focusring, + xul|*.text-link:-moz-focusring, + xul|*.inline-link:-moz-focusring { + color: #ff9500; + text-decoration: underline; + box-shadow: none; + } + + xul|button:-moz-focusring, + xul|menulist:-moz-focusring, + xul|checkbox:-moz-focusring > .checkbox-check, + xul|radio[focused="true"] > .radio-check, + xul|tab:-moz-focusring > .tab-middle > .tab-text { + outline: 2px solid rgba(0,149,221,0.5); + outline-offset: 1px; + -moz-outline-radius: 2px; + } + + xul|radio[focused="true"] > .radio-check { + -moz-outline-radius: 100%; + } + +} + + +/* @-moz-document url-prefix("about:privatebrowsing"){ */ + div#bar.showPrivate{ + background-color: #000; + } + .showPrivate ul#forgotten > li{ + background-image: url("chrome://global/skin/in-content/check.svg#check"); + background-position: -2px ; + background-size: 24px 24px; + } + .showPrivate ul#kept > li{ + background-image: url("chrome://browser/skin/warning16.png"); + background-size: 32px 16px; + background-position: -16px 7px; + } + .showPrivate span#tpEnabled{ + background-color: #424e5a; + background-color: #9b9b9b; + } + .showPrivate span#tpDisabled{ + background-color: #000; + } +/* } */ + +@-moz-document url-prefix("about:performance") { + #subprocess-reports td { + background-color: rgb(75,75,75) !important; + } +} + +/* For the 'Tab Groups' extension */ +page:-moz-any(#tabGroups-preferences,#theFoxOnlyBetter-preferences,#omnisidebar-preferences,#findbartweak-preferences) > stack { + min-height: 214px; /* If the viewport is too small some content will be hidden! */ + padding: 18px; + background-color: var(--in-content-frame-background); +} +page:-moz-any(#tabGroups-preferences,#theFoxOnlyBetter-preferences,#omnisidebar-preferences,#findbartweak-preferences) .main-wrapper { + border: 1px solid var(--in-content-main-border-color); + border-radius: 5px; + overflow: hidden; +} +/* .main-content, */ +page:-moz-any(#tabGroups-preferences,#theFoxOnlyBetter-preferences,#omnisidebar-preferences,#findbartweak-preferences) .main-wrapper .main-content { + border-width: 0; +} +page:-moz-any(#tabGroups-preferences,#theFoxOnlyBetter-preferences,#omnisidebar-preferences,#findbartweak-preferences) .category-icon { + padding: 4px; +} +page:-moz-any(#tabGroups-preferences,#theFoxOnlyBetter-preferences,#omnisidebar-preferences,#findbartweak-preferences) #main-footer { + background-color: var(--in-content-box-background); +} + + + + +#body{ + box-sizing: border-box; + height: 100%; + min-height: 214px; /* If the viewport is too small some content will be hidden! */ + padding: 18px; + background-color: var(--in-content-frame-background); +} + +#body > .app > #categories, +#body > #categories { + overflow: auto; +} + + +/* Rules for about:debugging */ + +#body > .app > .main-content > div[role=tabpanel] > .header, +#body > .app > .main-content > #tab-addons > .header, +#body > .app > .main-content > #tab-workers > .header, +#body > .main-content > #tab-addons > .header, +#body > .main-content > #tab-workers > .header{ + display: none; +} + +#workers > .targets > .target-list > .target-container::before, +#workers > .targets > .target-container::before, +#workers > .targets > .target::before, +#workers > div > .targets > .target::before{ + content: ""; + background-image: url(chrome://devtools/skin/images/debugging-workers-generic.svg); + background-size: 100%; + height: 24px; + width: 24px; + margin-inline-end: 5px; +} +#workers > .targets > .target-list > .target-container::before, +#workers > .targets > .target-container::before{ + margin-top: 6px; + align-self: flex-start; +} + +#workers > .targets > .target-list > .target-container > .target-icon, +#tab-workers > #workers > .targets > .target-container > .target-icon, +#tab-workers > #workers > .targets > .target > .target-icon, +#tab-workers > #workers > div > .targets > .target > .target-icon{ + display: none; +} + +@supports (not (word-spacing:100%)) and (not (orphans:3)) { /* Firefox = 44 */ + .category[value="addons"] > .category-icon, + .category[value="workers"] > .category-icon{ + display: none; + } + .category[value="addons"]::before{ + content: ""; + background-image: url(chrome://devtools/skin/images/debugging-addons.svg); + background-size: 100%; + height: 32px; + min-width: 32px; + margin-inline-start: 6px; + } + .category[value="workers"]::before{ + content: ""; + background-image: url(chrome://devtools/skin/images/debugging-workers.svg); + background-size: 100%; + height: 32px; + min-width: 32px; + margin-inline-start: 6px; + } +} +\ No newline at end of file diff --git a/src/chrome/global/in-content/dropdown.svg b/src/chrome/global/in-content/dropdown.svg @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve"> + <style> + use:not(:target) { + display: none; + } + use { + fill: #fff; + } + use[id$="-disabled"] { + fill: GrayText; + } + </style> + <defs style="display: none;"> + <path id="dropdown-shape" fill-rule="evenodd" clip-rule="evenodd" d="M12,6l-4.016,4L4,6H12z"/> + </defs> + <use id="dropdown" xlink:href="#dropdown-shape"/> + <use id="dropdown-disabled" xlink:href="#dropdown-shape"/> +</svg> diff --git a/src/chrome/global/in-content/help-glyph.svg b/src/chrome/global/in-content/help-glyph.svg @@ -0,0 +1,16 @@ +<!-- 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> + path { fill: #fff; } + circle { fill: #424e5a; stroke: #353e48; stroke-width: .5px; } + #hover:target ~ circle { fill: #178ce5; stroke: #1270b7; } + #active:target ~ circle { fill: #0095dd; stroke: #0077b1; } + </style> + + <g id="hover"/> + <g id="active"/> + <circle cx="12" cy="12" r="11.75" /> + <path d="M12.2,4.9c-1.6,0-2.9,0.4-3.8,0.8L9.2,8c0.6-0.4,1.5-0.6,2.2-0.6c1.1,0,1.6,0.5,1.6,1.2 c0,0.7-0.6,1.3-1.3,2.1c-1,1.1-1.4,2.1-1.3,3.2l0,0.5h3V14c0-0.9,0.3-1.7,1.2-2.5c0.9-0.9,1.9-1.9,1.9-3.4 C16.6,6.4,15.2,4.9,12.2,4.9z M12,16.1c-1.1,0-1.9,0.8-1.9,1.9c0,1.1,0.8,1.9,1.9,1.9c1.2,0,1.9-0.8,1.9-1.9 C13.9,16.9,13.1,16.1,12,16.1z"/> +</svg> diff --git a/src/chrome/global/in-content/help-glyphs.svg b/src/chrome/global/in-content/help-glyphs.svg @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve"> + <style> + use:not(:target) { + display: none; + } + use { + fill: #424e5a; + } + use[id$="-inverted"] { + fill: #fff; + stroke: #0095dd; + stroke-width: 0.5; + } + use[id$="-native"] { + fill: -moz-dialogText; + } + </style> + <defs style="display: none;"> + <path id="q-shape" d="M11.625,4.854c0,2.593-2.881,2.417-2.881,4.21v0.399H6.439V8.968c0-2.769,2.545-2.577,2.545-3.89 + c0-0.576-0.416-0.912-1.121-0.912c-0.656,0-1.296,0.32-1.873,0.977L4.375,3.894C5.287,2.821,6.471,2.182,8.12,2.182 + C10.457,2.182,11.625,3.43,11.625,4.854z M9.064,12.361c0,0.801-0.64,1.457-1.44,1.457c-0.801,0-1.441-0.656-1.441-1.457 + c0-0.784,0.64-1.44,1.441-1.44C8.424,10.921,9.064,11.577,9.064,12.361z"/> + </defs> + <use id="q-mark" xlink:href="#q-shape"/> + <use id="q-inverted" xlink:href="#q-shape"/> + <use id="q-native" xlink:href="#q-shape"/> +</svg> diff --git a/src/chrome/global/in-content/info-pages.css b/src/chrome/global/in-content/info-pages.css @@ -0,0 +1,145 @@ +@import url("chrome://global/skin/in-content/common.css"); +/* Body and container */ +body { + display: flex; + flex-direction: column; + box-sizing: border-box; + min-height: 100vh; + padding-top: 0; + padding-bottom: 0; + -moz-padding-start: calc(48px + 4.6em); + -moz-padding-end: 48px; + padding-inline-start: calc(48px + 4.6em); + padding-inline-end: 48px; + align-items: center; + justify-content: center; +} + +.container { + min-width: 13em; + max-width: 52em; +} + +.container.flex, +.container.restore-chosen { + display: flex; + flex-direction: column; + flex-grow: 1; + margin: 10vh 0; +} + +/* Typography */ +body > .container > h1:not(:empty) /* This is for about:about */ +{ + border-bottom: 1px solid #C1C1C1; + padding-bottom: 0.4em; +} + +.title { + background-image: url("chrome://browser/skin/aboutNetError_info.svg"); + background-position: left 0; + background-repeat: no-repeat; + background-size: 1.6em; + -moz-margin-start: -2.3em; + -moz-padding-start: 2.3em; + margin-inline-start: -2.3em; + padding-inline-start: 2.3em; + font-size: 2.5em; +} + +.title:-moz-dir(rtl), +.title:-moz-locale-dir(rtl) { + background-position: right 0; +} +.title:dir(rtl) { + background-position: right 0; +} + +.title-text { + border-bottom: 1px solid #C1C1C1; + font-size: inherit; + padding-bottom: 0.4em; +} + +@media (max-width: 675px) { + body { + padding: 0 48px; + } + + .title { + background-image: none !important; + -moz-padding-start: 0; + -moz-margin-start: 0; + padding-inline-start: 0; + margin-inline-start: 0; + } + + .title-text { + padding-top: 0; + } +} + +ul, ol { + margin: 0; + padding: 0; + -moz-margin-start: 1em; + margin-inline-start: 1em; +} + +ul > li, ol > li { + margin-bottom: .5em; +} + +ul { + list-style: disc; +} + +dt { + font-weight: bold; +} + +ul.columns { + column-count: 2; + column-gap: 5em; +} + +@media (max-width: 35em) { + ul.columns { + column-count: 1; + } +} + +/* Buttons */ +.button-container { + margin-top: 1.2em; +} + +.button-container > button { + min-width: 150px; +} + +.button-container > button:first-child { + -moz-margin-start: 0; + margin-inline-start: 0; +} + +/* Trees */ +.tree-container { + margin-top: 1.2em; + flex-grow: 1; + min-height: 12em; +} + +.tree-container > tree { + height: 100%; +} + +tree { + width: 100%; +} +@supports not (scroll-snap-type:none) { {}/* Firefox < 39 */ + tree { + min-height: 12em; + margin-top: 1.2em; + } +} +\ No newline at end of file diff --git a/src/chrome/global/in-content/radio.svg b/src/chrome/global/in-content/radio.svg @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 21 21" enable-background="new 0 0 21 21" xml:space="preserve"> + <style> + use:not(:target) { + display: none; + } + use { + fill: #fff; + } + use[id$="-native"] { + fill: #fff; + } + </style> + <defs style="display: none;"> + <circle id="radio-shape" cx="10.5" cy="10.5" r="6"/> + </defs> + <use id="radio" xlink:href="#radio-shape"/> + <use id="radio-native" xlink:href="#radio-shape"/> +</svg> diff --git a/src/chrome/global/linkTree.css b/src/chrome/global/linkTree.css @@ -1,3 +1,7 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /** diff --git a/src/chrome/global/listbox.css b/src/chrome/global/listbox.css @@ -11,15 +11,11 @@ /* ::::: listbox ::::: */ listbox { - -moz-appearance: listbox; + -moz-appearance: none; margin: 2px 4px; - border: 2px solid; - -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow; - -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow; - -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow; - -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow; - background-color: -moz-Field; - color: -moz-FieldText; + border: 1px solid rgb(75,75,75); + background-color: rgb(50,50,50); + color: #fff; } listbox[disabled="true"] { @@ -33,48 +29,33 @@ listitem { } listbox:focus > listitem[selected="true"][current="true"] { - outline: 1px dotted #F3D982; + outline: 1px dotted rgb(75,75,75); } listbox:focus > listitem[current="true"] { - outline: 1px dotted Highlight; + outline: 1px dotted rgb(140,140,140); outline-offset: -1px; } -listitem[selected="true"] { - background-color: -moz-cellhighlight; - color: -moz-cellhighlighttext; -} - +listitem[selected="true"], listbox:focus > listitem[selected="true"] { - background-color: Highlight; - color: HighlightText; + background-color: rgb(110,110,110); + color: #fff; } /* ::::: listheader ::::: */ listheader { - -moz-appearance: treeheadercell; + -moz-appearance: none; -moz-box-align: center; - border: 2px solid; - -moz-border-top-colors: ThreeDHighlight ThreeDLightShadow; - -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow; - -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow; - -moz-border-left-colors: ThreeDHighlight ThreeDLightShadow; - background-color: -moz-Dialog; - color: -moz-DialogText; + border: 1px solid rgb(75,75,75); + background-color: rgb(60,60,60); + color: #fff; padding: 0 4px; } listheader[sortable="true"]:hover:active { - border-top: 2px solid; - border-right: 1px solid; - border-bottom: 1px solid; - border-left: 2px solid; - -moz-border-top-colors: ThreeDShadow -moz-Dialog; - -moz-border-right-colors: ThreeDShadow; - -moz-border-bottom-colors: ThreeDShadow; - -moz-border-left-colors: ThreeDShadow -moz-Dialog; + border: 1px solid rgb(60,60,60); padding-top: 1px; padding-bottom: 0px; -moz-padding-start: 5px; @@ -96,19 +77,19 @@ listheader[sortable="true"]:hover:active { } .listheader-sortdirection[sortDirection="ascending"] { - list-style-image: url("chrome://global/skin/tree/sort-asc.png"); + list-style-image: url("chrome://global/skin/tree/sort.svg#asc"); } .listheader-sortdirection[sortDirection="ascending"]:-moz-system-metric(windows-classic) { - list-style-image: url("chrome://global/skin/tree/sort-asc-classic.png"); + list-style-image: url("chrome://global/skin/tree/sort.svg#asc-classic"); } .listheader-sortdirection[sortDirection="descending"] { - list-style-image: url("chrome://global/skin/tree/sort-dsc.png"); + list-style-image: url("chrome://global/skin/tree/sort.svg#dsc"); } .listheader-sortdirection[sortDirection="descending"]:-moz-system-metric(windows-classic) { - list-style-image: url("chrome://global/skin/tree/sort-dsc-classic.png"); + list-style-image: url("chrome://global/skin/tree/sort.svg#dsc-classic"); } /* ::::: listcell ::::: */ @@ -132,12 +113,14 @@ listheader[sortable="true"]:hover:active { /* ::::: listcell checkbox ::::: */ -.listcell-check { - -moz-appearance: checkbox; - -moz-box-align: center; - margin: 0px 2px; - border: 1px solid -moz-DialogText; - min-width: 13px; - min-height: 13px; - background: -moz-Field no-repeat 50% 50%; +.listcell-check[checked="true"] { + background-image: url("chrome://global/skin/checkbox/cbox-check.svg#check"); +} + +.listcell-check[disabled="true"] { + border-color: GrayText; +} + +.listcell-check[disabled="true"][checked="true"] { + background-image: url("chrome://global/skin/checkbox/cbox-check.svg#check-dis"); } diff --git a/src/chrome/global/media/volumeThumb.png b/src/chrome/global/media/volumeThumb.png Binary files differ. diff --git a/src/chrome/global/menu.css b/src/chrome/global/menu.css @@ -1,258 +1 @@ -/* 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/. */ - -/* ===== menu.css ======================================================= - == Styles used by XUL menu-related elements. - ======================================================================= */ - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -/* ::::: menu/menuitem ::::: */ - -menu, -menuitem, -.splitmenu-menuitem { - -moz-appearance: none; - -moz-box-align: center; - color: #FFFFFF; - font: menu; - list-style-image: none; - -moz-image-region: auto; -} - -menuitem[default="true"] { - font-weight: bold; -} - -menu[disabled="true"], -menuitem[disabled="true"], -.splitmenu-menuitem[disabled="true"], -menu[_moz-menuactive="true"][disabled="true"], -menuitem[_moz-menuactive="true"][disabled="true"], -.splitmenu-menuitem[_moz-menuactive="true"][disabled="true"] { - color: rgb(200,200,200); - text-shadow: none; -} - -@media (-moz-windows-classic) { - menu[disabled="true"], - menubar > menu[disabled="true"][_moz-menuactive="true"], - menuitem[disabled="true"], - .splitmenu-menuitem[disabled="true"] { - color: rgb(200,200,200); - text-shadow: 1px 1px #777777; - } -} - -menuitem.spell-suggestion { - font-weight: bold; -} - -/* ..... internal content .... */ - -.menu-accel, -.menu-iconic-accel, -.menu-text, -.menu-iconic-text { - margin: 0px !important; - padding: 1px 0px; - color: inherit; -} - -.menu-text { - -moz-appearance: none; - -moz-padding-start: 1.45em !important; -} - -.menu-text, -.menu-iconic-text { - font-weight: inherit; - -moz-margin-start: 2px !important; - -moz-padding-end: 2px; -} - -.menu-description { - font-style: italic; - color: GrayText; - -moz-margin-start: 1ex !important; -} - -.menu-accel, -.menu-iconic-accel { - color: inherit; - -moz-margin-start: 0.74em !important; - -moz-margin-end: 1.35em !important; -} - -.menu-iconic-left { - min-width: 1.45em; -} - -.menu-iconic-icon { - width: 16px; - height: 16px; -} - -menu.menu-iconic > .menu-iconic-left, -menuitem.menuitem-iconic > .menu-iconic-left, -.splitmenu-menuitem[iconic="true"] > .menu-iconic-left { - /*-moz-appearance: menuimage;*/ - padding-top: 2px; -} - -/* ..... menu arrow box ..... */ - -.menu-right { -margin: 0 0 0 6px; -width: 8px; -list-style-image: url("chrome://global/skin/arrow/arrow-rit-sharp.gif"); --moz-image-region: auto; -} - -/* ::::: menu/menuitems in menubar ::::: */ - -menubar > menu { - border: 2px solid transparent; -} - -menubar > menu[_moz-menuactive="true"]:not([disabled="true"]) { - color: #fff; -} - -menubar > menu[_moz-menuactive="true"][open="true"] { - border-width: 3px 1px 1px 3px; -} - -menubar > menu:-moz-lwtheme { - -moz-appearance: none; - border-style: none; -} - -menubar > menu:-moz-lwtheme:not([disabled="true"]) { - color: inherit !important; -} - -menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) { - background-color: rgb(110,110,110); - color: #fff !important; - text-shadow: none; -} - -menubar > menu:-moz-window-inactive { - color: rgb(173,173,173); -} - -/* ..... internal content .... */ - -.menubar-left { - color: inherit; -} - -.menubar-text { - margin: 1px 6px 2px 6px !important; - color: inherit; -} - -/* ::::: menu/menuitems in popups ::::: */ - -menupopup > menu, -menupopup > menuitem { - max-width: 42em; -} - -menu[_moz-menuactive="true"], -menuitem[_moz-menuactive="true"], -.splitmenu-menuitem[_moz-menuactive="true"] { - background-color: rgb(110,110,110) !important; - color: #fff !important; -} - -/* ::::: menu/menuitems in menulist popups ::::: */ - -.menulist-menupopup > menuitem, -menulist > menupopup > menuitem, -.menulist-menupopup > menu, -menulist > menupopup > menu { - -moz-appearance: none; - border: 1px solid transparent; - padding: 1px 5px; - max-width: none; - font: message-box; - color: #FFFFFF; -} - -.menulist-menupopup > menuitem > .menu-iconic-left, -menulist > menupopup > menuitem > .menu-iconic-left, -.menulist-menupopup > menu > .menu-iconic-left, -menulist > menupopup > menu > .menu-iconic-left { - display: none; - padding-top: 0px; -} - -.menulist-menupopup > menuitem > label, -menulist > menupopup > menuitem > label, -.menulist-menupopup > menu > label, -menulist > menupopup > menu > label { - padding-top: 0px; - padding-bottom: 0px; -} - -menulist:-moz-focusring > menupopup > menuitem[_moz-menuactive="true"] { - border: 1px dotted rgb(75,75,75); - background-color: rgb(110,110,110); - color: #fff; -} - -menuitem[checked="true"] { - list-style-image: url("chrome://global/skin/menu/menu-check.gif"); -} - -menuitem[checked="true"][disabled="true"], -menuitem[checked="true"][disabled="true"][_moz-menuactive="true"] { - list-style-image: url("chrome://global/skin/menu/menu-check-disabled.gif"); -} - -/* ::::: checkbox and radio menuitems ::::: */ - -menuitem[checked="true"][type="radio"] { - list-style-image: url("chrome://global/skin/menu/menu-radio.gif"); -} - -menuitem[checked="true"][type="radio"][disabled="true"], -menuitem[checked="true"][type="radio"][disabled="true"][_moz-menuactive="true"] { - list-style-image: url("chrome://global/skin/menu/menu-radio-disabled.gif"); -} - -/* ::::: menuseparator ::::: */ - -menuseparator { - margin: 2px 3px; - border-top: 1px solid rgb(75,75,75); -} - -menuseparator[collapsed="true"] { - margin: 0 !important; -} - -menulist > menupopup > menuseparator, -.menulist-menupopup > menuseparator { - padding: 6px 0 5px 0; - border-top: 1px solid #FFFFFF; - border-bottom: none; -} - -/* ::::: autocomplete ::::: */ - -.autocomplete-history-popup > menuitem { - max-width: none !important; - font: message-box; -} - -/* ::::: tree column picker ::::: */ - -.treecell-popupcell-menu { - -moz-margin-start: -2px; - list-style-image: url("chrome://global/skin/columnselect.gif"); - -moz-image-region: auto; -} +@import url("chrome://os/skin/menu.css"); +\ No newline at end of file diff --git a/src/chrome/global/menu/menu-check.svg b/src/chrome/global/menu/menu-check.svg @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"> + <style> + g { + fill: #fff; + } + #check-dis:target + g { + opacity: .4; + } + </style> + <g id="check-dis"/> + <g id="check" transform="translate(4.5,4.5)"> + <path d="M 3,4.5244 5.8333,0 7,1.1951 3.3333,7 0,3.5854 0.91667,2.64638 Z"/> + </g> +</svg> diff --git a/src/chrome/global/menu/menu-radio.svg b/src/chrome/global/menu/menu-radio.svg @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"> + <style> + g { + fill: #fff; + } + #radio-dis:target + g { + opacity: .4; + } + </style> + <g id="radio-dis"/> + <g id="radio" transform="matrix(4.7244 0 0 4.7244 5.5 5.4961)"> + <circle cx=".52917" cy=".53" r=".52917" stroke-width=".21167"/> + </g> +</svg> diff --git a/src/chrome/global/menulist.css b/src/chrome/global/menulist.css @@ -1,183 +1 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* ===== menulist.css =================================================== - == Styles used by the XUL menulist element. - ======================================================================= */ - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -@namespace html url("http://www.w3.org/1999/xhtml"); - -/* :::::::::: menulist :::::::::: */ - -menulist { - -moz-appearance: none; - margin: 2px 4px; - border: 1px solid; - -moz-border-top-colors: rgb(75,75,75); - -moz-border-right-colors: rgb(75,75,75); - -moz-border-bottom-colors: rgb(75,75,75); - -moz-border-left-colors: rgb(75,75,75); - background-color: rgb(50,50,50); - color: #fff; - text-shadow: none; -} - -.menulist-label-box { - -moz-box-align: center; - -moz-box-pack: center; - margin: 1px; - border: 1px solid transparent; - background-color: transparent; - color: inherit; -} - -.menulist-icon[src] { - margin: 0px 2px 0px 2px; -} - -.menulist-label { - margin-top: 0 !important; - -moz-margin-end: 0 !important; - margin-bottom: 0 !important; - -moz-margin-start: 1px !important; -} - -.menulist-description { - font-style: italic; - color: GrayText; - -moz-margin-start: 1ex !important; -} - -menulist:hover:not(:active):not([disabled=true]) { - background-color: rgb(75,75,75); -} - -menulist:hover:active:not([disabled=true]) { - background-color: rgb(110,110,110); -} - -/* ..... dropmarker ..... */ - -menulist > .menulist-dropmarker { - border: none; - background: transparent; - margin-right: 0 !important; -} - -menulist[disabled="true"]:hover:active > .menulist-dropmarker { - padding: 1px; -} - -menulist:hover:active > .menulist-dropmarker { - padding-top: 2px; - padding-bottom: 0px; - -moz-padding-start: 2px; - -moz-padding-end: 0px; -} - -/* ..... focused state ..... */ - -menulist:focus:not([open="true"]):not(.menulist-compact) > .menulist-label-box { - background-color: rgb(110,110,110); - color: #fff; -} - -menulist:-moz-focusring:not([open="true"]) > .menulist-label-box { - border: 1px dotted #F5DB95; -} - -/* ..... disabled state ..... */ - -menulist[disabled="true"] { - background-color: rgb(62,62,62); - color: GrayText; -} - -/* ::::: editable menulists ::::: */ - -.menulist-editable-box { - padding-top: 3px; - padding-bottom: 3px; - -moz-padding-start: 2px; - -moz-padding-end: 0px; -} - -html|*.menulist-editable-input { - margin: 0px !important; - border: none !important; - padding: 0px !important; - background: inherit; - font: inherit; - color: #fff; -} - -/* ::::: compact menulists ::::: */ - -.menulist-compact { - -moz-appearance: none; - -moz-box-align: center; - -moz-box-pack: center; - margin: 0; - -moz-border-top-colors: rgb(75,75,75); - -moz-border-right-colors: rgb(75,75,75); - -moz-border-bottom-colors: rgb(75,75,75); - -moz-border-left-colors: rgb(75,75,75); - background-color: rgb(50,50,50); - color: #fff; - list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); -} - -.menulist-compact > .menulist-label-box > .menulist-label { - margin: 0 3px !important; - text-align: end; -} - -.menulist-compact > .menulist-label-box > .menulist-icon { - -moz-margin-start: 2px; -} - -.menulist-compact[open="true"] { - background-color: rgb(110,110,110); -} - -.menulist-compact[disabled="true"] { - list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif"); -} - -.menulist-compact:-moz-focusring:not([open="true"]) > .menulist-label-box { - border: 1px dotted; -} - -menulist:-moz-focusring:not([open="true"]):not(.menulist-compact) > .menulist-label-box { - border: 1px dotted rgb(75,75,75); -} - -@media (-moz-windows-default-theme) { - .menulist-label-box { - background-color: transparent !important; - color: inherit !important; - } - - .menulist-label { - margin-top: -1px !important; - margin-bottom: -1px !important; - -moz-margin-start: 0 !important; - } - - menulist:not([editable="true"]) > .menulist-dropmarker { - margin-top: -2px; - -moz-margin-start: 3px; - -moz-margin-end: -3px; - } - - .menulist-icon { - margin-top: -1px; - margin-bottom: -1px; - } -} +@import url("chrome://os/skin/menulist.css"); +\ No newline at end of file diff --git a/src/chrome/global/narrate.css b/src/chrome/global/narrate.css @@ -0,0 +1,11 @@ +body.light .narrating { + background-color: #ffc; +} + +body.sepia .narrating { + background-color: #e0d7c5; +} + +body.dark .narrating { + background-color: #242424; +} diff --git a/src/chrome/global/narrate/arrow.svg b/src/chrome/global/narrate/arrow.svg @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 12 12"> + <path d="M6 9L1 4l1-1 4 4 4-4 1 1z" fill="#4C4C4C"/> +</svg> diff --git a/src/chrome/global/narrate/back.svg b/src/chrome/global/narrate/back.svg @@ -0,0 +1,15 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24"> + <defs> + <style> + use:not(:target) { + display: none; + } + #disabled { + opacity: 0.5; + } + </style> + <path id="shape" d="M 5 0 C 4.446 0 4 0.446 4 1 L 4 23 C 4 23.554 4.446 24 5 24 L 7 24 C 7.554 24 8 23.554 8 23 L 8 12.404297 C 8.04108 12.509297 8.109944 12.610125 8.203125 12.703125 L 19.296875 23.775391 C 19.495259 23.972391 19.661613 24.039562 19.796875 23.976562 C 19.932137 23.915564 20 23.748516 20 23.478516 L 20 0.52148438 C 20 0.25248437 19.93214 0.084484365 19.796875 0.021484375 C 19.661613 -0.040515625 19.495259 0.02856248 19.296875 0.2265625 L 8.203125 11.298828 C 8.1099445 11.381828 8.04108 11.481703 8 11.595703 L 8 1 C 8 0.446 7.554 0 7 0 L 5 0 z " fill="gray"/> + </defs> + <use id="enabled" xlink:href="#shape"/> + <use id="disabled" xlink:href="#shape"/> +</svg> diff --git a/src/chrome/global/narrate/fast.svg b/src/chrome/global/narrate/fast.svg @@ -0,0 +1,3 @@ +<svg id="Icons" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 20.4"> + <path fill="gray" d="M14.42 16.68a.77.77 0 0 0 .54.7l2.51.68a1.58 1.58 0 0 1 1.06 1.22l.05.39-3.89-.53a4.34 4.34 0 0 1-1.74-.72L7.2 14.03a5.79 5.79 0 0 1-5.34-4.88h-.82a1 1 0 0 1-1-1l2.9-3.24a6.16 6.16 0 0 1 4.7-2.39 5.88 5.88 0 0 1 .77.05 5 5 0 0 1 .87.15c3.75 1 6.5 5.84 6.5 5.84a2.27 2.27 0 0 0 1.14.85h.17a1.27 1.27 0 0 0 1.22-.4l.78-1-2.47-1.2c-3.38-1.46-2.46-5.71-2.46-5.71 0-.26.23-.32.42-.14l5.32 5-4.31-4.81a1.39 1.39 0 0 1 .81-1.22l4.17 6.65.33.31 2.19 1.54a2.44 2.44 0 0 1 .92 1.75v2.77l-.16.13a1.66 1.66 0 0 1-1.63.19l-.75-.36a2.57 2.57 0 0 0-2.55.32l-2.18 1.82a4.28 4.28 0 0 1-.89.55 10.18 10.18 0 0 0-4.62-8.46c-.27-.16-.66.31-.47.48a10.52 10.52 0 0 1 3.68 8.5v.48zm8.38-5.42a.49.49 0 1 0-.49-.49.49.49 0 0 0 .49.49zm-18 9.14v-.52a1.39 1.39 0 0 1 .93-1.25s2.7-.66 3.43-1.84l2.06 1.63a25.62 25.62 0 0 1-6.43 2z"/> +</svg> diff --git a/src/chrome/global/narrate/forward.svg b/src/chrome/global/narrate/forward.svg @@ -0,0 +1,15 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24"> + <defs> + <style> + use:not(:target) { + display: none; + } + #disabled { + opacity: 0.5; + } + </style> + <path id="shape" d="m 19,0 c 0.554,0 1,0.446 1,1 l 0,22 c 0,0.554 -0.446,1 -1,1 l -2,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-10.595703 c -0.04108,0.105 -0.109944,0.205828 -0.203125,0.298828 L 4.703125,23.775391 c -0.198384,0.197 -0.364738,0.264171 -0.5,0.201171 C 4.067863,23.915564 4,23.748516 4,23.478516 L 4,0.52148438 c 0,-0.26900001 0.06786,-0.43700001 0.203125,-0.5 0.135262,-0.062 0.301616,0.0070781 0.5,0.20507812 l 11.09375,11.0722655 c 0.09318,0.083 0.162045,0.182875 0.203125,0.296875 L 16,1 c 0,-0.554 0.446,-1 1,-1 l 2,0 z" fill="gray"/> + </defs> + <use id="enabled" xlink:href="#shape"/> + <use id="disabled" xlink:href="#shape"/> +</svg> diff --git a/src/chrome/global/narrate/narrate.svg b/src/chrome/global/narrate/narrate.svg @@ -0,0 +1,3 @@ +<svg id="Icons" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 18.77"> + <path fill="gray" d="M3.13 13.72a1.57 1.57 0 0 1-3.13 0V5.41a1.57 1.57 0 0 1 3.13 0v8.31zm6.29 3.62a1.57 1.57 0 0 1-3.13 0V1.44a1.57 1.57 0 0 1 3.13 0v15.9zm6.29-2.9a1.57 1.57 0 0 1-3.13 0V4.83a1.57 1.57 0 0 1 3.13 0v9.61zM22 12.62a1.57 1.57 0 0 1-3.13 0V6.15a1.57 1.57 0 0 1 3.13 0v6.47z"/> +</svg> diff --git a/src/chrome/global/narrate/slow.svg b/src/chrome/global/narrate/slow.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"> + <g fill="gray"> + <path d="M1.684,13.486c-0.209,0-0.404-0.132-0.474-0.341c-0.528-1.58-0.23-5.767,4.097-7.921 c1.315-0.656,2.589-0.988,3.787-0.988c3.237,0,5.096,2.341,5.99,3.465c0.158,0.199,0.181,0.533,0,0.713 c-0.793,0.794-1.852,1.542-3.231,2.286c-2.46,1.327-5.045,1.775-7.121,2.134c-1.123,0.194-2.093,0.361-2.89,0.627 C1.789,13.479,1.735,13.486,1.684,13.486L1.684,13.486z"/> + <path d="M23.185,5.465c-0.86-1.121-2.074-1.819-3.168-1.819c-0.641,0-1.556,0.23-2.273,1.328 c-0.374,0.571-0.577,1.161-0.773,1.73c-0.512,1.482-1.041,3.016-4.662,4.969c-2.316,1.249-4.707,1.664-6.815,2.03 c-2.524,0.438-4.704,0.814-5.455,2.622c-0.069,0.165-0.045,0.354,0.062,0.495c0.107,0.143,0.281,0.217,0.46,0.193 c0.667-0.081,1.533,0.041,2.434,0.217c-0.122,0.146-0.261,0.286-0.391,0.418c-0.38,0.385-0.774,0.783-0.657,1.292 c0.108,0.474,0.604,0.699,0.966,0.828c0.399,0.142,0.843,0.217,1.283,0.217c1.241,0,2.216-0.579,2.649-1.539 c1.704,0.287,3.487,0.313,5.043,0.313l1.639-0.006c0.066,0.056,0.178,0.166,0.264,0.25c0.504,0.506,1.348,1.351,2.721,1.351 c0.129,0,0.264-0.008,0.416-0.026c0.687-0.102,1.351-0.267,1.574-0.787c0.227-0.528-0.123-1.023-0.526-1.597 c-0.481-0.685-1.08-1.532-0.998-2.652c0.196-0.397,0.368-0.824,0.546-1.267c0.479-1.19,0.975-2.421,2.12-3.513 c0.431,0.343,1.022,0.549,1.63,0.549l0,0c0.439,0,0.876-0.102,1.295-0.3c0.624-0.293,1.104-0.967,1.316-1.847 C24.175,7.707,23.914,6.418,23.185,5.465L23.185,5.465z M20.397,7.757c-0.276,0-0.5-0.224-0.5-0.5s0.224-0.5,0.5-0.5 c0.275,0,0.5,0.224,0.5,0.5S20.674,7.757,20.397,7.757z"/> + </g> +</svg> diff --git a/src/chrome/global/narrate/start.svg b/src/chrome/global/narrate/start.svg @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"> + <path d="M21.64 12.44L2.827 22.895c-.217.123-.403.137-.56.042-.155-.094-.233-.264-.233-.51V1.572c0-.244.08-.414.233-.51.157-.093.343-.08.56.044L21.642 11.56c.217.124.326.27.326.44 0 .17-.11.316-.327.44z" fill="gray"/> +</svg> diff --git a/src/chrome/global/narrate/stop.svg b/src/chrome/global/narrate/stop.svg @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"> + <rect ry="1" rx="1" y="2" x="2" height="20" width="20" fill="gray"/> +</svg> diff --git a/src/chrome/global/narrateControls.css b/src/chrome/global/narrateControls.css @@ -0,0 +1,193 @@ +:scope { + --border-color: #e5e5e5; +} + +#narrate-toggle { /* Removed in Firefox 49 */ + background-image: url("chrome://global/skin/narrate/narrate.svg"); +} + +#narrate-toggle > svg { /* Added in Firefox 49 */ + display: block; + margin: 0 8px; +} + +.dropdown-popup button { + background-color: transparent; +} + +.dropdown-popup button:hover:not(:disabled) { + background-color: #eaeaea; +} + +.narrate-row { + display: flex; + align-items: center; + min-height: 40px; + box-sizing: border-box; +} + +.narrate-row:not(:first-child) { + border-top: 1px solid var(--border-color); +} + +/* Control buttons */ + +#narrate-control > button { + background-size: 24px 24px; + background-repeat: no-repeat; + background-position: center center; + height: 64px; + width: 100px; + border: none; + color: #666; + box-sizing: border-box; +} + +#narrate-control > button:not(:first-child) { + border-left: 1px solid var(--border-color); +} + +#narrate-skip-previous { + border-top-left-radius: 3px; + background-image: url("chrome://global/skin/narrate/back.svg#enabled"); +} + +#narrate-skip-next { + border-top-right-radius: 3px; + background-image: url("chrome://global/skin/narrate/forward.svg#enabled"); +} + +#narrate-skip-previous:disabled { + background-image: url("chrome://global/skin/narrate/back.svg#disabled"); +} + +#narrate-skip-next:disabled { + background-image: url("chrome://global/skin/narrate/forward.svg#disabled"); +} + +#narrate-start-stop { + background-image: url("chrome://global/skin/narrate/start.svg"); +} + +#narrate-start-stop.speaking { /* Removed in Firefox 49 */ + background-image: url("chrome://global/skin/narrate/stop.svg"); +} + +#narrate-dropdown.speaking #narrate-start-stop { /* Added in Firefox 49 */ + background-image: url("chrome://global/skin/narrate/stop.svg"); +} + +/* Rate control */ + +#narrate-rate::before, #narrate-rate::after { + content: ''; + width: 48px; + height: 40px; + background-position: center; + background-repeat: no-repeat; + background-size: 24px auto; +} + +#narrate-rate::before { + background-image: url("chrome://global/skin/narrate/slow.svg"); +} + +#narrate-rate::after { + background-image: url("chrome://global/skin/narrate/fast.svg"); +} + +#narrate-rate-input { + margin: 0 1px; + flex-grow: 1; +} + +#narrate-rate-input::-moz-range-track { + background-color: #979797; + height: 2px; +} + +#narrate-rate-input::-moz-range-progress { + background-color: #2EA3FF; + height: 2px; +} + +#narrate-rate-input::-moz-range-thumb { + background-color: #808080; + height: 16px; + width: 16px; + border-radius: 8px; + border-width: 0; +} + +#narrate-rate-input:active::-moz-range-thumb { + background-color: #2EA3FF; +} + +/* Voice selection */ + +.voiceselect { + width: 100%; +} + +.voiceselect > button.select-toggle, +.voiceselect > .options > button.option { + -moz-appearance: none; + border: none; + width: 100%; + min-height: 40px; +} + +.voiceselect.open > button.select-toggle { + border-bottom: 1px solid var(--border-color); +} + +.voiceselect > button.select-toggle::after { + content: ''; + background-image: url("chrome://global/skin/narrate/arrow.svg"); + background-position: center; + background-repeat: no-repeat; + background-size: 12px 12px; + display: inline-block; + width: 1.5em; + height: 1em; + vertical-align: middle; +} + +.voiceselect > .options > button.option:not(:first-child) { + border-top: 1px solid var(--border-color); +} + +.voiceselect > .options > button.option { + box-sizing: border-box; +} + +.voiceselect > .options:not(.hovering) > button.option:focus { + background-color: #eaeaea; +} + +.voiceselect > .options:not(.hovering) > button.option:hover:not(:focus) { + background-color: transparent; +} + +.voiceselect > .options > button.option::-moz-focus-inner { + outline: none; + border: 0; +} + +.voiceselect > .options { + display: none; + overflow-y: auto; +} + +.voiceselect.open > .options { + display: block; +} + +.current-voice { + color: #7f7f7f; +} + +.voiceselect:not(.open) > button, +.option:last-child { + border-radius: 0 0 3px 3px; +} diff --git a/src/chrome/global/notification.css b/src/chrome/global/notification.css @@ -74,80 +74,75 @@ notification[type="critical"] { margin-top: 17px; } -/* -XXX: apply styles to all themes until bug 509642 is fixed -@media (-moz-windows-default-theme) { -*/ - .popup-notification-menubutton { - -moz-appearance: none; - border-radius: 3px; - padding: 0; - } - - .popup-notification-menubutton:hover:active { - border-color: rgba(0,0,0,.5); - } - - .popup-notification-menubutton > * > * > .button-text { - color: #fff !important; - } - - .popup-notification-menubutton:not([type="menu-button"]), - .popup-notification-menubutton > .button-menubutton-button, - .popup-notification-menubutton > .button-menubutton-dropmarker { - -moz-appearance: none; - margin: 0; - border: 1px solid rgb(75,75,75); - background: rgb(50,50,50); - } - - .popup-notification-menubutton > .button-menubutton-button { - background-color: transparent; - padding: 1px; - -moz-border-end: none; - } - - .popup-notification-menubutton:not([type="menu-button"]), - .popup-notification-menubutton > .button-menubutton-button > .button-box { - -moz-padding-start: 8px; - -moz-padding-end: 5px; - } - - .popup-notification-menubutton > .button-menubutton-dropmarker { - padding: 9px 5px 8px; - width: auto; - height: auto; - list-style-image: url("chrome://global/skin/arrow/arrow-dn-sharp.gif"); - } - - .popup-notification-menubutton:-moz-focusring > .button-menubutton-dropmarker { - outline: 1px dotted ThreeDDarkShadow; - outline-offset: -3px; - } - - .popup-notification-menubutton > .button-menubutton-button:-moz-locale-dir(ltr), - .popup-notification-menubutton > .button-menubutton-dropmarker:-moz-locale-dir(rtl) { - border-radius: 2px 0 0 2px; - } - - .popup-notification-menubutton > .button-menubutton-button:-moz-locale-dir(rtl), - .popup-notification-menubutton > .button-menubutton-dropmarker:-moz-locale-dir(ltr) { - border-radius: 0 2px 2px 0; - } - - .popup-notification-menubutton:not([type="menu-button"]):hover, - .popup-notification-menubutton > .button-menubutton-button:hover, - .popup-notification-menubutton > .button-menubutton-dropmarker:hover { - background: rgb(75,75,75); - } - - .popup-notification-menubutton:not([type="menu-button"]):hover:active, - .popup-notification-menubutton > .button-menubutton-button:hover:active, - .popup-notification-menubutton > .button-menubutton-dropmarker:hover:active, - .popup-notification-menubutton[open="true"] > .button-menubutton-dropmarker { - background: rgb(23,23,23); - } -/*}*/ +.popup-notification-menubutton { + -moz-appearance: none; + border-radius: 3px; + padding: 0; +} + +.popup-notification-menubutton:hover:active { + border-color: rgba(0,0,0,.5); +} + +.popup-notification-menubutton:not([type="menu-button"]), +.popup-notification-menubutton > .button-menubutton-button, +.popup-notification-menubutton > .button-menubutton-dropmarker { + -moz-appearance: none; + margin: 0; + border: 1px solid rgb(75,75,75); + background: rgb(50,50,50); +} + +.popup-notification-menubutton > .button-menubutton-button { + background-color: transparent; + padding: 1px; + -moz-border-end: none; +} + +.popup-notification-menubutton:not([type="menu-button"]), +.popup-notification-menubutton > .button-menubutton-button > .button-box { + -moz-padding-start: 8px; + -moz-padding-end: 5px; +} + +.popup-notification-menubutton > .button-menubutton-dropmarker { + padding: 9px 5px 8px; + width: auto; + height: auto; + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#dn"); +} + +.popup-notification-menubutton > .button-menubutton-dropmarker > image { + width: 9px; +} + +.popup-notification-menubutton:-moz-focusring > .button-menubutton-dropmarker { + outline: 1px dotted ThreeDDarkShadow; + outline-offset: -3px; +} + +.popup-notification-menubutton > .button-menubutton-button:-moz-locale-dir(ltr), +.popup-notification-menubutton > .button-menubutton-dropmarker:-moz-locale-dir(rtl) { + border-radius: 2px 0 0 2px; +} + +.popup-notification-menubutton > .button-menubutton-button:-moz-locale-dir(rtl), +.popup-notification-menubutton > .button-menubutton-dropmarker:-moz-locale-dir(ltr) { + border-radius: 0 2px 2px 0; +} + +.popup-notification-menubutton:not([type="menu-button"]):hover, +.popup-notification-menubutton > .button-menubutton-button:hover, +.popup-notification-menubutton > .button-menubutton-dropmarker:hover { + background: rgb(75,75,75); +} + +.popup-notification-menubutton:not([type="menu-button"]):hover:active, +.popup-notification-menubutton > .button-menubutton-button:hover:active, +.popup-notification-menubutton > .button-menubutton-dropmarker:hover:active, +.popup-notification-menubutton[open="true"] > .button-menubutton-dropmarker { + background: rgb(23,23,23); +} .popup-notification-closebutton { -moz-margin-end: -14px; diff --git a/src/chrome/global/passwordmgr.css b/src/chrome/global/passwordmgr.css @@ -11,3 +11,16 @@ .actionButtons { margin: 0px 3px 6px 3px !important; } + +treechildren::-moz-tree-image(siteCol) { + list-style-image: url(chrome://browser/skin/places/place.svg#defaultFavicon); + width: 16px; + height: 16px; + -moz-margin-end: 5px; + margin-inline-end: 5px; +} + +window:not([chromehidden]) treechildren::-moz-tree-image(siteCol, selected), /* for the 'in-content' version */ +treechildren::-moz-tree-image(siteCol, selected, focus) { + list-style-image: url(chrome://browser/skin/places/place.svg#defaultFaviconHL); +} diff --git a/src/chrome/global/plugins.css b/src/chrome/global/plugins.css @@ -0,0 +1,4 @@ +@import url("chrome://global/skin/about.css"); +body{ + max-width: 90em; +} diff --git a/src/chrome/global/popup.css b/src/chrome/global/popup.css @@ -1,165 +1 @@ - -/* 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/. */ - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -/* ::::: menupopup ::::: */ - -menupopup, -panel { - border: 1px solid transparent; - -moz-border-top-colors : rgb(75,75,75); - -moz-border-left-colors : rgb(75,75,75); - -moz-border-right-colors : rgb(23,23,23); - -moz-border-bottom-colors: rgb(23,23,23); - padding: 0px; - min-width: 1px; - background: rgb(43,43,43); - color: #fff; -} - -menupopup { - -moz-appearance: none; -} - -menupopup > menu > menupopup { - /* align submenus */ - -moz-margin-start: -3px; - margin-top: -3px; -} - -panel[type="arrow"] { - -moz-appearance: none; - background: transparent; - border: none; -} - -panel[type="arrow"][side="top"], -panel[type="arrow"][side="bottom"] { - margin-left: -20px; - margin-right: -20px; -} - -panel[type="arrow"][side="left"], -panel[type="arrow"][side="right"] { - margin-top: -20px; - margin-bottom: -20px; -} - -.panel-arrowcontent { - border-radius: 4px; - padding: 10px; - color: #fff; - background: rgb(50,50,50); - background-clip: padding-box; - border: 1px solid rgb(75,75,75); - margin: 4px; -} - -.panel-arrow[side="top"], -.panel-arrow[side="bottom"] { - list-style-image: url("chrome://global/skin/arrow/panelarrow-vertical-themed.svg"); - position: relative; - margin-left: 10px; - margin-right: 10px; -} - -.panel-arrow[side="top"] { - margin-bottom: -5px; -} - -.panel-arrow[side="bottom"] { - transform: scaleY(-1); - margin-top: -5px; -} - -.panel-arrow[side="left"], -.panel-arrow[side="right"] { - list-style-image: url("chrome://global/skin/arrow/panelarrow-horizontal-themed.svg"); - position: relative; - margin-top: 10px; - margin-bottom: 10px; -} - -.panel-arrow[side="left"] { - margin-right: -5px; -} - -.panel-arrow[side="right"] { - transform: scaleX(-1); - margin-left: -5px; -} - -@media (-moz-windows-default-theme) { - .panel-arrowcontainer[panelopen] { - transition-duration: 100ms, 75ms; - transition-property: opacity, transform; - transition-timing-function: ease-out; - } - - .panel-arrowcontainer:not([panelopen]) { - opacity: 0; - } - - .panel-arrowcontainer:not([panelopen])[side="top"] { - transform: translateY(-20px); - } - - .panel-arrowcontainer:not([panelopen])[side="bottom"] { - transform: translateY(20px); - } - - .panel-arrowcontainer:not([panelopen])[side="left"] { - transform: translateX(-20px); - } - - .panel-arrowcontainer:not([panelopen])[side="right"] { - transform: translateX(20px); - } - - .panel-arrow[side="top"], - .panel-arrow[side="bottom"] { - list-style-image: url("chrome://global/skin/arrow/panelarrow-vertical.svg"); - } - - .panel-arrow[side="left"], - .panel-arrow[side="right"] { - list-style-image: url("chrome://global/skin/arrow/panelarrow-horizontal.svg"); - } -} - -/* ::::: tooltip ::::: */ - -tooltip { - -moz-appearance: none; - margin-top: 21px; - border: 1px solid rgb(75,75,75); - padding: 2px 3px; - max-width: 40em; - background-color: rgb(110,110,110); - color: #fff; - font: message-box; -} - -tooltip[titletip="true"] { - /* See bug 32157 comment 128 - * margin: -2px 0px 0px -3px; - */ - max-width: none; -} - -/* rules for popups associated with menulists */ - -menulist > menupopup { - -moz-appearance: none; - border-width: 1px; - -moz-border-top-colors: rgb(75,75,75); - -moz-border-right-colors: rgb(75,75,75); - -moz-border-bottom-colors: rgb(75,75,75); - -moz-border-left-colors: rgb(75,75,75); - padding: 0px; - min-width: 0px; - background-color: rgb(50,50,50); -} +@import url("chrome://os/skin/popup.css"); +\ No newline at end of file diff --git a/src/chrome/global/printPageSetup.css b/src/chrome/global/printPageSetup.css @@ -1,3 +1,7 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + .portrait-page { list-style-image: url("chrome://global/skin/icons/Portrait.png"); } diff --git a/src/chrome/global/printPreview.css b/src/chrome/global/printPreview.css @@ -1,44 +1,77 @@ +/* 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/. */ + /* ..... page navigation ..... */ +.navigate-button { + min-width: 1.9em; +} + +.navigate-button > .toolbarbutton-icon { + /* display: none; |* This is in the default theme. Here the icons are shown instead of the labels --johnGraciliano */ + -moz-margin-end: 0; + margin-inline-end: 0; +} +.navigate-button > .toolbarbutton-text { + display: none; +} + +.navigate-button[anonid=navigateHome], +.navigate-button[anonid=navigateEnd]:-moz-locale-dir(rtl), .home-arrow, .end-arrow:-moz-locale-dir(rtl) { list-style-image: url("chrome://global/skin/printpreview/arrow-left-end.png"); -moz-image-region: rect(0, 16px, 16px, 0); } +.navigate-button[anonid=navigateHome]:hover, +.navigate-button[anonid=navigateEnd]:-moz-locale-dir(rtl):hover, .home-arrow:hover, .end-arrow:-moz-locale-dir(rtl):hover { -moz-image-region: rect(0, 32px, 16px, 16px); } +.navigate-button[anonid=navigateEnd], +.navigate-button[anonid=navigateHome]:-moz-locale-dir(rtl), .end-arrow, .home-arrow:-moz-locale-dir(rtl) { list-style-image: url("chrome://global/skin/printpreview/arrow-right-end.png"); -moz-image-region: rect(0, 16px, 16px, 0); } +.navigate-button[anonid=navigateEnd]:hover, +.navigate-button[anonid=navigateHome]:-moz-locale-dir(rtl):hover, .end-arrow:hover, .home-arrow:-moz-locale-dir(rtl):hover { -moz-image-region: rect(0, 32px, 16px, 16px); } +.navigate-button[anonid=navigatePrevious], +.navigate-button[anonid=navigateNext]:-moz-locale-dir(rtl), .previous-arrow, .next-arrow:-moz-locale-dir(rtl) { list-style-image: url("chrome://global/skin/printpreview/arrow-left.png"); -moz-image-region: rect(0, 16px, 16px, 0); } +.navigate-button[anonid=navigatePrevious]:hover, +.navigate-button[anonid=navigateNext]:-moz-locale-dir(rtl):hover, .previous-arrow:hover, .next-arrow:-moz-locale-dir(rtl):hover { -moz-image-region: rect(0, 32px, 16px, 16px); } +.navigate-button[anonid=navigateNext], +.navigate-button[anonid=navigatePrevious]:-moz-locale-dir(rtl), .next-arrow, .previous-arrow:-moz-locale-dir(rtl) { list-style-image: url("chrome://global/skin/printpreview/arrow-right.png"); -moz-image-region: rect(0, 16px, 16px, 0); } +.navigate-button[anonid=navigateNext]:hover, +.navigate-button[anonid=navigatePrevious]:-moz-locale-dir(rtl):hover, .next-arrow:hover, .previous-arrow:-moz-locale-dir(rtl):hover { -moz-image-region: rect(0, 32px, 16px, 16px); @@ -60,11 +93,9 @@ .toolbar-portrait-page { list-style-image: url("chrome://global/skin/icons/Print-preview.png"); -moz-image-region: rect(0px 16px 16px 0px); - color: #fff; } .toolbar-landscape-page { list-style-image: url("chrome://global/skin/icons/Print-preview.png"); -moz-image-region: rect(0px 32px 16px 16px); - color: #fff; } diff --git a/src/chrome/global/radio.css b/src/chrome/global/radio.css @@ -1,95 +1 @@ -/* 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/. */ - -/* ===== radio.css =================================================== - == Styles used by the XUL radio element. - ======================================================================= */ - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -/* ::::: radio ::::: */ - -radio { - -moz-appearance: none; - -moz-box-align: center; - margin: 2px 4px; - padding-top: 1px; - padding-bottom: 1px; - -moz-padding-start: 4px; - -moz-padding-end: 2px; -} - -.radio-label-box { - -moz-margin-start: 2px; - border: 1px solid transparent; - padding-top: 0px; - padding-bottom: 1px; - -moz-padding-start: 1px; - -moz-padding-end: 0px; -} - -.radio-icon { - -moz-margin-end: 2px; -} - -.radio-label { - margin: 0 !important; -} - -/* ..... focused state ..... */ - -radio[focused="true"] > .radio-label-box { - border: 1px dotted rgb(75,75,75); -} - -/* ..... disabled state ..... */ - -radio[disabled="true"] > .radio-check-box1 { - background-color: rgb(62,62,62); -} - -radio[disabled="true"] { - color: GrayText; -} - -/* ::::: checkmark image ::::: */ - -.radio-check-box1 { - -moz-appearance: none; - margin: 1px 0px; - border-top: 1px solid rgb(75,75,75); - border-right: 1px solid rgb(75,75,75); - border-bottom: 1px solid rgb(75,75,75); - border-left: 1px solid rgb(75,75,75); - border-radius: 50%; - width: 12px; - height: 12px; - background-color: rgb(50,50,50); -} - -.radio-check-box2 { - border-top: 1px solid rgb(75,75,75); - border-right: 1px solid rgb(75,75,75); - border-bottom: 1px solid rgb(75,75,75); - border-left: 1px solid rgb(75,75,75); - border-radius: 50%; - padding: 2px; - width: 4px; - height: 4px; - list-style-image: none; -} - -radio:hover:active > .radio-check-box1 { - background-color: rgb(110,110,110); -} - -/* ..... selected state ..... */ - -radio[selected="true"] > .radio-check-box1 > .radio-check-box2 { - list-style-image: url("chrome://global/skin/radio/radio-check.gif"); -} - -radio[selected="true"][disabled="true"] > .radio-check-box1 > .radio-check-box2 { - list-style-image: url("chrome://global/skin/radio/radio-check-dis.gif") !important -} +@import url("chrome://os/skin/radio.css"); +\ No newline at end of file diff --git a/src/chrome/global/radio/radio-check.svg b/src/chrome/global/radio/radio-check.svg @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="4" height="4" version="1.1" viewBox="0 0 1.0583 1.0583" xmlns="http://www.w3.org/2000/svg"> + <style> + g { + fill: #fff; + } + #radio-dis:target + g { + opacity: .4; + } + </style> + <g id="radio-dis"/> + <g id="radio" fill="#fff"> + <circle cx=".52917" cy=".53" r=".52917" fill="#fff"/> + </g> +</svg> diff --git a/src/chrome/global/reader/RM-Add-24x24.svg b/src/chrome/global/reader/RM-Add-24x24.svg @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> +<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10 + C22,6.477,17.523,2,12,2z M17.714,12.714h-5v5h-1.429v-5h-5v-1.429h5v-5h1.429v5h5V12.714z"/> +</svg> diff --git a/src/chrome/global/reader/RM-Close-24x24.svg b/src/chrome/global/reader/RM-Close-24x24.svg @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg viewBox="0 0 24 24" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink"> + <defs> + <style type="text/css"> + use:not(:target) { + display: none; + } + + #close { + fill: #808080; + } + #close-hover { + fill: #FFFFFF; + } + </style> + + <g id="close-shape"> + <polygon points="20.477,6.551 20.477,17.449 11.992,17.449 11.992,20 23,20 23,4 11.992,4 11.992,6.551"/> + <polygon points="1,11.981 9.698,19.95 9.698,15.13 18.184,15.13 18.184,8.87 9.698,8.87 9.698,4.011"/> + </g> + </defs> + + <use id="close" xlink:href="#close-shape"/> + <use id="close-hover" xlink:href="#close-shape"/> + +</svg> +\ No newline at end of file diff --git a/src/chrome/global/reader/RM-Content-Width-Minus-42x16.svg b/src/chrome/global/reader/RM-Content-Width-Minus-42x16.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> + +<!-- 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" + xmlns:xlink="http://www.w3.org/1999/xlink" + width="42" + height="16" + viewBox="0 0 42 16" + fill="#808080"> + + <path d="M14.5,7 L8.75,1.25 L10,-1.91791433e-15 L18,8 L17.375,8.625 L10,16 L8.75,14.75 L14.5,9 L1.13686838e-13,9 L1.13686838e-13,7 L14.5,7 Z"/> + <path d="M38.5,7 L32.75,1.25 L34,6.58831647e-15 L42,8 L41.375,8.625 L34,16 L32.75,14.75 L38.5,9 L24,9 L24,7 L38.5,7 Z" transform="translate(33.000000, 8.000000) scale(-1, 1) translate(-33.000000, -8.000000)"/> + +</svg> diff --git a/src/chrome/global/reader/RM-Content-Width-Plus-44x16.svg b/src/chrome/global/reader/RM-Content-Width-Plus-44x16.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> + +<!-- 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" + xmlns:xlink="http://www.w3.org/1999/xlink" + width="44" + height="16" + viewBox="0 0 44 16" + fill="#808080"> + + <path d="M14.5,7 L8.75,1.25 L10,-1.91791433e-15 L18,8 L17.375,8.625 L10,16 L8.75,14.75 L14.5,9 L1.13686838e-13,9 L1.13686838e-13,7 L14.5,7 Z" transform="translate(9.000000, 8.000000) scale(-1, 1) translate(-9.000000, -8.000000)"/> + <path d="M40.5,7 L34.75,1.25 L36,-5.17110888e-16 L44,8 L43.375,8.625 L36,16 L34.75,14.75 L40.5,9 L26,9 L26,7 L40.5,7 Z"/> + +</svg> diff --git a/src/chrome/global/reader/RM-Delete-24x24.svg b/src/chrome/global/reader/RM-Delete-24x24.svg @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> +<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10 + C22,6.477,17.523,2,12,2z M11.286,6.286 M6.286,12.714v-1.429h11.429v1.429H6.286z"/> +</svg> diff --git a/src/chrome/global/reader/RM-Line-Height-Minus-38x14.svg b/src/chrome/global/reader/RM-Line-Height-Minus-38x14.svg @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> + +<!-- 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" + xmlns:xlink="http://www.w3.org/1999/xlink" + width="38" + height="14" + viewBox="0 0 38 14" + fill="#808080"> + + <rect x="0" y="0" width="28" height="2"/> + <rect x="0" y="6" width="38" height="2"/> + <rect x="0" y="12" width="18" height="2"/> + +</svg> diff --git a/src/chrome/global/reader/RM-Line-Height-Plus-38x24.svg b/src/chrome/global/reader/RM-Line-Height-Plus-38x24.svg @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> + +<!-- 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" + xmlns:xlink="http://www.w3.org/1999/xlink" + width="38" + height="24" + viewBox="0 0 38 24" + fill="#808080"> + + <rect x="0" y="0" width="28" height="2"/> + <rect x="0" y="11" width="38" height="2"/> + <rect x="0" y="22" width="18" height="2"/> + +</svg> diff --git a/src/chrome/global/reader/RM-Minus-24x24.svg b/src/chrome/global/reader/RM-Minus-24x24.svg @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> +<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M0,13.5v-3h24v3H0z"/> +<g enable-background="new "> + <g> + <defs> + <rect id="SVGID_2_" x="-269.917" y="-1054" width="22" height="34"/> + </defs> + <clipPath id="SVGID_1_"> + <use xlink:href="#SVGID_2_" overflow="visible"/> + </clipPath> + <g clip-path="url(#SVGID_1_)"> + <defs> + <rect id="SVGID_6_" x="-365.917" y="-1459" width="1080" height="2896"/> + </defs> + <clipPath id="SVGID_3_"> + <use xlink:href="#SVGID_6_" overflow="visible"/> + </clipPath> + </g> + <g clip-path="url(#SVGID_1_)"> + <defs> + <rect id="SVGID_10_" x="-365.917" y="-1459" width="1080" height="2896"/> + </defs> + <clipPath id="SVGID_5_"> + <use xlink:href="#SVGID_10_" overflow="visible"/> + </clipPath> + </g> + <g clip-path="url(#SVGID_1_)"> + <defs> + <rect id="SVGID_16_" x="-365.917" y="-1459" width="1080" height="2896"/> + </defs> + <clipPath id="SVGID_7_"> + <use xlink:href="#SVGID_16_" overflow="visible"/> + </clipPath> + </g> + </g> +</g> +</svg> diff --git a/src/chrome/global/reader/RM-Plus-24x24.svg b/src/chrome/global/reader/RM-Plus-24x24.svg @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> +<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M24,13.5H13.5V24h-3V13.5H0v-3h10.5V0h3v10.5H24V13.5z"/> +<g enable-background="new "> + <g> + <defs> + <rect id="SVGID_2_" x="-233.667" y="-1054" width="22" height="34"/> + </defs> + <clipPath id="SVGID_1_"> + <use xlink:href="#SVGID_2_" overflow="visible"/> + </clipPath> + <g clip-path="url(#SVGID_1_)"> + <defs> + <rect id="SVGID_6_" x="-329.667" y="-1459" width="1080" height="2896"/> + </defs> + <clipPath id="SVGID_3_"> + <use xlink:href="#SVGID_6_" overflow="visible"/> + </clipPath> + </g> + <g clip-path="url(#SVGID_1_)"> + <defs> + <rect id="SVGID_10_" x="-329.667" y="-1459" width="1080" height="2896"/> + </defs> + <clipPath id="SVGID_5_"> + <use xlink:href="#SVGID_10_" overflow="visible"/> + </clipPath> + </g> + <g clip-path="url(#SVGID_1_)"> + <defs> + <rect id="SVGID_16_" x="-329.667" y="-1459" width="1080" height="2896"/> + </defs> + <clipPath id="SVGID_7_"> + <use xlink:href="#SVGID_16_" overflow="visible"/> + </clipPath> + </g> + </g> +</g> +</svg> diff --git a/src/chrome/global/reader/RM-Reading-List-24x24.svg b/src/chrome/global/reader/RM-Reading-List-24x24.svg @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> +<g> + <rect x="8" y="10" fill-rule="evenodd" clip-rule="evenodd" fill="#808080" width="14" height="4"/> + <rect x="8" y="16" fill-rule="evenodd" clip-rule="evenodd" fill="#808080" width="14" height="4"/> + <rect x="8" y="4" fill-rule="evenodd" clip-rule="evenodd" fill="#808080" width="14" height="4"/> + <circle fill-rule="evenodd" clip-rule="evenodd" fill="#808080" cx="4" cy="6" r="2"/> + <circle fill-rule="evenodd" clip-rule="evenodd" fill="#808080" cx="4" cy="12" r="2"/> + <circle fill-rule="evenodd" clip-rule="evenodd" fill="#808080" cx="4" cy="18" r="2"/> +</g> +<g enable-background="new "> + <g> + <defs> + <rect id="SVGID_2_" x="-197" y="-1054" width="22" height="34"/> + </defs> + <clipPath id="SVGID_1_"> + <use xlink:href="#SVGID_2_" overflow="visible"/> + </clipPath> + <g clip-path="url(#SVGID_1_)"> + <defs> + <rect id="SVGID_6_" x="-293" y="-1459" width="1080" height="2896"/> + </defs> + <clipPath id="SVGID_3_"> + <use xlink:href="#SVGID_6_" overflow="visible"/> + </clipPath> + </g> + <g clip-path="url(#SVGID_1_)"> + <defs> + <rect id="SVGID_10_" x="-293" y="-1459" width="1080" height="2896"/> + </defs> + <clipPath id="SVGID_5_"> + <use xlink:href="#SVGID_10_" overflow="visible"/> + </clipPath> + </g> + <g clip-path="url(#SVGID_1_)"> + <defs> + <rect id="SVGID_16_" x="-293" y="-1459" width="1080" height="2896"/> + </defs> + <clipPath id="SVGID_7_"> + <use xlink:href="#SVGID_16_" overflow="visible"/> + </clipPath> + </g> + </g> +</g> +</svg> diff --git a/src/chrome/global/reader/RM-Type-Controls-24x24.svg b/src/chrome/global/reader/RM-Type-Controls-24x24.svg @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> +<g> + <path fill="#808080" d="M8.23,18.748v-1.016l1.182-0.146c0.065-0.013,0.12-0.055,0.166-0.127s0.052-0.143,0.02-0.215L8.513,14.07 + H4.236l-1.104,3.096c-0.039,0.104-0.02,0.199,0.059,0.283s0.153,0.13,0.225,0.137l1.123,0.146v1.016H0.232v-1.016l1.123-0.166 + L5.837,5.008h2.275l4.443,12.197c0.052,0.124,0.103,0.21,0.151,0.259s0.145,0.089,0.288,0.122l0.762,0.146v1.016H8.23z + M6.296,8.084l-1.68,4.805h3.398L6.296,8.084z"/> + <path fill="#808080" d="M20.05,18.748l-0.264-0.996c-0.345,0.234-0.706,0.443-1.083,0.625c-0.331,0.156-0.702,0.298-1.112,0.425 + c-0.409,0.127-0.835,0.19-1.277,0.19c-0.364,0-0.704-0.06-1.02-0.181s-0.592-0.293-0.829-0.518s-0.424-0.497-0.561-0.815 + S13.7,16.801,13.7,16.404c0-0.299,0.024-0.576,0.073-0.83s0.146-0.49,0.293-0.708s0.356-0.426,0.63-0.625s0.637-0.392,1.089-0.581 + s1.008-0.377,1.665-0.566s1.445-0.384,2.363-0.586v-0.244c0-0.098,0.003-0.186,0.01-0.264c0-0.091,0.003-0.182,0.01-0.273 + c0.007-0.189-0.013-0.392-0.059-0.61s-0.137-0.42-0.273-0.605s-0.329-0.338-0.576-0.459s-0.569-0.181-0.967-0.181 + c-0.137,0-0.259,0.003-0.366,0.01s-0.197,0.016-0.269,0.029c-0.085,0.013-0.159,0.026-0.225,0.039v1.895h-2.061 + c-0.169,0.013-0.319-0.003-0.449-0.049c-0.11-0.039-0.213-0.107-0.308-0.205s-0.142-0.25-0.142-0.459 + c0-0.371,0.132-0.703,0.396-0.996c0.263-0.293,0.607-0.542,1.033-0.747s0.904-0.363,1.435-0.474 + c0.529-0.111,1.058-0.166,1.585-0.166c0.572,0,1.096,0.042,1.57,0.127s0.883,0.249,1.224,0.493c0.342,0.244,0.604,0.587,0.79,1.03 + s0.278,1.025,0.278,1.748v5.137c0,0.124,0.042,0.229,0.127,0.317s0.188,0.138,0.312,0.151l0.879,0.059v0.938H20.05z M19.793,13.592 + c-0.645,0.13-1.177,0.264-1.597,0.4s-0.754,0.293-1.001,0.469s-0.42,0.376-0.518,0.601s-0.146,0.487-0.146,0.786 + c0,0.208,0.034,0.402,0.103,0.581s0.166,0.335,0.293,0.469s0.278,0.239,0.454,0.317s0.368,0.117,0.576,0.117 + c0.215,0,0.432-0.023,0.649-0.068s0.415-0.094,0.591-0.146c0.208-0.065,0.407-0.14,0.596-0.225V13.592z"/> +</g> +</svg> diff --git a/src/chrome/global/reader/RM-Type-Controls-Arrow.svg b/src/chrome/global/reader/RM-Type-Controls-Arrow.svg @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> +<polygon opacity="0.15" fill-rule="evenodd" clip-rule="evenodd" points="16.583,0.015 16.569,0 4.583,12 16.569,24 16.583,23.985 + "/> +<g enable-background="new "> + <g> + <defs> + <rect id="SVGID_2_" x="-125" y="-1086.667" width="22" height="34"/> + </defs> + <clipPath id="SVGID_1_"> + <use xlink:href="#SVGID_2_" overflow="visible"/> + </clipPath> + <g clip-path="url(#SVGID_1_)"> + <defs> + <rect id="SVGID_6_" x="-221" y="-1491.667" width="1080" height="2896"/> + </defs> + <clipPath id="SVGID_3_"> + <use xlink:href="#SVGID_6_" overflow="visible"/> + </clipPath> + </g> + <g clip-path="url(#SVGID_1_)"> + <defs> + <rect id="SVGID_10_" x="-221" y="-1491.667" width="1080" height="2896"/> + </defs> + <clipPath id="SVGID_5_"> + <use xlink:href="#SVGID_10_" overflow="visible"/> + </clipPath> + </g> + <g clip-path="url(#SVGID_1_)"> + <defs> + <rect id="SVGID_16_" x="-221" y="-1491.667" width="1080" height="2896"/> + </defs> + <clipPath id="SVGID_7_"> + <use xlink:href="#SVGID_16_" overflow="visible"/> + </clipPath> + </g> + </g> +</g> +<polygon fill-rule="evenodd" clip-rule="evenodd" fill="#FBFBFB" points="16.575,1.021 16.561,1.008 5.583,12 16.577,23.008 + 16.591,22.994 "/> +</svg> diff --git a/src/chrome/global/reader/pocket.svg b/src/chrome/global/reader/pocket.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + viewBox="0 0 24 24"> + <style> + use:not(:target) { + display: none; + } + use { + fill: #808080; + } + use[id$="-added"] { + fill: #EE4056; + } + </style> + <defs style="display: none;"> + <path id="pocket-mark-shape" d="M21.901,4.204C21.642,3.484,20.956,3,20.196,3h-0.01h-1.721H3.814C3.067,3,2.385,3.474,2.119,4.179 + C2.04,4.388,2,4.606,2,4.828v6.082l0.069,1.21c0.29,2.751,1.707,5.155,3.899,6.832c0.039,0.03,0.079,0.06,0.119,0.089l0.025,0.018 + c1.175,0.866,2.491,1.452,3.91,1.741C10.677,20.932,11.347,21,12.013,21c0.615,0,1.232-0.057,1.839-0.171 + c0.073-0.014,0.145-0.028,0.219-0.044c0.02-0.004,0.042-0.012,0.064-0.023c1.359-0.299,2.621-0.87,3.753-1.704l0.025-0.018 + c0.04-0.029,0.08-0.059,0.119-0.089c2.192-1.677,3.609-4.08,3.898-6.832L22,10.91V4.828C22,4.618,21.975,4.409,21.901,4.204z + M17.667,10.539l-4.704,4.547c-0.266,0.256-0.608,0.385-0.949,0.385c-0.342,0-0.684-0.129-0.949-0.385l-4.705-4.547 + c-0.547-0.528-0.565-1.403-0.04-1.954c0.524-0.551,1.392-0.569,1.939-0.041l3.756,3.63l3.755-3.63 + c0.547-0.528,1.415-0.51,1.939,0.04C18.231,9.136,18.213,10.011,17.667,10.539z"/> + </defs> + <use id="pocket-mark" xlink:href="#pocket-mark-shape"/> + <use id="pocket-mark-added" xlink:href="#pocket-mark-shape"/> +</svg> diff --git a/src/chrome/global/resizer.css b/src/chrome/global/resizer.css @@ -7,7 +7,7 @@ resizer { -moz-appearance: none; background: url("chrome://global/skin/icons/resizer.png") no-repeat; - background-size: 15px 15px; + background-size: 100% 100%; cursor: se-resize; width: 15px; height: 15px; diff --git a/src/chrome/global/richlistbox.css b/src/chrome/global/richlistbox.css @@ -31,6 +31,5 @@ richlistbox[seltype="multiple"]:focus > richlistitem[current="true"] { } richlistbox[seltype="multiple"]:focus > richlistitem[current="true"][selected="true"] { - outline: 1px dotted rgb(60,60,60); /* TODO: find a suitable system color */ + outline: 1px dotted rgb(60,60,60); } - diff --git a/src/chrome/global/scrollbars.css b/src/chrome/global/scrollbars.css @@ -1,234 +1 @@ -/* 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/. */ - -/* ===== xulscrollbars.css ============================================== - == Styles used by XUL scrollbar-related elements. - ======================================================================= */ - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -@namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */ - -/* ::::: scrollbar ::::: */ - -scrollbar { - /*-moz-appearance: scrollbartrack-horizontal;*/ - -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar"); - cursor: default; - height: 15px; - background: rgb(23,23,23); -} - -/* ::::: borders for thumb and buttons ::::: */ - -thumb, -scrollbarbutton { - background:rgb(50,50,50) 50% 50% no-repeat; -} - -thumb { - border: 1px solid; - -moz-border-top-colors: rgb(75,75,75); - -moz-border-right-colors: rgb(75,75,75); - -moz-border-bottom-colors: rgb(75,75,75); - -moz-border-left-colors: rgb(75,75,75); -} - -thumb:hover { - background-color: rgb(75,75,75); -} - -thumb:active { - background-color: rgb(110,110,110); -} - -/* ::::: thumb (horizontal) ::::: */ - -thumb { - min-height: 18px; - border-radius: 3px; -} - -thumb[orient="horizontal"] { - min-width: 18px; -} - -/* ::::: scrollbar button ::::: */ - -scrollbarbutton { - background: rgb(23,23,23) no-repeat 0px 1px; - min-width: 15px; - min-height: 15px; -} - -scrollbarbutton:hover:active, scrollbarbutton[active="true"] { - background-color: rgb(110,110,110); -} - -/* ::::: square at the corner of two scrollbars ::::: */ - -scrollcorner { - /* XXX -moz-appearance: scrollcorner; */ - -moz-binding: url(chrome://global/content/bindings/scrollbar.xml#scrollbar-base); - width: 16px; - cursor: default; - background-color: rgb(50,50,50); -} - -/* ..... increment .... */ - -scrollbarbutton[type="increment"] { - -moz-appearance: none; - background-image: url("chrome://global/skin/arrow/arrow-rit-sharp.gif"); - background-position: center; - background-repeat: no-repeat; -} - -scrollbarbutton[type="increment"][disabled="true"] { - background-color: rgb(62,62,62); -} - -scrollbar[orient="vertical"] > scrollbarbutton[type="increment"] { - -moz-appearance: none; - background-image: url("chrome://global/skin/arrow/arrow-dn-sharp.gif"); - background-position: center; - background-repeat: no-repeat; -} - -scrollbar[orient="vertical"] > scrollbarbutton[type="increment"][disabled="true"] { - background-color: rgb(62,62,62); -} - -/* ..... decrement .... */ - -scrollbarbutton[type="decrement"] { - -moz-appearance: none; - background-image: url("chrome://global/skin/arrow/arrow-lft-sharp.gif"); - background-position: center; - background-repeat: no-repeat; -} - -scrollbarbutton[type="decrement"][disabled="true"] { - background-color: rgb(62,62,62); -} - -scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"] { - -moz-appearance: none; - background-image: url("chrome://global/skin/arrow/arrow-up-sharp.gif"); - background-position: center; - background-repeat: no-repeat; -} - -scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true"] { - background-color: rgb(62,62,62); -} - -/* :::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ -/* ::::::::::::::::::::: MEDIA PRINT :::::::::::::::::::::: */ -/* :::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ -@media print { - /* ::::: scrollbar ::::: */ - - html|div scrollbar { - /*-moz-appearance: scrollbartrack-horizontal;*/ - -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar"); - cursor: default; - height: 15px; - background: rgb(23,23,23); - } - - /* ::::: borders for thumb and buttons ::::: */ - - html|div thumb, - html|div scrollbarbutton { - background: rgb(50,50,50) 50% 50% no-repeat; - } - - html|div thumb { - border: 1px solid; - -moz-border-top-colors: rgb(75,75,75); - -moz-border-right-colors: rgb(75,75,75); - -moz-border-bottom-colors: rgb(75,75,75); - -moz-border-left-colors: rgb(75,75,75); - } - - html|div thumb:hover { - background-color: rgb(75,75,75); - } - - html|div thumb:active { - background-color: rgb(110,110,110); - } - - /* ::::: thumb (horizontal) ::::: */ - - html|div thumb { - min-height: 18px; - border-radius: 3px; - } - - html|div thumb[orient="horizontal"] { - min-width: 18px; - } - - /* ::::: scrollbar button ::::: */ - - html|div scrollbarbutton { - background: rgb(50,50,50) no-repeat 0px 1px; - width: 15px; - height: 15px; - } - - html|div scrollbarbutton:hover:active, html|div scrollbarbutton[active="true"] { - background-color: rgb(110,110,110); - } - - /* ..... increment .... */ - - html|div scrollbarbutton[type="increment"] { - -moz-appearance: none; - background-image: url("chrome://global/skin/arrow/arrow-rit-sharp.gif"); - background-position: center; - background-repeat: no-repeat; - } - - html|div scrollbarbutton[type="increment"][disabled="true"] { - background-color: rgb(62,62,62); - } - - html|div scrollbar[orient="vertical"] > scrollbarbutton[type="increment"] { - -moz-appearance: none; - background-image: url("chrome://global/skin/arrow/arrow-dn-sharp.gif"); - background-position: center; - background-repeat: no-repeat; - } - - html|div scrollbar[orient="vertical"] > scrollbarbutton[type="increment"][disabled="true"] { - background-color: rgb(62,62,62); - } - - /* ..... decrement .... */ - - html|div scrollbarbutton[type="decrement"] { - -moz-appearance: none; - background-image: url("chrome://global/skin/arrow/arrow-lft-sharp.gif"); - background-position: center; - background-repeat: no-repeat; - } - - html|div scrollbarbutton[type="decrement"][disabled="true"] { - background-color: rgb(62,62,62); - } - - html|div scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"] { - -moz-appearance: none; - background-image: url("chrome://global/skin/arrow/arrow-up-sharp.gif"); - background-position: center; - background-repeat: no-repeat; - } - - html|div scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true"] { - background-color: rgb(62,62,62); - } - -} +@import url("chrome://os/skin/scrollbars.css"); +\ No newline at end of file diff --git a/src/chrome/global/scrollbox.css b/src/chrome/global/scrollbox.css @@ -1,3 +1,7 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* @@ -9,7 +13,7 @@ .autorepeatbutton-down:-moz-locale-dir(rtl)[orient="horizontal"], .scrollbutton-up[orient="horizontal"], .scrollbutton-down:-moz-locale-dir(rtl)[orient="horizontal"] { - list-style-image: url("chrome://global/skin/arrow/arrow-lft.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-h.svg#lft"); -moz-image-region: auto; /* cut off inheritance */ } @@ -17,7 +21,7 @@ .autorepeatbutton-up:-moz-locale-dir(rtl)[orient="horizontal"], .scrollbutton-down[orient="horizontal"], .scrollbutton-up:-moz-locale-dir(rtl)[orient="horizontal"] { - list-style-image: url("chrome://global/skin/arrow/arrow-rit.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-h.svg#rit"); -moz-image-region: auto; /* cut off inheritance */ } @@ -26,7 +30,7 @@ .autorepeatbutton-down:-moz-locale-dir(rtl)[orient="horizontal"][disabled="true"], .scrollbutton-up[orient="horizontal"][disabled="true"], .scrollbutton-down:-moz-locale-dir(rtl)[orient="horizontal"][disabled="true"] { - list-style-image: url("chrome://global/skin/arrow/arrow-lft-dis.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-h.svg#lft-dis"); -moz-image-region: auto; /* cut off inheritance */ } @@ -34,33 +38,33 @@ .autorepeatbutton-up:-moz-locale-dir(rtl)[orient="horizontal"][disabled="true"], .scrollbutton-down[orient="horizontal"][disabled="true"], .scrollbutton-up:-moz-locale-dir(rtl)[orient="horizontal"][disabled="true"] { - list-style-image: url("chrome://global/skin/arrow/arrow-rit-dis.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-h.svg]rit-dis"); -moz-image-region: auto; /* cut off inheritance */ } /* Vertical enabled */ .autorepeatbutton-up, .scrollbutton-up { - list-style-image: url("chrome://global/skin/arrow/arrow-up.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#up"); -moz-image-region: auto; /* cut off inheritance */ } .autorepeatbutton-down, .scrollbutton-down { - list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#dn"); -moz-image-region: auto; /* cut off inheritance */ } /* Vertical disabled */ .autorepeatbutton-up[disabled="true"], .scrollbutton-up[disabled="true"] { - list-style-image: url("chrome://global/skin/arrow/arrow-up-dis.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#up-dis"); -moz-image-region: auto; /* cut off inheritance */ } .autorepeatbutton-down[disabled="true"], .scrollbutton-down[disabled="true"] { - list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#dn-dis"); -moz-image-region: auto; /* cut off inheritance */ } @@ -88,7 +92,7 @@ autorepeatbutton { autorepeatbutton:not([disabled="true"]):hover, autorepeatbutton:not([disabled="true"]):hover:active { margin: 1px; - border: 1px inset ThreeDFace; + border: 1px inset rgb(75,75,75); padding-top: 2px; padding-bottom: 1px; -moz-padding-start: 2px; diff --git a/src/chrome/global/spinbuttons.css b/src/chrome/global/spinbuttons.css @@ -39,22 +39,22 @@ spinbuttons { .spinbuttons-up { -moz-appearance: none; - background-image: url("chrome://global/skin/arrow/arrow-up.gif"); + background-image: url("chrome://global/skin/arrow/arrow-v.svg#up"); background-position: center center; background-repeat: no-repeat; } .spinbuttons-up[disabled="true"] { - background-image: url("chrome://global/skin/arrow/arrow-up-dis.gif"); + background-image: url("chrome://global/skin/arrow/arrow-v.svg#up-dis"); } .spinbuttons-down { -moz-appearance: none; - background-image: url("chrome://global/skin/arrow/arrow-dn.gif"); + background-image: url("chrome://global/skin/arrow/arrow-v.svg#dn"); background-position: center center; background-repeat: no-repeat; } .spinbuttons-down[disabled="true"] { - background-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif"); + background-image: url("chrome://global/skin/arrow/arrow-v.svg#dn-dis"); } diff --git a/src/chrome/global/tabbox.css b/src/chrome/global/tabbox.css @@ -33,8 +33,7 @@ tabpanels { /* ::::: tab ::::: */ -tab -{ +tab { -moz-appearance: none; margin-top: 2px; border-top: 1px solid; diff --git a/src/chrome/global/toolbar.css b/src/chrome/global/toolbar.css @@ -6,63 +6,9 @@ == Styles used by XUL toolbar-related elements. ======================================================================= */ -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -/* ::::: toolbox ::::: */ - -toolbox { - -moz-appearance: none; - background-color: rgb(43,43,43); - border-top: 1px solid; - -moz-border-top-colors: rgb(75,75,75); - color: #fff; -} - -/* ::::: toolbar & menubar ::::: */ +@import url("chrome://os/skin/toolbar.css"); -toolbar, menubar { - -moz-appearance: none; - background-color: rgb(43,43,43); - color: #fff; -} - -toolbar { - min-width: 1px; - min-height: 19px; - border-top: 1px solid rgb(75,75,75); - border-bottom: 1px solid rgb(75,75,75); -} - -toolbar:first-child, menubar { - min-width: 1px; - border-bottom: 1px solid rgb(75,75,75); - border-top: 0px !important; -} - -/* ::::: lightweight theme ::::: */ - -menubar:-moz-lwtheme, -toolbox:-moz-lwtheme, -toolbar:-moz-lwtheme { - -moz-appearance: none; - background: none; - border-style: none; - color: inherit; -} - -/* ::::: toolbar decorations ::::: */ - -toolbarseparator { - -moz-appearance: none; - margin: 3px 4px; - background: url("chrome://global/skin/toolbar/toolbar-separator.png") transparent repeat-y; - padding: 0; - width: 1px !important; -} - -toolbarspacer { - width: 15px; -} +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* ::::: toolbarpaletteitem ::::: */ @@ -119,4 +65,4 @@ toolbarpaletteitem[dragover="left"] { toolbarpaletteitem[dragover="right"] { border-right-color: rgb(75,75,75); -} +} +\ No newline at end of file diff --git a/src/chrome/global/toolbarbutton.css b/src/chrome/global/toolbarbutton.css @@ -1,201 +1 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* ===== toolbarbutton.css ===================================================== - == Styles used by the XUL button element. - ======================================================================= */ - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -/* ::::: toolbarbutton ::::: */ - -toolbarbutton { - -moz-appearance: toolbarbutton; - -moz-box-align: center; - -moz-box-pack: center; - margin: 0; - border: 1px solid transparent; - padding: 3px; - background-color: transparent; - color: #fff; -} - -.toolbarbutton-icon[label]:not([label=""]), -.toolbarbutton-icon[type="menu"] { - -moz-margin-end: 5px; -} - -.toolbarbutton-text { - margin: 0 !important; - text-align: center; -} - -toolbarbutton.tabbable { - -moz-user-focus: normal !important; -} - -toolbarbutton:-moz-focusring { - /* -moz-appearance looks redundant here but is necessary. - Without it, the outline won't appear. */ - -moz-appearance: toolbarbutton; - outline: 1px dotted -moz-DialogText; - outline-offset: -2px; -} - -toolbarbutton:hover:not([disabled="true"]) { - border-color: ThreeDHighlight ThreeDShadow ThreeDShadow ThreeDHighlight; -} - -toolbarbutton:hover:active:not([disabled="true"]), -toolbarbutton[open="true"]:hover, -toolbarbutton[open="true"] { - border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow; - padding-top: 4px; - padding-bottom: 2px; - -moz-padding-start: 4px; - -moz-padding-end: 2px; -} - -toolbarbutton[disabled="true"] { - color: GrayText; - text-shadow: none; -} - -@media (-moz-windows-classic) { - toolbarbutton[disabled="true"] { - color: ThreeDShadow; - text-shadow: 1px 1px ThreeDHighlight; - } -} - -toolbarbutton[checked="true"]:not([disabled="true"]) { - border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow; - padding-top: 4px; - padding-bottom: 2px; - -moz-padding-start: 4px; - -moz-padding-end: 2px; - background-color: rgba(255,255,255,0.5); - color: ButtonText; -} - -@media (-moz-windows-default-theme) { - toolbarbutton:-moz-lwtheme { - text-shadow: none; - } - - toolbarbutton:-moz-lwtheme:not(:hover):not([checked="true"]):not([open="true"]):not([disabled="true"]) { - color: inherit; - text-shadow: inherit; - } -} - -@media not all and (-moz-windows-default-theme) { - toolbarbutton:-moz-lwtheme { - -moz-appearance: none; - } - - toolbarbutton:-moz-lwtheme:not([disabled="true"]) { - color: inherit; - text-shadow: inherit; - } -} - -/* ::::: toolbarbutton menu ::::: */ - -.toolbarbutton-menu-dropmarker { - -moz-appearance: none !important; - border: none !important; - background-color: transparent !important; - padding: 0; - width: auto; - height: auto; - margin-top: 1px; -} - -/* ::::: toolbarbutton menu-button ::::: */ - -toolbarbutton[type="menu-button"] { - -moz-box-align: stretch; - -moz-box-orient: horizontal !important; -} - -toolbarbutton[type="menu-button"], -toolbarbutton[type="menu-button"]:hover, -toolbarbutton[type="menu-button"]:hover:active, -toolbarbutton[type="menu-button"][open="true"], -toolbarbutton[type="menu-button"][disabled="true"], -toolbarbutton[type="menu-button"][disabled="true"]:hover, -toolbarbutton[type="menu-button"][disabled="true"]:hover:active { - border-style: none; - padding: 0 !important; -} - -.toolbarbutton-menubutton-button { - -moz-box-align: center; - -moz-box-pack: center; - -moz-box-orient: vertical; -} - -/* ::::: toolbarbutton badged ::::: */ - -.toolbarbutton-badge-container > .toolbarbutton-icon[label]:not([label=""]) { - -moz-margin-end: 0; -} - -.toolbarbutton-badge[badge=""] { - display: none; -} - -.toolbarbutton-badge { - background-color: rgb(110,110,110); -} - -.toolbarbutton-badge::after { - /* The |content| property is set in the content stylesheet. */ - font-size: 10px; - font-weight: bold; - padding: 1px 2px 2px; - color: #fff; - background-color: inherit; - border-radius: 2px; - box-shadow: 0 1px 0 hsla(0, 100%, 100%, .2) inset, - 0 -1px 0 hsla(0, 0%, 0%, .1) inset, - 0 1px 0 hsla(206, 50%, 10%, .2); - position: absolute; - top: -4px; - right: -2px; - min-width: 10px; - line-height: 10px; - text-align: center; -} - -.toolbarbutton-badge:-moz-locale-dir(rtl)::after { - left: -2px; - right: auto; -} - -.toolbarbutton-badge-container { - position: relative; -} - -/* .......... dropmarker .......... */ - -.toolbarbutton-menubutton-dropmarker { - -moz-appearance: none; - padding: 3px 7px; - border: none; - background-color: transparent; - width: auto; -} - -@media (-moz-windows-default-theme) { - toolbarbutton:-moz-lwtheme:not([disabled="true"]) { - color: inherit; - text-shadow: inherit; - } -} +@import url("chrome://os/skin/toolbarbutton.css"); +\ No newline at end of file diff --git a/src/chrome/global/tree.css b/src/chrome/global/tree.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/. */ - /* ===== tree.css =================================================== == Styles used by the XUL outline element. ======================================================================= */ @@ -206,7 +202,7 @@ treecolpicker { -moz-box-align: center; -moz-box-pack: center; border: 1px solid rgb(75,75,75); - background-color: rgb(50,50,50); + background-color: rgb(60,60,60); color: #fff; padding: 0px 4px; } @@ -229,18 +225,7 @@ treecol[hideheader="true"] { treecol:hover:active, treecolpicker:hover:active { - border-top: 1px solid rgb(110,110,110); - padding-top: 1px; - padding-bottom: 0px; - -moz-padding-start: 5px; - -moz-padding-end: 4px; -} - -.treecol-image:hover:active { - padding-top: 1px; - padding-bottom: 0px; - -moz-padding-start: 2px; - -moz-padding-end: 1px; + background-color: rgb(110,110,110); } /* ::::: column drag and drop styles ::::: */ @@ -279,25 +264,25 @@ treechildren::-moz-tree-column(insertafter) { } treecol:not([hideheader="true"]) > .treecol-sortdirection[sortDirection="ascending"] { - list-style-image: url("chrome://global/skin/tree/sort-asc.png"); + list-style-image: url("chrome://global/skin/tree/sort.svg#asc"); } treecol:not([hideheader="true"]) > .treecol-sortdirection[sortDirection="ascending"]:-moz-system-metric(windows-classic) { - list-style-image: url("chrome://global/skin/tree/sort-asc-classic.png"); + list-style-image: url("chrome://global/skin/tree/sort.svg#asc-classic"); } treecol:not([hideheader="true"]) > .treecol-sortdirection[sortDirection="descending"] { - list-style-image: url("chrome://global/skin/tree/sort-dsc.png"); + list-style-image: url("chrome://global/skin/tree/sort.svg#dsc"); } treecol:not([hideheader="true"]) > .treecol-sortdirection[sortDirection="descending"]:-moz-system-metric(windows-classic) { - list-style-image: url("chrome://global/skin/tree/sort-dsc-classic.png"); + list-style-image: url("chrome://global/skin/tree/sort.svg#dsc-classic"); } /* ::::: column picker ::::: */ .tree-columnpicker-icon { - list-style-image: url("chrome://global/skin/tree/columnpicker.gif"); + list-style-image: url("chrome://global/skin/tree/columnpicker.svg"); } /* ::::: twisty ::::: */ @@ -306,12 +291,11 @@ treechildren::-moz-tree-twisty { -moz-padding-end: 4px; padding-top: 1px; width: 9px; /* The image's width is 9 pixels */ - list-style-image: url("chrome://global/skin/tree/twisty-clsd.png"); + list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd"); } treechildren::-moz-tree-twisty(open) { - width: 9px; /* The image's width is 9 pixels */ - list-style-image: url("chrome://global/skin/tree/twisty-open.png"); + list-style-image: url("chrome://global/skin/tree/twisty.svg#open"); } treechildren::-moz-tree-indentation { @@ -363,35 +347,26 @@ treechildren::-moz-tree-twisty { width: 9px; } -/* - Please note that the following RTL icons are only available in Aero themes: - * chrome://global/skin/tree/twisty-clsd-hover.png - * chrome://global/skin/tree/twisty-open-hover.png - * chrome://global/skin/tree/twisty-clsd-rtl.png - * chrome://global/skin/tree/twisty-open-rtl.png - * chrome://global/skin/tree/twisty-clsd-hover-rtl.png - * chrome://global/skin/tree/twisty-open-hover-rtl.png -*/ treechildren::-moz-tree-twisty(hover) { - list-style-image: url("chrome://global/skin/tree/twisty-clsd-hover.png"); + list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover"); } treechildren::-moz-tree-twisty(hover, open) { - list-style-image: url("chrome://global/skin/tree/twisty-open-hover.png"); + list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover"); } treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty { - list-style-image: url("chrome://global/skin/tree/twisty-clsd-rtl.png"); + list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-rtl"); } treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open) { - list-style-image: url("chrome://global/skin/tree/twisty-open-rtl.png"); + list-style-image: url("chrome://global/skin/tree/twisty.svg#open-rtl"); } treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover) { - list-style-image: url("chrome://global/skin/tree/twisty-clsd-hover-rtl.png"); + list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover-rtl"); } treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover, open) { - list-style-image: url("chrome://global/skin/tree/twisty-open-hover-rtl.png"); + list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover-rtl"); } diff --git a/src/chrome/global/tree/columnpicker.svg b/src/chrome/global/tree/columnpicker.svg @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" + y="0" + width="14" + height="12" + viewBox="0 0 14 12"> + <path d="M 6,9.5 h -3.5 v -7 h 8 v 4.5 + M 3,4.5 h 7 M 6.5,3 v 4" stroke="#fff" stroke-width="1" fill="none"/> + <path d="M 6.4,8 h 6.2 l -3.1,3.2 l-3.1,-3.2 z" stroke="#fff" stroke-width="0" fill="#fff"/> +</svg> +\ No newline at end of file diff --git a/src/chrome/global/tree/sort.svg b/src/chrome/global/tree/sort.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" + y="0" + width="9" + height="5" + viewBox="0 0 9 5"> + <style> + .t:not(:target){ + display: none; + } + path { + stroke-width: 0; + stroke: #fff; + fill: #fff; + } + path[id$=classic] { + stroke-width: 0; + stroke: #808080; + fill: #808080; + } + </style> + <path id="asc" class="t" d="M 8.6,4 h -8.2 l 4.1,-4.2 l 4.1,4.2 z"/> + <path id="dsc" class="t" d="M 0.4,0 h 8.2 l -4.1,4.2 l -4.1,-4.2 z"/> + <path id="asc-classic" class="t" d="M 8.6,4 h -8.2 l 4.1,-4.2 l 4.1,4.2 z"/> + <path id="dsc-classic" class="t" d="M 0.4,0 h 8.2 l -4.1,4.2 l -4.1,-4.2 z"/> +</svg> +\ No newline at end of file diff --git a/src/chrome/global/tree/twisty.svg b/src/chrome/global/tree/twisty.svg @@ -0,0 +1,38 @@ +<?xml version="1.0"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="9" height="9"> + <style> + use:not(:target) { + display: none; + } + use { + stroke: #fff; + opacity: 0.85; + fill: #fff; + } + use[id^="open"] { + opacity: 1; + } + use[id*="-hover"] { + stroke: #1cc4f7; + opacity: 1; + fill: #c0e8f9; + } + </style> + <defs> + <path id="clsd-shape" d="m 2.5,0.5 4,4 -4,4 z"/> + <path id="open-shape" d="M 7.5,3 7.5,7.5 3,7.5 3,6.5 6.5,3 Z"/> + <path id="clsd-rtl-shape" d="m 6.5,0.5 -4,4 4,4 z"/> + <path id="open-rtl-shape" d="m 1.5,3 0,4.5 4.5,0 0,-1 L 2.5,3 Z"/> + </defs> + <use id="clsd" xlink:href="#clsd-shape"/> + <use id="clsd-hover" xlink:href="#clsd-shape"/> + <use id="open" xlink:href="#open-shape"/> + <use id="open-hover" xlink:href="#open-shape"/> + <use id="clsd-rtl" xlink:href="#clsd-rtl-shape"/> + <use id="clsd-hover-rtl" xlink:href="#clsd-rtl-shape"/> + <use id="open-rtl" xlink:href="#open-rtl-shape"/> + <use id="open-hover-rtl" xlink:href="#open-rtl-shape"/> +</svg> diff --git a/src/chrome/mozapps/aboutNetworking.css b/src/chrome/mozapps/aboutNetworking.css @@ -1,60 +1 @@ -/* 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 { - min-width: 330px; - max-width: 100%; - min-height: 330px; - max-height: 100%; -} - -#menu { - position: absolute; - top: 5px; - color: gray; -} - -.warningBackground { - display: none; - background: -moz-Dialog; - width:100%; - height:100%; - z-index:10; - top:0; - left:0; - position:fixed; -} - -.warningMessage { - color: -moz-FieldText; - position: relative; - min-width: 330px; - max-width: 50em; - margin: 4em auto; - border: 1px solid ThreeDShadow; - border-radius: 10px; - padding: 3em; - -moz-padding-start: 30px; - background: -moz-Field; - margin-left: auto; - text-align: center; -} - -.tab { - display: none; -} - -.active { - display: block; -} - -#menu .selected { - color: blue; -} - -#refreshdiv { - top: 5px; - position: absolute; - right: 30px; -} +@import url("chrome://appver/skin/aboutNetworking.css"); +\ No newline at end of file diff --git a/src/chrome/mozapps/aboutNetworking.svg b/src/chrome/mozapps/aboutNetworking.svg @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" + y="0" + width="32" + height="32" + viewBox="0 0 32 32"> + <style> + use:not(:target) { + display: none; + } + use { + fill: none; + stroke: #fff; + stroke-width: 1; + } + use[id$="-red"] { + fill: none; + stroke: #F00; + } + use[id="security"] { + fill: none; + stroke: #fff; + } + </style> + <defs style="display: none;"> + <g id="http-shape"> + <path d="M 22.8,3 c -3,1 -7.3,1 -7.3,4 c 0,2 1,1.5 1,3.5 l 0,3.5 c 0,1 1,3.5 2,3.5 c 1,0 3,-2 5,-2 l 3,0 c 2.5,0 2.17,-0.5 3.67,-3 a 14,14 0 0,0 -7.37,-9.5 Z" stroke-width="0"/> + <circle cx="16.5" cy="15.5" r="14" fill="none"/> + <path d="M 22.8,3 c -3,1 -7.3,1 -7.3,4 c 0,2 1,1.5 1,3.5 l 0,3.5 c 0,1 1,3.5 2,3.5 c 1,0 3,-2 5,-2 l 3,0 c 2.5,0 2.17,-0.5 3.67,-3" fill="none"/> + <path d="M 14.5,19.5 c 2,0 3,0 3,2 c 0,1.5 -.5,2 -2,2 c -1.5,0 -1.5,.5 -3,2 c -1,1 -2,0 -2,-1 c 0,-2 -1.5,-2.5 0,-4 c 2.75,-2.75 3,-1 4,-1 Z"/> + </g> + <g id="sockets-shape"> + <rect x="3.5" y="3.5" width="25" height="25" rx="3.5" ry="3.5"/> + <path d="M 11.5,10 v 7 m 9,-6.66 v 6.33 m -3,6.83 v -1.4 a 1.5,1.8 0 0,0 -3,0 v 1.4 h 3 v -1"/> + </g> + <g id="dns-shape-TRIAL"> + <path d="M 6,4.5 h 20 a 2.5,2.5 0 0,1 2.5,2.5 v 8 a 2.5,2.5 0 0,1 -2.5,2.5 h -8.33 l -8,8 l 2,-8 h -5.67 a 2.5,2.5 0 0,1 -2.5,-2.5 v -8 a 2.5,2.5 0 0,1 2.5,-2.5 z"/> + <path d="M 6,4.5 m 3.5,6.75 h 1.5 m 4.5,0 h 1.5 m 4.5,0 h 1.5" stroke-width="1.5"/> + </g> + <g id="dns-shape"> + <path d="M 5.5,19.5 h 4 v 2 c 0,1 -.5,3 -2.5,5 c 5,0 8.5,-3 10.5,-7 h 8 a 5,5 0 0,0 0,-10 h -1 a 4.8,4.8 0 0,0 -7,-3 a 5.8,5.8 0 0,0 -11,3 a 5,5 0 0,0 0,10 Z"/> + <rect x="10.5" y="13.5" width="1" height="1"/> + <rect x="15.5" y="13.5" width="1" height="1"/> + <rect x="20.5" y="13.5" width="1" height="1"/> + </g> + <g id="websockets-shape"> + <circle cx="16" cy="16" r="13.5"/> + <circle cx="16" cy="16" r=".75"/> + <path d="M 16,16 m 0.25,6.495 a 5.3,6.5 0 0,0 5.379,-3.245 l 2.5,2 m -2.5,-2 m -11.106,0.25 a 7.5,6.5 0 0,1 0,-7 m 11.106,0.25 a5.3,6.5 0 0,0 -5.379,-3.245 l .8,-3.3"/> + </g> + <g id="dnslookup-shape"> + <circle cx="14" cy="13" r="9.5"/> + <line x1="21" y1="20" x2="27.5" y2="26.5"/> + </g> + <g id="logging-shape"> + <path d="M 5.5,3.5 v 24 h 20 v -17 l -7,-7 Z m 12,.5 v 7.5 h 7.5"/> + <path d="M 9.0,15.5 h 13 m -13,4 h 13 m -13,4 h 8"/> + </g> + </defs> + <use id="http" xlink:href="#http-shape"/> + <use id="sockets" xlink:href="#sockets-shape"/> + <use id="dns" xlink:href="#dns-shape"/> + <use id="websockets" xlink:href="#websockets-shape"/> + <use id="dnslookup" xlink:href="#dnslookup-shape"/> + <use id="logging" xlink:href="#logging-shape"/> +</svg> +\ No newline at end of file diff --git a/src/chrome/mozapps/aboutProfiles.css b/src/chrome/mozapps/aboutProfiles.css @@ -0,0 +1,105 @@ +/* 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/. */ + +html { + --aboutProfiles-table-background: rgb(75,75,75); + background-color: var(--in-content-frame-background); /* was var(--in-content-page-background) --johnGraciliano */ + padding: 48px 48px; +} + +body { + margin: auto; +} + +#body { + box-sizing: content-box; + max-width: 90em; + background-color: var(--in-content-page-background); + color: #fff; + border: 1px solid var(--in-content-main-border-color); + border-radius: 10px; + padding: 3em 30px; +} + +.page-subtitle { + margin-bottom: 3em; +} + +button { + -moz-margin-start: 0; + -moz-margin-end: 8px; +} + +table { + background-color: var(--aboutProfiles-table-background); + color: var(--in-content-text-color); + font: message-box; + text-align: start; + width: 100%; + border: 1px solid var(--in-content-border-color); + border-spacing: 0px; +} + +th, td { + border-width: 0; + border-style: solid; + padding: 4px; + text-align: start; +} + +th { + background-color: var(--in-content-table-header-background); + color: var(--in-content-selected-text); + border-color: var(--in-content-border-color); +} + +th.column { + white-space: nowrap; + width: 0px; +} + +td { + border-color: var(--in-content-table-border-dark-color); +} + +th:not(:last-child), +td:not(:last-child){ + -moz-border-end-width: 1px; + border-inline-end-width: 1px; +} + +tr:not(:last-child) > th, +tr:not(:last-child) > td{ + border-bottom-width: 1px; +} + +thead + tbody > tr:first-child > td{ + border-top: 1px solid var(--in-content-border-color); +} + +table button { + padding-top: 1px; + padding-bottom: 1px; + margin: 1px; + height: auto; + min-height: unset; + line-height: normal; +} + +#action-box { + background-color: var(--aboutProfiles-table-background); + border: 1px solid var(--in-content-border-color); + color: var(--in-content-text-color); + float: right; + margin-top: 2em; + margin-bottom: 20px; + -moz-margin-start: 20px; + -moz-margin-end: 0; + padding: 16px; + width: 30%; +} + +#action-box:-moz-dir(rtl) { + float: left; +} diff --git a/src/chrome/mozapps/aboutServiceWorkers.css b/src/chrome/mozapps/aboutServiceWorkers.css @@ -0,0 +1,44 @@ +/* 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 { + min-width: 330px; + max-width: 100%; + min-height: 330px; + max-height: 100%; +} + +.warningBackground { + display: none; + background: rgb(23,23,23); + width:100%; + height:100%; + z-index:10; + top:0; + left:0; + position:fixed; +} + +.warningMessage { + color: #fff; + position: relative; + min-width: 330px; + max-width: 50em; + margin: 4em auto; + border: 1px solid rgb(50,50,50); + border-radius: 10px; + padding: 3em; + -moz-padding-start: 30px; + background: rgb(43,43,43); + margin-left: auto; + text-align: center; +} + +.active { + display: block; +} + +.inactive { + display: none; +} diff --git a/src/chrome/mozapps/extensions/addons.svg b/src/chrome/mozapps/extensions/addons.svg @@ -16,28 +16,28 @@ stroke-width: 1; } use[id="extensionGeneric"] { - fill: #1a96f6; - stroke: #1a96f6; + fill: #4B89B9; + stroke: #4B89B9; } use[id="themeGeneric"] { - fill: #f24cae; - stroke: #f24cae; + fill: #BD6A9B; + stroke: #BD6A9B; } use[id="pluginGeneric"] { - fill: #08d5c9; - stroke: #08d5c9; + fill: #4FB5AF; + stroke: #4FB5AF; } use[id="dictionaryGeneric"] { - fill: #c196fc; - stroke: #c196fc; + fill: #B7A2D5; + stroke: #B7A2D5; } use[id="languageGeneric"] { - fill: #0fca7d; - stroke: #0fca7d; + fill: #B7A2D5; + stroke: #B7A2D5; } use[id="experimentGeneric"] { - fill: #f6bf00; - stroke: #f6bf00; + fill: #D8BC5D; + stroke: #D8BC5D; } </style> <defs style="display: none;"> diff --git a/src/chrome/mozapps/extensions/alerticon-info-positive.svg b/src/chrome/mozapps/extensions/alerticon-info-positive.svg @@ -2,5 +2,5 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 18 18"> - <path fill="#51A040" d="M18,4.796c0,0.31-0.109,0.573-0.325,0.79l-8.408,8.406l-1.579,1.58c-0.217,0.217-0.48,0.325-0.789,0.325c-0.31,0-0.573-0.108-0.79-0.325l-1.579-1.58L0.325,9.79C0.108,9.573,0,9.31,0,9s0.108-0.573,0.325-0.79l1.58-1.579c0.216-0.217,0.479-0.325,0.789-0.325s0.573,0.108,0.79,0.325l3.414,3.426l7.617-7.63c0.217-0.216,0.48-0.325,0.79-0.325c0.309,0,0.572,0.109,0.789,0.325l1.58,1.58C17.891,4.224,18,4.487,18,4.796z"/> + <path fill="#62c44e" d="M18,4.796c0,0.31-0.109,0.573-0.325,0.79l-8.408,8.406l-1.579,1.58c-0.217,0.217-0.48,0.325-0.789,0.325c-0.31,0-0.573-0.108-0.79-0.325l-1.579-1.58L0.325,9.79C0.108,9.573,0,9.31,0,9s0.108-0.573,0.325-0.79l1.58-1.579c0.216-0.217,0.479-0.325,0.789-0.325s0.573,0.108,0.79,0.325l3.414,3.426l7.617-7.63c0.217-0.216,0.48-0.325,0.79-0.325c0.309,0,0.572,0.109,0.789,0.325l1.58,1.58C17.891,4.224,18,4.487,18,4.796z"/> </svg> diff --git a/src/chrome/mozapps/extensions/alerticon-warning.svg b/src/chrome/mozapps/extensions/alerticon-warning.svg @@ -2,5 +2,5 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 18 18"> - <path fill="#E0BF2C" d="M10.124,1.324l7.705,14.127c0.234,0.421,0.228,0.843-0.019,1.264c-0.114,0.193-0.271,0.347-0.467,0.461c-0.198,0.114-0.41,0.171-0.638,0.171H1.294c-0.228,0-0.44-0.057-0.636-0.171c-0.198-0.114-0.353-0.268-0.467-0.461c-0.247-0.421-0.254-0.843-0.02-1.264L7.876,1.324C7.99,1.117,8.147,0.953,8.348,0.833C8.548,0.712,8.766,0.652,9,0.652c0.234,0,0.451,0.06,0.652,0.181C9.853,0.953,10.009,1.117,10.124,1.324z M10.264,10.695l0.181-4.605c0-0.08-0.034-0.143-0.1-0.191c-0.087-0.073-0.168-0.11-0.241-0.11H7.896c-0.073,0-0.154,0.037-0.241,0.11c-0.067,0.048-0.1,0.118-0.1,0.211l0.17,4.586c0,0.067,0.034,0.122,0.1,0.165c0.067,0.044,0.147,0.065,0.241,0.065h1.856c0.094,0,0.172-0.021,0.236-0.065C10.222,10.818,10.258,10.762,10.264,10.695z M10.284,14.448v-1.907c0-0.094-0.031-0.172-0.095-0.236c-0.064-0.064-0.139-0.095-0.225-0.095H8.036c-0.087,0-0.162,0.031-0.225,0.095c-0.064,0.064-0.095,0.142-0.095,0.236v1.907c0,0.094,0.031,0.173,0.095,0.236c0.064,0.064,0.138,0.095,0.225,0.095h1.927c0.086,0,0.162-0.031,0.225-0.095C10.252,14.621,10.284,14.542,10.284,14.448z"/> + <path fill="#f0cd2f" d="M10.124,1.324l7.705,14.127c0.234,0.421,0.228,0.843-0.019,1.264c-0.114,0.193-0.271,0.347-0.467,0.461c-0.198,0.114-0.41,0.171-0.638,0.171H1.294c-0.228,0-0.44-0.057-0.636-0.171c-0.198-0.114-0.353-0.268-0.467-0.461c-0.247-0.421-0.254-0.843-0.02-1.264L7.876,1.324C7.99,1.117,8.147,0.953,8.348,0.833C8.548,0.712,8.766,0.652,9,0.652c0.234,0,0.451,0.06,0.652,0.181C9.853,0.953,10.009,1.117,10.124,1.324z M10.264,10.695l0.181-4.605c0-0.08-0.034-0.143-0.1-0.191c-0.087-0.073-0.168-0.11-0.241-0.11H7.896c-0.073,0-0.154,0.037-0.241,0.11c-0.067,0.048-0.1,0.118-0.1,0.211l0.17,4.586c0,0.067,0.034,0.122,0.1,0.165c0.067,0.044,0.147,0.065,0.241,0.065h1.856c0.094,0,0.172-0.021,0.236-0.065C10.222,10.818,10.258,10.762,10.264,10.695z M10.284,14.448v-1.907c0-0.094-0.031-0.172-0.095-0.236c-0.064-0.064-0.139-0.095-0.225-0.095H8.036c-0.087,0-0.162,0.031-0.225,0.095c-0.064,0.064-0.095,0.142-0.095,0.236v1.907c0,0.094,0.031,0.173,0.095,0.236c0.064,0.064,0.138,0.095,0.225,0.095h1.927c0.086,0,0.162-0.031,0.225-0.095C10.252,14.621,10.284,14.542,10.284,14.448z"/> </svg> diff --git a/src/chrome/mozapps/extensions/category-available.png b/src/chrome/mozapps/extensions/category-available.png Binary files differ. diff --git a/src/chrome/mozapps/extensions/category-dictionaries.png b/src/chrome/mozapps/extensions/category-dictionaries.png Binary files differ. diff --git a/src/chrome/mozapps/extensions/category-discover.png b/src/chrome/mozapps/extensions/category-discover.png Binary files differ. diff --git a/src/chrome/mozapps/extensions/category-experiments.png b/src/chrome/mozapps/extensions/category-experiments.png Binary files differ. diff --git a/src/chrome/mozapps/extensions/category-extensions.png b/src/chrome/mozapps/extensions/category-extensions.png Binary files differ. diff --git a/src/chrome/mozapps/extensions/category-languages.png b/src/chrome/mozapps/extensions/category-languages.png Binary files differ. diff --git a/src/chrome/mozapps/extensions/category-plugins.png b/src/chrome/mozapps/extensions/category-plugins.png Binary files differ. diff --git a/src/chrome/mozapps/extensions/category-recent.png b/src/chrome/mozapps/extensions/category-recent.png Binary files differ. diff --git a/src/chrome/mozapps/extensions/category-search.png b/src/chrome/mozapps/extensions/category-search.png Binary files differ. diff --git a/src/chrome/mozapps/extensions/category-searchengines.png b/src/chrome/mozapps/extensions/category-searchengines.png Binary files differ. diff --git a/src/chrome/mozapps/extensions/category-service.png b/src/chrome/mozapps/extensions/category-service.png Binary files differ. diff --git a/src/chrome/mozapps/extensions/category-themes.png b/src/chrome/mozapps/extensions/category-themes.png Binary files differ. diff --git a/src/chrome/mozapps/extensions/category-userscripts.png b/src/chrome/mozapps/extensions/category-userscripts.png Binary files differ. diff --git a/src/chrome/mozapps/extensions/category-userstyle.png b/src/chrome/mozapps/extensions/category-userstyle.png Binary files differ. diff --git a/src/chrome/mozapps/extensions/extensionGeneric-16.png b/src/chrome/mozapps/extensions/extensionGeneric-16.png Binary files differ. diff --git a/src/chrome/mozapps/extensions/extensionGeneric-16.svg b/src/chrome/mozapps/extensions/extensionGeneric-16.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="18" height="18" viewBox="0 0 18 18"> + <style> + g { + fill: none; + stroke: #fff; + stroke-width: 1.0325; + } + #darktext:target + g { + stroke: #000; + stroke-width: 1; + } + </style> + <g id="darktext"/> + <g> + <path d="M 1.5,11 v 2.75 a 1.75,1.75 0 0,0 1.75,1.75 + h 2.75 v -.05 a 1.85,1.85 0 1,1 3,0 v .05 h 1.75 a 1.75,1.75 0 0,0 1.75,-1.75 + v -3 h .05 a 1.9,1.9 0 1,0 0,-3 h-.05 v -1.5 a 1.75,1.75 0 0,0 -1.75,-1.75 + h -1.5 v -.05 a 1.9,1.9 0 1,0 -3,0 v .05 h -3 a 1.75,1.75 0 0,0 -1.75,1.75 + v 1.75 h .05 a 1.85,1.85 0 1,1 0,3 h-.05 Z"/> + </g> +</svg> +\ No newline at end of file diff --git a/src/chrome/mozapps/extensions/extensions.css b/src/chrome/mozapps/extensions/extensions.css @@ -8,25 +8,20 @@ @import url("chrome://global/skin/inContentUI.css"); - -.nav-button { - list-style-image: url(chrome://mozapps/skin/extensions/navigation.png); -} - #forward-btn { -moz-border-start: none; } #back-btn:-moz-locale-dir(ltr), #forward-btn:-moz-locale-dir(rtl) { - -moz-image-region: rect(0, 18px, 18px, 0); + list-style-image: url("chrome://browser/skin/toolbar/back.svg"); border-top-right-radius: 0; border-bottom-right-radius: 0; } #back-btn:-moz-locale-dir(rtl), #forward-btn:-moz-locale-dir(ltr) { - -moz-image-region: rect(0, 36px, 18px, 18px); + list-style-image: url("chrome://browser/skin/toolbar/forward.svg"); border-top-left-radius: 0; border-bottom-left-radius: 0; } @@ -46,9 +41,7 @@ } #addons-page[warning] .global-warning-container { - background-color: rgba(255, 255, 0, 0.1); - background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"); - background-repeat: repeat-x; + background-image: linear-gradient(transparent, rgba(175, 175, 0, 0.1)); } #detail-view .global-warning { @@ -87,32 +80,20 @@ .warning-icon { list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.svg"); - width: 16px; - height: 15px; - margin: 3px 0; } .error-icon { list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.svg"); - width: 16px; - height: 15px; - margin: 3px 0; } .pending-icon, .info-icon { list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.svg"); - width: 16px; - height: 15px; - margin: 3px 0; } .addon-view[pending="disable"] .pending-icon, .addon-view[pending="uninstall"] .pending-icon { list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.svg"); - width: 16px; - height: 15px; - margin: 3px 0; } @@ -305,7 +286,7 @@ } #header-utils-btn { - list-style-image: url("chrome://mozapps/skin/extensions/utilities.png"); + list-style-image: url("chrome://browser/skin/toolbar/menu.svg"); -moz-margin-end: 16px; } @@ -340,12 +321,11 @@ } .sorter[checkState="1"] { - list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); - background-color: rgb(110,110,110) !important; + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#dn"); } .sorter[checkState="2"] { - list-style-image: url("chrome://global/skin/arrow/arrow-up.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#up"); } .sorter .button-icon { @@ -429,28 +409,28 @@ } .addon[active="false"] .icon { - filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale"); + filter: grayscale(100%); } .addon-view[type="theme"] .icon { - list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/addons.svg#themeGeneric"); } .addon-view[type="locale"] .icon { - list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/addons.svg#languageGeneric"); } .addon-view[type="plugin"] .icon { - list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/addons.svg#pluginGeneric"); } .addon-view[type="dictionary"] .icon { - list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/addons.svg#dictionaryGeneric"); } .addon-view[type="experiment"] .icon { - list-style-image: url("chrome://mozapps/skin/extensions/experimentGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/addons.svg#experimentGeneric"); } .name-container { @@ -569,7 +549,7 @@ font-weight: bold; -moz-box-direction: reverse; cursor: pointer; - list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#dn"); } .addon .relnotes-toggle > .button-box > .button-icon { @@ -577,49 +557,38 @@ } .addon[show-relnotes] .relnotes-toggle { - list-style-image: url("chrome://global/skin/arrow/arrow-up.gif"); + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#up"); } -/*.addon[active="false"] { - background-color: rgba(135, 135, 135, 0.1); - background-image: linear-gradient(rgba(135, 135, 135, 0), - rgba(135, 135, 135, 0.1)); -}*/ - .addon-view[active="false"], .addon-view[active="false"] .name-container { color: #AAA; } +.addon-view[notification], +.addon-view[pending] { + --view-highlight-color: transparent; + background-image: radial-gradient(at 50% 0%, + var(--view-highlight-color) 0%, + transparent 75%); +} .addon-view[notification="warning"] { - background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"), - linear-gradient(rgba(255, 255, 0, 0.04), - rgba(255, 255, 0, 0)); - background-repeat: repeat-x; + --view-highlight-color: rgb(86,85,79); } .addon-view[notification="error"] { - background-image: url("chrome://mozapps/skin/extensions/stripes-error.png"), - linear-gradient(rgba(255, 0, 0, 0.04), - rgba(255, 0, 0, 0)); - background-repeat: repeat-x; + --view-highlight-color: rgb(89,81,81); } .addon-view[pending="enable"], .addon-view[pending="upgrade"], .addon-view[pending="install"] { - background-image: url("chrome://mozapps/skin/extensions/stripes-info-positive.png"), - linear-gradient(rgba(0, 255, 0, 0.04), - rgba(0, 255, 0, 0)); - background-repeat: repeat-x; + --view-highlight-color: rgb(85,89,86); } .addon-view[pending="disable"], .addon-view[pending="uninstall"] { - background-image: url("chrome://mozapps/skin/extensions/stripes-info-negative.png"), - linear-gradient(rgba(128, 128, 128, 0.04), - rgba(128, 128, 128, 0)); - background-repeat: repeat-x; + --view-highlight-color: rgb(75,75,75); } .addon[selected] { diff --git a/src/chrome/mozapps/extensions/stripes-error.png b/src/chrome/mozapps/extensions/stripes-error.png Binary files differ. diff --git a/src/chrome/mozapps/extensions/stripes-info-negative.png b/src/chrome/mozapps/extensions/stripes-info-negative.png Binary files differ. diff --git a/src/chrome/mozapps/extensions/stripes-info-positive.png b/src/chrome/mozapps/extensions/stripes-info-positive.png Binary files differ. diff --git a/src/chrome/mozapps/extensions/stripes-warning.png b/src/chrome/mozapps/extensions/stripes-warning.png Binary files differ. diff --git a/src/chrome/mozapps/passwordmgr/key-16.png b/src/chrome/mozapps/passwordmgr/key-16.png Binary files differ. diff --git a/src/chrome/mozapps/passwordmgr/key-64.png b/src/chrome/mozapps/passwordmgr/key-64.png Binary files differ. diff --git a/src/chrome/mozapps/passwordmgr/key.png b/src/chrome/mozapps/passwordmgr/key.png Binary files differ. diff --git a/src/chrome/mozapps/passwordmgr/key.svg b/src/chrome/mozapps/passwordmgr/key.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + x="0" y="0" width="16" height="16" viewBox="0 0 16 16"> + <style> + g { + fill: #9C9C9C; + stroke: none; + } + #large:target + g { + fill: #E5C564; + } + </style> + <g id="large"/> + <g> + <circle cx="12.87" cy="3.434" r=".75" fill="none"/> + <path transform="translate(0 .02)" d="m0.63 12.671 1.146 1.125 1.736-1.733-1.142-1.111zm11.24-11.757c-1.934 0-3.5 1.566-3.5 3.5 0 0.792 0.267 1.521 0.71 2.106l-0.02-0.02-7.815 7.807 0.76 0.739 7.784-7.818-0.02-0.02c0.585 0.44 1.312 0.705 2.101 0.705 1.934 0 3.5-1.567 3.5-3.5s-1.566-3.499-3.5-3.499zm1 3.25c-0.414 0-0.75-0.336-0.75-0.75s0.336-0.75 0.75-0.75 0.75 0.336 0.75 0.75-0.336 0.75-0.75 0.75z"/> + </g> +</svg> diff --git a/src/chrome/mozapps/places/defaultFavicon.png b/src/chrome/mozapps/places/defaultFavicon.png Binary files differ. diff --git a/src/chrome/mozapps/places/defaultFavicon.svg b/src/chrome/mozapps/places/defaultFavicon.svg @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"> + <g> + <polygon fill="#E4E4E4" points="2,0 2,14 14,14 14,6 8,6 8,0 " stroke="none"/> + <polygon fill="#E3E3E3" points="9.04,0 9.04,5.041 14,5.041 " stroke="none"/> + </g> +</svg> diff --git a/src/chrome/mozapps/plugins/pluginGeneric-16.svg b/src/chrome/mozapps/plugins/pluginGeneric-16.svg @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve"> +<path fill="#9B9B9B" stroke="#9B9B9B" stroke-miterlimit="10" d="M1,15l2.75-2.75 M6.125,3.125l6.75,6.75L10.5,12.25 + c-1.87,1.857-4.893,1.847-6.75-0.023c-1.849-1.861-1.849-4.865,0-6.727L6.125,3.125z M11.25,1l-3.5,3.5 M15,4.75l-3.5,3.5"/> +</svg> diff --git a/src/chrome/os/darwin/browser.css b/src/chrome/os/darwin/browser.css @@ -0,0 +1,47 @@ +#titlebar { + display: none; +} + +.tabbrowser-tab[selected="true"]:not(:-moz-lwtheme) > * > * > .tab-text { + text-shadow: none; +} + +#navigator-toolbox[tabsontop="false"] #PersonalToolbar, +#navigator-toolbox[tabsontop="false"] #TabsToolbar { + background: transparent; +} + +/* ::::: bookmark buttons ::::: */ + +toolbarbutton.bookmark-item { + font-weight: normal; + border: 0; + border-radius: 10000px; + padding: 1px 8px; + margin: 0 0 1px; +} + +.bookmark-item > .toolbarbutton-text { + display: -moz-box !important; + margin: 0 !important; +} + +.bookmark-item > .toolbarbutton-menu-dropmarker { + display: none; +} + +toolbarbutton.bookmark-item > menupopup { + margin-top: 2px; + -moz-margin-start: 3px; +} + +.bookmark-item > .toolbarbutton-icon { + width: 16px; + min-height: 16px; + max-height: 16px; +} + +.bookmark-item > .toolbarbutton-icon[label]:not([label=""]), +.bookmark-item > .toolbarbutton-icon[type="menu"] { + -moz-margin-end: 5px; +} diff --git a/src/chrome/os/darwin/menu.css b/src/chrome/os/darwin/menu.css @@ -0,0 +1,226 @@ +/* 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/. */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +menu, +menuitem { + -moz-appearance: none; + -moz-box-align: center; + color: #fff; + font: -moz-pull-down-menu; + list-style-image: none; + -moz-image-region: auto; + padding: 0 21px 2px; +} + +menu[disabled="true"], menuitem[disabled="true"], +menu[_moz-menuactive="true"][disabled="true"], +menuitem[_moz-menuactive="true"][disabled="true"] { + color: GrayText; +} + +/* ..... internal content .... */ + +.menu-text, +.menu-iconic-text, +.menu-accel, +.menu-iconic-accel { + margin: 0 !important; +} + +.menu-text, +.menu-iconic-text { + font-weight: inherit; + color: inherit; +} + +.menu-description { + font-style: italic; + color: GrayText; + -moz-margin-start: 1ex !important; +} + +.menu-iconic-icon { + height: 16px; + margin-top: -2px; + margin-bottom: -2px; + -moz-margin-end: 5px; + /* Empty icons shouldn't take up room, so we need to compensate + * the 5px margin-end with a negative margin-start. + */ + -moz-margin-start: -5px; +} + +/* menuitems with icons */ +.menuitem-iconic, +.menu-iconic, +menuitem[image], +menuitem[src] { + /* 2px higher than those without icons */ + padding-top: 1px; + padding-bottom: 3px; +} + +.menuitem-iconic > .menu-iconic-left > .menu-iconic-icon, +.menu-iconic > .menu-iconic-left > .menu-iconic-icon, +menuitem[image] > .menu-iconic-left > .menu-iconic-icon, +menuitem[src] > .menu-iconic-left > .menu-iconic-icon { + -moz-margin-start: 0; + width: 16px; +} + +/* ..... menu arrow box ..... */ + +.menu-right, +.menu-accel-container { + -moz-margin-start: 21px; + -moz-margin-end: -9px; + -moz-box-pack: end; +} + +/* The native menuarrow we use is 9px wide on 10.7+ and 8px wide on 10.6, + * so it needs to be 'pulled in' one pixel more by the negative margin in + * order to align properly: */ +@media not all and (-moz-mac-lion-theme) { + .menu-right { + -moz-margin-end: -10px; + } +} + +.menu-right { + margin-top: 0px; + margin-bottom: 0px; + -moz-margin-start: 6px; + -moz-margin-end: 0px; + width: 1ex; + height: 1ex; + /* These next two rules are needed to prevent inheritance and thus ugliness */ + list-style-image: url("chrome://global/skin/arrow/arrow-h.svg#rit"); + -moz-image-region: auto; + -moz-appearance: none; +} + +.menu-right > image { + width: 5px; +} + +/* ::::: menu/menuitems in menubar ::::: */ + +menubar > menu { + -moz-appearance: none; + padding: 2px 5px 2px 7px; + margin: 1px 0; +} + +menubar > menu[_moz-menuactive="true"] { + color: inherit; + background-color: transparent; +} + +menubar > menu[_moz-menuactive="true"][open="true"] { + -moz-appearance: none; + color: #fff; + background-color: rgb(110,110,110); +} + +/* ..... internal content .... */ + +.menubar-left { + margin: 0 2px; + color: inherit; +} + +.menubar-text { + margin: 0 1px !important; + color: inherit; +} + +/* ::::: menu/menuitems in popups ::::: */ + +menupopup > menu, +menupopup > menuitem { + max-width: 42em; +} + +menu[_moz-menuactive="true"], +menuitem[_moz-menuactive="true"] { + color: #fff; + background-color: rgb(110,110,110); +} + +/* ::::: menu/menuitems in menulist popups ::::: */ + +menulist > menupopup > menuitem, +menulist > menupopup > menu { + max-width: none; + font: inherit; + color: #fff; +} + +/* ::::: menuitems in editable menulist popups ::::: */ + +menulist[editable="true"] > menupopup > menuitem { + -moz-appearance: none; +} + +menulist[editable="true"] > menupopup > menuitem > .menu-iconic-left { + display: none; +} + +/* ::::: checked menuitems ::::: */ + +:not(menulist) > menupopup > menuitem[checked="true"] > .menu-iconic-left, +:not(menulist) > menupopup > menuitem[selected="true"] > .menu-iconic-left { + padding-top: 1px; + -moz-margin-start: -15px; + -moz-padding-start: 15px; + background: url("chrome://global/skin/menu/menu-check.svg#check") bottom left no-repeat transparent; +} + +:not(menulist) > menupopup > menuitem[checked="true"] > .menu-iconic-left:-moz-locale-dir(rtl), +:not(menulist) > menupopup > menuitem[selected="true"] > .menu-iconic-left:-moz-locale-dir(rtl) { + transform: scaleX(-1); +} + +menulist:not([editable="true"]) > menupopup > menuitem[checked="true"]::before, +menulist:not([editable="true"]) > menupopup > menuitem[selected="true"]::before { + content: '\2713'; /* a checkmark */ + display: block; + width: 15px; + -moz-margin-start: -15px; +} + +/* ::::: menuseparator ::::: */ + +menuseparator { + margin: 2px 3px; + border-top: 1px solid rgb(75,75,75); +} + +menuseparator[collapsed="true"] { + margin: 0 !important; +} + +menulist > menupopup > menuseparator, +.menulist-menupopup > menuseparator { + padding: 6px 0 5px 0; + border-top: 1px solid #FFFFFF; + border-bottom: none; +} + +/* ::::: autocomplete ::::: */ + +.autocomplete-history-popup > menuitem { + max-width: none !important; + font: message-box; +} + +/* ::::: tree column picker ::::: */ + +.treecell-popupcell-menu { + margin-left: -2px; + list-style-image: url("chrome://global/skin/tree/columnpicker.svg"); + -moz-image-region: auto; +} diff --git a/src/chrome/os/darwin/menulist.css b/src/chrome/os/darwin/menulist.css @@ -0,0 +1,81 @@ +/* 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/. */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace html url("http://www.w3.org/1999/xhtml"); + +menulist { + -moz-appearance: none; + margin: 2px 4px; + border: 1px solid; + -moz-border-top-colors: rgb(75,75,75); + -moz-border-right-colors: rgb(75,75,75); + -moz-border-bottom-colors: rgb(75,75,75); + -moz-border-left-colors: rgb(75,75,75); + background-color: rgb(50,50,50); + color: #fff; + text-shadow: none; +} + +menulist:not([popuponly="true"]) { + min-height: 20px !important; +} + +.menulist-label-box { + -moz-appearance: menulist-text; + -moz-box-align: center; + -moz-box-pack: center; + margin-bottom: 1px; +} + +.menulist-label { + margin: 1px 3px !important; +} + +.menulist-description { + font-style: italic; + color: GrayText; + -moz-margin-start: 1ex !important; +} + +menulist:hover:not(:active):not([disabled=true]) { + background-color: rgb(75,75,75); +} + +menulist:hover:active:not([disabled=true]) { + background-color: rgb(110,110,110); +} + +/* ..... dropmarker ..... */ + +menulist > .menulist-dropmarker { + border: none; + background: transparent; +} + +/* ..... disabled state ..... */ + +menulist[disabled="true"] { + background-color: rgb(62,62,62); + color: GrayText; +} + +menulist[disabled="true"] > .menulist-dropmarker { + -moz-padding-start: 7px !important; +} + +/* ::::: editable menulists ::::: */ + +menulist[editable="true"] { + -moz-appearance: none; + margin: 4px 2px; +} + +html|*.menulist-editable-input { + margin: 0px !important; + border: none !important; + padding: 0px !important; + background: inherit; + font: inherit; +} diff --git a/src/chrome/os/darwin/notification.css b/src/chrome/os/darwin/notification.css @@ -0,0 +1,76 @@ +/* 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/. */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +.popup-notification-menubutton { + -moz-appearance: none; + border-radius: 3px; + padding: 0; +} + +.popup-notification-menubutton:hover:active { + border-color: rgba(0,0,0,.5); +} + +.popup-notification-menubutton:not([type="menu-button"]), +.popup-notification-menubutton > .button-menubutton-button, +.popup-notification-menubutton > .button-menubutton-dropmarker { + -moz-appearance: none; + margin: 0; + border: 1px solid rgb(75,75,75); + background: rgb(50,50,50); +} + +.popup-notification-menubutton > .button-menubutton-button { + background-color: transparent; + padding: 1px; + -moz-border-end: none; +} + +.popup-notification-menubutton:not([type="menu-button"]), +.popup-notification-menubutton > .button-menubutton-button > .button-box { + -moz-padding-start: 8px; + -moz-padding-end: 5px; +} + +.popup-notification-menubutton > .button-menubutton-dropmarker { + padding: 9px 5px 8px; + width: auto; + height: auto; + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#dn"); +} + +.popup-notification-menubutton:-moz-focusring > .button-menubutton-dropmarker { + outline: 1px dotted ThreeDDarkShadow; + outline-offset: -3px; +} + +.popup-notification-menubutton > .button-menubutton-button:-moz-locale-dir(ltr), +.popup-notification-menubutton > .button-menubutton-dropmarker:-moz-locale-dir(rtl) { + border-radius: 2px 0 0 2px; +} + +.popup-notification-menubutton > .button-menubutton-button:-moz-locale-dir(rtl), +.popup-notification-menubutton > .button-menubutton-dropmarker:-moz-locale-dir(ltr) { + border-radius: 0 2px 2px 0; +} + +.popup-notification-menubutton:not([type="menu-button"]):hover, +.popup-notification-menubutton > .button-menubutton-button:hover, +.popup-notification-menubutton > .button-menubutton-dropmarker:hover { + background: rgb(75,75,75); +} + +.popup-notification-menubutton:not([type="menu-button"]):hover:active, +.popup-notification-menubutton > .button-menubutton-button:hover:active, +.popup-notification-menubutton > .button-menubutton-dropmarker:hover:active, +.popup-notification-menubutton[open="true"] > .button-menubutton-dropmarker { + background: rgb(23,23,23); +} + +.popup-notification-closebutton { + -moz-margin-end: -14px; + margin-top: -10px; +} diff --git a/src/chrome/os/darwin/popup.css b/src/chrome/os/darwin/popup.css @@ -0,0 +1,131 @@ +/* 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/. */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +.panel-arrowcontent { + --panel-arrowcontent-background: rgb(50,50,50); + --panel-arrowcontent-color: #fff; + --panel-arrowcontent-border: rgb(75,75,75); +} + +menupopup, +panel { + border: 1px solid transparent; + padding: 0px; + min-width: 1px; + color: #fff; +} + +menupopup { + -moz-appearance: none; + -moz-border-top-colors : rgb(75,75,75); + -moz-border-left-colors : rgb(75,75,75); + -moz-border-right-colors : rgb(23,23,23); + -moz-border-bottom-colors: rgb(23,23,23); + background: rgb(43,43,43); +} + +menupopup > menu > menupopup { + margin-top: -4px; +} + +.popup-internal-box { + padding: 4px 0; +} + +panel[titlebar] { + -moz-appearance: none; /* to disable rounded corners */ +} + +panel[type="arrow"] { + -moz-appearance: none; + background: transparent; +} + +panel[type="arrow"][side="top"], +panel[type="arrow"][side="bottom"] { + margin-left: -25px; + margin-right: -25px; +} + +panel[type="arrow"][side="left"], +panel[type="arrow"][side="right"] { + margin-top: -25px; + margin-bottom: -25px; +} + +.panel-arrowcontent { + -moz-appearance: none; + background: var(--panel-arrowcontent-background); + border-radius: 4px; + color: var(--panel-arrowcontent-color); + border: var(--panel-arrowcontent-border); + padding: 16px; + margin: 1px; +} + +.panel-arrow[side="top"] { + list-style-image: url("chrome://global/skin/arrow/panelarrow-vertical.svg"); + margin-left: 16px; + margin-right: 16px; + margin-bottom: -1px; +} + +.panel-arrow[side="bottom"] { + list-style-image: url("chrome://global/skin/arrow/panelarrow-vertical.svg"); + -moz-transform: scaleY(-1); + margin-left: 16px; + margin-right: 16px; + margin-top: -1px; +} + +.panel-arrow[side="left"] { + list-style-image: url("chrome://global/skin/arrow/panelarrow-horizontal.svg"); + margin-top: 16px; + margin-bottom: 16px; + margin-right: -1px; +} + +.panel-arrow[side="right"] { + list-style-image: url("chrome://global/skin/arrow/panelarrow-horizontal.svg"); + transform: scaleX(-1); + margin-top: 16px; + margin-bottom: 16px; + margin-left: -1px; +} + +/* ::::: tooltip ::::: */ + +tooltip { + -moz-appearance: none; + margin-top: 21px; + border: 1px solid rgb(75,75,75); + padding: 2px 3px; + max-width: 40em; + background-color: rgb(110,110,110); + color: #fff; + font: message-box; +} + +tooltip[titletip="true"] { + /* See bug 32157 comment 128 + * margin: -2px 0px 0px -3px; + */ + max-width: none; +} + +/* rules for popups associated with menulists */ + +menulist > menupopup { + min-width: 0px; +} + +menulist[editable="true"] > menupopup { + -moz-appearance: none; +} + +menulist[editable="true"] > menupopup > .popup-internal-box { + padding: 0; +} diff --git a/src/chrome/os/darwin/radio.css b/src/chrome/os/darwin/radio.css @@ -0,0 +1,86 @@ +/* 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/. */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +radiogroup { + margin: 1px 0px 1px 0px; +} + +radio { + -moz-appearance: none; + -moz-box-align: center; + margin: 4px 2px; + -moz-user-focus: ignore; +} + +.radio-label-box { + -moz-margin-start: 0px; + padding: 0px; +} + +.radio-icon { + -moz-margin-end: 2px; +} + +.radio-label { + margin: 1px 0 !important; +} + +/* ..... focused state ..... */ + +radio[focused="true"] > .radio-label-box { + border: 1px dotted rgb(75,75,75); +} + +/* ..... disabled state ..... */ + +radio[disabled="true"] > .radio-check-box1 { + background-color: rgb(62,62,62); +} + +radio[disabled="true"] { + color: GrayText; +} + +/* ::::: checkmark image ::::: */ + +.radio-check-box1 { + -moz-appearance: none; + margin: 1px 0px; + border-top: 1px solid rgb(75,75,75); + border-right: 1px solid rgb(75,75,75); + border-bottom: 1px solid rgb(75,75,75); + border-left: 1px solid rgb(75,75,75); + border-radius: 50%; + width: 12px; + height: 12px; + background-color: rgb(50,50,50); +} + +.radio-check-box2 { + border-top: 1px solid rgb(75,75,75); + border-right: 1px solid rgb(75,75,75); + border-bottom: 1px solid rgb(75,75,75); + border-left: 1px solid rgb(75,75,75); + border-radius: 50%; + padding: 2px; + width: 4px; + height: 4px; + list-style-image: none; +} + +radio:hover:active > .radio-check-box1 { + background-color: rgb(110,110,110); +} + +/* ..... selected state ..... */ + +radio[selected="true"] > .radio-check-box1 > .radio-check-box2 { + list-style-image: url("chrome://global/skin/radio/radio-check.svg#radio"); +} + +radio[selected="true"][disabled="true"] > .radio-check-box1 > .radio-check-box2 { + list-style-image: url("chrome://global/skin/radio/radio-check.svg#radio-dis") !important +} diff --git a/src/chrome/os/darwin/scrollbars.css b/src/chrome/os/darwin/scrollbars.css @@ -0,0 +1,90 @@ +/* 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/. */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace html url("http://www.w3.org/1999/xhtml"); + +scrollbar { + -moz-appearance: scrollbar; + -moz-binding: url(chrome://global/content/bindings/scrollbar.xml#scrollbar); + cursor: default; + background-color: white; + pointer-events: auto; +} + +scrollbar[root="true"] { + position: relative; + z-index: 2147483647; /* largest positive value of a signed 32-bit integer */ +} + +html|select[size]:not([size="0"]):not([size="1"]) > scrollbar, +html|select[multiple] > scrollbar { + -moz-appearance: scrollbar-small; +} + +@media all and (-moz-overlay-scrollbars) { + scrollbar:not([active="true"]), + scrollbar[disabled="true"] { + visibility: hidden; + } +} + +/* ..... track ..... */ + +slider { + -moz-appearance: scrollbartrack-horizontal; +} + +slider[orient="vertical"] { + -moz-appearance: scrollbartrack-vertical; +} + +/* ..... thumb ..... */ + +thumb { + -moz-appearance: scrollbarthumb-horizontal; +} + +thumb[orient="vertical"] { + -moz-appearance: scrollbarthumb-vertical; +} + +/* ..... increment ..... */ + +scrollbarbutton[type="increment"] { + -moz-appearance: scrollbarbutton-right; +} + +scrollbar[orient="vertical"] > scrollbarbutton[type="increment"] { + -moz-appearance: scrollbarbutton-down; +} + +/* ..... decrement ..... */ + +scrollbarbutton[type="decrement"] { + -moz-appearance: scrollbarbutton-left; +} + +scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"] { + -moz-appearance: scrollbarbutton-up; +} + +/* ::::: square at the corner of two scrollbars ::::: */ + +scrollcorner { + /* XXX -moz-appearance: scrollcorner; */ + -moz-binding: url(chrome://global/content/bindings/scrollbar.xml#scrollbar-base); + width: 16px; + cursor: default; + background-color: white; +} + +/* ::::::::::::::::::::: MEDIA PRINT :::::::::::::::::::::: */ +@media print { + html|div scrollbar { + -moz-appearance: scrollbar; + -moz-binding: url(chrome://global/content/bindings/scrollbar.xml#scrollbar); + cursor: default; + } +} diff --git a/src/chrome/os/darwin/tabbox.css b/src/chrome/os/darwin/tabbox.css @@ -0,0 +1,150 @@ +/* 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/. */ + +/* + The default style of these tabs is that of an NSTabView with tabs at + the top in the "regular" size. These tabs can be used with or without + a tabbox element. + For bottom tabs you should use the "tabs-bottom" class on the tabbox + or the tabs element. Bottom tabs use a style that's similar to the + one used in Adium. +*/ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +tabbox { + margin: 0 5px; +} + +tabpanels { + -moz-appearance: tabpanels; + padding: 33px 15px 15px; +} + +tabs { + -moz-box-align: center; + font: menu; +} + +tabbox > tabs { + padding: 0 10px; + margin-bottom: -12px; + position: relative; +} + +tab { + -moz-appearance: tab; +} + +tab:-moz-focusring { + /* Tab focus rings need to overlay adjacent tabs. */ + position: relative; +} + +tab:first-of-type { + -moz-padding-start: 2px; +} + +tab:last-of-type { + -moz-padding-end: 2px; +} + +@media (-moz-mac-lion-theme) { + tab[selected="true"] { + color: #FFF; + text-shadow: rgba(0, 0, 0, 0.4) 0 1px; + } +} + +.tab-middle { + padding: 1px 6px 2px; +} + +.tabs-left, +.tabs-right { + -moz-box-flex: 1; +} + +/* Tabs at the bottom + * These tabs are smaller, left aligned and don't extend into the tabpanel. + */ + +tabbox.tabs-bottom > tabpanels { + padding: 10px; +} + +tabbox.tabs-bottom > tabs, +tabs.tabs-bottom { + background-color: rgba(0, 0, 0, 0.1); + padding: 0; + margin: 0; + border-top: 2px solid; + -moz-border-top-colors: #888 rgba(0, 0, 0, 0.08); + -moz-box-align: start; + font: message-box; +} + +tabbox.tabs-bottom > tabs > .tabs-left, +tabs.tabs-bottom > .tabs-left { + -moz-box-flex: 0; +} + +tabbox.tabs-bottom > tabs > tab, +tabs.tabs-bottom > tab { + -moz-appearance: none; + margin: -1px 0 0; + padding: 0 0 2px 0; + position: relative; + -moz-border-end: 1px solid rgba(0, 0, 0, 0.19); +} + +tabbox.tabs-bottom > tabs > tab > .tab-middle, +tabs.tabs-bottom > tab > .tab-middle { + padding: 1px 2px 0 2px; +} + +tabbox.tabs-bottom > tabs > tab:not([selected=true]):hover, +tabs.tabs-bottom > tab:not([selected=true]):hover { + background-color: rgba(0, 0, 0, 0.1); + -moz-border-end-color: rgba(0, 0, 0, 0.1); +} + +tabbox.tabs-bottom > tabs > tab[selected=true], +tabs.tabs-bottom > tab[selected=true] { + color: #000; + text-shadow: none; + border: solid #888; + border-width: 0 2px 2px; + border-radius: 2px; + -moz-border-left-colors: rgba(0, 0, 0, 0.08) #888; + -moz-border-right-colors: rgba(0, 0, 0, 0.08) #888; + -moz-border-bottom-colors: rgba(0, 0, 0, 0.08) #888; + -moz-margin-end: -1px; + margin-top: -2px; + margin-bottom: 1px; + padding: 0; +} + +tabbox.tabs-bottom > tabs > tab[beforeselected=true], +tabs.tabs-bottom > tab[beforeselected=true] { + -moz-border-end-color: transparent; + -moz-margin-end: -2px; +} + +tabbox.tabs-bottom > tabs > tab:first-of-type:not([selected=true]), +tabs.tabs-bottom > tab:first-of-type:not([selected=true]) { + -moz-border-start: 4px solid transparent; +} + +tabbox.tabs-bottom > tabs > tab:first-of-type[selected=true], +tabs.tabs-bottom > tab:first-of-type[selected=true] { + -moz-margin-start: 2px; +} + +tabbox.tabs-bottom, +tabbox.tabs-bottom > tabpanels, +tabbox.tabs-bottom > tabs > tab[selected=true] > .tab-middle, +tabs.tabs-bottom > tab[selected=true] > .tab-middle { + -moz-appearance: dialog; +} diff --git a/src/chrome/os/darwin/toolbar.css b/src/chrome/os/darwin/toolbar.css @@ -0,0 +1,42 @@ +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +toolbar { + -moz-appearance: none; + background-color: rgb(43,43,43); + color: #fff; + min-width: 1px; + min-height: 19px; + border-top: 1px solid rgb(75,75,75); + border-bottom: 1px solid rgb(75,75,75); +} + +menubar:-moz-lwtheme, +toolbar:-moz-lwtheme { + -moz-appearance: none; + background: none; + border-style: none; + color: inherit !important; +} + +menubar { + -moz-appearance: none; + background-color: rgb(43,43,43); + color: #fff; + min-width: 1px; +} + +.toolbar-holder { + min-width: 1px; +} + +.toolbar-primary { + min-height: 24px; +} + +toolbarseparator { + -moz-appearance: none; + margin: 3px 4px; + background: url("chrome://global/skin/toolbar/toolbar-separator.png") transparent repeat-y; + padding: 0; + width: 1px !important; +} diff --git a/src/chrome/os/darwin/toolbarbutton.css b/src/chrome/os/darwin/toolbarbutton.css @@ -0,0 +1,145 @@ +/* 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/. */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +toolbarbutton { + -moz-box-align: center; + -moz-box-pack: center; + margin: 0px 2px 0px 2px; + padding: 3px 1px 3px 1px; + border-right: 1px solid transparent; + border-left: 1px solid transparent; + background-color: transparent; + color: #fff; +} + +toolbarbutton[open="true"], +toolbarbutton:not([disabled="true"]):active:hover { + text-shadow: none; +} + +.toolbarbutton-text { + margin: 0 !important; /* !important for overriding global.css */ + padding: 0px; + text-align: center; + vertical-align: middle; +} + +toolbarbutton[disabled="true"], +toolbarbutton[disabled="true"]:hover, +toolbarbutton[disabled="true"]:hover:active, +toolbarbutton[disabled="true"][open="true"] { + color: GrayText !important; +} + +/* ::::: toolbarbutton menu ::::: */ + +.toolbarbutton-menu-dropmarker { + -moz-appearance: none !important; + border: none !important; + background-color: transparent !important; + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#dn"); + padding: 0; + -moz-padding-start: 2px; + width: auto; +} + +.toolbarbutton-menu-dropmarker[disabled="true"] { + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#dn-dis"); + padding: 0; + -moz-padding-start: 2px; +} + +/* ::::: toolbarbutton menu-button ::::: */ + +toolbarbutton[type="menu-button"] { + -moz-box-align: stretch; + -moz-box-orient: horizontal !important; +} + +toolbarbutton[type="menu-button"], +toolbarbutton[type="menu-button"]:hover, +toolbarbutton[type="menu-button"]:hover:active, +toolbarbutton[type="menu-button"][open="true"], +toolbarbutton[type="menu-button"][disabled="true"], +toolbarbutton[type="menu-button"][disabled="true"]:hover, +toolbarbutton[type="menu-button"][disabled="true"]:hover:active { + background-color: transparent; +} + +.toolbarbutton-menubutton-button { + -moz-box-align: center; + -moz-box-pack: center; + -moz-box-orient: vertical; + text-shadow: inherit; +} + +/* ::::: toolbarbutton badged ::::: */ + +.toolbarbutton-badge { + background-color: rgb(110,110,110); +} + +.toolbarbutton-badge::after { + /* The |content| property is set in the content stylesheet. */ + font-size: 9px; + padding: 1px 2px 2px; + color: #fff; + background-color: inherit; + border-radius: 2px; + box-shadow: 0 1px 0 hsla(0, 100%, 100%, .2) inset, + 0 -1px 0 hsla(0, 0%, 0%, .1) inset, + 0 1px 0 hsla(206, 50%, 10%, .2); + position: absolute; + top: -8px; + right: -8px; + z-index: 1; + min-width: 10px; + line-height: 10px; + text-align: center; +} + +.toolbarbutton-badge:-moz-window-inactive::after { + background-color: rgb(230,230,230); + box-shadow: none; + border: 1px solid rgb(206,206,206); + color: rgb(192,192,192); +} + +.toolbarbutton-badge:-moz-locale-dir(rtl)::after { + left: -8px; + right: auto; +} + +toolbar[mode="icons"] > *|* > .toolbarbutton-badge::after { + right: -10px; +} + +toolbar[mode="icons"] > *|* > .toolbarbutton-badge:-moz-locale-dir(rtl)::after { + left: -10px; +} + +.toolbarbutton-badge-container { + position: relative; +} + +/* .......... dropmarker .......... */ + +.toolbarbutton-menubutton-dropmarker { + -moz-appearance: none; + border: none; + background-color: transparent !important; + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#dn"); + width: auto; + padding: 0 5px; +} + +.toolbarbutton-menubutton-dropmarker[disabled="true"] { + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#dn-dis"); +} + +toolbarbutton.tabbable { + -moz-user-focus: normal !important; +} diff --git a/src/chrome/os/darwin/tree.css b/src/chrome/os/darwin/tree.css @@ -0,0 +1,181 @@ +/* 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/. */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* ::::: tree ::::: */ + +tree { + color: -moz-DialogText; + background-color: #FFFFFF; +} + +/* ::::: tree focusring ::::: */ + +.focusring > .tree-stack > .tree-rows > .tree-bodybox { + border: 1px solid transparent; +} + +.focusring:focus > .tree-stack > .tree-rows > .tree-bodybox { + border: 1px solid -moz-mac-focusring; +} + +/* ::::: tree rows ::::: */ + +treechildren::-moz-tree-row { + border-top: 1px solid transparent; + height: 18px; + background-color: -moz-field; +} + +treechildren:not(.autocomplete-treebody)::-moz-tree-row(multicol, odd) { + background-color: -moz-oddtreerow; +} + +treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected) { + background-color: -moz-mac-secondaryhighlight; +} + +treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, focus) { + background-color: Highlight; + color: HighlightText; +} + +/* ::::: tree cells ::::: */ + +treechildren::-moz-tree-cell-text(selected) { + color: -moz-DialogText; +} + +tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected) { + background-color: -moz-mac-secondaryhighlight; + +} +tree[seltype="cell"] > treechildren::-moz-tree-cell-text(active, selected) { + color: -moz-DialogText; +} + +tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected) { + background-color: -moz-mac-secondaryhighlight; + color: -moz-DialogText; +} + +tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected, focus) { + background-color: Highlight; +} + +/* ::::: lines connecting cells ::::: */ + +treechildren::-moz-tree-line { + /* XXX there should be no border on Mac, but trees currently + paint the line black by default, so I'll just leave this + for now. */ + visibility: hidden; + border: 1px dotted grey; +} + +/* ::::: tree separator ::::: */ + +treechildren::-moz-tree-separator { + border-top: 1px dashed #C7C7C7; + margin: 0 2px; +} + +/* ::::: drop feedback ::::: */ + +tree[seltype="cell"] > treechildren::-moz-tree-cell(primary, dropOn), +tree[seltype="text"] > treechildren::-moz-tree-cell(primary, dropOn), +treechildren::-moz-tree-cell(primary, dropOn) { + background-color: #A1A1A1 !important; + color: #FFF !important; + background-image: none; +} +tree[seltype="cell"] > treechildren::-moz-tree-cell-text(primary, dropOn), +tree[seltype="text"] > treechildren::-moz-tree-cell-text(primary, dropOn), +treechildren::-moz-tree-cell-text(primary, dropOn) { + color: #FFF !important; +} + +treechildren::-moz-tree-drop-feedback { + background-color: #A1A1A1; +} + +/* ::::: tree progress meter ::::: */ + +treechildren::-moz-tree-progressmeter { + border: 2px solid; + -moz-border-top-colors: #AAAAAA #000000; + -moz-border-right-colors: #FFFFFF #000000; + -moz-border-bottom-colors: #FFFFFF #000000; + -moz-border-left-colors: #AAAAAA #000000; +} + +treechildren::-moz-tree-cell-text(progressmeter) { + -moz-appearance: progressbar; +} + +/* ::::: tree columns ::::: */ + +treecol[hideheader="true"] { + max-height: 0px; +} + +/* ..... internal box ..... */ + +treecol:hover:active, +treecolpicker:hover:active { + -moz-border-start: 2px solid; + -moz-border-end: 1px solid; + -moz-border-top-colors: ThreeDDarkShadow ThreeDShadow; + -moz-border-right-colors: ThreeDDarkShadow; + -moz-border-bottom-colors: ThreeDDarkShadow; + -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow; + background-color: #666666; +} + +/* ::::: column drag and drop styles ::::: */ + +treecol[dragging="true"] { + -moz-border-top-colors: ThreeDDarkShadow ThreeDShadow !important; + -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow!important; + -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow !important; + -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow !important; + padding: 0px 4px !important; +} + +/* ::::: twisty ::::: */ + +treechildren::-moz-tree-twisty { + -moz-appearance: treetwisty; + -moz-padding-end: 2px; +} + +treechildren::-moz-tree-twisty(open) { + -moz-appearance: treetwistyopen; +} + +treechildren::-moz-tree-twisty(Name, separator) { + -moz-appearance: none; +} + +treechildren::-moz-tree-indentation { + width: 16px; +} + +/* ::::: gridline style ::::: */ + +treechildren.gridlines::-moz-tree-cell { + -moz-border-end: 1px solid GrayText; + border-bottom: 1px solid GrayText; +} + +/* ::::: editable tree ::::: */ + +.tree-input { + border-width: 0; + box-shadow: 0 0 1px -moz-mac-focusring inset, 0 0 4px 1px -moz-mac-focusring, 0 0 1.5px 1px -moz-mac-focusring; + margin: 0; + -moz-margin-start: -2px; + padding: 2px 1px 1px; +} +\ No newline at end of file diff --git a/src/chrome/os/linux/browser.css b/src/chrome/os/linux/browser.css @@ -0,0 +1,58 @@ +#appmenu-toolbar-button { + -moz-appearance: none; + border: none; + padding: 3px 5px 3px 3px !important; + list-style-image: url("chrome://browser/skin/toolbar/menu.svg"); + -moz-image-region: auto; +} + +toolbar:not([brighttext]) #appmenu-toolbar-button { + list-style-image: url("chrome://browser/skin/toolbar/menu.svg#darktext"); +} + +#appmenu-toolbar-button > label, +#appmenu-toolbar-button > .toolbarbutton-menu-dropmarker { + display: none !important; +} + +.toolbarbutton-1 > .toolbarbutton-menu-dropmarker, +.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { + list-style-image: none !important; +} + +#appmenu_history > .splitmenu-menuitem > .menu-iconic-left > .menu-iconic-icon { + list-style-image: url("chrome://browser/skin/toolbar/history.svg"); +} + +/* Places toolbar */ +toolbarbutton.bookmark-item { + margin: 0; + padding: 2px 3px; +} + +toolbarbutton.bookmark-item:hover:active, +toolbarbutton.bookmark-item[open="true"] { + padding-top: 3px; + padding-bottom: 1px; + -moz-padding-start: 4px; + -moz-padding-end: 2px; +} + +.bookmark-item > .toolbarbutton-icon { + width: 16px; + height: 16px; +} + +/* Prevent [mode="icons"] from hiding the label */ +.bookmark-item > .toolbarbutton-text { + display: -moz-box !important; +} + +.bookmark-item > .toolbarbutton-menu-dropmarker { + display: none; +} + +/* Dropmarker for folder bookmarks */ +.bookmark-item[container] > .toolbarbutton-menu-dropmarker { + display: -moz-box !important; +} +\ No newline at end of file diff --git a/src/chrome/os/linux/menu.css b/src/chrome/os/linux/menu.css @@ -0,0 +1,210 @@ +/* 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/. */ + +/* ===== menu.css ======================================================= + == Styles used by XUL menu-related elements. + ======================================================================= */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* ::::: menu/menuitem ::::: */ + +menu, +menuitem, +.splitmenu-menuitem { + -moz-appearance: none; + -moz-box-align: center; + color: #FFFFFF; + font: menu; + list-style-image: none; + -moz-image-region: auto; +} + +menuitem[default="true"] { + font-weight: bold; +} + +menu[_moz-menuactive="true"], +menuitem[_moz-menuactive="true"], +.splitmenu-menuitem[_moz-menuactive="true"] { + color: #fff; + background-color: rgb(110,110,110); +} + +menu[disabled="true"], +menuitem[disabled="true"], +.splitmenu-menuitem[disabled="true"] { + color: GrayText; +} + +menubar > menu { + padding: 0px 4px; + color: #fff; +} + +menubar:-moz-lwtheme > menu { + text-shadow: none; +} + +menubar:-moz-lwtheme > menu:not([open="true"]) { + color: inherit; + text-shadow: inherit; +} + +menubar > menu[_moz-menuactive="true"]:not([open]):not([disabled="true"]):not(:-moz-lwtheme) { + color: #fff; +} + +menubar > menu[open] { + color: #fff; + background-color: rgb(110,110,110); +} +menuitem.spell-suggestion { + font-weight:bold; +} + +/* ::::: menu/menuitems in menulist popups ::::: */ + +menulist > menupopup > menuitem, +menulist > menupopup > menu { + padding: 1px 5px; + max-width: none; + font: message-box; +} + +/* ..... internal content .... */ + +.menu-text, +.menu-iconic-left, +.menu-iconic-text { + margin-top: 0px !important; + margin-bottom: 0px !important; + -moz-margin-start: 0px !important; + -moz-margin-end: 2px !important; + color: inherit; +} + +.menu-text { + /* This is (18 + the size of end-padding on .menu-iconic-left)px */ + -moz-margin-start: 21px !important; + font-weight: inherit; +} + +.menu-description { + font-style: italic; + color: GrayText; + -moz-margin-start: 1ex !important; +} + +.menu-accel, +.menu-iconic-accel { + margin-top: 0px !important; + margin-bottom: 0px !important; + -moz-margin-start: 7px !important; + color: inherit; +} + +.menu-accel-container { + -moz-box-pack: end; +} + +.menu-iconic-left { + width: 16px; + /* We can only hardcode this, to make the default GTK icon<->label spacing */ + -moz-padding-end: 3px !important; +} + +.menu-iconic-icon { + width: 16px; + height: 16px; +} + +.menu-right { + margin-top: 0px; + margin-bottom: 0px; + -moz-margin-start: 6px; + -moz-margin-end: 0px; + width: 1ex; + height: 1ex; + /* These next two rules are needed to prevent inheritance and thus ugliness */ + list-style-image: url("chrome://global/skin/arrow/arrow-h.svg#rit"); + -moz-image-region: auto; + -moz-appearance: none; +} + +.menu-right > image { + width: 5px; +} + +.menubar-left { + margin-top: 0px; + margin-bottom: 0px; + -moz-margin-start: 0px; + -moz-margin-end: 2px; + color: inherit; +} + +.menubar-text { + margin: 0 1px !important; + color: inherit; +} + + +menulist > menupopup > menuitem > .menu-iconic-left, +menulist > menupopup > menu > .menu-iconic-left { + display: none; +} + +menuitem[checked="true"] { + list-style-image: url("chrome://global/skin/menu/menu-check.svg#check"); +} + +menuitem[checked="true"][disabled="true"], +menuitem[checked="true"][disabled="true"][_moz-menuactive="true"] { + list-style-image: url("chrome://global/skin/menu/menu-check.svg#check-dis"); +} + +/* ::::: checkbox and radio menuitems ::::: */ + +menuitem[checked="true"][type="radio"] { + list-style-image: url("chrome://global/skin/menu/menu-radio.svg#radio"); +} + +menuitem[checked="true"][type="radio"][disabled="true"], +menuitem[checked="true"][type="radio"][disabled="true"][_moz-menuactive="true"] { + list-style-image: url("chrome://global/skin/menu/menu-radio.svg#radio-dis"); +} + +/* ::::: menuseparator ::::: */ + +menuseparator { + margin: 2px 3px; + border-top: 1px solid rgb(75,75,75); +} + +menuseparator[collapsed="true"] { + margin: 0 !important; +} + +menulist > menupopup > menuseparator, +.menulist-menupopup > menuseparator { + padding: 6px 0 5px 0; + border-top: 1px solid #FFFFFF; + border-bottom: none; +} + +/* ::::: autocomplete ::::: */ + +.autocomplete-history-popup > menuitem { + max-width: none !important; + font: message-box; +} + +/* ::::: tree column picker ::::: */ + +.treecell-popupcell-menu { + -moz-margin-start: -2px; + list-style-image: url("chrome://global/skin/tree/columnpicker.svg"); + -moz-image-region: auto; +} diff --git a/src/chrome/os/linux/menulist.css b/src/chrome/os/linux/menulist.css @@ -0,0 +1,119 @@ +/* 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/. */ + +/* ===== menulist.css =================================================== + == Styles used by the XUL menulist element. + ====================================================================== */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace html url("http://www.w3.org/1999/xhtml"); + +/* :::::::::: menulist :::::::::: */ + +menulist { + -moz-appearance: none; + margin: 2px 4px; + border: 1px solid; + -moz-border-top-colors: rgb(75,75,75); + -moz-border-right-colors: rgb(75,75,75); + -moz-border-bottom-colors: rgb(75,75,75); + -moz-border-left-colors: rgb(75,75,75); + background-color: rgb(50,50,50); + color: #fff; + text-shadow: none; +} + +.menulist-label-box { + -moz-box-align: center; + -moz-box-pack: center; + margin: 1px; + border: 1px solid transparent; + background-color: transparent; + color: inherit; +} + +.menulist-label { + margin: 1px 3px !important; +} + +menulist:hover { + background-color: rgb(75,75,75); +} + +menulist:hover:active, +menulist[open="true"] { + background-color: rgb(110,110,110); +} + +menulist[disabled="true"], +menulist[disabled="true"]:hover, +menulist[disabled="true"]:hover:active { + background-color: rgb(62,62,62); + color: GrayText; +} + +.menulist-description { + font-style: italic; + color: GrayText; + -moz-margin-start: 1ex !important; +} + +/* ..... dropmarker ..... */ + +menulist > .menulist-dropmarker { + border: none; + background: transparent; + margin-right: 0 !important; +} + +menulist[disabled="true"]:hover:active > .menulist-dropmarker { + padding: 1px; +} + +menulist:hover:active > .menulist-dropmarker { + padding-top: 2px; + padding-bottom: 0px; + -moz-padding-start: 2px; + -moz-padding-end: 0px; +} + +/* ..... focused state ..... */ + +menulist:focus:not([open="true"]):not(.menulist-compact) > .menulist-label-box { + background-color: rgb(110,110,110); + color: #fff; +} + +menulist:-moz-focusring:not([open="true"]) > .menulist-label-box { + border: 1px dotted #F5DB95; +} + +/* ::::: editable menulists ::::: */ + +menulist[editable="true"] { + -moz-appearance: none; + color: #fff; +} + +.menulist-editable-box { + -moz-appearance: none; + padding-top: 3px; + padding-bottom: 3px; + -moz-padding-start: 2px; + -moz-padding-end: 0px; + color: #fff; +} + +menulist[editable="true"] > .menulist-dropmarker { + display: -moz-box; + -moz-appearance: none; + color: #fff; +} + +html|*.menulist-editable-input { + margin: 0px !important; + border: none !important; + padding: 0px !important; + font: inherit; +} diff --git a/src/chrome/os/linux/notification.css b/src/chrome/os/linux/notification.css @@ -0,0 +1,14 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +.notification-inner { + padding-top: 1px; + padding-bottom: 1px; +} + +.popup-notification-menubutton > .button-menubutton-dropmarker { + list-style-image: none; +} +\ No newline at end of file diff --git a/src/chrome/os/linux/popup.css b/src/chrome/os/linux/popup.css @@ -0,0 +1,112 @@ +/* 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/. */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* ::::: menupopup ::::: */ + +menupopup, +panel { + border: 1px solid transparent; + padding: 0px; + min-width: 1px; + color: #fff; +} + +menupopup { + -moz-appearance: none; + -moz-border-top-colors : rgb(75,75,75); + -moz-border-left-colors : rgb(75,75,75); + -moz-border-right-colors : rgb(23,23,23); + -moz-border-bottom-colors: rgb(23,23,23); + background: rgb(43,43,43); +} + +/* ::::: arrow panel ::::: */ + +panel[type="arrow"] { + -moz-appearance: none; +} + +panel[type="arrow"][side="top"], +panel[type="arrow"][side="bottom"] { + margin-left: -16px; + margin-right: -16px; +} + +panel[type="arrow"][side="left"], +panel[type="arrow"][side="right"] { + margin-top: -16px; + margin-bottom: -16px; +} + +.panel-arrowcontent { + padding: 10px; + color: #fff; + background: rgb(50,50,50); + border: 1px solid rgb(75,75,75); +} + +.panel-arrow[side="top"], +.panel-arrow[side="bottom"] { + list-style-image: url("chrome://global/skin/arrow/panelarrow-vertical-themed.svg"); + position: relative; + margin-left: 6px; + margin-right: 6px; +} + +.panel-arrow[side="top"] { + margin-bottom: -1px; +} + +.panel-arrow[side="bottom"] { + transform: scaleY(-1); + margin-top: -1px; +} + +.panel-arrow[side="left"], +.panel-arrow[side="right"] { + list-style-image: url("chrome://global/skin/arrow/panelarrow-horizontal-themed.svg"); + position: relative; + margin-top: 6px; + margin-bottom: 6px; +} + +.panel-arrow[side="left"] { + margin-right: -1px; +} + +.panel-arrow[side="right"] { + transform: scaleX(-1); + margin-left: -1px; +} + +/* ::::: tooltip ::::: */ + +tooltip { + -moz-appearance: none; + margin-top: 21px; + border: 1px solid rgb(75,75,75); + /* GTK hardcodes this to 4px */ + padding: 4px; + max-width: 40em; + background-color: rgb(110,110,110); + color: #fff; + font: message-box; +} + +tooltip[titletip="true"] { + /* See bug 32157 comment 128 + * margin: -2px 0px 0px -3px; + */ + max-width: none; +} + +/* rules for popups associated with menulists */ + +menulist > menupopup { + padding: 0px; + min-width: 0px; +} + diff --git a/src/chrome/os/linux/radio.css b/src/chrome/os/linux/radio.css @@ -0,0 +1,95 @@ +/* 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/. */ + +/* ===== radio.css =================================================== + == Styles used by the XUL radio element. + ======================================================================= */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* ::::: radio ::::: */ + +radio { + -moz-appearance: none; + -moz-box-align: center; + margin: 2px 4px; + padding-top: 1px; + padding-bottom: 1px; + -moz-padding-start: 4px; + -moz-padding-end: 2px; +} + +.radio-label-box { + -moz-margin-start: 2px; + border: 1px solid transparent; + padding-top: 0px; + padding-bottom: 1px; + -moz-padding-start: 1px; + -moz-padding-end: 0px; +} + +.radio-icon { + -moz-margin-end: 2px; +} + +.radio-label { + margin: 0 !important; +} + +/* ..... focused state ..... */ + +radio[focused="true"] > .radio-label-box { + border: 1px dotted rgb(75,75,75); +} + +/* ..... disabled state ..... */ + +radio[disabled="true"] > .radio-check-box1 { + background-color: rgb(62,62,62); +} + +radio[disabled="true"] { + color: GrayText; +} + +/* ::::: checkmark image ::::: */ + +.radio-check-box1 { + -moz-appearance: none; + margin: 1px 0px; + border-top: 1px solid rgb(75,75,75); + border-right: 1px solid rgb(75,75,75); + border-bottom: 1px solid rgb(75,75,75); + border-left: 1px solid rgb(75,75,75); + border-radius: 50%; + width: 12px; + height: 12px; + background-color: rgb(50,50,50); +} + +.radio-check-box2 { + border-top: 1px solid rgb(75,75,75); + border-right: 1px solid rgb(75,75,75); + border-bottom: 1px solid rgb(75,75,75); + border-left: 1px solid rgb(75,75,75); + border-radius: 50%; + padding: 2px; + width: 4px; + height: 4px; + list-style-image: none; +} + +radio:hover:active > .radio-check-box1 { + background-color: rgb(110,110,110); +} + +/* ..... selected state ..... */ + +radio[selected="true"] > .radio-check-box1 > .radio-check-box2 { + list-style-image: url("chrome://global/skin/radio/radio-check.svg#radio"); +} + +radio[selected="true"][disabled="true"] > .radio-check-box1 > .radio-check-box2 { + list-style-image: url("chrome://global/skin/radio/radio-check.svg#radio-dis") !important +} diff --git a/src/chrome/os/linux/scrollbars.css b/src/chrome/os/linux/scrollbars.css @@ -0,0 +1,227 @@ +/* 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/. */ + +/* ===== xulscrollbars.css ============================================== + == Styles used by XUL scrollbar-related elements. + ======================================================================= */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */ + +/* ::::: scrollbar ::::: */ + +scrollbar { + -moz-appearance: scrollbartrack-horizontal; + -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar"); + cursor: default; + background: url("chrome://global/skin/scrollbar/slider.gif") scrollbar; + pointer-events: auto; +} + +@media all and (-moz-overlay-scrollbars) { + scrollbar[root="true"] { + position: relative; + z-index: 2147483647; /* largest positive value of a signed 32-bit integer */ + } + + scrollbar:not([active="true"]), + scrollbar[disabled="true"] { + visibility: hidden; + } +} + +scrollbar[orient="vertical"] +{ + -moz-appearance: scrollbartrack-vertical; +} + +/* ::::: borders for thumb and buttons ::::: */ + +thumb, +scrollbarbutton { + border: 2px solid; + -moz-border-top-colors: ThreeDLightShadow ThreeDHighlight; + -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow; + -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow; + -moz-border-left-colors: ThreeDLightShadow ThreeDHighlight; + background-color: -moz-Dialog; +} + +/* ::::: thumb (horizontal) ::::: */ + +thumb { + -moz-appearance: scrollbarthumb-vertical; + min-height: 8px; +} + +thumb[orient="horizontal"] { + -moz-appearance: scrollbarthumb-horizontal; + min-width: 8px; +} + +/* ::::: scrollbar button ::::: */ + +scrollbarbutton { + background: -moz-Dialog no-repeat 50% 50%; + min-width: 16px; + min-height: 16px; +} + +scrollbarbutton:hover:active, scrollbarbutton[active="true"] { + -moz-border-top-colors: ThreeDShadow -moz-Dialog; + -moz-border-right-colors: ThreeDShadow -moz-Dialog; + -moz-border-bottom-colors: ThreeDShadow -moz-Dialog; + -moz-border-left-colors: ThreeDShadow -moz-Dialog; + background-position: 60% 60%; +} + +/* ::::: square at the corner of two scrollbars ::::: */ + +scrollcorner { + /* XXX -moz-appearance: scrollcorner; */ + -moz-binding: url(chrome://global/content/bindings/scrollbar.xml#scrollbar-base); + width: 16px; + cursor: default; + background-color: -moz-Dialog; +} + +/* ..... increment .... */ + +scrollbarbutton[type="increment"] { + -moz-appearance: scrollbarbutton-right; + background-image: url("chrome://global/skin/arrow/arrow-rit.gif") +} + +scrollbarbutton[type="increment"][disabled="true"] { + background-image: url("chrome://global/skin/arrow/arrow-rit-dis.gif") +} + +scrollbar[orient="vertical"] > scrollbarbutton[type="increment"] { + -moz-appearance: scrollbarbutton-down; + background-image: url("chrome://global/skin/arrow/arrow-dn.gif") +} + +scrollbar[orient="vertical"] > scrollbarbutton[type="increment"][disabled="true"] { + background-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif") +} + +/* ..... decrement .... */ + +scrollbarbutton[type="decrement"] { + -moz-appearance: scrollbarbutton-left; + background-image: url("chrome://global/skin/arrow/arrow-lft.gif") +} + +scrollbarbutton[type="decrement"][disabled="true"] { + background-image: url("chrome://global/skin/arrow/arrow-lft-dis.gif") +} + +scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"] { + -moz-appearance: scrollbarbutton-up; + background-image: url("chrome://global/skin/arrow/arrow-up.gif") +} + +scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true"] { + background-image: url("chrome://global/skin/arrow/arrow-up-dis.gif") +} + +/* :::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ +/* ::::::::::::::::::::: MEDIA PRINT :::::::::::::::::::::: */ +/* :::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ +@media print { + /* ::::: scrollbar ::::: */ + + html|div scrollbar { + -moz-appearance: scrollbartrack-horizontal; + -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar"); + cursor: default; + background: url("chrome://global/skin/scrollbar/slider.gif") scrollbar; + } + + html|div scrollbar[orient="vertical"] + { + -moz-appearance: scrollbartrack-vertical; + } + + /* ::::: borders for thumb and buttons ::::: */ + + html|div thumb, + html|div scrollbarbutton { + border: 2px solid; + -moz-border-top-colors: ThreeDLightShadow ThreeDHighlight; + -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow; + -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow; + -moz-border-left-colors: ThreeDLightShadow ThreeDHighlight; + background-color: -moz-Dialog; + } + + /* ::::: thumb (horizontal) ::::: */ + + html|div thumb { + -moz-appearance: scrollbarthumb-vertical; + min-height: 8px; + } + + html|div thumb[orient="horizontal"] { + -moz-appearance: scrollbarthumb-horizontal; + min-width: 8px; + } + + /* ::::: scrollbar button ::::: */ + + html|div scrollbarbutton { + background: -moz-Dialog no-repeat 50% 50%; + min-width: 16px; + min-height: 16px; + } + + html|div scrollbarbutton:hover:active, html|div scrollbarbutton[active="true"] { + -moz-border-top-colors: ThreeDShadow -moz-Dialog; + -moz-border-right-colors: ThreeDShadow -moz-Dialog; + -moz-border-bottom-colors: ThreeDShadow -moz-Dialog; + -moz-border-left-colors: ThreeDShadow -moz-Dialog; + background-position: 60% 60%; + } + + /* ..... increment .... */ + + html|div scrollbarbutton[type="increment"] { + -moz-appearance: scrollbarbutton-right; + background-image: url("chrome://global/skin/arrow/arrow-rit.gif") + } + + html|div scrollbarbutton[type="increment"][disabled="true"] { + background-image: url("chrome://global/skin/arrow/arrow-rit-dis.gif") + } + + html|div scrollbar[orient="vertical"] > scrollbarbutton[type="increment"] { + -moz-appearance: scrollbarbutton-down; + background-image: url("chrome://global/skin/arrow/arrow-dn.gif") + } + + html|div scrollbar[orient="vertical"] > scrollbarbutton[type="increment"][disabled="true"] { + background-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif") + } + + /* ..... decrement .... */ + + html|div scrollbarbutton[type="decrement"] { + -moz-appearance: scrollbarbutton-left; + background-image: url("chrome://global/skin/arrow/arrow-lft.gif") + } + + html|div scrollbarbutton[type="decrement"][disabled="true"] { + background-image: url("chrome://global/skin/arrow/arrow-lft-dis.gif") + } + + html|div scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"] { + -moz-appearance: scrollbarbutton-up; + background-image: url("chrome://global/skin/arrow/arrow-up.gif") + } + + html|div scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true"] { + background-image: url("chrome://global/skin/arrow/arrow-up-dis.gif") + } + +} diff --git a/src/chrome/os/linux/tabbox.css b/src/chrome/os/linux/tabbox.css @@ -0,0 +1,111 @@ +/* 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/. */ + +/* ===== tabbox.css ================================================= + == Styles used by XUL tab-related elements. + ======================================================================= */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + + +/* ::::: tabs ::::: */ + +tabs { + position: relative; + z-index: 0; +} + +/* ::::: tabpanels ::::: */ + +tabpanels { + -moz-appearance: none; + border-right: 1px solid; + border-bottom: 1px solid; + border-left: 1px solid; + -moz-border-right-colors: rgb(75,75,75); + -moz-border-bottom-colors: rgb(75,75,75); + -moz-border-left-colors: rgb(75,75,75); + padding: 8px; + background-color: rgb(43,43,43); + color: #fff; +} + +/* ::::: tab ::::: */ + +tab { + position: relative; + -moz-appearance: tab; + margin-top: 2px; + border-top: 1px solid; + border-right: 1px solid; + border-left: 1px solid; + border-bottom: 1px solid rgb(75,75,75); + -moz-border-top-colors: rgb(75,75,75); + -moz-border-right-colors: rgb(75,75,75); + -moz-border-left-colors: rgb(75,75,75); + border-top-left-radius: 2px; + border-top-right-radius: 2px; + padding: 1px 4px 2px 4px; + background-color: rgb(23,23,23); + color: #fff; +} + +tab[selected="true"] { + z-index: 1; + margin-top: 0; + background-color: rgb(43,43,43); + border-bottom-color: transparent; + padding: 1px 6px 4px 6px; +} + +tab + tab { + -moz-margin-start: -2px; +} + +.tab-text { + margin: 0 !important; +} + +/* ::::: tab-bottom :::::::::: + :: Tabs that are attached to the bottom of a panel, but not necessarily + :: a tabpanels. + ::::: */ + +.tab-bottom { + margin-top: 0; + margin-bottom: 2px; + border-top: 1px solid; + border-bottom: 1px solid; + -moz-border-top-colors: rgb(75,75,75); + -moz-border-bottom-colors: rgb(75,75,75); + border-top-left-radius: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 2px; + border-bottom-left-radius: 2px; + padding: 2px 4px 1px 4px; +} + +.tab-bottom[selected="true"] { + margin-bottom: 0; + -moz-border-top-colors: rgb(110,110,110); + padding: 4px 6px 1px 6px; +} + +.tab-bottom[beforeselected="true"]:-moz-locale-dir(ltr), +.tab-bottom[selected="true"]:-moz-locale-dir(rtl) + .tab-bottom { + border-bottom-right-radius: 0; +} + +.tab-bottom[selected="true"]:-moz-locale-dir(ltr) + .tab-bottom, +.tab-bottom[beforeselected="true"]:-moz-locale-dir(rtl) { + border-bottom-left-radius: 0; +} + +/* ::::: tabs-bottom ::::: */ + +.tabs-bottom > .tabs-left, +.tabs-bottom > .tabs-right { + border-top: 1px solid rgb(75,75,75); + border-bottom: none; +} diff --git a/src/chrome/os/linux/toolbar.css b/src/chrome/os/linux/toolbar.css @@ -0,0 +1,66 @@ +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* ::::: toolbox ::::: */ + +toolbox { + -moz-appearance: none; + background-color: rgb(43,43,43); + border-top: 1px solid; + -moz-border-top-colors: rgb(75,75,75); + color: #fff; +} + +/* ::::: menubar & toolbar ::::: */ + +toolbar, menubar { + -moz-appearance: none; + color: #fff; +} + +toolbar { + background-color: rgb(43,43,43); + min-width: 1px; + min-height: 19px; + border-top: 1px solid rgb(75,75,75); + border-bottom: 1px solid rgb(75,75,75); +} + +toolbar:first-child, menubar { + min-width: 1px; + border-bottom: 1px solid rgb(75,75,75); + border-top: 0px !important; +} + +menubar, toolbar[type="menubar"] { + -moz-appearance: none; + color: #fff; + min-width: 1px; + min-height: 20px; + padding: 1px 0px; +} + +menubar:-moz-lwtheme, +toolbar:-moz-lwtheme { + -moz-appearance: none; + color: inherit !important; +} + +/* in browser.xul, the menubar is inside a toolbar... */ +toolbaritem > menubar { + -moz-appearance: none; +} + +/* ::::: toolbar decorations ::::: */ + +toolbarseparator { + -moz-appearance: none; + margin: 3px 4px; + background: url("chrome://global/skin/toolbar/toolbar-separator.png") transparent repeat-y; + padding: 0; + width: 1px !important; +} + +toolbarspacer { + width: 15px; +} + diff --git a/src/chrome/os/linux/toolbarbutton.css b/src/chrome/os/linux/toolbarbutton.css @@ -0,0 +1,143 @@ +/* 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/. */ + +/* ===== toolbarbutton.css ===================================================== + == Styles used by the XUL button element. + ======================================================================= */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* ::::: toolbarbutton ::::: */ + +toolbarbutton { + -moz-appearance: toolbarbutton; + -moz-box-align: center; + -moz-box-pack: center; + margin: 0; + padding: 3px; + color: #fff; +} + +toolbarbutton:-moz-lwtheme { + text-shadow: none; +} + +.toolbarbutton-icon[label]:not([label=""]), +.toolbarbutton-icon[type="menu"] { + -moz-margin-end: 2px; +} + +.toolbarbutton-text { + margin: 0 !important; /* !important for overriding global.css */ + text-align: center; +} + +toolbarbutton.tabbable { + -moz-user-focus: normal !important; +} + +toolbarbutton:hover:active, +toolbarbutton[open="true"] { + padding-top: 4px; + padding-bottom: 2px; + -moz-padding-start: 4px; + -moz-padding-end: 2px; +} + +toolbarbutton[disabled="true"], +toolbarbutton[disabled="true"]:hover, +toolbarbutton[disabled="true"]:hover:active, +toolbarbutton[disabled="true"][open="true"] { + padding: 3px; + color: GrayText; +} + +toolbarbutton[checked="true"]:not(:hover) { + color: #fff; +} + +toolbarbutton:-moz-lwtheme:not(:hover):not([checked="true"]):not([open="true"]):not([disabled="true"]) { + color: inherit; + text-shadow: inherit; +} + +/* ::::: toolbarbutton menu ::::: */ + +.toolbarbutton-menu-dropmarker { + -moz-appearance: none !important; + border: none !important; + background-color: transparent !important; + padding: 0; + width: auto; + height: auto; + margin-top: 1px; +} + +/* ::::: toolbarbutton menu-button ::::: */ + +toolbarbutton[type="menu-button"] { + -moz-box-align: stretch; + -moz-appearance: dualbutton; + -moz-box-orient: horizontal !important; +} + +toolbarbutton[type="menu-button"], +toolbarbutton[type="menu-button"]:hover, +toolbarbutton[type="menu-button"]:hover:active, +toolbarbutton[type="menu-button"][open="true"], +toolbarbutton[type="menu-button"][disabled="true"], +toolbarbutton[type="menu-button"][disabled="true"]:hover, +toolbarbutton[type="menu-button"][disabled="true"]:hover:active { + padding: 0 !important; +} + +.toolbarbutton-menubutton-button { + -moz-box-align: center; + -moz-box-pack: center; + -moz-box-orient: vertical; +} + +/* ::::: toolbarbutton badged ::::: */ + +.toolbarbutton-badge { + background-color: rgb(110,110,110); +} + +.toolbarbutton-badge::after { + /* The |content| property is set in the content stylesheet. */ + font-size: 10px; + font-weight: bold; + padding: 1px 2px 2px; + color: #fff; + background-color: inherit; + border-radius: 2px; + box-shadow: 0 1px 0 hsla(0, 100%, 100%, .2) inset, + 0 -1px 0 hsla(0, 0%, 0%, .1) inset, + 0 1px 0 hsla(206, 50%, 10%, .2); + position: absolute; + top: -4px; + right: -2px; + min-width: 10px; + line-height: 10px; + text-align: center; +} + +.toolbarbutton-badge:-moz-locale-dir(rtl)::after { + left: -2px; + right: auto; +} + +.toolbarbutton-badge-container { + position: relative; +} + +/* .......... dropmarker .......... */ + +.toolbarbutton-menubutton-dropmarker { + -moz-appearance: none; + padding: 3px 7px; + border: none; + background-color: transparent; + width: auto; +} diff --git a/src/chrome/os/linux/tree.css b/src/chrome/os/linux/tree.css @@ -0,0 +1,234 @@ +/* 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/. */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* ::::: tree ::::: */ + +tree { + border: 2px solid; + -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow; + -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow; + -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow; + -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow; + background-color: -moz-Field; + color: -moz-FieldText; +} + +/* ::::: tree focusring ::::: */ + +.focusring > .tree-stack > .tree-rows > .tree-bodybox { + border: 1px solid transparent; +} + +.focusring:focus > .tree-stack > .tree-rows > .tree-bodybox { + border: 1px solid #000000; +} + +/* ::::: tree rows ::::: */ + +treechildren:not(.autocomplete-treebody)::-moz-tree-row(multicol, odd) { + background-color: -moz-oddtreerow; +} + +treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected) { + background-color: -moz-cellhighlight; +} + +treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, focus) { + background-color: Highlight; +} + +/* ::::: tree cells ::::: */ + +treechildren::-moz-tree-cell-text(selected) { + color: -moz-cellhighlighttext; +} + +tree[seltype="cell"] > treechildren::-moz-tree-cell { + border: 1px solid transparent; +} + +tree[seltype="text"] > treechildren::-moz-tree-cell-text { + border: 1px solid transparent; +} + +tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected) { + background-color: -moz-cellhighlight; +} + +tree[seltype="cell"] > treechildren::-moz-tree-cell-text(active, selected) { + color: -moz-cellhighlighttext; +} + +tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected) { + background-color: -moz-cellhighlight; + color: -moz-cellhighlighttext; +} + +tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected, focus) { + background-color: Highlight; +} + +tree[seltype="cell"] > treechildren::-moz-tree-cell(active, current, focus) { + border: 1px dotted #000000; +} + +tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, current, focus) { + border: 1px dotted #000000; +} + +tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected, current, focus) { + border: 1px dotted #C0C0C0; +} + +tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected, current, focus) { + border: 1px dotted #C0C0C0; +} + +/* ::::: lines connecting cells ::::: */ + +tree[seltype="cell"] > treechildren::-moz-tree-line, +tree[seltype="text"] > treechildren::-moz-tree-line, +treechildren::-moz-tree-line { + border: 1px dotted ThreeDShadow; +} + +tree[seltype="cell"] > treechildren::-moz-tree-line(active, selected, focus), +treechildren::-moz-tree-line(selected, focus) { + border: 1px dotted HighlightText; +} + +/* ::::: tree separator ::::: */ + +treechildren::-moz-tree-separator { + border-top: 1px solid ThreeDShadow; + border-bottom: 1px solid ThreeDHighlight; +} + +/* ::::: drop feedback ::::: */ + +tree[seltype="cell"] > treechildren::-moz-tree-cell-text(primary, dropOn), +tree[seltype="text"] > treechildren::-moz-tree-cell-text(primary, dropOn), +treechildren::-moz-tree-cell-text(primary, dropOn) { + background-color: Highlight; + color: HighlightText; +} + +treechildren::-moz-tree-drop-feedback { + background-color: Highlight; +} + +/* ::::: tree progress meter ::::: */ + +treechildren::-moz-tree-progressmeter { + padding: 1px; + border: 1px solid; + border-top-color: ThreeDShadow; + border-right-color: ThreeDHighlight; + border-bottom-color: ThreeDHighlight; + border-left-color: ThreeDShadow; + background-color: -moz-Dialog; + color: ThreeDShadow; +} + +treechildren::-moz-tree-progressmeter(progressUndetermined) { + list-style-image: url("chrome://global/skin/progressmeter/progressmeter-busy.gif"); +} + +/* ::::: tree columns ::::: */ + +treecol:hover, +treecolpicker:hover { + color: -moz-buttonhovertext; +} + +/* ..... internal box ..... */ + +treecol:hover:active, +treecolpicker:hover:active { + color: ButtonText; + border: 2px solid; + -moz-border-top-colors: ThreeDShadow -moz-Dialog; + -moz-border-right-colors: ThreeDShadow transparent; + -moz-border-bottom-colors: ThreeDShadow transparent; + -moz-border-left-colors: ThreeDShadow -moz-Dialog; + padding-top: 0px; + padding-bottom: 0px; + -moz-padding-start: 3px; + -moz-padding-end: 1px; +} + +.treecol-image:hover:active { + padding: 0px; + -moz-padding-start: 2px; +} + +treecol:hover:active .treecol-text { + margin: 1px 0px -1px 0px !important; +} + +/* ::::: column drag and drop styles ::::: */ + +treecol[dragging="true"] { + -moz-border-top-colors: ThreeDDarkShadow transparent !important; + -moz-border-right-colors: ThreeDDarkShadow transparent!important; + -moz-border-bottom-colors: ThreeDDarkShadow transparent !important; + -moz-border-left-colors: ThreeDDarkShadow transparent !important; +} + +/* ::::: sort direction indicator ::::: */ + +.treecol-sortdirection { + -moz-appearance: treeheadersortarrow; +} + +/* ::::: twisty ::::: */ + +treechildren::-moz-tree-twisty { + -moz-appearance: treetwisty; + -moz-padding-end: 4px; + padding-top: 1px; + width: 9px; /* The image's width is 9 pixels */ + list-style-image: url("chrome://global/skin/tree/twisty-clsd.png"); +} + +treechildren::-moz-tree-twisty(open) { + -moz-appearance: treetwistyopen; + width: 9px; /* The image's width is 9 pixels */ + list-style-image: url("chrome://global/skin/tree/twisty-open.png"); +} + +treechildren::-moz-tree-indentation { + width: 18px; +} + +/* ::::: gridline style ::::: */ + +treechildren.gridlines::-moz-tree-cell { + border-right: 1px solid transparent !important; + border-bottom: 1px solid transparent !important; +} + +/* ::::: editable tree ::::: */ + +treechildren::-moz-tree-row(selected, editing) { + background-color: transparent; + border: none; +} + +treechildren::-moz-tree-cell-text(selected, editing) { + color: inherit; +} + +.tree-input { + border: 1px solid Highlight; + -moz-border-top-colors: Highlight; + -moz-border-bottom-colors: Highlight; + -moz-border-left-colors: Highlight; + -moz-border-right-colors: Highlight; + margin: 0; + -moz-margin-start: -4px; + padding: 1px; +} +\ No newline at end of file diff --git a/src/chrome/os/winnt/browser.css b/src/chrome/os/winnt/browser.css @@ -0,0 +1,576 @@ +:root { + --appmenu-background: rgba(90,90,90,.85); + --appmenu-border-color: rgba(0,0,0,.15); + --appmenu-border-radius: 4px; +} + +/* ::::: app menu button ::::: */ + +#appmenu-button { + -moz-appearance: none; + background: var(--appmenu-background); + background-clip: padding-box; + border-radius: 0 0 var(--appmenu-border-radius) var(--appmenu-border-radius); + border: 1px solid var(--appmenu-border-color); + border-top: none; + font-weight: bold; + box-shadow: none; + padding: 0 1.5em .05em; + margin: 0 0 2px; + color: #fff; +} + +@media (-moz-windows-classic) { + #appmenu-button { + margin-bottom: 1px; + } +} + +#main-window[privatebrowsingmode=temporary] #appmenu-button { + --appmenu-background: rgba(235,235,235,.75); + color: #000; +} + +#appmenu-button:hover:not(:active):not([open]) { + --appmenu-background: rgba(110,110,110,.75); + --appmenu-border-color: rgba(0,0,0,.20); +} + +#main-window[privatebrowsingmode=temporary] #appmenu-button:hover:not(:active):not([open]) { + --appmenu-background: rgba(240,240,240,.85); +} + +#appmenu-button:hover:active, +#appmenu-button[open] { + border-radius: 0; + --appmenu-background: rgba(75,75,75,.4); + --appmenu-border-color: rgba(0,0,0,.25); +} + +#main-window[privatebrowsingmode=temporary] #appmenu-button:hover:active, +#main-window[privatebrowsingmode=temporary] #appmenu-button[open] { + --appmenu-background: rgba(255,255,255,.4); +} + +#appmenu-button > .button-box { + border-style: none; + padding: 0; +} + +#appmenu-button > .button-box > .button-menu-dropmarker { + list-style-image: url(chrome://browser/skin/toolbarbutton-dropdown-arrow.svg); + width: auto; + height: auto; + padding: 0; + margin: 0; + -moz-margin-start: .5em; +} + +#main-window[privatebrowsingmode=temporary] #appmenu-button > .button-box > .button-menu-dropmarker { + list-style-image: url(chrome://browser/skin/toolbarbutton-dropdown-arrow.svg#darktext); +} + +/* ::::: titlebar ::::: */ + +#main-window[sizemode="normal"] > #titlebar { + -moz-appearance: -moz-window-titlebar; +} + +#main-window[sizemode="maximized"] > #titlebar { + -moz-appearance: -moz-window-titlebar-maximized; +} + +@media all and (-moz-windows-classic) { + #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container { + margin-top: 4px; + } +} + +#titlebar-buttonbox { + -moz-appearance: -moz-window-button-box; +} + +#main-window[sizemode="maximized"] #titlebar-buttonbox { + -moz-appearance: -moz-window-button-box-maximized; +} + +.titlebar-placeholder[type="appmenu-button"] { + margin-left: 4px; +} + +.titlebar-placeholder[type="caption-buttons"] { + margin-left: 22px; +} + +#titlebar-min { + -moz-appearance: -moz-window-button-minimize; +} + +#titlebar-max { + -moz-appearance: -moz-window-button-maximize; +} + +#main-window[sizemode="maximized"] #titlebar-max { + -moz-appearance: -moz-window-button-restore; +} + +#titlebar-close { + -moz-appearance: -moz-window-button-close; +} + +@media not all and (-moz-windows-classic) { + #titlebar-min { + -moz-margin-end: 2px; + } +} + +/* ::::: bookmark buttons ::::: */ + +toolbarbutton.bookmark-item { + margin: 0; + padding: 2px 3px; +} + +toolbarbutton.bookmark-item:hover:active:not([disabled="true"]), +toolbarbutton.bookmark-item[open="true"] { + padding-top: 3px; + padding-bottom: 1px; + -moz-padding-start: 4px; + -moz-padding-end: 2px; +} + +.bookmark-item:not(#bookmarks-menu-button) > .toolbarbutton-icon { + width: 16px; + height: 16px; +} + + +.bookmark-item > .toolbarbutton-text { + display: -moz-box !important; +} + +.bookmark-item > .toolbarbutton-menu-dropmarker { + display: none; +} + +@media (-moz-windows-glass) { + #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container { + margin-top: 1px; + } + + #appmenu-button { + border-width: 2px; + -moz-border-left-colors: rgba(255,255,255,.5) var(--appmenu-border-color); + -moz-border-bottom-colors: rgba(255,255,255,.5) var(--appmenu-border-color); + -moz-border-right-colors: rgba(255,255,255,.5) var(--appmenu-border-color); + margin-bottom: 1px; + box-shadow: 0 1px 0 rgba(255,255,255,.25) inset, + 0 0 2px 1px rgba(255,255,255,.25) inset; + } + + #appmenu-popup { + margin-top: -1px; + -moz-margin-start: 1px; + } +} + +@media all and (-moz-windows-default-theme) { + #navigator-toolbox > toolbar:not(:-moz-lwtheme), + #addon-bar:not(:-moz-lwtheme) { + background-color: rgb(43,43,43); + } + + #sidebar-splitter { + border: 0; + -moz-border-end: 1px solid rgb(75,75,75); + min-width: 0; + width: 3px; + background-color: transparent; + -moz-margin-start: -3px; + position: relative; + } +} + +@media all and (-moz-windows-compositor) { + #main-window { + background-color: transparent; + -moz-appearance: -moz-win-glass; + } + + /* On win 10, if we don't set this on the entire browser container, including + * the sidebar, then the accent color bleeds through in the titlebar + * if the sidebar is open. */ + #browser { + -moz-appearance: -moz-win-exclude-glass; + } + +/* ==== Windows 10 styling ==== */ + + @media (-moz-os-version: windows-win10) { + /* Draw XUL caption buttons on Win10 */ + #appmenu-button { + margin-top: -1px !important; + margin-bottom: 5px !important; + } + + #tabbrowser-tabs { + min-height: 28px; + } + + #titlebar-buttonbox, + .titlebar-button { + -moz-appearance: none !important; + } + + .titlebar-button { + border: none; + border-radius: 0px; + margin: 0 !important; + padding: 8px 17px; + transition: background-color linear 120ms; + } + + .titlebar-button:hover { + background-color: hsla(0, 0%, 100%, .17); + } + + .titlebar-button:hover:active { + background-color: hsla(0, 0%, 100%, .27); + transition: none; + } + + .titlebar-button:not(:hover) > .toolbarbutton-icon:-moz-window-inactive { + opacity: 0.5; + } + + #titlebar-close:hover { + background-color: hsla(0, 86%, 49%, 1); + } + + #titlebar-close:hover:active { + background-color: hsla(0, 60%, 39%, 1); + transition: none; + } + + #main-window[sizemode=maximized] .titlebar-button { + padding-top: 8px; + padding-bottom: 8px; + } + + .titlebar-button > .toolbarbutton-icon { + width: 12px; + height: 12px; + } + + #main-window[chromemargin^="0,"][sizemode=normal] #navigator-toolbox { + margin-top: -4px; + } + + #titlebar-min { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-white); + } + + #titlebar-max { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-white); + } + + #main-window[sizemode="maximized"] #titlebar-max { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-white); + } + + #titlebar-close { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-white); + } + #titlebar-close:hover { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-white); + } + + /* light persona */ + .titlebar-button:-moz-lwtheme-darktext:hover { + background-color: hsla(0, 0%, 0%, .17); + } + + .titlebar-button:-moz-lwtheme-darktext:hover:active { + background-color: hsla(0, 0%, 0%, .27); + transition: none; + } + + #titlebar-min:-moz-lwtheme-darktext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-darktext); + } + #titlebar-max:-moz-lwtheme-darktext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-darktext); + } + #main-window[sizemode="maximized"]:-moz-lwtheme-darktext #titlebar-max:-moz-lwtheme-darktext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-darktext); + } + #titlebar-close:-moz-lwtheme-darktext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-darktext); + } + #titlebar-close:hover:-moz-lwtheme-darktext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-darktext); + } + + /* dark persona */ + .titlebar-button:-moz-lwtheme-brighttext:hover { + background-color: hsla(0, 0%, 100%, .27); + } + + .titlebar-button:-moz-lwtheme-brighttext:hover:active { + background-color: hsla(0, 0%, 100%, .37); + transition: none; + } + + #titlebar-min:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-themes); + } + #titlebar-max:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-themes); + } + #main-window[sizemode="maximized"]:-moz-lwtheme-brighttext #titlebar-max:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-themes); + } + #titlebar-close:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-themes); + } + #titlebar-close:hover:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-themes); + } + + /* the 12px image renders a 10px icon, and the 10px upscaled gets rounded to 12.5, which + * rounds up to 13px, which makes the icon one pixel too big on 1.25dppx. Fix: */ + @media (min-resolution: 1.20dppx) and (max-resolution: 1.45dppx) { + .titlebar-button > .toolbarbutton-icon { + width: 11.5px; + height: 11.5px; + } + } + + /* 175% dpi should result in the same device pixel sizes as 150% dpi. */ + @media (min-resolution: 1.70dppx) and (max-resolution: 1.95dppx) { + .titlebar-button { + padding-left: 14.1px; + padding-right: 14.1px; + } + + .titlebar-button > .toolbarbutton-icon { + width: 10.8px; + height: 10.8px; + } + } + + /* 225% dpi should result in the same device pixel sizes as 200% dpi. */ + @media (min-resolution: 2.20dppx) and (max-resolution: 2.45dppx) { + .titlebar-button { + padding-left: 15.3333px; + padding-right: 15.3333px; + } + + .titlebar-button > .toolbarbutton-icon { + width: 10.8px; + height: 10.8px; + } + } + + /* 275% dpi should result in the same device pixel sizes as 250% dpi. */ + @media (min-resolution: 2.70dppx) and (max-resolution: 2.95dppx) { + .titlebar-button > .toolbarbutton-icon { + width: 10.8px; + height: 10.8px; + } + } + } + +/* ==== Windows Vista/7/8 styling ==== */ + + @media (-moz-os-version: windows-vista), + (-moz-os-version: windows-win7), + (-moz-os-version: windows-win8) { + /* Make sure the native margins are correct on Win Vista/7/8. + * We can't use -moz-win-glass there because the border sizing would + * not be correct. */ + #main-window { + -moz-appearance: -moz-win-borderless-glass; + } + + /* These should be hidden w/ glass enabled. Windows draws its own buttons. */ + .titlebar-button { + display: none; + } + + /* The borders on the glass frame are ours, and inside #browser, and on + * vista and win7 we want to make sure they are "glassy", so we can't use + * #browser as the exclude-glass container. We use #appcontent instead. */ + #browser { + -moz-appearance: none; + } + + #appcontent { + -moz-appearance: -moz-win-exclude-glass; + } + + #main-window[chromemargin^="0,"][sizemode=normal] #navigator-toolbox { + margin-top: -7px; + } + + /* Artificially draw window borders that are covered by lwtheme, see bug 591930. */ + #main-window[sizemode="normal"] > #titlebar > #titlebar-content:-moz-lwtheme { + border-top: 2px solid; + -moz-border-top-colors: rgb(37, 44, 51) rgba(255,255,255,.6); + } + + #main-window[sizemode="normal"] > #titlebar > #titlebar-content:-moz-lwtheme:-moz-window-inactive { + -moz-border-top-colors: rgb(102, 102, 102) rgba(255,255,255,.6); + } + + #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container:-moz-lwtheme { + margin-top: -1px; + } + + #main-window[sizemode="normal"] #titlebar-buttonbox:-moz-lwtheme { + margin-top: -2px; + } + + #appmenu-button { + margin-bottom: -1px; + } + } + +/* ==== ==== */ + + #main-window[sizemode=fullscreen]:not(:-moz-lwtheme) { + -moz-appearance: none; + background-color: rgb(23,23,23); + } + + #main-menubar > menu:not(:-moz-lwtheme) { + color: inherit; + } + + /* Show toolbar borders on vista through win8, but not on win10 and later: */ + @media (-moz-os-version: windows-vista), + (-moz-os-version: windows-win7), + (-moz-os-version: windows-win8) { + /* Vertical toolbar border */ + #main-window[sizemode=normal] #navigator-toolbox::after, + #main-window[sizemode=normal] #navigator-toolbox[tabsontop=true] > toolbar:not(#toolbar-menubar):not(#TabsToolbar), + #main-window[sizemode=normal] #navigator-toolbox[tabsontop=false] > toolbar:not(#toolbar-menubar):not(#nav-bar) { + border-left: 1px solid hsla(0,0%,12%,0.25); + border-right: 1px solid hsla(0,0%,12%,0.25); + background-clip: padding-box; + } + + #main-window[sizemode=normal] #navigator-toolbox > toolbar:-moz-lwtheme { + border-color: transparent !important; + } + #main-window[sizemode=normal] #browser-border-start, + #main-window[sizemode=normal] #browser-border-end { + display: -moz-box; + background-color: hsla(0,0%,12%,0.25); + width: 1px; + } + #main-window[sizemode=normal] #browser-bottombox { + border: 1px solid hsla(0,0%,12%,0.25); + border-top-style: none; + } + } + + /* Round top corners on Vista/7/8, but not Win10 because it's flush against the window edge */ + @media (-moz-os-version: windows-vista), + (-moz-os-version: windows-win7), + (-moz-os-version: windows-win8) { + #main-window[sizemode=normal][tabsontop=false] #PersonalToolbar:not(:-moz-lwtheme) { + border-top-left-radius: 3.5px; + border-top-right-radius: 3.5px; + } + + #main-window[sizemode=normal][tabsontop=true] #nav-bar:not(:-moz-lwtheme), + #main-window[sizemode=normal][tabsontop=true] > #nav-bar[collapsed=true]:not([customizing]) + toolbar:not(:-moz-lwtheme), + #main-window[sizemode=normal][tabsontop=true] > #nav-bar[collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme) { + border-top-left-radius: 2px; + border-top-right-radius: 2px; + } + } + + + #main-window[sizemode=normal][tabsontop=true] #nav-bar:not(:-moz-lwtheme), + #main-window[sizemode=normal][tabsontop=true] > #nav-bar[collapsed=true]:not([customizing]) + toolbar:not(:-moz-lwtheme), + #main-window[sizemode=normal][tabsontop=true] > #nav-bar[collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme) { + border-top: 1px solid rgba(75,75,75,1); + background-clip: padding-box; + } + #main-window[sizemode=normal]:not([disablechrome]) #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme) { + margin-bottom: -1px; + background-image: none !important; + } + #main-window[sizemode=normal]:not([disablechrome]) #tabbrowser-tabs[tabsontop=true] > .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox > .scrollbox-innerbox:not(:-moz-lwtheme) { + position: relative; + } + + #main-window[sizemode=normal] #TabsToolbar[tabsontop=true] { + padding-left: 4px; + padding-right: 4px; + } + + #main-window[sizemode=normal] #TabsToolbar[tabsontop=false] { + padding-left: 2px; + padding-right: 2px; + } + + + #toolbar-menubar:not([autohide="true"]), + #TabsToolbar[tabsontop="true"], + #navigator-toolbox[tabsontop="false"] > #nav-bar, + #nav-bar + #customToolbars + #PersonalToolbar[collapsed="true"] + #TabsToolbar[tabsontop="false"]:last-child, + #navigator-toolbox > toolbar:not(#toolbar-menubar):-moz-lwtheme { + -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag"); + } + + #appcontent:not(:-moz-lwtheme) { + background-color: -moz-dialog; + } + + #browser-bottombox:not(:-moz-lwtheme) { + background-color: rgb(38,38,38); + background-clip: padding-box; + } + + @media (-moz-os-version: windows-vista), + (-moz-os-version: windows-win7), + (-moz-os-version: windows-win8) { + #main-window[sizemode=normal] #browser-bottombox:not(:-moz-lwtheme), + #main-window[sizemode=normal] #addon-bar:not(:-moz-lwtheme) { + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; + } + } + + #addon-bar:not(:-moz-lwtheme) { + -moz-appearance: none; + border-bottom-style: none; + } + + .tabbrowser-tab:not(:-moz-lwtheme) { + text-shadow: none; + } + + #main-window[sizemode=normal] .statuspanel-inner { + + padding-left: 1px; + padding-right: 1px; + } + + #tab-view:-moz-lwtheme { + background-image: url("chrome://browser/skin/tabview/grain.png"), + -moz-linear-gradient(rgba(255,255,255,0), #CCD9EA 200px, #C7D5E7); + background-attachment: fixed; + } +} + +@media not all and (-moz-windows-compositor) { + #toolbar-menubar:not([autohide=true]):not(:-moz-lwtheme):-moz-system-metric(windows-default-theme), + #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme):-moz-system-metric(windows-default-theme), + #navigator-toolbox[tabsontop=false] > toolbar:not(#toolbar-menubar):not(:-moz-lwtheme):-moz-system-metric(windows-default-theme) { + -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag"); + } +} +\ No newline at end of file diff --git a/src/chrome/os/winnt/menu.css b/src/chrome/os/winnt/menu.css @@ -0,0 +1,252 @@ +/* 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/. */ + +/* ===== menu.css ======================================================= + == Styles used by XUL menu-related elements. + ======================================================================= */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* ::::: menu/menuitem ::::: */ + +menu, +menuitem, +.splitmenu-menuitem { + -moz-appearance: none; + -moz-box-align: center; + color: #FFFFFF; + font: menu; + list-style-image: none; + -moz-image-region: auto; +} + +menuitem[default="true"] { + font-weight: bold; +} + +menu[disabled="true"], +menuitem[disabled="true"], +.splitmenu-menuitem[disabled="true"], +menu[_moz-menuactive="true"][disabled="true"], +menuitem[_moz-menuactive="true"][disabled="true"], +.splitmenu-menuitem[_moz-menuactive="true"][disabled="true"] { + color: GrayText; + text-shadow: none; +} + +menuitem.spell-suggestion { + font-weight: bold; +} + +/* ..... internal content .... */ + +.menu-accel, +.menu-iconic-accel, +.menu-text, +.menu-iconic-text { + margin: 0px !important; + padding: 1px 0px; + color: inherit; +} + +.menu-text { + -moz-appearance: none; + -moz-padding-start: 1.45em !important; +} + +.menu-text, +.menu-iconic-text { + font-weight: inherit; + -moz-margin-start: 2px !important; + -moz-padding-end: 2px; +} + +.menu-description { + font-style: italic; + color: GrayText; + -moz-margin-start: 1ex !important; +} + +.menu-accel, +.menu-iconic-accel { + color: inherit; + -moz-margin-start: 0.74em !important; + -moz-margin-end: 1.35em !important; +} + +.menu-iconic-left { + min-width: 1.45em; +} + +.menu-iconic-icon { + width: 16px; + height: 16px; +} + +menu.menu-iconic > .menu-iconic-left, +menuitem.menuitem-iconic > .menu-iconic-left, +.splitmenu-menuitem[iconic="true"] > .menu-iconic-left { + /*-moz-appearance: menuimage;*/ + padding-top: 2px; +} + +/* ..... menu arrow box ..... */ + +.menu-right { + margin: 0 0 0 6px; + width: 8px; + list-style-image: url("chrome://global/skin/arrow/arrow-h.svg#rit"); + -moz-image-region: auto; +} + +.menu-right > image { + width: 5px; +} + +/* ::::: menu/menuitems in menubar ::::: */ + +menubar > menu { + border: 2px solid transparent; +} + +menubar > menu[_moz-menuactive="true"]:not([disabled="true"]) { + color: #fff; +} + +menubar > menu[_moz-menuactive="true"][open="true"] { + border-width: 3px 1px 1px 3px; +} + +menubar > menu:-moz-lwtheme { + -moz-appearance: none; + border-style: none; +} + +menubar > menu:-moz-lwtheme:not([disabled="true"]) { + color: inherit !important; +} + +menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) { + background-color: rgb(110,110,110); + color: #fff !important; + text-shadow: none; +} + +menubar > menu:-moz-window-inactive { + color: rgb(173,173,173); +} + +/* ..... internal content .... */ + +.menubar-left { + color: inherit; +} + +.menubar-text { + margin: 1px 6px 2px 6px !important; + color: inherit; +} + +/* ::::: menu/menuitems in popups ::::: */ + +menupopup > menu, +menupopup > menuitem { + max-width: 42em; +} + +menu[_moz-menuactive="true"], +menuitem[_moz-menuactive="true"], +.splitmenu-menuitem[_moz-menuactive="true"] { + background-color: rgb(110,110,110) !important; + color: #fff !important; +} + +/* ::::: menu/menuitems in menulist popups ::::: */ + +.menulist-menupopup > menuitem, +menulist > menupopup > menuitem, +.menulist-menupopup > menu, +menulist > menupopup > menu { + -moz-appearance: none; + border: 1px solid transparent; + padding: 1px 5px; + max-width: none; + font: message-box; + color: #FFFFFF; +} + +.menulist-menupopup > menuitem > .menu-iconic-left, +menulist > menupopup > menuitem > .menu-iconic-left, +.menulist-menupopup > menu > .menu-iconic-left, +menulist > menupopup > menu > .menu-iconic-left { + display: none; + padding-top: 0px; +} + +.menulist-menupopup > menuitem > label, +menulist > menupopup > menuitem > label, +.menulist-menupopup > menu > label, +menulist > menupopup > menu > label { + padding-top: 0px; + padding-bottom: 0px; +} + +menulist:-moz-focusring > menupopup > menuitem[_moz-menuactive="true"] { + border: 1px dotted rgb(75,75,75); + background-color: rgb(110,110,110); + color: #fff; +} + +menuitem[checked="true"] { + list-style-image: url("chrome://global/skin/menu/menu-check.svg#check"); +} + +menuitem[checked="true"][disabled="true"], +menuitem[checked="true"][disabled="true"][_moz-menuactive="true"] { + list-style-image: url("chrome://global/skin/menu/menu-check.svg#check-dis"); +} + +/* ::::: checkbox and radio menuitems ::::: */ + +menuitem[checked="true"][type="radio"] { + list-style-image: url("chrome://global/skin/menu/menu-radio.svg#radio"); +} + +menuitem[checked="true"][type="radio"][disabled="true"], +menuitem[checked="true"][type="radio"][disabled="true"][_moz-menuactive="true"] { + list-style-image: url("chrome://global/skin/menu/menu-radio.svg#radio-dis"); +} + +/* ::::: menuseparator ::::: */ + +menuseparator { + margin: 2px 3px; + border-top: 1px solid rgb(75,75,75); +} + +menuseparator[collapsed="true"] { + margin: 0 !important; +} + +menulist > menupopup > menuseparator, +.menulist-menupopup > menuseparator { + padding: 6px 0 5px 0; + border-top: 1px solid #FFFFFF; + border-bottom: none; +} + +/* ::::: autocomplete ::::: */ + +.autocomplete-history-popup > menuitem { + max-width: none !important; + font: message-box; +} + +/* ::::: tree column picker ::::: */ + +.treecell-popupcell-menu { + -moz-margin-start: -2px; + list-style-image: url("chrome://global/skin/tree/columnpicker.svg"); + -moz-image-region: auto; +} diff --git a/src/chrome/os/winnt/menulist.css b/src/chrome/os/winnt/menulist.css @@ -0,0 +1,138 @@ +/* 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/. */ + +/* ===== menulist.css =================================================== + == Styles used by the XUL menulist element. + ======================================================================= */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace html url("http://www.w3.org/1999/xhtml"); + +/* :::::::::: menulist :::::::::: */ + +menulist { + -moz-appearance: none; + margin: 2px 4px; + border: 1px solid; + -moz-border-top-colors: rgb(75,75,75); + -moz-border-right-colors: rgb(75,75,75); + -moz-border-bottom-colors: rgb(75,75,75); + -moz-border-left-colors: rgb(75,75,75); + background-color: rgb(50,50,50); + color: #fff; + text-shadow: none; +} + +.menulist-label-box { + -moz-box-align: center; + -moz-box-pack: center; + margin: 1px; + border: 1px solid transparent; + background-color: transparent; + color: inherit; +} + +.menulist-icon[src] { + margin: 0px 2px 0px 2px; +} + +.menulist-label { + margin-top: 0 !important; + -moz-margin-end: 0 !important; + margin-bottom: 0 !important; + -moz-margin-start: 1px !important; +} + +.menulist-description { + font-style: italic; + color: GrayText; + -moz-margin-start: 1ex !important; +} + +menulist:hover:not(:active):not([disabled=true]) { + background-color: rgb(75,75,75); +} + +menulist:hover:active:not([disabled=true]) { + background-color: rgb(110,110,110); +} + +/* ..... dropmarker ..... */ + +menulist > .menulist-dropmarker { + border: none; + background: transparent; + margin-right: 0 !important; +} + +menulist[disabled="true"]:hover:active > .menulist-dropmarker { + padding: 1px; +} + +menulist:hover:active > .menulist-dropmarker { + padding-top: 2px; + padding-bottom: 0px; + -moz-padding-start: 2px; + -moz-padding-end: 0px; +} + +/* ..... focused state ..... */ + +menulist:focus:not([open="true"]):not(.menulist-compact) > .menulist-label-box { + background-color: rgb(110,110,110); + color: #fff; +} + +menulist:-moz-focusring:not([open="true"]) > .menulist-label-box { + border: 1px dotted #F5DB95; +} + +/* ..... disabled state ..... */ + +menulist[disabled="true"] { + background-color: rgb(62,62,62); + color: GrayText; +} + +/* ::::: editable menulists ::::: */ + +.menulist-editable-box { + padding-top: 3px; + padding-bottom: 3px; + -moz-padding-start: 2px; + -moz-padding-end: 0px; +} + +html|*.menulist-editable-input { + margin: 0px !important; + border: none !important; + padding: 0px !important; + background: inherit; + font: inherit; + color: #fff; +} + +@media (-moz-windows-default-theme) { + .menulist-label-box { + background-color: transparent !important; + color: inherit !important; + } + + .menulist-label { + margin-top: -1px !important; + margin-bottom: -1px !important; + -moz-margin-start: 0 !important; + } + + menulist:not([editable="true"]) > .menulist-dropmarker { + margin-top: -2px; + -moz-margin-start: 3px; + -moz-margin-end: -3px; + } + + .menulist-icon { + margin-top: -1px; + margin-bottom: -1px; + } +} diff --git a/src/chrome/os/winnt/notification.css b/src/chrome/os/winnt/notification.css @@ -0,0 +1,80 @@ +/* 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/. */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +.popup-notification-menubutton { + -moz-appearance: none; + border-radius: 3px; + padding: 0; +} + +.popup-notification-menubutton:hover:active { + border-color: rgba(0,0,0,.5); +} + +.popup-notification-menubutton:not([type="menu-button"]), +.popup-notification-menubutton > .button-menubutton-button, +.popup-notification-menubutton > .button-menubutton-dropmarker { + -moz-appearance: none; + margin: 0; + border: 1px solid rgb(75,75,75); + background: rgb(50,50,50); +} + +.popup-notification-menubutton > .button-menubutton-button { + background-color: transparent; + padding: 1px; + -moz-border-end: none; +} + +.popup-notification-menubutton:not([type="menu-button"]), +.popup-notification-menubutton > .button-menubutton-button > .button-box { + -moz-padding-start: 8px; + -moz-padding-end: 5px; +} + +.popup-notification-menubutton > .button-menubutton-dropmarker { + padding: 9px 5px 8px; + width: auto; + height: auto; + list-style-image: url("chrome://global/skin/arrow/arrow-v.svg#dn"); +} + +.popup-notification-menubutton > .button-menubutton-dropmarker > image { + width: 9px; +} + +.popup-notification-menubutton:-moz-focusring > .button-menubutton-dropmarker { + outline: 1px dotted ThreeDDarkShadow; + outline-offset: -3px; +} + +.popup-notification-menubutton > .button-menubutton-button:-moz-locale-dir(ltr), +.popup-notification-menubutton > .button-menubutton-dropmarker:-moz-locale-dir(rtl) { + border-radius: 2px 0 0 2px; +} + +.popup-notification-menubutton > .button-menubutton-button:-moz-locale-dir(rtl), +.popup-notification-menubutton > .button-menubutton-dropmarker:-moz-locale-dir(ltr) { + border-radius: 0 2px 2px 0; +} + +.popup-notification-menubutton:not([type="menu-button"]):hover, +.popup-notification-menubutton > .button-menubutton-button:hover, +.popup-notification-menubutton > .button-menubutton-dropmarker:hover { + background: rgb(75,75,75); +} + +.popup-notification-menubutton:not([type="menu-button"]):hover:active, +.popup-notification-menubutton > .button-menubutton-button:hover:active, +.popup-notification-menubutton > .button-menubutton-dropmarker:hover:active, +.popup-notification-menubutton[open="true"] > .button-menubutton-dropmarker { + background: rgb(23,23,23); +} + +.popup-notification-closebutton { + -moz-margin-end: -14px; + margin-top: -10px; +} diff --git a/src/chrome/os/winnt/popup.css b/src/chrome/os/winnt/popup.css @@ -0,0 +1,146 @@ +/* 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/. */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* ::::: Variables ::::: */ +.panel-arrowcontent { + --panel-arrowcontent-background: rgb(50,50,50); + --panel-arrowcontent-color: #fff; + --panel-arrowcontent-border: 1px solid rgb(75,75,75); +} + +/* ::::: menupopup ::::: */ + +menupopup, +panel { + border: 1px solid transparent; + -moz-border-top-colors : rgb(75,75,75); + -moz-border-left-colors : rgb(75,75,75); + -moz-border-right-colors : rgb(23,23,23); + -moz-border-bottom-colors: rgb(23,23,23); + padding: 0px; + min-width: 1px; + background: rgb(43,43,43); + color: #fff; +} + +menupopup { + -moz-appearance: none; +} + +menupopup > menu > menupopup { + /* align submenus */ + -moz-margin-start: -3px; + margin-top: -3px; +} + +panel[type="arrow"] { + -moz-appearance: none; + background: transparent; + border: none; +} + +panel[type="arrow"][side="top"], +panel[type="arrow"][side="bottom"] { + margin-left: -20px; + margin-right: -20px; +} + +panel[type="arrow"][side="left"], +panel[type="arrow"][side="right"] { + margin-top: -20px; + margin-bottom: -20px; +} + +.panel-arrowcontent { + padding: 10px; + color: var(--panel-arrowcontent-color); + background: var(--panel-arrowcontent-background); + background-clip: padding-box; + border: var(--panel-arrowcontent-border); + border-radius: 4px; + margin: 4px; +} + +.panel-arrow[side="top"], +.panel-arrow[side="bottom"] { + list-style-image: url("chrome://global/skin/arrow/panelarrow-vertical-themed.svg"); + position: relative; + margin-left: 10px; + margin-right: 10px; +} + +.panel-arrow[side="top"] { + margin-bottom: -5px; +} + +.panel-arrow[side="bottom"] { + transform: scaleY(-1); + margin-top: -5px; +} + +.panel-arrow[side="left"], +.panel-arrow[side="right"] { + list-style-image: url("chrome://global/skin/arrow/panelarrow-horizontal-themed.svg"); + position: relative; + margin-top: 10px; + margin-bottom: 10px; +} + +.panel-arrow[side="left"] { + margin-right: -5px; +} + +.panel-arrow[side="right"] { + transform: scaleX(-1); + margin-left: -5px; +} + +@media (-moz-windows-default-theme) { + .panel-arrow[side="top"], + .panel-arrow[side="bottom"] { + list-style-image: url("chrome://global/skin/arrow/panelarrow-vertical.svg"); + } + + .panel-arrow[side="left"], + .panel-arrow[side="right"] { + list-style-image: url("chrome://global/skin/arrow/panelarrow-horizontal.svg"); + } +} + +/* ::::: tooltip ::::: */ + +tooltip { + -moz-appearance: none; + margin-top: 21px; + border: 1px solid rgb(75,75,75); + padding: 2px 3px; + max-width: 40em; + background-color: rgb(110,110,110); + color: #fff; + font: message-box; +} + +tooltip[titletip="true"] { + /* See bug 32157 comment 128 + * margin: -2px 0px 0px -3px; + */ + max-width: none; +} + +/* rules for popups associated with menulists */ + +menulist > menupopup { + -moz-appearance: none; + border-width: 1px; + -moz-border-top-colors: rgb(75,75,75); + -moz-border-right-colors: rgb(75,75,75); + -moz-border-bottom-colors: rgb(75,75,75); + -moz-border-left-colors: rgb(75,75,75); + padding: 0px; + min-width: 0px; + background-color: rgb(50,50,50); +} + diff --git a/src/chrome/os/winnt/radio.css b/src/chrome/os/winnt/radio.css @@ -0,0 +1,95 @@ +/* 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/. */ + +/* ===== radio.css =================================================== + == Styles used by the XUL radio element. + ======================================================================= */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* ::::: radio ::::: */ + +radio { + -moz-appearance: none; + -moz-box-align: center; + margin: 2px 4px; + padding-top: 1px; + padding-bottom: 1px; + -moz-padding-start: 4px; + -moz-padding-end: 2px; +} + +.radio-label-box { + -moz-margin-start: 2px; + border: 1px solid transparent; + padding-top: 0px; + padding-bottom: 1px; + -moz-padding-start: 1px; + -moz-padding-end: 0px; +} + +.radio-icon { + -moz-margin-end: 2px; +} + +.radio-label { + margin: 0 !important; +} + +/* ..... focused state ..... */ + +radio[focused="true"] > .radio-label-box { + border: 1px dotted rgb(75,75,75); +} + +/* ..... disabled state ..... */ + +radio[disabled="true"] > .radio-check-box1 { + background-color: rgb(62,62,62); +} + +radio[disabled="true"] { + color: GrayText; +} + +/* ::::: checkmark image ::::: */ + +.radio-check-box1 { + -moz-appearance: none; + margin: 1px 0px; + border-top: 1px solid rgb(75,75,75); + border-right: 1px solid rgb(75,75,75); + border-bottom: 1px solid rgb(75,75,75); + border-left: 1px solid rgb(75,75,75); + border-radius: 50%; + width: 12px; + height: 12px; + background-color: rgb(50,50,50); +} + +.radio-check-box2 { + border-top: 1px solid rgb(75,75,75); + border-right: 1px solid rgb(75,75,75); + border-bottom: 1px solid rgb(75,75,75); + border-left: 1px solid rgb(75,75,75); + border-radius: 50%; + padding: 2px; + width: 4px; + height: 4px; + list-style-image: none; +} + +radio:hover:active > .radio-check-box1 { + background-color: rgb(110,110,110); +} + +/* ..... selected state ..... */ + +radio[selected="true"] > .radio-check-box1 > .radio-check-box2 { + list-style-image: url("chrome://global/skin/radio/radio-check.svg#radio"); +} + +radio[selected="true"][disabled="true"] > .radio-check-box1 > .radio-check-box2 { + list-style-image: url("chrome://global/skin/radio/radio-check.svg#radio-dis") !important +} diff --git a/src/chrome/os/winnt/scrollbars.css b/src/chrome/os/winnt/scrollbars.css @@ -0,0 +1,266 @@ +/* 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/. */ + +/* ===== xulscrollbars.css ============================================== + == Styles used by XUL scrollbar-related elements. + ======================================================================= */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */ + +/* ::::: scrollbar ::::: */ + +scrollbar { + -moz-appearance: none; + -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar"); + cursor: default; + background: rgb(23,23,23); + pointer-events: auto; +} + +@media all and (-moz-overlay-scrollbars) { + scrollbar[root="true"] { + position: relative; + z-index: 2147483647; /* largest positive value of a signed 32-bit integer */ + } + + scrollbar:not([active="true"]), + scrollbar[disabled="true"] { + visibility: hidden; + } +} + +scrollbar[orient="vertical"] +{ + -moz-appearance: none; +} + +/* ::::: borders for thumb and buttons ::::: */ + +thumb, +scrollbarbutton { + background:rgb(50,50,50) 50% 50% no-repeat; +} + +thumb { + border: 1px solid; + -moz-border-top-colors: rgb(75,75,75); + -moz-border-right-colors: rgb(75,75,75); + -moz-border-bottom-colors: rgb(75,75,75); + -moz-border-left-colors: rgb(75,75,75); +} + +thumb:hover { + background-color: rgb(75,75,75); +} + +thumb:active { + background-color: rgb(110,110,110); +} + +/* ::::: thumb (horizontal) ::::: */ + +thumb { + min-height: 18px; + border-radius: 3px; +} + +thumb[orient="horizontal"] { + min-width: 18px; +} + +/* ::::: scrollbar button ::::: */ + +scrollbarbutton { + background: rgb(23,23,23) no-repeat 0px 1px; + min-width: 15px; + min-height: 15px; +} + +scrollbarbutton:hover:active, scrollbarbutton[active="true"] { + background-color: rgb(110,110,110); +} + +scrollbar[orient="vertical"] > scrollbarbutton { + background-size: 9px 5px; +} + +scrollbar:not([orient="vertical"]) > scrollbarbutton { + background-size: 5px 9px; +} + +/* ::::: square at the corner of two scrollbars ::::: */ + +scrollcorner { + /* XXX -moz-appearance: scrollcorner; */ + -moz-binding: url(chrome://global/content/bindings/scrollbar.xml#scrollbar-base); + width: 16px; + cursor: default; + background-color: rgb(50,50,50); +} + +/* ..... increment .... */ + +scrollbarbutton[type="increment"] { + -moz-appearance: none; + background-image: url("chrome://global/skin/arrow/arrow-h.svg#rit"); + background-position: center; + background-repeat: no-repeat; +} + +scrollbarbutton[type="increment"][disabled="true"] { + background-image: url("chrome://global/skin/arrow/arrow-h.svg#rit-dis"); + background-color: rgb(62,62,62); +} + +scrollbar[orient="vertical"] > scrollbarbutton[type="increment"] { + -moz-appearance: none; + background-image: url("chrome://global/skin/arrow/arrow-v.svg#dn"); + background-position: center; + background-repeat: no-repeat; +} + +scrollbar[orient="vertical"] > scrollbarbutton[type="increment"][disabled="true"] { + background-image: url("chrome://global/skin/arrow/arrow-v.svg#dn-dis"); + background-color: rgb(62,62,62); +} + +/* ..... decrement .... */ + +scrollbarbutton[type="decrement"] { + -moz-appearance: none; + background-image: url("chrome://global/skin/arrow/arrow-h.svg#lft"); + background-position: center; + background-repeat: no-repeat; +} + +scrollbarbutton[type="decrement"][disabled="true"] { + background-image: url("chrome://global/skin/arrow/arrow-h.svg#lft-dis"); + background-color: rgb(62,62,62); +} + +scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"] { + -moz-appearance: none; + background-image: url("chrome://global/skin/arrow/arrow-v.svg#up"); + background-position: center; + background-repeat: no-repeat; +} + +scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true"] { + background-image: url("chrome://global/skin/arrow/arrow-v.svg#up-dis"); + background-color: rgb(62,62,62); +} + +/* :::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ +/* ::::::::::::::::::::: MEDIA PRINT :::::::::::::::::::::: */ +/* :::::::::::::::::::::::::::::::::::::::::::::::::::::::: */ +@media print { + /* ::::: scrollbar ::::: */ + + html|div scrollbar { + -moz-appearance: none; + -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar"); + cursor: default; + background: rgb(23,23,23); + } + + /* ::::: borders for thumb and buttons ::::: */ + + html|div thumb, + html|div scrollbarbutton { + background: rgb(50,50,50) 50% 50% no-repeat; + } + + html|div thumb { + border: 1px solid; + -moz-border-top-colors: rgb(75,75,75); + -moz-border-right-colors: rgb(75,75,75); + -moz-border-bottom-colors: rgb(75,75,75); + -moz-border-left-colors: rgb(75,75,75); + } + + html|div thumb:hover { + background-color: rgb(75,75,75); + } + + html|div thumb:active { + background-color: rgb(110,110,110); + } + + /* ::::: thumb (horizontal) ::::: */ + + html|div thumb { + min-height: 18px; + border-radius: 3px; + } + + html|div thumb[orient="horizontal"] { + min-width: 18px; + } + + /* ::::: scrollbar button ::::: */ + + html|div scrollbarbutton { + background: rgb(50,50,50) no-repeat 0px 1px; + width: 15px; + height: 15px; + } + + html|div scrollbarbutton:hover:active, html|div scrollbarbutton[active="true"] { + background-color: rgb(110,110,110); + } + + /* ..... increment .... */ + + html|div scrollbarbutton[type="increment"] { + -moz-appearance: none; + background-image: url("chrome://global/skin/arrow/arrow-h.svg#rit"); + background-position: center; + background-repeat: no-repeat; + } + + html|div scrollbarbutton[type="increment"][disabled="true"] { + background-image: url("chrome://global/skin/arrow/arrow-h.svg#rit-dis"); + background-color: rgb(62,62,62); + } + + html|div scrollbar[orient="vertical"] > scrollbarbutton[type="increment"] { + -moz-appearance: none; + background-image: url("chrome://global/skin/arrow/arrow-v.svg#dn"); + background-position: center; + background-repeat: no-repeat; + } + + html|div scrollbar[orient="vertical"] > scrollbarbutton[type="increment"][disabled="true"] { + background-image: url("chrome://global/skin/arrow/arrow-v.svg#dn-dis"); + background-color: rgb(62,62,62); + } + + /* ..... decrement .... */ + + html|div scrollbarbutton[type="decrement"] { + -moz-appearance: none; + background-image: url("chrome://global/skin/arrow/arrow-h.svg#lft"); + background-position: center; + background-repeat: no-repeat; + } + + html|div scrollbarbutton[type="decrement"][disabled="true"] { + background-image: url("chrome://global/skin/arrow/arrow-h.svg#lft-dis"); + background-color: rgb(62,62,62); + } + + html|div scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"] { + -moz-appearance: none; + background-image: url("chrome://global/skin/arrow/arrow-v.svg#up"); + background-position: center; + background-repeat: no-repeat; + } + + html|div scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true"] { + background-image: url("chrome://global/skin/arrow/arrow-v.svg#up-dis"); + background-color: rgb(62,62,62); + } + +} diff --git a/src/chrome/os/winnt/tabbox.css b/src/chrome/os/winnt/tabbox.css @@ -0,0 +1,133 @@ +/* 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/. */ + +/* ===== tabbox.css ================================================= + == Styles used by XUL tab-related elements. + ======================================================================= */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* ::::: tabs ::::: */ + +.tabs-left, +.tabs-right { + border-bottom: 1px solid; + -moz-border-bottom-colors: rgb(75,75,75); +} + +/* ::::: tabpanels ::::: */ + +tabpanels { + -moz-appearance: none; + border-right: 1px solid; + border-bottom: 1px solid; + border-left: 1px solid; + -moz-border-right-colors: rgb(75,75,75); + -moz-border-bottom-colors: rgb(75,75,75); + -moz-border-left-colors: rgb(75,75,75); + padding: 8px; + background-color: rgb(43,43,43); + color: #fff; +} + +/* ::::: tab ::::: */ + +tab { + -moz-appearance: none; + margin-top: 2px; + border-top: 1px solid; + border-right: 1px solid; + border-left: 1px solid; + border-bottom: 1px solid rgb(75,75,75); + -moz-border-top-colors: rgb(75,75,75); + -moz-border-right-colors: rgb(75,75,75); + -moz-border-left-colors: rgb(75,75,75); + border-top-left-radius: 2px; + border-top-right-radius: 2px; + padding: 1px 4px 2px 4px; + background-color: rgb(23,23,23); + color: #fff; +} + +tab:-moz-locale-dir(rtl) { + border-bottom-left-radius: 1px; + border-bottom-right-radius: 0px; +} + +.tab-text { + margin: 0 !important; +} + +tab[selected="true"] { + margin-top: 0; + background-color: rgb(43,43,43); + border-bottom-color: transparent; + padding: 1px 6px 4px 6px; +} + +tab:-moz-focusring > .tab-middle { + /* Don't specify the outline-color, we should always use initial value. */ + outline: 1px dotted; +} + +tab[beforeselected="true"]:-moz-locale-dir(ltr), +tab[selected="true"]:-moz-locale-dir(rtl) + tab { + border-right: none; + border-top-right-radius: 0; +} + +tab[selected="true"]:-moz-locale-dir(ltr) + tab, +tab[beforeselected="true"]:-moz-locale-dir(rtl) { + border-left: none; + border-top-left-radius: 0; +} + +tab:first-of-type[selected="true"] { + padding-right: 5px; + padding-left: 5px; +} + +/* ::::: tab-bottom :::::::::: + :: Tabs that are attached to the bottom of a panel, but not necessarily + :: a tabpanels. + ::::: */ + +.tab-bottom { + margin-top: 0; + margin-bottom: 2px; + border-top: 1px solid; + border-bottom: 1px solid; + -moz-border-top-colors: rgb(75,75,75); + -moz-border-bottom-colors: rgb(75,75,75); + border-top-left-radius: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 2px; + border-bottom-left-radius: 2px; + padding: 2px 4px 1px 4px; +} + +.tab-bottom[selected="true"] { + margin-bottom: 0; + -moz-border-top-colors: rgb(110,110,110); + padding: 4px 6px 1px 6px; +} + +.tab-bottom[beforeselected="true"]:-moz-locale-dir(ltr), +.tab-bottom[selected="true"]:-moz-locale-dir(rtl) + .tab-bottom { + border-bottom-right-radius: 0; +} + +.tab-bottom[selected="true"]:-moz-locale-dir(ltr) + .tab-bottom, +.tab-bottom[beforeselected="true"]:-moz-locale-dir(rtl) { + border-bottom-left-radius: 0; +} + +/* ::::: tabs-bottom ::::: */ + +.tabs-bottom > .tabs-left, +.tabs-bottom > .tabs-right { + border-top: 1px solid rgb(75,75,75); + border-bottom: none; +} + diff --git a/src/chrome/os/winnt/toolbar.css b/src/chrome/os/winnt/toolbar.css @@ -0,0 +1,57 @@ +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* ::::: toolbox ::::: */ + +toolbox { + -moz-appearance: none; + background-color: rgb(43,43,43); + border-top: 1px solid; + -moz-border-top-colors: rgb(75,75,75); + color: #fff; +} + +/* ::::: toolbar & menubar ::::: */ + +toolbar, menubar { + -moz-appearance: none; + color: #fff; +} + +toolbar { + background-color: rgb(43,43,43); + min-width: 1px; + min-height: 19px; + border-top: 1px solid rgb(75,75,75); + border-bottom: 1px solid rgb(75,75,75); +} + +toolbar:first-child, menubar { + min-width: 1px; + border-bottom: 1px solid rgb(75,75,75); + border-top: 0px !important; +} + +/* ::::: lightweight theme ::::: */ + +menubar:-moz-lwtheme, +toolbox:-moz-lwtheme, +toolbar:-moz-lwtheme { + -moz-appearance: none; + background: none; + border-style: none; + color: inherit !important; +} + +/* ::::: toolbar decorations ::::: */ + +toolbarseparator { + -moz-appearance: none; + margin: 3px 4px; + background: url("chrome://global/skin/toolbar/toolbar-separator.png") transparent repeat-y; + padding: 0; + width: 1px !important; +} + +toolbarspacer { + width: 15px; +} +\ No newline at end of file diff --git a/src/chrome/os/winnt/toolbarbutton.css b/src/chrome/os/winnt/toolbarbutton.css @@ -0,0 +1,188 @@ +/* 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/. */ + +/* ===== toolbarbutton.css ===================================================== + == Styles used by the XUL button element. + ======================================================================= */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* ::::: toolbarbutton ::::: */ + +toolbarbutton { + -moz-appearance: toolbarbutton; + -moz-box-align: center; + -moz-box-pack: center; + margin: 0; + border: 1px solid transparent; + padding: 3px; + background-color: transparent; + color: #fff; +} + +.toolbarbutton-icon[label]:not([label=""]), +.toolbarbutton-icon[type="menu"] { + -moz-margin-end: 5px; +} + +.toolbarbutton-text { + margin: 0 !important; /* !important for overriding global.css */ + text-align: center; +} + +toolbarbutton.tabbable { + -moz-user-focus: normal !important; +} + +toolbarbutton:-moz-focusring { + /* -moz-appearance looks redundant here but is necessary. + Without it, the outline won't appear. */ + -moz-appearance: toolbarbutton; + outline: 1px dotted -moz-DialogText; + outline-offset: -2px; +} + +toolbarbutton:hover:not([disabled="true"]) { + border-color: ThreeDHighlight ThreeDShadow ThreeDShadow ThreeDHighlight; +} + +toolbarbutton:hover:active:not([disabled="true"]), +toolbarbutton[open="true"]:hover, +toolbarbutton[open="true"] { + border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow; + padding-top: 4px; + padding-bottom: 2px; + -moz-padding-start: 4px; + -moz-padding-end: 2px; +} + +toolbarbutton[disabled="true"] { + color: GrayText; + text-shadow: none; +} + +toolbarbutton[checked="true"]:not([disabled="true"]) { + border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow; + padding-top: 4px; + padding-bottom: 2px; + -moz-padding-start: 4px; + -moz-padding-end: 2px; + background-color: rgba(255,255,255,0.5); + color: #fff; +} + +@media (-moz-windows-default-theme) { + toolbarbutton:-moz-lwtheme { + text-shadow: none; + } + + toolbarbutton:-moz-lwtheme:not(:hover):not([checked="true"]):not([open="true"]):not([disabled="true"]) { + color: inherit; + text-shadow: inherit; + } + + toolbarbutton:-moz-lwtheme:not([disabled="true"]) { + color: inherit; + text-shadow: inherit; + } +} + +@media not all and (-moz-windows-default-theme) { + toolbarbutton:-moz-lwtheme { + -moz-appearance: none; + } + + toolbarbutton:-moz-lwtheme:not([disabled="true"]) { + color: inherit; + text-shadow: inherit; + } +} + +/* ::::: toolbarbutton menu ::::: */ + +.toolbarbutton-menu-dropmarker { + -moz-appearance: none !important; + border: none !important; + background-color: transparent !important; + padding: 0; + width: auto; + height: auto; + margin-top: 1px; +} + +/* ::::: toolbarbutton menu-button ::::: */ + +toolbarbutton[type="menu-button"] { + -moz-box-align: stretch; + -moz-box-orient: horizontal !important; +} + +toolbarbutton[type="menu-button"], +toolbarbutton[type="menu-button"]:hover, +toolbarbutton[type="menu-button"]:hover:active, +toolbarbutton[type="menu-button"][open="true"], +toolbarbutton[type="menu-button"][disabled="true"], +toolbarbutton[type="menu-button"][disabled="true"]:hover, +toolbarbutton[type="menu-button"][disabled="true"]:hover:active { + border-style: none; + padding: 0 !important; +} + +.toolbarbutton-menubutton-button { + -moz-box-align: center; + -moz-box-pack: center; + -moz-box-orient: vertical; +} + +/* ::::: toolbarbutton badged ::::: */ + +.toolbarbutton-badge-container > .toolbarbutton-icon[label]:not([label=""]) { + -moz-margin-end: 0; +} + +.toolbarbutton-badge[badge=""] { + display: none; +} + +.toolbarbutton-badge { + background-color: rgb(110,110,110); +} + +.toolbarbutton-badge::after { + /* The |content| property is set in the content stylesheet. */ + font-size: 10px; + font-weight: bold; + padding: 1px 2px 2px; + color: #fff; + background-color: inherit; + border-radius: 2px; + box-shadow: 0 1px 0 hsla(0, 100%, 100%, .2) inset, + 0 -1px 0 hsla(0, 0%, 0%, .1) inset, + 0 1px 0 hsla(206, 50%, 10%, .2); + position: absolute; + top: -4px; + right: -2px; + min-width: 10px; + line-height: 10px; + text-align: center; +} + +.toolbarbutton-badge:-moz-locale-dir(rtl)::after { + left: -2px; + right: auto; +} + +.toolbarbutton-badge-container { + position: relative; +} + +/* .......... dropmarker .......... */ + +.toolbarbutton-menubutton-dropmarker { + -moz-appearance: none; + padding: 3px 7px; + border: none; + background-color: transparent; + width: auto; +} diff --git a/src/chrome/os/winnt/tree.css b/src/chrome/os/winnt/tree.css @@ -0,0 +1,519 @@ +/* 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/. */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* ::::: tree ::::: */ + +tree { + border: 2px solid; + -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow; + -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow; + -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow; + -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow; + background-color: -moz-Field; + color: -moz-FieldText; +} + +/* ::::: tree focusring ::::: */ + +.focusring > .tree-stack > .tree-rows > .tree-bodybox { + border: 1px solid transparent; +} + +.focusring:-moz-focusring > .tree-stack > .tree-rows > .tree-bodybox { + border: 1px solid #000000; +} + +/* ::::: tree rows ::::: */ + +treechildren::-moz-tree-row { + border: 1px solid transparent; + min-height: 18px; + height: 1.3em; +} + +treechildren::-moz-tree-row(selected) { + background-color: -moz-cellhighlight; +} + +treechildren::-moz-tree-row(selected, focus) { + background-color: Highlight; +} + +treechildren::-moz-tree-row(current, focus) { + border: 1px dotted Highlight; +} + +treechildren::-moz-tree-row(selected, current, focus) { + border: 1px dotted #F3D982; +} + +tree[seltype="cell"] > treechildren::-moz-tree-row, +tree[seltype="text"] > treechildren::-moz-tree-row { + border: none; + background-color: transparent; + background-image: none; +} + +/* ::::: tree cells ::::: */ + +treechildren::-moz-tree-cell-text(selected) { + color: -moz-cellhighlighttext; +} + +tree[seltype="cell"] > treechildren::-moz-tree-cell { + border: 1px solid transparent; +} + +tree[seltype="text"] > treechildren::-moz-tree-cell-text { + border: 1px solid transparent; +} + +tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected) { + background-color: -moz-cellhighlight; + +} +tree[seltype="cell"] > treechildren::-moz-tree-cell-text(active, selected) { + color: -moz-cellhighlighttext; +} + +tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected) { + background-color: -moz-cellhighlight; + color: -moz-cellhighlighttext; +} + +tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected, focus) { + background-color: Highlight; +} + +tree[seltype="cell"] > treechildren::-moz-tree-cell(active, current, focus) { + border: 1px dotted #000000; +} + +tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, current, focus) { + border: 1px dotted #000000; +} + +tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected, current, focus) { + border: 1px dotted #C0C0C0; +} + +tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected, current, focus) { + border: 1px dotted #C0C0C0; +} + +/* ::::: tree separator ::::: */ + +treechildren::-moz-tree-separator { + border-top: 1px solid ThreeDShadow; + border-bottom: 1px solid ThreeDHighlight; +} + +/* ::::: lines connecting cells ::::: */ + +tree[seltype="cell"] > treechildren::-moz-tree-line, +tree[seltype="text"] > treechildren::-moz-tree-line, +treechildren::-moz-tree-line { + border: 1px dotted ThreeDShadow; +} + +tree[seltype="cell"] > treechildren::-moz-tree-line(active, selected, focus), +treechildren::-moz-tree-line(selected, focus) { + border: 1px dotted HighlightText; +} + +/* ::::: drop feedback ::::: */ + +treechildren::-moz-tree-row(dropOn) { + background-color: Highlight; +} + +tree[seltype="cell"] > treechildren::-moz-tree-cell-text(primary, dropOn), +tree[seltype="text"] > treechildren::-moz-tree-cell-text(primary, dropOn), +treechildren::-moz-tree-cell-text(primary, dropOn) { + color: HighlightText; +} + +treechildren::-moz-tree-drop-feedback { + background-color: Highlight; +} + +/* ::::: tree progress meter ::::: */ + +treechildren::-moz-tree-progressmeter { + padding: 1px; + border: 1px solid; + border-top-color: ThreeDShadow; + border-right-color: ThreeDHighlight; + border-bottom-color: ThreeDHighlight; + border-left-color: ThreeDShadow; + background-color: -moz-Dialog; + color: ThreeDShadow; +} + +treechildren::-moz-tree-progressmeter(progressUndetermined) { + list-style-image: url("chrome://global/skin/progressmeter/progressmeter-busy.gif"); +} + +/* ::::: tree columns ::::: */ + +treecol:hover:active, +treecolpicker:hover:active { + -moz-border-top-colors: ThreeDShadow -moz-Dialog; + -moz-border-right-colors: ThreeDShadow; + -moz-border-bottom-colors: ThreeDShadow; + -moz-border-left-colors: ThreeDShadow -moz-Dialog; + padding-top: 1px; + padding-bottom: 0px; + -moz-padding-start: 5px; + -moz-padding-end: 3px; +} + +.treecol-image:hover:active { + padding-top: 1px; + padding-bottom: 0px; + -moz-padding-start: 2px; + -moz-padding-end: 0px; +} + +/* ::::: column drag and drop styles ::::: */ + +treecol[dragging="true"] { + -moz-border-top-colors: ThreeDDarkShadow transparent !important; + -moz-border-right-colors: ThreeDDarkShadow transparent!important; + -moz-border-bottom-colors: ThreeDDarkShadow transparent !important; + -moz-border-left-colors: ThreeDDarkShadow transparent !important; +} + +/* ::::: sort direction indicator ::::: */ + +.treecol-sortdirection { + list-style-image: none; +} + +treecol:not([hideheader="true"]) > .treecol-sortdirection[sortDirection="ascending"] { + list-style-image: url("chrome://global/skin/tree/sort.svg#asc"); +} + +treecol:not([hideheader="true"]) > .treecol-sortdirection[sortDirection="ascending"]:-moz-system-metric(windows-classic) { + list-style-image: url("chrome://global/skin/tree/sort.svg#asc-classic"); +} + +treecol:not([hideheader="true"]) > .treecol-sortdirection[sortDirection="descending"] { + list-style-image: url("chrome://global/skin/tree/sort.svg#dsc"); +} + +treecol:not([hideheader="true"]) > .treecol-sortdirection[sortDirection="descending"]:-moz-system-metric(windows-classic) { + list-style-image: url("chrome://global/skin/tree/sort.svg#dsc-classic"); +} + +/* ::::: twisty ::::: */ + +treechildren::-moz-tree-twisty { + -moz-padding-end: 4px; + padding-top: 1px; + width: 9px; /* The image's width is 9 pixels */ + list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd"); +} + +treechildren::-moz-tree-twisty(open) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#open"); +} + +treechildren::-moz-tree-indentation { + width: 18px; +} + +/* ::::: gridline style ::::: */ + +treechildren.gridlines::-moz-tree-cell { + border-right: 1px solid transparent !important; + border-bottom: 1px solid transparent !important; +} + +/* ::::: editable tree ::::: */ + +treechildren::-moz-tree-row(selected, editing) { + background-color: transparent; + border: none; +} + +treechildren::-moz-tree-cell-text(selected, editing) { + color: inherit; +} + +.tree-input { + border: 1px solid Highlight; + -moz-border-top-colors: Highlight; + -moz-border-bottom-colors: Highlight; + -moz-border-left-colors: Highlight; + -moz-border-right-colors: Highlight; + margin: 0; + -moz-margin-start: -4px; + padding: 1px; +} + +/* ::::: twisty ::::: */ + +treechildren::-moz-tree-indentation { + width: 12px; +} + +treechildren::-moz-tree-twisty { + -moz-padding-end: 1px; +} + +treechildren::-moz-tree-twisty(hover) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover"); +} + +treechildren::-moz-tree-twisty(hover, open) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover"); +} + +treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty { + list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-rtl"); +} + +treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#open-rtl"); +} + +treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover-rtl"); +} + +treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover, open) { + list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover-rtl"); +} + +@media (-moz-os-version: windows-win10) { + treechildren::-moz-tree-twisty { + list-style-image: url("chrome://global/skin/tree/twisty-10.svg#clsd"); + } + + treechildren::-moz-tree-twisty(open) { + list-style-image: url("chrome://global/skin/tree/twisty-10.svg#open"); + } + + treechildren::-moz-tree-twisty(hover) { + list-style-image: url("chrome://global/skin/tree/twisty-10.svg#clsd-hover"); + } + + treechildren::-moz-tree-twisty(hover, open) { + list-style-image: url("chrome://global/skin/tree/twisty-10.svg#open-hover"); + } + + treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty { + list-style-image: url("chrome://global/skin/tree/twisty-10.svg#clsd-rtl"); + } + + treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open) { + list-style-image: url("chrome://global/skin/tree/twisty-10.svg#open-rtl"); + } + + treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover) { + list-style-image: url("chrome://global/skin/tree/twisty-10.svg#clsd-hover-rtl"); + } + + treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover, open) { + list-style-image: url("chrome://global/skin/tree/twisty-10.svg#open-hover-rtl"); + } +} + +@media (-moz-windows-default-theme) { + treechildren { + --treechildren-outline: none; + --treechildren-2ndBorderColor: rgba(255,255,255,.4); + --treechildren-selectedColor: rgb(217,217,217); + --treechildren-focusColor: rgb(123,195,255); + --treechildren-selectedFocusColor: rgb(205,232,255); + --treechildren-currentColor: rgb(125,162,206); + --treechildren-hoverColor: rgb(229,243,255); + --treechildren-selectedBorder: var(--treechildren-selectedColor); + --treechildren-selectedBottomBorder: rgb(204,204,204); + --treechildren-selectedImage: linear-gradient(rgb(217,217,217), rgb(217,217,217)); + --treechildren-selectedBackground: transparent; + --treechildren-currentFocusBorder: var(--treechildren-focusColor); + --treechildren-currentFocusBottomBorder: var(--treechildren-focusColor); + --treechildren-selectedFocusBorder: var(--treechildren-selectedFocusColor); + --treechildren-selectedFocusBottomBorder: rgb(165,214,255); + --treechildren-selectedFocusImage: none; + --treechildren-selectedFocusBackground: var(--treechildren-selectedFocusColor); + --treechildren-selectedFocusCurrentBorder: var(--treechildren-focusColor); + --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-focusColor); + --treechildren-selectedFocusCurrentImage: linear-gradient(rgb(205,232,255), rgb(205,232,255)); + --treechildren-hoverBorder: var(--treechildren-hoverColor); + --treechildren-hoverBottomBorder: var(--treechildren-hoverColor); + --treechildren-hoverImage: linear-gradient(rgb(229,243,255), rgb(229,243,255)); + --treechildren-hoverCurrentBorder: var(--treechildren-currentColor); + --treechildren-hoverCurrentBottomBorder: var(--treechildren-currentColor); + --treechildren-hoverCurrentImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.16)); + --treechildren-hoverSelectedBorder: var(--treechildren-focusColor); + --treechildren-hoverSelectedBottomBorder: var(--treechildren-focusColor); + --treechildren-hoverSelectedImage: linear-gradient(rgb(205,232,255), rgb(205,232,255)); + } + + treechildren:not(.autocomplete-treebody)::-moz-tree-row { + height: 1.8em; + color: -moz-FieldText; + -moz-margin-start: 1px; + -moz-margin-end: 1px; + border-width: 1px; + border-color: transparent; + background-repeat: no-repeat; + background-size: 100% 100%; + } + + treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected) { + -moz-border-top-colors: var(--treechildren-selectedBorder); + -moz-border-right-colors: var(--treechildren-selectedBorder); + -moz-border-left-colors: var(--treechildren-selectedBorder); + -moz-border-bottom-colors: var(--treechildren-selectedBottomBorder); + background-image: var(--treechildren-selectedImage); + background-color: var(--treechildren-selectedBackground); + outline: var(--treechildren-outline); + } + + treechildren:not(.autocomplete-treebody)::-moz-tree-row(current, focus) { + border-style: solid; + -moz-border-top-colors: var(--treechildren-currentFocusBorder); + -moz-border-right-colors: var(--treechildren-currentFocusBorder); + -moz-border-left-colors: var(--treechildren-currentFocusBorder); + -moz-border-bottom-colors: var(--treechildren-currentFocusBottomBorder); + outline: var(--treechildren-outline); + } + + treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, focus), + treechildren::-moz-tree-row(dropOn) { + -moz-border-top-colors: var(--treechildren-selectedFocusBorder); + -moz-border-right-colors: var(--treechildren-selectedFocusBorder); + -moz-border-left-colors: var(--treechildren-selectedFocusBorder); + -moz-border-bottom-colors: var(--treechildren-selectedFocusBottomBorder); + background-image: var(--treechildren-selectedFocusImage); + background-color: var(--treechildren-selectedFocusBackground); + } + + treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, current, focus) { + border-style: solid; + -moz-border-top-colors: var(--treechildren-selectedFocusCurrentBorder); + -moz-border-right-colors: var(--treechildren-selectedFocusCurrentBorder); + -moz-border-left-colors: var(--treechildren-selectedFocusCurrentBorder); + -moz-border-bottom-colors: var(--treechildren-selectedFocusCurrentBottomBorder); + background-image: var(--treechildren-selectedFocusCurrentImage); + } + + treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover) { + -moz-border-top-colors: var(--treechildren-hoverBorder); + -moz-border-right-colors: var(--treechildren-hoverBorder); + -moz-border-left-colors: var(--treechildren-hoverBorder); + -moz-border-bottom-colors: var(--treechildren-hoverBottomBorder); + background-image: var(--treechildren-hoverImage); + outline: var(--treechildren-outline); + } + + treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, current) { + -moz-border-top-colors: var(--treechildren-hoverCurrentBorder); + -moz-border-right-colors: var(--treechildren-hoverCurrentBorder); + -moz-border-left-colors: var(--treechildren-hoverCurrentBorder); + -moz-border-bottom-colors: var(--treechildren-hoverCurrentBottomBorder); + background-image: var(--treechildren-hoverCurrentImage); + } + + treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, selected) { + -moz-border-top-colors: var(--treechildren-hoverSelectedBorder); + -moz-border-right-colors: var(--treechildren-hoverSelectedBorder); + -moz-border-left-colors: var(--treechildren-hoverSelectedBorder); + -moz-border-bottom-colors: var(--treechildren-hoverSelectedBottomBorder); + background-image: var(--treechildren-hoverSelectedImage); + } + + tree[disabled="true"] > treechildren::-moz-tree-row { + background: none; + -moz-border-top-colors: transparent; + -moz-border-right-colors: transparent; + -moz-border-left-colors: transparent; + -moz-border-bottom-colors: transparent; + } + + treechildren::-moz-tree-cell(dropOn) { + background-image: none; + background-color: transparent; + border-radius: 0; + } + + treechildren::-moz-tree-cell-text(primary, dropOn) { + color: -moz-FieldText; + } + + treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text { + padding-bottom: initial; + border-color: transparent; + background-color: transparent; + } + + treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text(selected, focus) { + color: -moz-DialogText; + } + + @media (-moz-os-version: windows-vista), + (-moz-os-version: windows-win7) { + treechildren { + --treechildren-outline: 1px solid var(--treechildren-2ndBorderColor); + --treechildren-2ndBottomBorderColor: rgba(255,255,255,.6); + --treechildren-selectedBorder: var(--treechildren-selectedColor) var(--treechildren-2ndBorderColor); + --treechildren-selectedBottomBorder: var(--treechildren-selectedColor) var(--treechildren-2ndBottomBorderColor); + --treechildren-selectedImage: linear-gradient(rgba(190,190,190,.1), rgba(190,190,190,.4)); + --treechildren-currentFocusBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); + --treechildren-currentFocusBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); + --treechildren-selectedFocusBorder: rgb(132,172,221) var(--treechildren-2ndBorderColor); + --treechildren-selectedFocusBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); + --treechildren-selectedFocusImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.375)); + --treechildren-selectedFocusBackground: transparent; + --treechildren-selectedFocusCurrentBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); + --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); + --treechildren-selectedFocusCurrentImage: linear-gradient(rgba(131,183,249,.28), rgba(131,183,249,.5)); + --treechildren-hoverBorder: rgb(184,214,251) var(--treechildren-2ndBorderColor); + --treechildren-hoverBottomBorder: rgb(184,214,251) var(--treechildren-2ndBottomBorderColor); + --treechildren-hoverImage: linear-gradient(rgba(131,183,249,.05), rgba(131,183,249,.16)); + --treechildren-hoverCurrentBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); + --treechildren-hoverCurrentBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); + --treechildren-hoverCurrentImage: linear-gradient(rgba(131,183,249,.05), rgba(131,183,249,.16)); + --treechildren-hoverSelectedBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor); + --treechildren-hoverSelectedBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor); + --treechildren-hoverSelectedImage: linear-gradient(rgba(131,183,249,.28), rgba(131,183,249,.5)); + } + + treechildren:not(.autocomplete-treebody)::-moz-tree-row { + border-width: 2px; + border-radius: 3px; + -moz-outline-radius: 3px; + } + } + + @media (-moz-os-version: windows-win8) { + treechildren { + --treechildren-outline: 1px solid var(--treechildren-2ndBorderColor); + --treechildren-selectedBorder: var(--treechildren-selectedColor); + --treechildren-selectedBottomBorder: var(--treechildren-selectedColor); + --treechildren-selectedImage: linear-gradient(rgba(190,190,190,.4), rgba(190,190,190,.4)); + --treechildren-currentFocusBorder: var(--treechildren-currentColor); + --treechildren-currentFocusBottomBorder: var(--treechildren-currentColor); + --treechildren-selectedFocusBorder: rgb(132,172,221) var(--treechildren-2ndBorderColor); + --treechildren-selectedFocusBottomBorder: var(--treechildren-currentColor); + --treechildren-selectedFocusImage: linear-gradient(rgba(131,183,249,.375), rgba(131,183,249,.375)); + --treechildren-selectedFocusBackground: transparent; + --treechildren-selectedFocusCurrentBorder: var(--treechildren-currentColor); + --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-currentColor); + --treechildren-selectedFocusCurrentImage: linear-gradient(rgba(131,183,249,.5), rgba(131,183,249,.5)); + --treechildren-hoverBorder: rgb(184,214,251); + --treechildren-hoverBottomBorder: rgb(184,214,251); + --treechildren-hoverImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.16)); + --treechildren-hoverSelectedBorder: var(--treechildren-currentColor); + --treechildren-hoverSelectedBottomBorder: var(--treechildren-currentColor); + --treechildren-hoverSelectedImage: linear-gradient(rgba(131,183,249,.5), rgba(131,183,249,.5)); + } + } +} +\ No newline at end of file diff --git a/src/chrome/ostarget/aero/browser.css b/src/chrome/ostarget/aero/browser.css @@ -1,628 +0,0 @@ -@import url("chrome://global/skin/"); - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -@namespace html url("http://www.w3.org/1999/xhtml"); - - -@media not all and (-moz-windows-compositor) { - #main-window[sizemode="normal"] > #titlebar { - -moz-appearance: none !important; - } - - #main-window[tabsintitlebar] #titlebar { - visibility: hidden; - } - #main-window[tabsintitlebar] #titlebar-content { - -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox"); - visibility: visible; - } -} - -@media (-moz-windows-compositor) { - #main-menubar { - background-color: transparent; - } -} - -/* ::::: titlebar ::::: */ - -#main-window[sizemode="normal"] > #titlebar { - -moz-appearance: -moz-window-titlebar; -} - -#main-window[sizemode="maximized"] > #titlebar { - -moz-appearance: -moz-window-titlebar-maximized; -} - -@media all and (-moz-windows-classic) { - #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container { - margin-top: 4px; - } -} - -#titlebar-buttonbox { - -moz-appearance: -moz-window-button-box; -} - -#main-window[sizemode="maximized"] #titlebar-buttonbox { - -moz-appearance: -moz-window-button-box-maximized; -} - -.titlebar-placeholder[type="appmenu-button"] { - margin-left: 4px; -} - -.titlebar-placeholder[type="caption-buttons"] { - margin-left: 22px; -} - - - -#titlebar-min { - -moz-appearance: -moz-window-button-minimize; -} - -#titlebar-max { - -moz-appearance: -moz-window-button-maximize; -} - -#main-window[sizemode="maximized"] #titlebar-max { - -moz-appearance: -moz-window-button-restore; -} - -#titlebar-close { - -moz-appearance: -moz-window-button-close; -} - -@media not all and (-moz-windows-classic) { - #titlebar-min { - -moz-margin-end: 2px; - } -} - -/* ::::: bookmark buttons ::::: */ - -toolbarbutton.bookmark-item { - margin: 0; - padding: 2px 3px; -} - -toolbarbutton.bookmark-item:hover:active:not([disabled="true"]), -toolbarbutton.bookmark-item[open="true"] { - padding-top: 3px; - padding-bottom: 1px; - -moz-padding-start: 4px; - -moz-padding-end: 2px; -} - -.bookmark-item:not(#bookmarks-menu-button) > .toolbarbutton-icon { - width: 16px; - height: 16px; -} - - -.bookmark-item > .toolbarbutton-text { - display: -moz-box !important; -} - -.bookmark-item > .toolbarbutton-menu-dropmarker { - display: none; -} - -#wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box { - width: 16px; - height: 16px; - background: url("chrome://browser/skin/places/bookmarksToolbar.png") no-repeat center; -} - -.bookmarks-toolbar-customize { - max-width: 15em !important; - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important; -} - -/* ::::: bookmark menus ::::: */ - -menu.bookmark-item, -menuitem.bookmark-item { - min-width: 0; - max-width: 32em; -} - -.bookmark-item > .menu-iconic-left { - margin-top: 0; - margin-bottom: 0; -} - -.bookmark-item > .menu-iconic-left > .menu-iconic-icon { - -moz-padding-start: 0px; -} - -/* ::::: primary toolbar buttons ::::: */ -/* ::::: fullscreen window controls ::::: */ - -#TabsToolbar > #window-controls { - -moz-margin-start: 4px; -} - -#minimize-button, -#restore-button, -#close-button { - list-style-image: url("chrome://global/skin/icons/windowControls.png"); - padding: 0; -} - -#minimize-button { - -moz-image-region: rect(0, 16px, 16px, 0); -} -#minimize-button:hover { - -moz-image-region: rect(16px, 16px, 32px, 0); -} -#minimize-button:hover:active { - -moz-image-region: rect(32px, 16px, 48px, 0); -} -#restore-button { - -moz-image-region: rect(0, 32px, 16px, 16px); -} -#restore-button:hover { - -moz-image-region: rect(16px, 32px, 32px, 16px); -} -#restore-button:hover:active { - -moz-image-region: rect(32px, 32px, 48px, 16px); -} -#close-button { - -moz-image-region: rect(0, 48px, 16px, 32px); - -moz-appearance: none; - border-style: none; - margin: 2px; -} -#close-button:hover { - -moz-image-region: rect(16px, 48px, 32px, 32px); -} -#close-button:hover:active { - -moz-image-region: rect(32px, 48px, 48px, 32px); -} - -/* ::::: throbber ::::: */ -#TabsToolbar { - min-height: 0; - padding: 0; -} - -#TabsToolbar:not(:-moz-lwtheme), -#TabsToolbar[tabsontop=false] { - background-image: -moz-linear-gradient(bottom, rgba(10%,10%,10%,.4) 1px, rgba(0,0,0,0) 1px, transparent); -} - -#main-window[chromemargin][tabsontop=true] #TabsToolbar { - background: transparent; -} - -@media not all and (-moz-windows-classic) { - #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container { - margin-top: 1px; - } - - #appmenu-button { - border-width: 2px; - -moz-border-left-colors: rgba(255,255,255,.5) rgba(83,42,6,.9); - -moz-border-bottom-colors: rgba(255,255,255,.5) rgba(83,42,6,.9); - -moz-border-right-colors: rgba(255,255,255,.5) rgba(83,42,6,.9); - margin-bottom: 1px; - box-shadow: 0 1px 0 rgba(255,255,255,.25) inset, - 0 0 2px 1px rgba(255,255,255,.25) inset; - } - - #main-window[privatebrowsingmode=temporary] #appmenu-button { - -moz-border-left-colors: rgba(255,255,255,.5) rgba(43,8,65,.9); - -moz-border-bottom-colors: rgba(255,255,255,.5) rgba(43,8,65,.9); - -moz-border-right-colors: rgba(255,255,255,.5) rgba(43,8,65,.9); - } - - #appmenu-popup { - margin-top: -1px; - -moz-margin-start: 1px; - } -} - -@media all and (-moz-windows-default-theme) { - #navigator-toolbox > toolbar:not(:-moz-lwtheme), - #addon-bar:not(:-moz-lwtheme) { - background-color: rgb(43,43,43); - } - - - - #sidebar-splitter { - border: 0; - -moz-border-end: 1px solid rgb(75,75,75); - min-width: 0; - width: 3px; - background-color: transparent; - -moz-margin-start: -3px; - position: relative; - } -} - -@media all and (-moz-windows-compositor) { - #main-window { - -moz-appearance: -moz-win-glass; - } - - /* On win 10, if we don't set this on the entire browser container, including - * the sidebar, then the accent color bleeds through in the titlebar - * if the sidebar is open. */ - #browser { - -moz-appearance: -moz-win-exclude-glass; - } - -/* ==== Windows 10 styling ==== */ - - @media (-moz-os-version: windows-win10) { - /* Draw XUL caption buttons on Win10 */ - #appmenu-button { - margin-top: -1px !important; - margin-bottom: 5px !important; - } - - #tabbrowser-tabs { - min-height: 28px; - } - - #titlebar-buttonbox, - .titlebar-button { - -moz-appearance: none !important; - } - - .titlebar-button { - border: none; - margin: 0 !important; - padding: 8px 17px; - } - - #main-window[sizemode=maximized] .titlebar-button { - padding-top: 8px; - padding-bottom: 8px; - } - - .titlebar-button > .toolbarbutton-icon { - width: 12px; - height: 12px; - } - - #main-window[chromemargin^="0,"][sizemode=normal] #navigator-toolbox { - margin-top: -4px; - } - - #titlebar-min { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-highlight); - } - - #titlebar-max { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-highlight); - } - - #main-window[sizemode="maximized"] #titlebar-max { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-highlight); - } - - #titlebar-close { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highlight); - } - #titlebar-close:hover { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highlight); - } - - /* light persona */ - #titlebar-min:-moz-lwtheme-darktext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-outline); - } - #titlebar-max:-moz-lwtheme-darktext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-outline); - } - #main-window[sizemode="maximized"]:-moz-lwtheme-darktext #titlebar-max:-moz-lwtheme-darktext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-outline); - } - #titlebar-close:-moz-lwtheme-darktext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline); - } - #titlebar-close:hover:-moz-lwtheme-darktext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline); - } - - /* dark persona */ - #titlebar-min:-moz-lwtheme-brighttext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-outline-inverted); - } - #titlebar-max:-moz-lwtheme-brighttext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-outline-inverted); - } - #main-window[sizemode="maximized"]:-moz-lwtheme-brighttext #titlebar-max:-moz-lwtheme-brighttext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-outline-inverted); - } - #titlebar-close:-moz-lwtheme-brighttext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline-inverted); - } - #titlebar-close:hover:-moz-lwtheme-brighttext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline-inverted); - } - - /* the 12px image renders a 10px icon, and the 10px upscaled gets rounded to 12.5, which - * rounds up to 13px, which makes the icon one pixel too big on 1.25dppx. Fix: */ - @media (min-resolution: 1.20dppx) and (max-resolution: 1.45dppx) { - .titlebar-button > .toolbarbutton-icon { - width: 11.5px; - height: 11.5px; - } - } - - /* 175% dpi should result in the same device pixel sizes as 150% dpi. */ - @media (min-resolution: 1.70dppx) and (max-resolution: 1.95dppx) { - .titlebar-button { - padding-left: 14.1px; - padding-right: 14.1px; - } - - .titlebar-button > .toolbarbutton-icon { - width: 10.8px; - height: 10.8px; - } - } - - /* 225% dpi should result in the same device pixel sizes as 200% dpi. */ - @media (min-resolution: 2.20dppx) and (max-resolution: 2.45dppx) { - .titlebar-button { - padding-left: 15.3333px; - padding-right: 15.3333px; - } - - .titlebar-button > .toolbarbutton-icon { - width: 10.8px; - height: 10.8px; - } - } - - /* 275% dpi should result in the same device pixel sizes as 250% dpi. */ - @media (min-resolution: 2.70dppx) and (max-resolution: 2.95dppx) { - .titlebar-button > .toolbarbutton-icon { - width: 10.8px; - height: 10.8px; - } - } - - .titlebar-button:hover { - background-color: hsla(0, 0%, 255%, .22); - } - - .titlebar-button:hover:active { - background-color: hsla(0, 0%, 255%, .32); - } - - .titlebar-button:not(:hover) > .toolbarbutton-icon:-moz-window-inactive { - opacity: 0.5; - } - - #titlebar-close:hover { - background-color: hsl(355, 86%, 49%); - } - - #titlebar-close:hover:active { - background-color: hsl(355, 82%, 69%); - } - - /* light persona */ - .titlebar-button:-moz-lwtheme-darktext:hover { - background-color: hsla(0, 0%, 0%, .12); - } - - .titlebar-button:-moz-lwtheme-darktext:hover:active { - background-color: hsla(0, 0%, 100%, .22); - } - } - -/* ==== Windows Vista/7/8 styling ==== */ - - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7), - (-moz-os-version: windows-win8) { - /* Make sure the native margins are correct on Win Vista/7/8. - * We can't use -moz-win-glass there because the border sizing would - * not be correct. */ - #main-window { - -moz-appearance: -moz-win-borderless-glass; - } - - /* These should be hidden w/ glass enabled. Windows draws its own buttons. */ - .titlebar-button { - display: none; - } - - /* The borders on the glass frame are ours, and inside #browser, and on - * vista and win7 we want to make sure they are "glassy", so we can't use - * #browser as the exclude-glass container. We use #appcontent instead. */ - #browser { - -moz-appearance: none; - } - - #appcontent { - -moz-appearance: -moz-win-exclude-glass; - } - - #main-window[chromemargin^="0,"][sizemode=normal] #navigator-toolbox { - margin-top: -7px; - } - - /* Artificially draw window borders that are covered by lwtheme, see bug 591930. */ - #main-window[sizemode="normal"] > #titlebar > #titlebar-content:-moz-lwtheme { - border-top: 2px solid; - -moz-border-top-colors: rgb(37, 44, 51) rgba(255,255,255,.6); - } - - #main-window[sizemode="normal"] > #titlebar > #titlebar-content:-moz-lwtheme:-moz-window-inactive { - -moz-border-top-colors: rgb(102, 102, 102) rgba(255,255,255,.6); - } - - #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container:-moz-lwtheme { - margin-top: -1px; - } - - #main-window[sizemode="normal"] #titlebar-buttonbox:-moz-lwtheme { - margin-top: -2px; - } - - #appmenu-button { - margin-bottom: -1px; - } - } - - #main-window[sizemode=fullscreen]:not(:-moz-lwtheme) { - -moz-appearance: none; - background-color: #556; - } - - - #toolbar-menubar:not(:-moz-lwtheme), - #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme), - #navigator-toolbox[tabsontop=false] > #nav-bar:not(:-moz-lwtheme), - #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child:not(:-moz-lwtheme) { - background-color: transparent !important; - color: black; - border-left-style: none !important; - border-right-style: none !important; - } - - /* Show toolbar borders on vista through win8, but not on win10 and later: */ - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7), - (-moz-os-version: windows-win8) { - /* Vertical toolbar border */ - #main-window[sizemode=normal] #navigator-toolbox::after, - #main-window[sizemode=normal] #navigator-toolbox[tabsontop=true] > toolbar:not(#toolbar-menubar):not(#TabsToolbar), - #main-window[sizemode=normal] #navigator-toolbox[tabsontop=false] > toolbar:not(#toolbar-menubar):not(#nav-bar) { - border-left: 1px solid hsla(0,0%,12%,0.25); - border-right: 1px solid hsla(0,0%,12%,0.25); - background-clip: padding-box; - } - - #main-window[sizemode=normal] #navigator-toolbox > toolbar:-moz-lwtheme { - border-color: transparent !important; - } - #main-window[sizemode=normal] #browser-border-start, - #main-window[sizemode=normal] #browser-border-end { - display: -moz-box; - background-color: hsla(0,0%,12%,0.25); - width: 1px; - } - #main-window[sizemode=normal] #browser-bottombox { - border: 1px solid hsla(0,0%,12%,0.25); - border-top-style: none; - } - } - - /* Round top corners on Vista/7/8, but not Win10 because it's flush against the window edge */ - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7), - (-moz-os-version: windows-win8) { - #main-window[sizemode=normal][tabsontop=false] #PersonalToolbar:not(:-moz-lwtheme) { - border-top-left-radius: 3.5px; - border-top-right-radius: 3.5px; - } - - #main-window[sizemode=normal][tabsontop=true] #nav-bar:not(:-moz-lwtheme), - #main-window[sizemode=normal][tabsontop=true] > #nav-bar[collapsed=true]:not([customizing]) + toolbar:not(:-moz-lwtheme), - #main-window[sizemode=normal][tabsontop=true] > #nav-bar[collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme) { - border-top-left-radius: 2px; - border-top-right-radius: 2px; - } - } - - - #main-window[sizemode=normal][tabsontop=true] #nav-bar:not(:-moz-lwtheme), - #main-window[sizemode=normal][tabsontop=true] > #nav-bar[collapsed=true]:not([customizing]) + toolbar:not(:-moz-lwtheme), - #main-window[sizemode=normal][tabsontop=true] > #nav-bar[collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme) { - border-top: 1px solid rgba(75,75,75,1); - background-clip: padding-box; - } - #main-window[sizemode=normal]:not([disablechrome]) #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme) { - margin-bottom: -1px; - background-image: none !important; - } - #main-window[sizemode=normal]:not([disablechrome]) #tabbrowser-tabs[tabsontop=true] > .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox > .scrollbox-innerbox:not(:-moz-lwtheme) { - position: relative; - } - - #navigator-toolbox[tabsontop=false] > #PersonalToolbar { - margin-top: 1px; - } - #navigator-toolbox[tabsontop=false] > #PersonalToolbar:not(:-moz-lwtheme) { - margin-top: 0px; - border-top: 1px solid rgb(50,50,50); - } - - #main-window[sizemode=normal] #TabsToolbar[tabsontop=true] { - padding-left: 4px; - padding-right: 4px; - } - - #main-window[sizemode=normal] #TabsToolbar[tabsontop=false] { - padding-left: 2px; - padding-right: 2px; - } - - - #toolbar-menubar:not([autohide="true"]), - #TabsToolbar[tabsontop="true"], - #navigator-toolbox[tabsontop="false"] > #nav-bar, - #nav-bar + #customToolbars + #PersonalToolbar[collapsed="true"] + #TabsToolbar[tabsontop="false"]:last-child, - #navigator-toolbox > toolbar:not(#toolbar-menubar):-moz-lwtheme { - -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag"); - } - - #appcontent:not(:-moz-lwtheme) { - background-color: -moz-dialog; - } - - #browser-bottombox:not(:-moz-lwtheme) { - background-color: rgb(38,38,38); - background-clip: padding-box; - } - - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7), - (-moz-os-version: windows-win8) { - #main-window[sizemode=normal] #browser-bottombox:not(:-moz-lwtheme), - #main-window[sizemode=normal] #addon-bar:not(:-moz-lwtheme) { - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; - } - } - - #addon-bar:not(:-moz-lwtheme) { - -moz-appearance: none; - border-bottom-style: none; - } - - .tabbrowser-tab:not(:-moz-lwtheme) { - text-shadow: none; - } - - #main-window[sizemode=normal] .statuspanel-inner { - - padding-left: 1px; - padding-right: 1px; - } - - #tab-view:-moz-lwtheme { - background-image: url("chrome://browser/skin/tabview/grain.png"), - -moz-linear-gradient(rgba(255,255,255,0), #CCD9EA 200px, #C7D5E7); - background-attachment: fixed; - } -} - -@media not all and (-moz-windows-compositor) { - #toolbar-menubar:not([autohide=true]):not(:-moz-lwtheme):-moz-system-metric(windows-default-theme), - #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme):-moz-system-metric(windows-default-theme), - #navigator-toolbox[tabsontop=false] > toolbar:not(#toolbar-menubar):not(:-moz-lwtheme):-moz-system-metric(windows-default-theme) { - -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag"); - background-color: transparent; - } -} diff --git a/src/chrome/ostarget/general/KUI-background.png b/src/chrome/ostarget/general/KUI-background.png Binary files differ. diff --git a/src/chrome/ostarget/general/KUI-close.png b/src/chrome/ostarget/general/KUI-close.png Binary files differ. diff --git a/src/chrome/ostarget/general/appmenu-dropmarker.png b/src/chrome/ostarget/general/appmenu-dropmarker.png Binary files differ. diff --git a/src/chrome/ostarget/general/appmenu-icons.png b/src/chrome/ostarget/general/appmenu-icons.png Binary files differ. diff --git a/src/chrome/ostarget/general/browser.css b/src/chrome/ostarget/general/browser.css @@ -1,234 +0,0 @@ -@import url("chrome://global/skin/"); - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -@namespace html url("http://www.w3.org/1999/xhtml"); - - -#main-window[tabsintitlebar] #titlebar { - visibility: hidden; -} -#main-window[tabsintitlebar] #titlebar-content { - -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox"); - visibility: visible; -} - -/* ::::: titlebar ::::: */ - -#main-window[sizemode="normal"] > #titlebar { - -moz-appearance: none; -} - -#main-window[sizemode="maximized"] > #titlebar { - -moz-appearance: -moz-window-titlebar-maximized; -} - -#main-window[sizemode="maximized"][tabsintitlebar] > #titlebar { - -moz-appearance: none; - min-height: 26px; - margin-top: 4px; -} - - -@media all and (-moz-windows-classic) { - #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container { - margin-top: 4px; - } -} - -#titlebar-buttonbox { - -moz-appearance: -moz-window-button-box; -} - -#main-window[sizemode="maximized"] #titlebar-buttonbox { - -moz-appearance: -moz-window-button-box-maximized; -} - -.titlebar-placeholder[type="appmenu-button"] { - margin-left: 4px; -} - -.titlebar-placeholder[type="caption-buttons"] { - margin-left: 10px; -} - - -#main-window[tabsintitlebar] #titlebar-min, #minimize-button { - -moz-appearance: none !important; - background: url("chrome://browser/skin/min-btn.png") left no-repeat; - width: 25px; - height: 25px; - border: none; - margin-right: 0; -} - -#main-window[tabsintitlebar] #titlebar-max, #restore-button { - -moz-appearance: none !important; - background: url("chrome://browser/skin/max-btn.png") left no-repeat; - width: 25px; - height: 25px; - border: none; -} - -#main-window[tabsintitlebar] #titlebar-close, #close-button { - -moz-appearance: none !important; - background: url("chrome://browser/skin/close-btn.png") left no-repeat; - width: 25px; - height: 25px; - border: none; -} - -#main-window[tabsintitlebar] #titlebar-min:hover, #main-window[tabsintitlebar] #titlebar-max:hover, #main-window[tabsintitlebar] #titlebar-close:hover, -#minimize-button:hover, #restore-button:hover, #close-button:hover { - background-position: center; -} - -#main-window[tabsintitlebar] #titlebar-min:active, #main-window[tabsintitlebar] #titlebar-max:active, #main-window[tabsintitlebar] #titlebar-close:active, -#minimize-button:hover, #restore-button:hover, #close-button:active { - background-position: right; -} - -#minimize-button, #restore-button, #close-button { - padding: 0; - margin-top: -1px; -} - - - -#titlebar-min { - -moz-appearance: -moz-window-button-minimize; -} - -#titlebar-max { - -moz-appearance: -moz-window-button-maximize; -} - -#main-window[sizemode="maximized"] #titlebar-max { - -moz-appearance: -moz-window-button-restore; -} - -#titlebar-close { - -moz-appearance: -moz-window-button-close; -} - -@media not all and (-moz-windows-classic) { - #titlebar-min { - -moz-margin-end: 2px; - } -} - -/* ::::: bookmark buttons ::::: */ - -toolbarbutton.bookmark-item { - margin: 0; - padding: 2px 3px; -} - -toolbarbutton.bookmark-item:hover:active:not([disabled="true"]), -toolbarbutton.bookmark-item[open="true"] { - padding-top: 3px; - padding-bottom: 1px; - -moz-padding-start: 4px; - -moz-padding-end: 2px; -} - -.bookmark-item:not(#bookmarks-menu-button) > .toolbarbutton-icon { - width: 16px; - height: 16px; -} - - -.bookmark-item > .toolbarbutton-text { - display: -moz-box !important; -} - -.bookmark-item > .toolbarbutton-menu-dropmarker { - display: none; -} - -#wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box { - width: 16px; - height: 16px; - background: url("chrome://browser/skin/places/bookmarksToolbar.png") no-repeat center; -} - -.bookmarks-toolbar-customize { - max-width: 15em !important; - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important; -} - -/* ::::: bookmark menus ::::: */ - -menu.bookmark-item, -menuitem.bookmark-item { - min-width: 0; - max-width: 32em; -} - -.bookmark-item > .menu-iconic-left { - margin-top: 0; - margin-bottom: 0; -} - -.bookmark-item > .menu-iconic-left > .menu-iconic-icon { - -moz-padding-start: 0px; -} - -/* ::::: fullscreen window controls ::::: */ -#TabsToolbar > #window-controls { - -moz-margin-start: 4px; -} - -#minimize-button, -#restore-button, -#close-button { - list-style-image: url("chrome://global/skin/icons/windowControls.png"); - padding: 0; -} - -#minimize-button { - -moz-image-region: rect(0, 16px, 16px, 0); -} -#minimize-button:hover { - -moz-image-region: rect(16px, 16px, 32px, 0); -} -#minimize-button:hover:active { - -moz-image-region: rect(32px, 16px, 48px, 0); -} -#restore-button { - -moz-image-region: rect(0, 32px, 16px, 16px); -} -#restore-button:hover { - -moz-image-region: rect(16px, 32px, 32px, 16px); -} -#restore-button:hover:active { - -moz-image-region: rect(32px, 32px, 48px, 16px); -} -#close-button { - -moz-image-region: rect(0, 48px, 16px, 32px); - -moz-appearance: none; - border-style: none; - margin: 2px; -} -#close-button:hover { - -moz-image-region: rect(16px, 48px, 32px, 32px); -} -#close-button:hover:active { - -moz-image-region: rect(32px, 48px, 48px, 32px); -} - -/* ::::: throbber ::::: */ -#TabsToolbar { - min-height: 0; - padding: 0; -} - -#main-window[chromemargin][tabsontop=true] #TabsToolbar { - background: transparent; -} - -@media all and (-moz-windows-default-theme) { - #main-window[sizemode=normal] #TabsToolbar:not([inFullscreen]) { - padding-left: 2px; - padding-right: 2px; - } -} diff --git a/src/chrome/ostarget/general/tabbrowser/tab.png b/src/chrome/ostarget/general/tabbrowser/tab.png Binary files differ. diff --git a/src/install.rdf b/src/install.rdf @@ -24,8 +24,8 @@ <Description> <!-- Pale Moon --> <em:id>{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}</em:id> - <em:minVersion>27.0.0b3</em:minVersion> - <em:maxVersion>27.*</em:maxVersion> + <em:minVersion>27.5.0</em:minVersion> + <em:maxVersion>28.*</em:maxVersion> </Description> </em:targetApplication> </Description>
