Merge pull request #698 from SpockFan02/master

Pale Moon: macOS: Fix icons in editBookmarkOverlay

6 files changed, 48 insertions, 18 deletions

diff --git a/application/palemoon/themes/osx/jar.mn b/application/palemoon/themes/osx/jar.mn
index 3df9496e8..a66563989 100644
--- a/application/palemoon/themes/osx/jar.mn
+++ b/application/palemoon/themes/osx/jar.mn
@@ -121,6 +121,8 @@ browser.jar:
         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/unfiledBookmarks.png          (places/unfiledBookmarks.png)
+  skin/classic/browser/places/unfiledBookmarks@2x.png       (places/unfiledBookmarks@2x.png)
         skin/classic/browser/places/tag.png                          (places/tag.png)
         skin/classic/browser/places/tag@2x.png                       (places/tag@2x.png)
         skin/classic/browser/places/history.png                      (places/history.png)
@@ -128,6 +130,8 @@ browser.jar:
         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/expander-closed-active.png    (places/expander-closed-active.png)
+  skin/classic/browser/places/expander-open-active.png      (places/expander-open-active.png)
         skin/classic/browser/places/livemark-item.png                (places/livemark-item.png)
         skin/classic/browser/places/expander-closed.png              (places/expander-closed.png)
         skin/classic/browser/places/expander-open.png                (places/expander-open.png)
diff --git a/application/palemoon/themes/osx/places/editBookmarkOverlay.css b/application/palemoon/themes/osx/places/editBookmarkOverlay.css
index 3becb5069..cc749c115 100644
--- a/application/palemoon/themes/osx/places/editBookmarkOverlay.css
+++ b/application/palemoon/themes/osx/places/editBookmarkOverlay.css
@@ -2,8 +2,12 @@
  * 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");
+
 /**** folder menulist ****/
-.folder-icon > .menulist-label-box > .menulist-icon {
+.folder-icon > .menulist-label-box > .menulist-icon,
+.folder-icon > .menu-iconic-left > .menu-iconic-icon {
   width: 16px;
   height: 16px;
 }
@@ -16,27 +20,41 @@
   list-style-image: url("chrome://global/skin/tree/folder.png") !important;
 }
 
+@media (min-resolution: 2dppx) {
+  .folder-icon {
+    list-style-image: url("chrome://global/skin/tree/folder@2x.png") !important;
+  }
+}
+
+.menulist-icon {
+  margin: 0 !important;
+}
 
 /**** expanders ****/
 
 .expander-up,
 .expander-down {
-  min-width: 0;
+  -moz-appearance: none;
   margin: 0;
-  -moz-margin-end: 4px;
-}
-
-.expander-up > .button-box,
-.expander-down > .button-box {
+  margin-left: 8px;
   padding: 0;
+  min-width: 0;
 }
 
 .expander-up {
-  list-style-image: url("chrome://global/skin/icons/collapse.png");
+  list-style-image: url("chrome://browser/skin/places/expander-open.png");
 }
 
 .expander-down {
-  list-style-image: url("chrome://global/skin/icons/expand.png");
+  list-style-image: url("chrome://browser/skin/places/expander-closed.png");
+}
+
+.expander-down:hover:active {
+  list-style-image: url("chrome://browser/skin/places/expander-closed-active.png");
+}
+
+.expander-up:hover:active {
+  list-style-image: url("chrome://browser/skin/places/expander-open-active.png");
 }
 
 #editBookmarkPanelContent {
@@ -44,8 +62,7 @@
 }
 
 #editBMPanel_folderTree {
-  margin-top: 2px;
-  margin-bottom: 2px;
+  margin: 6px 4px 0 4px;
 }
 
 /* Hide the value column of the tag autocomplete popup
@@ -58,22 +75,31 @@
 }
 
 
-/* ::::: bookmark panel dropdown icons ::::: */
+/* ----- BOOKMARK PANEL DROPDOWN MENU ITEMS ----- */
 
 #editBMPanel_folderMenuList[selectedIndex="0"],
 #editBMPanel_toolbarFolderItem {
-  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important;
-  -moz-image-region: auto !important;
+  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important;  
 }
 
 #editBMPanel_folderMenuList[selectedIndex="1"],
 #editBMPanel_bmRootItem {
-  list-style-image: url("chrome://browser/skin/places/bookmarksMenu.png") !important;
-  -moz-image-region: auto !important;
+  list-style-image: url("chrome://browser/skin/places/bookmarksMenu.png") !important;  
 }
 
 #editBMPanel_folderMenuList[selectedIndex="2"],
 #editBMPanel_unfiledRootItem {
-  list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png") !important;
-  -moz-image-region: auto !important;
+  list-style-image: url("chrome://browser/skin/places/unfiledBookmarks.png") !important;  
+}
+
+@media (min-resolution: 2dppx) {
+  #editBMPanel_folderMenuList[selectedIndex="0"],
+  #editBMPanel_toolbarFolderItem {
+    list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png") !important;
+  }
+
+  #editBMPanel_folderMenuList[selectedIndex="2"],
+  #editBMPanel_unfiledRootItem {
+    list-style-image: url("chrome://browser/skin/places/unfiledBookmarks@2x.png") !important;
+  }
 }
diff --git a/application/palemoon/themes/osx/places/expander-closed-active.png b/application/palemoon/themes/osx/places/expander-closed-active.png
new file mode 100644
index 000000000..7ef5f04f9
--- /dev/null
+++ b/application/palemoon/themes/osx/places/expander-closed-active.png
diff --git a/application/palemoon/themes/osx/places/expander-open-active.png b/application/palemoon/themes/osx/places/expander-open-active.png
new file mode 100644
index 000000000..673ead568
--- /dev/null
+++ b/application/palemoon/themes/osx/places/expander-open-active.png
diff --git a/application/palemoon/themes/osx/places/unfiledBookmarks.png b/application/palemoon/themes/osx/places/unfiledBookmarks.png
new file mode 100644
index 000000000..69495dac0
--- /dev/null
+++ b/application/palemoon/themes/osx/places/unfiledBookmarks.png
diff --git a/application/palemoon/themes/osx/places/unfiledBookmarks@2x.png b/application/palemoon/themes/osx/places/unfiledBookmarks@2x.png
new file mode 100644
index 000000000..44efd6aba
--- /dev/null
+++ b/application/palemoon/themes/osx/places/unfiledBookmarks@2x.png