--- a/browser/base/content/test/performance/browser_startup_images.js
+++ b/browser/base/content/test/performance/browser_startup_images.js
@@ -25,31 +25,27 @@
*/
const whitelist = [
// Photon-only entries
{
file: "chrome://browser/skin/stop.svg",
platforms: ["linux", "win", "macosx"],
photon: true,
},
- {
- file: "chrome://browser/skin/toolbarbutton-dropdown-arrow.png",
- platforms: ["win"],
- photon: true,
- },
-
- // Non-Photon-only entries
- {
- file: "chrome://browser/skin/toolbarbutton-dropdown-arrow.png",
- platforms: ["linux", "win", "macosx"],
- photon: false,
- },
// Shared entries
{
+ file: "chrome://browser/skin/arrow-left.svg",
+ platforms: ["linux", "win", "macosx"],
+ },
+ {
+ file: "chrome://browser/skin/arrow-dropdown.svg",
+ platforms: ["linux", "win", "macosx"],
+ },
+ {
file: "chrome://browser/skin/fxa/sync-illustration.svg",
platforms: ["linux", "win", "macosx"],
},
{
file: "chrome://browser/skin/tabbrowser/tab-overflow-indicator.png",
platforms: ["linux", "win", "macosx"],
},
@@ -133,34 +129,22 @@ const whitelist = [
},
{
file: "chrome://browser/skin/yosemite/tab-stroke-end-inactive.png",
hidpi: "<not loaded>",
platforms: ["macosx"],
},
{
- file: "chrome://browser/skin/tabbrowser/newtab.png",
- hidpi: "chrome://browser/skin/tabbrowser/newtab@2x.png",
- platforms: ["macosx"],
- },
-
- {
file: "chrome://global/skin/icons/chevron.png",
hidpi: "chrome://global/skin/icons/chevron@2x.png",
platforms: ["macosx"],
},
{
- file: "chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon.png",
- hidpi: "chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon@2x.png",
- platforms: ["macosx"],
- },
-
- {
file: "chrome://pocket/content/panels/img/pocketmenuitem16.png",
hidpi: "chrome://pocket/content/panels/img/pocketmenuitem16@2x.png",
platforms: ["macosx"],
},
{
file: "chrome://browser/skin/places/bookmarksToolbar.png",
hidpi: "chrome://browser/skin/places/bookmarksToolbar@2x.png",
@@ -169,72 +153,30 @@ const whitelist = [
{
file: "chrome://global/skin/tree/folder.png",
hidpi: "chrome://global/skin/tree/folder@2x.png",
platforms: ["macosx"],
},
{
- file: "chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.png",
- hidpi: "chrome://browser/skin/tabbrowser/tab-arrow-left-inverted@2x.png",
- platforms: ["linux", "macosx"],
- },
- {
- file: "chrome://browser/skin/tabbrowser/tab-arrow-right-inverted.png",
- hidpi: "chrome://browser/skin/tabbrowser/tab-arrow-right-inverted@2x.png",
- platforms: ["macosx"],
- },
-
- {
- file: "chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon-inverted.png",
- hidpi: "chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png",
- platforms: ["macosx"],
- },
-
- {
file: "chrome://global/skin/toolbar/chevron.gif",
platforms: ["win", "linux"],
},
{
file: "chrome://browser/skin/reload-stop-go.png",
platforms: ["win", "linux"],
intermittentShown: ["win", "linux"],
},
{
- file: "chrome://browser/skin/tabbrowser/alltabs.png",
- platforms: ["linux"],
- },
- {
- file: "chrome://browser/skin/tabbrowser/alltabs-inverted.png",
- platforms: ["linux"],
- },
-
- {
- file: "chrome://browser/skin/tabbrowser/tab-arrow-left.svg",
- platforms: ["win"],
- },
-
- {
file: "chrome://global/skin/icons/resizer.png",
platforms: ["win"],
},
-
- {
- file: "chrome://browser/skin/tabbrowser/tab-arrow-left.png",
- hidpi: "chrome://browser/skin/tabbrowser/tab-arrow-left@2x.png",
- platforms: ["linux", "macosx"],
- },
- {
- file: "chrome://browser/skin/tabbrowser/tab-arrow-right.png",
- hidpi: "chrome://browser/skin/tabbrowser/tab-arrow-right@2x.png",
- platforms: ["macosx"],
- },
];
add_task(async function() {
let startupRecorder = Cc["@mozilla.org/test/startuprecorder;1"].getService().wrappedJSObject;
await startupRecorder.done;
let data = startupRecorder.data.images;
let filteredWhitelist = whitelist.filter(el => {
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1027,72 +1027,29 @@ html|span.ac-emphasize-text-url {
#TabsToolbar[brighttext] .tab-close-button:not([selected]):not(:hover) {
background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 80, 16, 64);
}
.tab-close-button:not(:hover):-moz-lwtheme-darktext {
background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 96, 16, 80);
}
-/* Tabstrip new tab button */
-.tabs-newtab-button,
-#TabsToolbar > #new-tab-button ,
-#TabsToolbar > toolbarpaletteitem > #new-tab-button {
- list-style-image: url(chrome://browser/skin/tabbrowser/newtab.svg);
- -moz-image-region: auto;
-}
+/* Tab bar scroll arrows */
-#TabsToolbar[brighttext] .tabs-newtab-button,
-#TabsToolbar[brighttext] > #new-tab-button,
-#TabsToolbar[brighttext] > toolbarpaletteitem > #new-tab-button {
- list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted.svg);
-}
-
-/* Tabbrowser arrowscrollbox arrows */
.tabbrowser-arrowscrollbox > .scrollbutton-up > .toolbarbutton-icon,
.tabbrowser-arrowscrollbox > .scrollbutton-down > .toolbarbutton-icon {
-moz-appearance: none;
}
-.tabbrowser-arrowscrollbox > .scrollbutton-up,
-.tabbrowser-arrowscrollbox > .scrollbutton-down {
- list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.png");
-}
-
-#TabsToolbar[brighttext] > #tabbrowser-tabs > .tabbrowser-arrowscrollbox > .scrollbutton-up,
-#TabsToolbar[brighttext] > #tabbrowser-tabs > .tabbrowser-arrowscrollbox > .scrollbutton-down {
- list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.png);
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl),
-.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr) {
- transform: scaleX(-1);
-}
-
-#alltabs-button {
- list-style-image: url("chrome://browser/skin/tabbrowser/alltabs.png");
-}
-
-#TabsToolbar[brighttext] > #alltabs-button,
-#TabsToolbar[brighttext] > toolbarpaletteitem > #alltabs-button {
- list-style-image: url("chrome://browser/skin/tabbrowser/alltabs-inverted.png");
-}
-
/* All tabs menupopup */
-.alltabs-item > .menu-iconic-left > .menu-iconic-icon {
- list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.svg");
-}
.alltabs-item[selected="true"] {
font-weight: bold;
}
-.alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
- list-style-image: url("chrome://global/skin/icons/loading.png");
-}
toolbarbutton.chevron {
list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
}
toolbar[brighttext] toolbarbutton.chevron {
list-style-image: url("chrome://global/skin/toolbar/chevron-inverted.png") !important;
}
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -69,24 +69,18 @@ browser.jar:
skin/classic/browser/preferences/preferences.css (preferences/preferences.css)
* skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
* skin/classic/browser/preferences/in-content-new/preferences.css (preferences/in-content-new/preferences.css)
* skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css)
* skin/classic/browser/preferences/in-content-new/dialog.css (preferences/in-content-new/dialog.css)
skin/classic/browser/preferences/applications.css (preferences/applications.css)
skin/classic/browser/social/services-16.png (social/services-16.png)
skin/classic/browser/social/services-64.png (social/services-64.png)
- skin/classic/browser/tabbrowser/alltabs.png (tabbrowser/alltabs.png)
- skin/classic/browser/tabbrowser/alltabs-inverted.png (tabbrowser/alltabs-inverted.png)
- skin/classic/browser/tabbrowser/newtab.svg (tabbrowser/newtab.svg)
- skin/classic/browser/tabbrowser/newtab-inverted.svg (tabbrowser/newtab-inverted.svg)
skin/classic/browser/tabbrowser/tab-active-middle.png (tabbrowser/tab-active-middle.png)
skin/classic/browser/tabbrowser/tab-active-middle@2x.png (tabbrowser/tab-active-middle@2x.png)
- skin/classic/browser/tabbrowser/tab-arrow-left.png (tabbrowser/tab-arrow-left.png)
- skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png (tabbrowser/tab-arrow-left-inverted.png)
skin/classic/browser/tabbrowser/tab-background-end.png (tabbrowser/tab-background-end.png)
skin/classic/browser/tabbrowser/tab-background-end@2x.png (tabbrowser/tab-background-end@2x.png)
skin/classic/browser/tabbrowser/tab-background-middle.png (tabbrowser/tab-background-middle.png)
skin/classic/browser/tabbrowser/tab-background-middle@2x.png (tabbrowser/tab-background-middle@2x.png)
skin/classic/browser/tabbrowser/tab-background-start.png (tabbrowser/tab-background-start.png)
skin/classic/browser/tabbrowser/tab-background-start@2x.png (tabbrowser/tab-background-start@2x.png)
# NOTE: The following two files (tab-selected-end.svg, tab-selected-start.svg) get pre-processed in
deleted file mode 100644
index f3261f1da05abdf5fdabdfa17083243deb74b78d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a7abe739634da367dd3af96dacbe8c4c1327f071..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/browser/themes/linux/tabbrowser/newtab-inverted.svg
+++ /dev/null
@@ -1,13 +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/. -->
-<svg width="16" height="18" xmlns="http://www.w3.org/2000/svg">
- <g stroke="#666" stroke-width="2" fill="none">
- <rect x="7" y="3" width="2" height="12" rx="0.25" ry="0.25"/>
- <rect x="2" y="8" width="12" height="2" rx="0.25" ry="0.25"/>
- </g>
- <g fill="#fff">
- <rect x="7" y="3" width="2" height="12"/>
- <rect x="2" y="8" width="12" height="2"/>
- </g>
-</svg>
deleted file mode 100644
--- a/browser/themes/linux/tabbrowser/newtab.svg
+++ /dev/null
@@ -1,7 +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/. -->
-<svg width="16" height="18" xmlns="http://www.w3.org/2000/svg" fill="#4c4c4c">
- <rect x="7" y="3" width="2" height="12"/>
- <rect x="2" y="8" width="12" height="2"/>
-</svg>
deleted file mode 100644
index 16cd7a2775ae1f56274035fcde4ed5e8c211a52c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index e0fb348d66f4001a50ca9488b9daddcf37bbc3ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -1628,211 +1628,16 @@ toolbarbutton.chevron > .toolbarbutton-m
}
@media (min-resolution: 2dppx) {
#TabsToolbar[brighttext] .tab-close-button.close-icon:not([selected=true]):not(:hover) {
-moz-image-region: rect(0, 128px, 32px, 96px);
}
}
-.tabbrowser-arrowscrollbox > .scrollbutton-up,
-.tabbrowser-arrowscrollbox > .scrollbutton-down {
- -moz-image-region: rect(0, 13px, 20px, 0);
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(ltr),
-.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(rtl) {
- list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.png");
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr),
-.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl) {
- list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-right.png");
-}
-
-#TabsToolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(ltr),
-#TabsToolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(rtl) {
- list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.png");
-}
-
-#TabsToolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr),
-#TabsToolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl) {
- list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-right-inverted.png");
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover,
-.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover {
- -moz-image-region: rect(0, 26px, 20px, 13px);
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover:active,
-.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover:active {
- -moz-image-region: rect(0, 39px, 20px, 26px);
-}
-
-@media (min-resolution: 2dppx) {
- .tabbrowser-arrowscrollbox > .scrollbutton-up,
- .tabbrowser-arrowscrollbox > .scrollbutton-down {
- -moz-image-region: rect(0, 26px, 40px, 0);
- }
-
- .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(ltr),
- .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(rtl) {
- list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left@2x.png");
- }
-
- .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr),
- .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl) {
- list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-right@2x.png");
- }
-
- #TabsToolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(ltr),
- #TabsToolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(rtl) {
- list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left-inverted@2x.png");
- }
-
- #TabsToolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr),
- #TabsToolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl) {
- list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-right-inverted@2x.png");
- }
-
- .tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover,
- .tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover {
- -moz-image-region: rect(0, 52px, 40px, 26px);
- }
-
- .tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover:active,
- .tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover:active {
- -moz-image-region: rect(0, 78px, 40px, 52px);
- }
-
- .tabbrowser-arrowscrollbox > .scrollbutton-up > .toolbarbutton-icon,
- .tabbrowser-arrowscrollbox > .scrollbutton-down > .toolbarbutton-icon {
- width: 13px;
- }
-}
-
-/**
- * Tabstrip toolbar buttons
- */
-
-.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: rect(0, 18px, 20px, 0);
-}
-
-#TabsToolbar[brighttext] .tabs-newtab-button,
-#TabsToolbar[brighttext] > #new-tab-button,
-#TabsToolbar[brighttext] > toolbarpaletteitem > #new-tab-button {
- list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted.png);
-}
-
-.tabs-newtab-button:hover,
-#TabsToolbar > #new-tab-button:hover {
- -moz-image-region: rect(0, 36px, 20px, 18px);
-}
-
-.tabs-newtab-button:hover:active,
-#TabsToolbar > #new-tab-button:hover:active {
- -moz-image-region: rect(0, 54px, 20px, 36px);
-}
-
-@media (min-resolution: 2dppx) {
- .tabs-newtab-button,
- #TabsToolbar > #new-tab-button,
- #TabsToolbar > toolbarpaletteitem > #new-tab-button {
- list-style-image: url(chrome://browser/skin/tabbrowser/newtab@2x.png);
- -moz-image-region: rect(0, 36px, 40px, 0);
- }
-
- #TabsToolbar[brighttext] .tabs-newtab-button,
- #TabsToolbar[brighttext] > #new-tab-button,
- #TabsToolbar[brighttext] > toolbarpaletteitem > #new-tab-button {
- list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted@2x.png);
- }
-
- .tabs-newtab-button:hover,
- #TabsToolbar > #new-tab-button:hover {
- -moz-image-region: rect(0, 72px, 40px, 36px);
- }
-
- .tabs-newtab-button:hover:active,
- #TabsToolbar > #new-tab-button:hover:active {
- -moz-image-region: rect(0, 108px, 40px, 72px);
- }
-
- .tabs-newtab-button > .toolbarbutton-icon {
- width: 40px;
- }
-
- #TabsToolbar > #new-tab-button > .toolbarbutton-icon,
- #TabsToolbar > toolbarpaletteitem > #new-tab-button > .toolbarbutton-icon {
- max-width: 18px;
- }
-}
-
-#alltabs-button {
- list-style-image: url(chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon.png);
- -moz-image-region: rect(0, 17px, 20px, 0);
-}
-
-#TabsToolbar[brighttext] #alltabs-button {
- list-style-image: url(chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon-inverted.png);
-}
-
-#alltabs-button:not([disabled="true"]):hover {
- -moz-image-region: rect(0, 34px, 20px, 17px);
-}
-
-#alltabs-button[open="true"]:not([disabled="true"]),
-#alltabs-button:not([disabled="true"]):hover:active {
- -moz-image-region: rect(0, 51px, 20px, 34px);
-}
-
-@media (min-resolution: 2dppx) {
- #alltabs-button {
- list-style-image: url(chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon@2x.png);
- -moz-image-region: rect(0, 34px, 40px, 0);
- }
-
- #TabsToolbar[brighttext] #alltabs-button {
- list-style-image: url(chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png);
- }
-
- #alltabs-button:not([disabled="true"]):hover {
- -moz-image-region: rect(0, 68px, 40px, 34px);
- }
-
- #alltabs-button[open="true"]:not([disabled="true"]),
- #alltabs-button:not([disabled="true"]):hover:active {
- -moz-image-region: rect(0, 102px, 40px, 68px);
- }
-
- #alltabs-button > .toolbarbutton-icon {
- width: 17px;
- }
-}
-
-/* All Tabs Menupopup */
-.alltabs-item > .menu-iconic-left > .menu-iconic-icon {
- list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.svg");
-}
-
-.alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
- list-style-image: url("chrome://global/skin/icons/loading.png") !important;
-}
-
-@media (min-resolution: 2dppx) {
- .alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
- list-style-image: url("chrome://global/skin/icons/loading@2x.png") !important;
- }
-}
-
/* Bookmarks toolbar */
#PlacesToolbarDropIndicator {
list-style-image: url(chrome://browser/skin/places/toolbarDropMarker.png);
}
/* Bookmark drag and drop styles */
.bookmark-item[dragover-into="true"] {
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -104,34 +104,18 @@ browser.jar:
* skin/classic/browser/preferences/in-content-new/preferences.css (preferences/in-content-new/preferences.css)
* skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css)
* skin/classic/browser/preferences/in-content-new/dialog.css (preferences/in-content-new/dialog.css)
skin/classic/browser/preferences/applications.css (preferences/applications.css)
skin/classic/browser/social/services-16.png (social/services-16.png)
skin/classic/browser/social/services-16@2x.png (social/services-16@2x.png)
skin/classic/browser/social/services-64.png (social/services-64.png)
skin/classic/browser/social/services-64@2x.png (social/services-64@2x.png)
- skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon.png (tabbrowser/alltabs-box-bkgnd-icon.png)
- skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon@2x.png (tabbrowser/alltabs-box-bkgnd-icon@2x.png)
- skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon-inverted.png (tabbrowser/alltabs-box-bkgnd-icon-inverted.png)
- skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png (tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png)
- skin/classic/browser/tabbrowser/newtab.png (tabbrowser/newtab.png)
- skin/classic/browser/tabbrowser/newtab@2x.png (tabbrowser/newtab@2x.png)
- skin/classic/browser/tabbrowser/newtab-inverted.png (tabbrowser/newtab-inverted.png)
- skin/classic/browser/tabbrowser/newtab-inverted@2x.png (tabbrowser/newtab-inverted@2x.png)
skin/classic/browser/tabbrowser/tab-active-middle.png (tabbrowser/tab-active-middle.png)
skin/classic/browser/tabbrowser/tab-active-middle@2x.png (tabbrowser/tab-active-middle@2x.png)
- skin/classic/browser/tabbrowser/tab-arrow-left.png (tabbrowser/tab-arrow-left.png)
- skin/classic/browser/tabbrowser/tab-arrow-left@2x.png (tabbrowser/tab-arrow-left@2x.png)
- skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png (tabbrowser/tab-arrow-left-inverted.png)
- skin/classic/browser/tabbrowser/tab-arrow-left-inverted@2x.png (tabbrowser/tab-arrow-left-inverted@2x.png)
- skin/classic/browser/tabbrowser/tab-arrow-right.png (tabbrowser/tab-arrow-right.png)
- skin/classic/browser/tabbrowser/tab-arrow-right@2x.png (tabbrowser/tab-arrow-right@2x.png)
- skin/classic/browser/tabbrowser/tab-arrow-right-inverted.png (tabbrowser/tab-arrow-right-inverted.png)
- skin/classic/browser/tabbrowser/tab-arrow-right-inverted@2x.png (tabbrowser/tab-arrow-right-inverted@2x.png)
skin/classic/browser/tabbrowser/tab-background-end.png (tabbrowser/tab-background-end.png)
skin/classic/browser/tabbrowser/tab-background-end@2x.png (tabbrowser/tab-background-end@2x.png)
skin/classic/browser/tabbrowser/tab-background-middle.png (tabbrowser/tab-background-middle.png)
skin/classic/browser/tabbrowser/tab-background-middle@2x.png (tabbrowser/tab-background-middle@2x.png)
skin/classic/browser/tabbrowser/tab-background-start.png (tabbrowser/tab-background-start.png)
skin/classic/browser/tabbrowser/tab-background-start@2x.png (tabbrowser/tab-background-start@2x.png)
# NOTE: The following two files (tab-selected-end.svg, tab-selected-start.svg) get pre-processed in
deleted file mode 100644
index 2d29c2cbea688fdf44ba7d1617bd9edd8a04a4c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 6feba0e83eaad385ae512fc611187c10dec6e9d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 32e42b04cce15cb654b44bc882b264bec5efa963..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index ffde5f05086c366c5873e0d5fa383f45982ae002..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index b0826024d787c0d6fad3b0672216e88d4a8e1089..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4ca8ec0baedeb9c40240ad2cf8c9f19bf6cb870b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 61ad41ae9a01660261253aed82c21fb0bd5e10c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 20bf78db21347a968e519564dc6aa39f4cc5fa78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 0cd8f37a6fb7dbb22ef7062a01d194348cf4e216..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index e4ab8cbaa24cb96c0117ba55655c2fb41f6f13b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 37ccf8cfe312e7a2438eed5a3625afb6ce7de02c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d319accc51cf1b9d0dc2cf4224f1349def1eeab6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -208,16 +208,17 @@
skin/classic/browser/search-indicator-badge-add@2x.png (../shared/search/search-indicator-badge-add@2x.png)
skin/classic/browser/search-indicator-magnifying-glass.svg (../shared/search/search-indicator-magnifying-glass.svg)
skin/classic/browser/search-arrow-go.svg (../shared/search/search-arrow-go.svg)
skin/classic/browser/gear.svg (../shared/search/gear.svg)
skin/classic/browser/sidebar/close.svg (../shared/sidebar/close.svg)
skin/classic/browser/tabbrowser/connecting.png (../shared/tabbrowser/connecting.png)
skin/classic/browser/tabbrowser/connecting@2x.png (../shared/tabbrowser/connecting@2x.png)
skin/classic/browser/tabbrowser/crashed.svg (../shared/tabbrowser/crashed.svg)
+ skin/classic/browser/tabbrowser/newtab.svg (../shared/tabbrowser/newtab.svg)
#ifdef MOZ_PHOTON_THEME
skin/classic/browser/tabbrowser/indicator-tab-attention.svg (../shared/tabbrowser/indicator-tab-attention.svg)
#endif
skin/classic/browser/tabbrowser/pendingpaint.png (../shared/tabbrowser/pendingpaint.png)
skin/classic/browser/tabbrowser/tab-audio-playing.svg (../shared/tabbrowser/tab-audio-playing.svg)
skin/classic/browser/tabbrowser/tab-audio-muted.svg (../shared/tabbrowser/tab-audio-muted.svg)
skin/classic/browser/tabbrowser/tab-audio-blocked.svg (../shared/tabbrowser/tab-audio-blocked.svg)
skin/classic/browser/tabbrowser/tab-audio-small.svg (../shared/tabbrowser/tab-audio-small.svg)
new file mode 100644
--- /dev/null
+++ b/browser/themes/shared/tabbrowser/newtab.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 width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill">
+ <rect x="7" y="1" width="2" height="14"/>
+ <rect x="1" y="7" width="14" height="2"/>
+</svg>
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -520,18 +520,41 @@
/* Also show separators beside the selected tab when dragging it. */
#tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after,
.tabbrowser-tab:not([selected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before,
#tabbrowser-tabs:not([overflow]) > .tabbrowser-tab[last-visible-tab]:not([selected]):not([beforehovered]):not(:hover)::after {
content: "";
display: -moz-box;
}
+/* Tab bar scroll arrows */
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up,
+.tabbrowser-arrowscrollbox > .scrollbutton-down {
+ list-style-image: url(chrome://browser/skin/arrow-left.svg);
+ -moz-context-properties: fill;
+ fill: currentColor;
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl),
+.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr) {
+ transform: scaleX(-1);
+}
+
/* New tab button */
+.tabs-newtab-button,
+#TabsToolbar > #new-tab-button ,
+#TabsToolbar > toolbarpaletteitem > #new-tab-button {
+ list-style-image: url(chrome://browser/skin/tabbrowser/newtab.svg);
+ -moz-context-properties: fill;
+ fill: currentColor;
+ color: inherit;
+}
+
.tabs-newtab-button {
width: calc(36px + var(--tab-curve-width));
}
.tabs-newtab-button > .toolbarbutton-menu-dropmarker {
display: none;
}
@@ -582,17 +605,37 @@
list-style-image: url("chrome://browser/skin/tabbrowser/connecting@2x.png");
}
.tab-throbber[progress] {
list-style-image: url("chrome://global/skin/icons/loading@2x.png");
}
}
-/* All tabs menupopup */
+/* All tabs button and menupopup */
+
+#alltabs-button {
+ list-style-image: url(chrome://browser/skin/arrow-dropdown.svg);
+ -moz-context-properties: fill;
+ fill: currentColor;
+}
+
+.alltabs-item > .menu-iconic-left > .menu-iconic-icon {
+ list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.svg");
+}
+
+.alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
+ list-style-image: url("chrome://global/skin/icons/loading.png");
+}
+
+@media (min-resolution: 1.1dppx) {
+ .alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
+ list-style-image: url("chrome://global/skin/icons/loading@2x.png");
+ }
+}
.alltabs-item[tabIsVisible] {
/* box-shadow instead of background-color to work around native styling */
box-shadow: inset -5px 0 ThreeDShadow;
}
.alltabs-endimage[soundplaying],
.alltabs-endimage[muted],
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1449,88 +1449,22 @@ treechildren.searchbar-treebody::-moz-tr
}
/* Tab close button */
.tab-close-button {
-moz-appearance: none;
border: none;
}
-/* Tab scrollbox arrow, tabstrip new tab and all-tabs buttons */
-
-.tabbrowser-arrowscrollbox > .scrollbutton-up,
-.tabbrowser-arrowscrollbox > .scrollbutton-down {
- list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.svg");
-}
-
-#TabsToolbar[brighttext] > #tabbrowser-tabs > .tabbrowser-arrowscrollbox > .scrollbutton-up,
-#TabsToolbar[brighttext] > #tabbrowser-tabs > .tabbrowser-arrowscrollbox > .scrollbutton-down {
- list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.svg);
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl),
-.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr) {
- transform: scaleX(-1);
-}
-
-.tabs-newtab-button > .toolbarbutton-icon {
- margin-top: -1px;
- margin-bottom: -1px;
-}
-
-.tabs-newtab-button,
-#TabsToolbar > #new-tab-button,
-#TabsToolbar > toolbarpaletteitem > #new-tab-button {
- list-style-image: url(chrome://browser/skin/tabbrowser/newtab.svg);
- -moz-image-region: auto;
-}
-
-#TabsToolbar[brighttext] .tabs-newtab-button,
-#TabsToolbar[brighttext] > #new-tab-button,
-#TabsToolbar[brighttext] > toolbarpaletteitem > #new-tab-button {
- list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted.svg);
-}
-
-.tabs-newtab-button > .toolbarbutton-icon,
-#TabsToolbar > #new-tab-button > .toolbarbutton-icon,
-#TabsToolbar > toolbarpaletteitem > #new-tab-button > .toolbarbutton-icon {
- width: 16px;
-}
-
-#TabsToolbar > #new-tab-button {
- width: 26px;
-}
-
-#alltabs-button {
- list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
-}
-
-#TabsToolbar[brighttext] > #alltabs-button,
-#TabsToolbar[brighttext] > toolbarpaletteitem > #alltabs-button {
- list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
-}
-
/* All tabs menupopup */
-.alltabs-item > .menu-iconic-left > .menu-iconic-icon {
- list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.svg");
-}
.alltabs-item[selected="true"] {
font-weight: bold;
}
-.alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
- list-style-image: url("chrome://global/skin/icons/loading.png");
-}
-
-@media (min-resolution: 1.1dppx) {
- .alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
- list-style-image: url("chrome://global/skin/icons/loading@2x.png");
- }
-}
toolbarbutton.chevron {
list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
}
toolbar[brighttext] toolbarbutton.chevron {
list-style-image: url("chrome://global/skin/toolbar/chevron-inverted.png") !important;
}
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -96,25 +96,18 @@ browser.jar:
skin/classic/browser/preferences/preferences.css (preferences/preferences.css)
* skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
* skin/classic/browser/preferences/in-content-new/preferences.css (preferences/in-content-new/preferences.css)
* skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css)
* skin/classic/browser/preferences/in-content-new/dialog.css (preferences/in-content-new/dialog.css)
skin/classic/browser/preferences/applications.css (preferences/applications.css)
skin/classic/browser/social/services-16.png (social/services-16.png)
skin/classic/browser/social/services-64.png (social/services-64.png)
- skin/classic/browser/tabbrowser/newtab.svg (tabbrowser/newtab.svg)
- skin/classic/browser/tabbrowser/newtab-win7.svg (tabbrowser/newtab-win7.svg)
- skin/classic/browser/tabbrowser/newtab-inverted.svg (tabbrowser/newtab-inverted.svg)
- skin/classic/browser/tabbrowser/newtab-inverted-win7.svg (tabbrowser/newtab-inverted-win7.svg)
skin/classic/browser/tabbrowser/tab-active-middle.png (tabbrowser/tab-active-middle.png)
skin/classic/browser/tabbrowser/tab-active-middle@2x.png (tabbrowser/tab-active-middle@2x.png)
- skin/classic/browser/tabbrowser/tab-arrow-left.svg (tabbrowser/tab-arrow-left.svg)
- skin/classic/browser/tabbrowser/tab-arrow-left-win7.svg (tabbrowser/tab-arrow-left-win7.svg)
- skin/classic/browser/tabbrowser/tab-arrow-left-inverted.svg (tabbrowser/tab-arrow-left-inverted.svg)
skin/classic/browser/tabbrowser/tab-background-start.png (tabbrowser/tab-background-start.png)
skin/classic/browser/tabbrowser/tab-background-start@2x.png (tabbrowser/tab-background-start@2x.png)
skin/classic/browser/tabbrowser/tab-background-middle.png (tabbrowser/tab-background-middle.png)
skin/classic/browser/tabbrowser/tab-background-middle@2x.png (tabbrowser/tab-background-middle@2x.png)
skin/classic/browser/tabbrowser/tab-background-end.png (tabbrowser/tab-background-end.png)
skin/classic/browser/tabbrowser/tab-background-end@2x.png (tabbrowser/tab-background-end@2x.png)
skin/classic/browser/tabbrowser/tab-background-start-preWin10.png (tabbrowser/tab-background-start-preWin10.png)
skin/classic/browser/tabbrowser/tab-background-start-preWin10@2x.png (tabbrowser/tab-background-start-preWin10@2x.png)
@@ -164,18 +157,15 @@ browser.jar:
% override chrome://browser/skin/sync-horizontalbar.png chrome://browser/skin/sync-horizontalbar-win7.png os=WINNT osversion<=6.1
% override chrome://browser/skin/sync-horizontalbar@2x.png chrome://browser/skin/sync-horizontalbar-win7@2x.png os=WINNT osversion<=6.1
% override chrome://browser/skin/syncProgress-horizontalbar.png chrome://browser/skin/syncProgress-horizontalbar-win7.png os=WINNT osversion<=6.1
% override chrome://browser/skin/syncProgress-horizontalbar@2x.png chrome://browser/skin/syncProgress-horizontalbar-win7@2x.png os=WINNT osversion<=6.1
% override chrome://browser/skin/toolbarbutton-dropdown-arrow.png chrome://browser/skin/toolbarbutton-dropdown-arrow-win7.png os=WINNT osversion<=6.1
% override chrome://browser/skin/urlbar-history-dropmarker.png chrome://browser/skin/urlbar-history-dropmarker-win7.png os=WINNT osversion<=6.1
% override chrome://browser/skin/urlbar-history-dropmarker@2x.png chrome://browser/skin/urlbar-history-dropmarker-win7@2x.png os=WINNT osversion<=6.1
% override chrome://browser/skin/downloads/download-glow-menuPanel.png chrome://browser/skin/downloads/download-glow-menuPanel-win7.png os=WINNT osversion<=6.1
-% override chrome://browser/skin/tabbrowser/newtab.svg chrome://browser/skin/tabbrowser/newtab-win7.svg os=WINNT osversion<=6.1
-% override chrome://browser/skin/tabbrowser/newtab-inverted.svg chrome://browser/skin/tabbrowser/newtab-inverted-win7.svg os=WINNT osversion<=6.1
-% override chrome://browser/skin/tabbrowser/tab-arrow-left.svg chrome://browser/skin/tabbrowser/tab-arrow-left-win7.svg os=WINNT osversion<=6.1
% override chrome://browser/skin/tabbrowser/tab-background-start.png chrome://browser/skin/tabbrowser/tab-background-start-preWin10.png os=WINNT osversion<=6.3
% override chrome://browser/skin/tabbrowser/tab-background-start@2x.png chrome://browser/skin/tabbrowser/tab-background-start-preWin10@2x.png os=WINNT osversion<=6.3
% override chrome://browser/skin/tabbrowser/tab-background-middle.png chrome://browser/skin/tabbrowser/tab-background-middle-preWin10.png os=WINNT osversion<=6.3
% override chrome://browser/skin/tabbrowser/tab-background-middle@2x.png chrome://browser/skin/tabbrowser/tab-background-middle-preWin10@2x.png os=WINNT osversion<=6.3
% override chrome://browser/skin/tabbrowser/tab-background-end.png chrome://browser/skin/tabbrowser/tab-background-end-preWin10.png os=WINNT osversion<=6.3
% override chrome://browser/skin/tabbrowser/tab-background-end@2x.png chrome://browser/skin/tabbrowser/tab-background-end-preWin10@2x.png os=WINNT osversion<=6.3
deleted file mode 100644
--- a/browser/themes/windows/tabbrowser/newtab-inverted-win7.svg
+++ /dev/null
@@ -1,13 +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/. -->
-<svg width="16" height="18" xmlns="http://www.w3.org/2000/svg">
- <g stroke="#666" stroke-width="2" fill="none">
- <rect x="7" y="4" width="2" height="10" rx="0.25" ry="0.25"/>
- <rect x="3" y="8" width="10" height="2" rx="0.25" ry="0.25"/>
- </g>
- <g fill="#fff">
- <rect width="2" height="10" x="7" y="4"/>
- <rect width="10" height="2" x="3" y="8"/>
- </g>
-</svg>
deleted file mode 100644
--- a/browser/themes/windows/tabbrowser/newtab-inverted.svg
+++ /dev/null
@@ -1,13 +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/. -->
-<svg width="16" height="18" xmlns="http://www.w3.org/2000/svg">
- <g stroke="#666" stroke-width="2" fill="none">
- <rect x="7" y="3" width="2" height="12" rx="0.25" ry="0.25"/>
- <rect x="2" y="8" width="12" height="2" rx="0.25" ry="0.25"/>
- </g>
- <g fill="#fff">
- <rect x="7" y="3" width="2" height="12"/>
- <rect x="2" y="8" width="12" height="2"/>
- </g>
-</svg>
deleted file mode 100644
--- a/browser/themes/windows/tabbrowser/newtab-win7.svg
+++ /dev/null
@@ -1,16 +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/. -->
-<svg width="16" height="18" xmlns="http://www.w3.org/2000/svg">
- <defs>
- <linearGradient id="gradient" x1="0%" x2="0%" y1="0%" y2="100%">
- <stop offset="0%" stop-color="#1c2835"/>
- <stop offset="60%" stop-color="#606e7b"/>
- <stop offset="100%" stop-color="#465765"/>
- </linearGradient>
- </defs>
- <g fill="url(#gradient)">
- <rect width="10" height="2" x="3" y="8"/>
- <rect width="2" height="10" x="7" y="4"/>
- </g>
-</svg>
deleted file mode 100644
--- a/browser/themes/windows/tabbrowser/newtab.svg
+++ /dev/null
@@ -1,7 +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/. -->
-<svg width="16" height="18" xmlns="http://www.w3.org/2000/svg" fill="#4c4c4c">
- <rect x="7" y="3" width="2" height="12"/>
- <rect x="2" y="8" width="12" height="2"/>
-</svg>
deleted file mode 100644
--- a/browser/themes/windows/tabbrowser/tab-arrow-left-inverted.svg
+++ /dev/null
@@ -1,7 +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/. -->
-<svg width="15" height="17" xmlns="http://www.w3.org/2000/svg">
- <path fill="#666" stroke-width="1.5" stroke="#666" d="M11 4L9.5 2.5l-5.875 6 5.875 6L11 13 6.625 8.5z"/>
- <path fill="#fff" d="M11 4L9.5 2.5l-5.875 6 5.875 6L11 13 6.625 8.5z"/>
-</svg>
deleted file mode 100644
--- a/browser/themes/windows/tabbrowser/tab-arrow-left-win7.svg
+++ /dev/null
@@ -1,13 +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/. -->
-<svg width="15" height="17" xmlns="http://www.w3.org/2000/svg">
- <defs>
- <linearGradient id="gradient" x1="0%" x2="0%" y1="0%" y2="100%">
- <stop offset="0%" stop-color="#1c2835"/>
- <stop offset="60%" stop-color="#606e7b"/>
- <stop offset="100%" stop-color="#465765"/>
- </linearGradient>
- </defs>
- <path d="M11 4L9.5 2.5l-5.875 6 5.875 6L11 13 6.625 8.5z" fill="url(#gradient)"/>
-</svg>
deleted file mode 100644
--- a/browser/themes/windows/tabbrowser/tab-arrow-left.svg
+++ /dev/null
@@ -1,6 +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/. -->
-<svg width="15" height="17" xmlns="http://www.w3.org/2000/svg">
- <path d="M11 4L9.5 2.5l-5.875 6 5.875 6L11 13 6.625 8.5z" fill="#4c4c4c"/>
-</svg>