Backed out changeset 1d04c6559f71 (bug 1377011) for failing browser-chrome's browser/base/content/test/static/browser_parsable_css.js on Linux because allBookmarks.png missing. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 27 Jul 2017 19:04:53 +0200
changeset 422584 7f9034bfd0c60fc5ec4097640f1197833e060f4a
parent 422583 b8c498fb8223517460c4124cb3d822718cc6e38a
child 422585 f3cb981a0f37f6b0f0f87785b609a174ade48a4b
push id1517
push userjlorenzo@mozilla.com
push dateThu, 14 Sep 2017 16:50:54 +0000
treeherdermozilla-release@3b41fd564418 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1377011
milestone56.0a1
backs out1d04c6559f7174af05c527917bd3b30fb25d8c7c
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 1d04c6559f71 (bug 1377011) for failing browser-chrome's browser/base/content/test/static/browser_parsable_css.js on Linux because allBookmarks.png missing. r=backout
browser/themes/linux/Toolbar-small.png
browser/themes/linux/jar.mn
browser/themes/linux/places/places.css
browser/themes/osx/places/places.css
browser/themes/shared/jar.inc.mn
browser/themes/shared/places/bookmarksMenu.svg
browser/themes/shared/places/bookmarksToolbar.svg
browser/themes/shared/places/folder-live.svg
browser/themes/shared/places/folder-smart.svg
browser/themes/shared/places/folder.svg
browser/themes/shared/places/history.svg
browser/themes/shared/places/tree-icons.inc.css
browser/themes/shared/places/unfiledBookmarks.svg
browser/themes/windows/jar.mn
browser/themes/windows/places/history.png
browser/themes/windows/places/places.css
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8f100a54a7d34d0f754e2908657083598fc75ded
GIT binary patch
literal 5955
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
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -24,16 +24,17 @@ browser.jar:
   skin/classic/browser/pageInfo.png
   skin/classic/browser/page-livemarks.png
   skin/classic/browser/privatebrowsing-mask.png
   skin/classic/browser/reload-stop-go.png
   skin/classic/browser/reload-stop-go@2x.png
   skin/classic/browser/searchbar.css
   skin/classic/browser/setDesktopBackground.css
   skin/classic/browser/slowStartup-16.png
+  skin/classic/browser/Toolbar-small.png
   skin/classic/browser/webRTC-indicator.css  (../shared/webRTC-indicator.css)
 * skin/classic/browser/controlcenter/panel.css        (controlcenter/panel.css)
 #ifndef MOZ_PHOTON_THEME
   skin/classic/browser/customizableui/background-noise-toolbar.png  (customizableui/background-noise-toolbar.png)
   skin/classic/browser/customizableui/customizeMode-gridTexture.png  (customizableui/customizeMode-gridTexture.png)
   skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png  (customizableui/customizeMode-separatorHorizontal.png)
   skin/classic/browser/customizableui/customizeMode-separatorVertical.png  (customizableui/customizeMode-separatorVertical.png)
 #endif
@@ -51,17 +52,17 @@ browser.jar:
   skin/classic/browser/places/bookmarksToolbar.png    (places/bookmarksToolbar.png)
   skin/classic/browser/places/bookmarksToolbar-menuPanel.png (places/bookmarksToolbar-menuPanel.png)
   skin/classic/browser/places/bookmarks-menu-arrow.png           (places/bookmarks-menu-arrow.png)
   skin/classic/browser/places/calendar.png            (places/calendar.png)
 * skin/classic/browser/places/editBookmarkOverlay.css (places/editBookmarkOverlay.css)
   skin/classic/browser/places/livemark-item.png       (places/livemark-item.png)
   skin/classic/browser/places/starred48.png           (places/starred48.png)
   skin/classic/browser/places/unstarred48.png         (places/unstarred48.png)
-* skin/classic/browser/places/places.css              (places/places.css)
+  skin/classic/browser/places/places.css              (places/places.css)
   skin/classic/browser/places/organizer.css           (places/organizer.css)
   skin/classic/browser/places/organizer.xml           (places/organizer.xml)
   skin/classic/browser/places/query.png               (places/query.png)
   skin/classic/browser/places/tag.png                 (places/tag.png)
   skin/classic/browser/places/toolbarDropMarker.png   (places/toolbarDropMarker.png)
   skin/classic/browser/places/unsortedBookmarks.png   (places/unsortedBookmarks.png)
   skin/classic/browser/places/downloads.png           (places/downloads.png)
   skin/classic/browser/preferences/alwaysAsk.png      (preferences/alwaysAsk.png)
--- a/browser/themes/linux/places/places.css
+++ b/browser/themes/linux/places/places.css
@@ -17,15 +17,106 @@
   text-decoration: underline;
 }
 
 .sidebar-placesTreechildren::-moz-tree-cell(separator) {
   cursor: default;
 }
 
 /* Trees */
+treechildren::-moz-tree-image(title) {
+  padding-right: 2px;
+  margin: 0px 2px;
+  width: 16px;
+  height: 16px;
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.svg");
+}
 
-%include ../../shared/places/tree-icons.inc.css
+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);
+}
+
+treechildren::-moz-tree-image(title, livemarkItem, visited) {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+treechildren::-moz-tree-image(title, separator) {
+  list-style-image: none;
+  width: 0;
+  height: 0;
+}
+
+treechildren::-moz-tree-image(title, container) {
+  list-style-image: url("moz-icon://stock/gtk-directory?size=menu");
+}
+
+treechildren::-moz-tree-image(title, container, livemark) {
+  list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(container, OrganizerQuery_AllBookmarks) {
+  list-style-image: url("chrome://browser/skin/Toolbar-small.png");
+  -moz-image-region: rect(0px 48px 16px 32px);
+}
+
+treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksToolbar) {
+  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksMenu) {
+  list-style-image: url("chrome://browser/skin/places/bookmarksMenu.png");
+  -moz-image-region: auto;
+}
 
-treechildren:-moz-tree-image(container,selected),
-treechildren:-moz-tree-image(selected,focus) {
-  fill: HighlightText;
+treechildren::-moz-tree-image(container, OrganizerQuery_UnfiledBookmarks) {
+  list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png");
+  -moz-image-region: auto;
+}
+
+/* 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");
+}
+
+treechildren::-moz-tree-image(query, OrganizerQuery_Downloads) {
+  list-style-image: url("chrome://browser/skin/places/downloads.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(title, query, tagContainer),
+treechildren::-moz-tree-image(query, OrganizerQuery_Tags) {
+  list-style-image: url("chrome://browser/skin/places/tag.png");
+}
+
+/* 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");
 }
+
+treechildren::-moz-tree-image(title, query, hostContainer) {
+  list-style-image: url("moz-icon://stock/gtk-directory?size=menu");
+}
+
+treechildren::-moz-tree-image(title, query, hostContainer, open) {
+  list-style-image: url("moz-icon://stock/gtk-directory?size=menu");
+}
+
+treechildren::-moz-tree-image(title, query, OrganizerQuery_History) {
+  list-style-image: url("chrome://browser/skin/Toolbar-small.png");
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+/* 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("moz-icon://stock/gtk-directory?size=menu");
+}
+
+treechildren::-moz-tree-image(cutting) {
+  opacity: 0.5;
+}
+
+treechildren::-moz-tree-cell-text(cutting) {
+  opacity: 0.7;
+}
--- a/browser/themes/osx/places/places.css
+++ b/browser/themes/osx/places/places.css
@@ -159,13 +159,118 @@
 }
 
 #sidebar-search-container {
   margin: 0 4px;
 }
 
 /* Trees */
 
-%include ../../shared/places/tree-icons.inc.css
+treechildren::-moz-tree-image(title) {
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.svg");
+  padding-inline-end: 2px;
+  margin: 0px 2px;
+  width: 16px;
+  height: 16px;
+}
+
+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);
+}
+
+treechildren::-moz-tree-image(title, livemarkItem, visited) {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+treechildren::-moz-tree-image(title, container),
+treechildren::-moz-tree-image(title, open) {
+  list-style-image: url("chrome://global/skin/tree/folder.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+treechildren::-moz-tree-image(title, separator) {
+  list-style-image: none;
+  width: 0 !important;
+  height: 0 !important;
+  margin: 0;
+}
+
+treechildren::-moz-tree-image(container, OrganizerQuery_AllBookmarks) {
+  list-style-image: url("chrome://browser/skin/places/allBookmarks.png");
+}
+
+treechildren::-moz-tree-image(container, livemark) {
+  list-style-image: url("chrome://browser/skin/page-livemarks.png");
+}
+
+treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksToolbar) {
+  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
+}
+
+treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksMenu) {
+  list-style-image: url("chrome://browser/skin/places/bookmarksMenu.png");
+}
+
+treechildren::-moz-tree-image(container, OrganizerQuery_UnfiledBookmarks) {
+  list-style-image: url("chrome://browser/skin/places/unfiledBookmarks.png");
+}
+
+/* query-nodes should be styled even if they're not expandable */
+treechildren::-moz-tree-image(query) {
+  list-style-image: url("chrome://browser/skin/places/query.png");
+}
 
-treechildren:-moz-tree-image(selected,focus) {
-  fill: HighlightText;
+treechildren::-moz-tree-image(query, OrganizerQuery_Downloads) {
+  list-style-image: url("chrome://browser/skin/places/downloads.png");
+}
+
+treechildren::-moz-tree-image(title, query, tagContainer),
+treechildren::-moz-tree-image(query, OrganizerQuery_Tags) {
+  list-style-image: url("chrome://browser/skin/places/tag.png");
+}
+
+/* calendar icon for folders grouping items by date */
+treechildren::-moz-tree-image(title, query, dayContainer) {
+  list-style-image: url("chrome://browser/skin/places/history.png");
+}
+
+treechildren::-moz-tree-image(title, query, hostContainer) {
+  list-style-image: url("chrome://global/skin/tree/folder.png");
+}
+
+treechildren::-moz-tree-image(title, query, hostContainer, open) {
+  list-style-image: url("chrome://global/skin/tree/folder.png");
+}
+
+treechildren::-moz-tree-image(query, OrganizerQuery_History) {
+  list-style-image: url("chrome://browser/skin/places/history.png");
 }
+
+/* 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),
+treechildren::-moz-tree-image(title, query, folder, open) {
+  list-style-image: url("chrome://global/skin/tree/folder.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+treechildren::-moz-tree-cell-text(title, separator) {
+  color: ThreeDShadow;
+  margin: 0px 5px;
+}
+
+treechildren::-moz-tree-cell-text(title, separator, selected, focus) {
+  color: HighlightText;
+}
+
+treechildren::-moz-tree-twisty(title, separator) {
+  -moz-appearance: none;
+  padding: 0px;
+}
+
+treechildren::-moz-tree-image(cutting) {
+  opacity: 0.5;
+}
+
+treechildren::-moz-tree-cell-text(cutting) {
+  opacity: 0.7;
+}
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -246,23 +246,16 @@
   skin/classic/browser/panic-panel/header.png                  (../shared/panic-panel/header.png)
   skin/classic/browser/panic-panel/header@2x.png               (../shared/panic-panel/header@2x.png)
   skin/classic/browser/panic-panel/header-small.png            (../shared/panic-panel/header-small.png)
   skin/classic/browser/panic-panel/header-small@2x.png         (../shared/panic-panel/header-small@2x.png)
   skin/classic/browser/panic-panel/icons.png                   (../shared/panic-panel/icons.png)
   skin/classic/browser/panic-panel/icons@2x.png                (../shared/panic-panel/icons@2x.png)
   skin/classic/browser/places/bookmarks-notification-finish.png (../shared/places/bookmarks-notification-finish.png)
   skin/classic/browser/places/bookmarks-notification-finish@2x.png (../shared/places/bookmarks-notification-finish@2x.png)
-  skin/classic/browser/places/bookmarksMenu.svg                (../shared/places/bookmarksMenu.svg)
-  skin/classic/browser/places/bookmarksToolbar.svg             (../shared/places/bookmarksToolbar.svg)
-  skin/classic/browser/places/folder.svg                       (../shared/places/folder.svg)
-  skin/classic/browser/places/folder-live.svg                  (../shared/places/folder-live.svg)
-  skin/classic/browser/places/folder-smart.svg                 (../shared/places/folder-smart.svg)
-  skin/classic/browser/places/history.svg                      (../shared/places/history.svg)
-  skin/classic/browser/places/unfiledBookmarks.svg             (../shared/places/unfiledBookmarks.svg)
   skin/classic/browser/privatebrowsing/aboutPrivateBrowsing.css (../shared/privatebrowsing/aboutPrivateBrowsing.css)
   skin/classic/browser/privatebrowsing/favicon.svg             (../shared/privatebrowsing/favicon.svg)
   skin/classic/browser/privatebrowsing/private-browsing.svg    (../shared/privatebrowsing/private-browsing.svg)
   skin/classic/browser/privatebrowsing/tracking-protection-off.svg (../shared/privatebrowsing/tracking-protection-off.svg)
   skin/classic/browser/privatebrowsing/tracking-protection.svg (../shared/privatebrowsing/tracking-protection.svg)
   skin/classic/browser/compacttheme/loading-inverted.png (../shared/compacttheme/loading-inverted.png)
   skin/classic/browser/compacttheme/loading-inverted@2x.png (../shared/compacttheme/loading-inverted@2x.png)
   skin/classic/browser/compacttheme/urlbar-history-dropmarker.svg (../shared/compacttheme/urlbar-history-dropmarker.svg)
deleted file mode 100644
--- a/browser/themes/shared/places/bookmarksMenu.svg
+++ /dev/null
@@ -1,9 +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="16" viewBox="0 0 16 16" fill="context-fill" xmlns="http://www.w3.org/2000/svg">
-  <path fill-opacity=".05" d="M15,2H1v12c0,0.6,0.5,1,1,1h12c0.6,0,1-0.4,1-1V2L15,2z"/>
-  <path d="M3,5v1h2V5H3z M3,9h2V8H3V9z M3,12h2v-1H3V12z"/>
-  <path fill-opacity=".9" d="M6,5v1h7V5H6z M12,8H6v1h6V8z M6,12h7v-1H6V12z"/>
-  <path d="M7,2V1H1v1v1v11c0,0.5,0.5,1,1,1h12c0.5,0,1-0.5,1-1V2H7z M13.5,14h-11C2.2,14,2,13.8,2,13.5V3h12v10.5 C14,13.8,13.8,14,13.5,14z"/>
-</svg>
deleted file mode 100644
--- a/browser/themes/shared/places/bookmarksToolbar.svg
+++ /dev/null
@@ -1,8 +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="16" viewBox="0 0 16 16" fill="context-fill" xmlns="http://www.w3.org/2000/svg">
-  <path fill-opacity=".15" d="M15,14H1c-0.6,0-1-0.4-1-1V3c0-0.5,0.4-1,1-1h14c0.6,0,1,0.5,1,1v10C16,13.6,15.6,14,15,14z"/>
-  <path d="M8.4,4.2l1,2.1l2.3,0.3c0.3,0,0.5,0.4,0.2,0.7l-1.7,1.7l0.4,2.4c0.1,0.3-0.3,0.6-0.6,0.4L8,10.8L6,12 c-0.3,0.1-0.6-0.1-0.6-0.4l0.4-2.4L4.1,7.4C3.9,7.2,4,6.8,4.3,6.7l2.3-0.3l1-2.1C7.8,3.9,8.2,3.9,8.4,4.2z"/>
-  <path d="M15,2H1C0.5,2,0,2.5,0,3v10c0,0.5,0.5,1,1,1h14c0.5,0,1-0.5,1-1V3C16,2.5,15.5,2,15,2z M15,12.5 c0,0.3-0.2,0.5-0.5,0.5h-13C1.2,13,1,12.8,1,12.5v-9C1,3.2,1.2,3,1.5,3h13C14.8,3,15,3.2,15,3.5V12.5z"/>
-</svg>
deleted file mode 100644
--- a/browser/themes/shared/places/folder-live.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="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-  <path fill="context-fill" d="M3.5,10A2.5,2.5,0,1,0,6,12.5,2.5,2.5,0,0,0,3.5,10ZM2,1A1,1,0,0,0,2,3,10.883,10.883,0,0,1,13,14a1,1,0,0,0,2,0A12.862,12.862,0,0,0,2,1ZM2,5A1,1,0,0,0,2,7a6.926,6.926,0,0,1,7,7,1,1,0,0,0,2,0A8.9,8.9,0,0,0,2,5Z"/>
-</svg>
deleted file mode 100644
--- a/browser/themes/shared/places/folder-smart.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="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-  <path fill="context-fill" d="M14,7H12.9a4.967,4.967,0,0,0-.732-1.753l.782-.783A1,1,0,1,0,11.535,3.05l-.782.783A4.968,4.968,0,0,0,9,3.1V2A1,1,0,0,0,7,2V3.1a4.968,4.968,0,0,0-1.753.732L4.464,3.05A1,1,0,0,0,3.05,4.464l.783.783A4.968,4.968,0,0,0,3.1,7H2A1,1,0,0,0,2,9H3.1a4.968,4.968,0,0,0,.732,1.753l-.783.782a1,1,0,1,0,1.414,1.414l.783-.782A4.967,4.967,0,0,0,7,12.9V14a1,1,0,0,0,2,0V12.9a4.968,4.968,0,0,0,1.753-.732l.782.782a1,1,0,0,0,1.414-1.414l-.782-.782A4.968,4.968,0,0,0,12.9,9H14a1,1,0,0,0,0-2ZM8,11a3,3,0,1,1,3-3A3,3,0,0,1,8,11Z"/>
-</svg>
deleted file mode 100644
--- a/browser/themes/shared/places/folder.svg
+++ /dev/null
@@ -1,10 +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="16" viewBox="0 0 16 16" fill="context-fill" xmlns="http://www.w3.org/2000/svg">
-  <path fill-opacity=".15" d="M5,1H1C0.4,1,0,1.4,0,2v12.1C0,14.6,0.4,15,0.9,15h14.2c0.5,0,0.9-0.4,0.9-0.9V3.9C16,3.4,15.6,3,15.1,3H7 L6.2,1.9C6.2,1.9,5.6,1,5,1L5,1z"/>
-  <path d="M4.9,2C5,2.1,5.2,2.3,5.4,2.5l0.8,1.1L6.5,4H7h7.5C14.8,4,15,4.2,15,4.5v9c0,0.3-0.2,0.5-0.5,0.5h-13 C1.2,14,1,13.8,1,13.5v-11C1,2.2,1.2,2,1.5,2H4.9 M5,1H1C0.4,1,0,1.4,0,2v12.1C0,14.6,0.4,15,0.9,15h14.2c0.5,0,0.9-0.4,0.9-0.9V3.9 C16,3.4,15.6,3,15.1,3H7L6.2,1.9C6.2,1.9,5.6,1,5,1L5,1z"/>
-  <path fill-opacity=".15" d="M14,5H2C0.9,5,0,5.9,0,7v7c0,0.6,0.4,1,1,1h14c0.6,0,1-0.4,1-1V7C16,5.9,15.1,5,14,5L14,5z"/>
-  <path fill-opacity=".15" d="M16,13H0v1c0,0.6,0.4,1,1,1h14c0.6,0,1-0.4,1-1V13z"/>
-  <path d="M14,6c0.6,0,1,0.4,1,1v6.5c0,0.3-0.2,0.5-0.5,0.5h-13C1.2,14,1,13.8,1,13.5V7c0-0.6,0.4-1,1-1H14 M14,5H2 C0.9,5,0,5.9,0,7v7c0,0.6,0.4,1,1,1h14c0.6,0,1-0.4,1-1V7C16,5.9,15.1,5,14,5L14,5z"/>
-</svg>
deleted file mode 100644
--- a/browser/themes/shared/places/history.svg
+++ /dev/null
@@ -1,9 +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="16" viewBox="0 0 16 16" fill="context-fill" xmlns="http://www.w3.org/2000/svg">
-  <path fill-opacity=".15" d="M8,0a8,8,0,1,0,8,8A8,8,0,0,0,8,0ZM8,13a5,5,0,1,1,5-5A5,5,0,0,1,8,13Z"/>
-  <path d="M8,1A7,7,0,1,1,1,8,7,7,0,0,1,8,1M8,0a8,8,0,1,0,8,8A8,8,0,0,0,8,0Z"/>
-  <path fill-opacity=".25" d="M8,3A5,5,0,1,1,3,8,5,5,0,0,1,8,3M8,2a6,6,0,1,0,6,6A6,6,0,0,0,8,2Z"/>
-  <path d="M10.5,9H7V4.5a.5.5,0,0,1,1,0V8h2.5a.5.5,0,1,1,0,1Z"/>
-</svg>
deleted file mode 100644
--- a/browser/themes/shared/places/tree-icons.inc.css
+++ /dev/null
@@ -1,112 +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/. */
-
-treechildren::-moz-tree-image(title) {
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.svg");
-  padding-inline-end: 2px;
-  margin: 0 2px;
-  width: 16px;
-  height: 16px;
-}
-
-treechildren:-moz-tree-image {
-  -moz-context-properties: fill;
-  fill: -moz-FieldText;
-}
-
-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);
-}
-
-treechildren::-moz-tree-image(title, livemarkItem, visited) {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-treechildren::-moz-tree-image(title, container),
-treechildren::-moz-tree-image(title, open) {
-  list-style-image: url("chrome://browser/skin/places/folder.svg");
-}
-
-treechildren::-moz-tree-image(title, separator) {
-  list-style-image: none;
-  width: 0 !important;
-  height: 0 !important;
-  margin: 0;
-}
-
-treechildren::-moz-tree-image(container, OrganizerQuery_AllBookmarks) {
-  list-style-image: url("chrome://browser/skin/places/allBookmarks.png");
-}
-
-treechildren::-moz-tree-image(container, livemark) {
-  list-style-image: url("chrome://browser/skin/places/folder-live.svg");
-}
-
-treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksToolbar) {
-  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg");
-}
-
-treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksMenu) {
-  list-style-image: url("chrome://browser/skin/places/bookmarksMenu.svg");
-}
-
-treechildren::-moz-tree-image(container, OrganizerQuery_UnfiledBookmarks) {
-  list-style-image: url("chrome://browser/skin/places/unfiledBookmarks.svg");
-}
-
-/* query-nodes should be styled even if they're not expandable */
-treechildren::-moz-tree-image(query) {
-  list-style-image: url("chrome://browser/skin/places/folder-smart.svg");
-}
-
-treechildren::-moz-tree-image(query, OrganizerQuery_Downloads) {
-  list-style-image: url("chrome://browser/skin/places/downloads.png");
-}
-
-treechildren::-moz-tree-image(title, query, tagContainer),
-treechildren::-moz-tree-image(query, OrganizerQuery_Tags) {
-  list-style-image: url("chrome://browser/skin/places/tag.png");
-}
-
-/* calendar icon for folders grouping items by date */
-treechildren::-moz-tree-image(title, query, dayContainer) {
-  list-style-image: url("chrome://browser/skin/places/history.svg");
-}
-
-treechildren::-moz-tree-image(title, query, hostContainer) {
-  list-style-image: url("chrome://browser/skin/places/folder.svg");
-}
-
-treechildren::-moz-tree-image(query, OrganizerQuery_History) {
-  list-style-image: url("chrome://browser/skin/places/history.svg");
-}
-
-/* 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://browser/skin/places/folder.svg");
-}
-
-treechildren::-moz-tree-cell-text(title, separator) {
-  color: ThreeDShadow;
-  margin: 0 5px;
-}
-
-treechildren::-moz-tree-cell-text(title, separator, selected, focus) {
-  color: HighlightText;
-}
-
-treechildren::-moz-tree-twisty(title, separator) {
-  -moz-appearance: none;
-  padding: 0;
-}
-
-treechildren::-moz-tree-image(cutting) {
-  opacity: 0.5;
-}
-
-treechildren::-moz-tree-cell-text(cutting) {
-  opacity: 0.7;
-}
deleted file mode 100644
--- a/browser/themes/shared/places/unfiledBookmarks.svg
+++ /dev/null
@@ -1,9 +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="16" viewBox="0 0 16 16" fill="context-fill" xmlns="http://www.w3.org/2000/svg">
-  <path fill-opacity=".05" d="M12.7,1H3.3l-.2.6L.1,9,0,9.2V13a2.006,2.006,0,0,0,2,2H14a2.006,2.006,0,0,0,2-2V9.2L15.9,9l-3-7.4L12.7,1Z"/>
-  <path d="M12,2l3,7.4V13a.945.945,0,0,1-1,1H2a.945.945,0,0,1-1-1V9.4L4,2h8m.7-1H3.3L.1,9.1,0,9.2V13a2.006,2.006,0,0,0,2,2H14a2.006,2.006,0,0,0,2-2V9.2L15.9,9,12.7,1Z"/>
-  <path fill-opacity=".05" d="M14.988,9,12,2H4L.851,9H5.023A2.931,2.931,0,0,0,8,11.6,2.889,2.889,0,0,0,11.012,9Z"/>
-  <path d="M10,9A2,2,0,0,1,6,9H0v1H5.184a2.983,2.983,0,0,0,5.633,0H16V9Z"/>
-</svg>
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -67,29 +67,30 @@ browser.jar:
   skin/classic/browser/downloads/download-glow-menuPanel-win7.png   (downloads/download-glow-menuPanel-win7.png)
   skin/classic/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png)
   skin/classic/browser/downloads/download-notification-start.png (downloads/download-notification-start.png)
 * skin/classic/browser/downloads/downloads.css                 (downloads/downloads.css)
   skin/classic/browser/feeds/feedIcon.png                      (feeds/feedIcon.png)
   skin/classic/browser/feeds/feedIcon16.png                    (feeds/feedIcon16.png)
   skin/classic/browser/feeds/subscribe.css                     (feeds/subscribe.css)
 * skin/classic/browser/newtab/newTab.css                       (newtab/newTab.css)
-* skin/classic/browser/places/places.css                       (places/places.css)
+  skin/classic/browser/places/places.css                       (places/places.css)
 * skin/classic/browser/places/organizer.css                    (places/organizer.css)
   skin/classic/browser/places/query.png                        (places/query.png)
   skin/classic/browser/places/bookmarksMenu.png                (places/bookmarksMenu.png)
   skin/classic/browser/places/bookmarksToolbar.png             (places/bookmarksToolbar.png)
   skin/classic/browser/places/bookmarksToolbar-menuPanel.png   (places/bookmarksToolbar-menuPanel.png)
   skin/classic/browser/places/calendar.png                     (places/calendar.png)
   skin/classic/browser/places/toolbarDropMarker.png            (places/toolbarDropMarker.png)
   skin/classic/browser/places/editBookmarkOverlay.css          (places/editBookmarkOverlay.css)
   skin/classic/browser/places/libraryToolbar.png               (places/libraryToolbar.png)
   skin/classic/browser/places/starred48.png                    (places/starred48.png)
   skin/classic/browser/places/unstarred48.png                  (places/unstarred48.png)
   skin/classic/browser/places/tag.png                          (places/tag.png)
+  skin/classic/browser/places/history.png                      (places/history.png)
   skin/classic/browser/places/allBookmarks.png                 (places/allBookmarks.png)
   skin/classic/browser/places/unsortedBookmarks.png            (places/unsortedBookmarks.png)
   skin/classic/browser/places/downloads.png                    (places/downloads.png)
   skin/classic/browser/places/livemark-item.png                (places/livemark-item.png)
   skin/classic/browser/preferences/alwaysAsk.png               (preferences/alwaysAsk.png)
   skin/classic/browser/preferences/application.png             (preferences/application.png)
   skin/classic/browser/preferences/saveFile.png                (preferences/saveFile.png)
   skin/classic/browser/preferences/preferences.css             (preferences/preferences.css)
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..656626930e48f7be42a2e1837a1049026b7c187f
GIT binary patch
literal 806
zc$@(y1KIqEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008*Nkl<Zc-n1K
z+fEZv6kRjZ=}d2FJEa#YRiQ{oL&5NZ@m&(*gD)gTh!Fh<6a4@aeee@B)Hf3)$~Q=@
zzA0Lea<`<@Qrc-dZRuskeMU$yaWW@4b7rq~)?RyW&NNM2d|oXt&k2IC$Z^~a!!QB>
zK>K6EG}ESGq#i9Ty}uaG2+o0Vp66di!r|M|XjF8&T#zIQ-EJ54dL31*hGMDM(X`qs
z$KmnA#l@X-0t;-j+1^ejlhcyjj^9T|s8%Y_n@x*cmSs2`4!E68bcnD}EM{Pu^NfTC
z0Cw}_L~@!W<3~1&PN$2pL;}%EF(jv^FgBh5I38-LgkG<QXe2UY0?!#%xI8>OHyDXL
z2?P}W*VY!okwJ_T*yr=3d|ZaluRsX|5DJIU?f2=dME`t%iFi7b`OY)LC}&%qWIIS=
zJU$9Rw4-mBP}L&zRtt?*8+}sX@+z>)4rrQ&P$(#oxes{eHZ!b3IS)pMpp*P^t%jQ3
z#QMf2v_=CgHIr6wAb=}ZN6;W|{G@`gH+fbnW?VzpvAMm2Beh@wz*#R`WS%67aLN+u
zS{1cw1>H^u>{0+B%S7{R*@#HAiLeO*M8Spuy76G|05X+Rv`Az)DNROARRen%!LhFE
ztmc+PkK1kC%*s1EdkfpS9KK|}T7jWp5I(QhB5a?YGQ7%DV7gqX!t3#%aCnF&nI_pK
z$`7Pq01FHEk;`q-%0X|`t-Yf7Q6rxS`-u^xRJG7is9gQ-DJmruCzTT`g<|2aAM^9~
zAo2qCc6ZTgH4%%&ShKYV`$qV%vXV`I&Rmxra>7B<O4KYmwXR5hoRrI!VLS%{@1RWI
z*GA)LwcF<2{{B0fi)WS-the*|{1D|h6QJ@iPd3)S(H!&ufO57&@%s@^PO!N!erB_4
zRKlnK4AbjWYJ~PLTu#>=s<G@LPuwo2H3NnTMoO~tO;Y%gfoTqQ8Sa1Me3x|?YZ7Ms
k*>Qp5)>zIYd-Y=cAE4K1gD@c|WB>pF07*qoM6N<$f@&~yVgLXD
--- a/browser/themes/windows/places/places.css
+++ b/browser/themes/windows/places/places.css
@@ -39,18 +39,128 @@
     #history-panel,
     #tabs-panel {
       background-color: #EEF3FA;
     }
   }
 }
 
 /* Trees */
+treechildren::-moz-tree-image(title) {
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.svg");
+  padding-right: 2px;
+  margin: 0px 2px;
+  width: 16px;
+  height: 16px;
+}
 
-%include ../../shared/places/tree-icons.inc.css
+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);
+}
+
+treechildren::-moz-tree-image(title, livemarkItem, visited) {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+treechildren::-moz-tree-image(title, separator) {
+  list-style-image: none;
+  width: 0;
+  height: 0;
+}
+
+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);
+}
+
+treechildren::-moz-tree-image(title, open) {
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+
+treechildren::-moz-tree-image(title, container, livemark) {
+  list-style-image: url("chrome://browser/skin/livemark-folder.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(container, OrganizerQuery_AllBookmarks) {
+  list-style-image: url("chrome://browser/skin/places/allBookmarks.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksToolbar) {
+  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksMenu) {
+  list-style-image: url("chrome://browser/skin/places/bookmarksMenu.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(container, OrganizerQuery_UnfiledBookmarks) {
+  list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png");
+  -moz-image-region: auto;
+}
+
+/* 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;
+}
+
+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;
+}
+
+treechildren::-moz-tree-image(query, OrganizerQuery_Downloads) {
+  list-style-image: url("chrome://browser/skin/places/downloads.png");
+  -moz-image-region: auto;
+}
+
+/* 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;
+}
+
+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);
+}
+
+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);
+}
+
+treechildren::-moz-tree-image(title, query, OrganizerQuery_History) {
+  list-style-image: url("chrome://browser/skin/places/history.png");
+}
+
+/* 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);
+}
+
+treechildren::-moz-tree-image(title, query, folder, open) {
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+
+treechildren::-moz-tree-image(cutting) {
+  opacity: 0.5;
+}
+
+treechildren::-moz-tree-cell-text(cutting) {
+  opacity: 0.7;
+}
 
 /* Browser Sidebars */
 
 /* Default button vert. margins are 1px/2px, and this can cause misalignment */
 #viewButton {
   margin-top: 2px;
   margin-bottom: 2px;
 }