Backed out changeset 99db9921183c (bug 1796940) for bc failures on br…

…owser_parsable_css.js. CLOSED TREE
dothq · Nov 17, 2022 · b1b874a · b1b874a
1 parent 2a31521
commit b1b874a
Show file tree

Hide file tree

Showing 17 changed files with 275 additions and 134 deletions.
diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
@@ -1281,12 +1281,8 @@ var PlacesToolbarHelper = {
           submenu.setAttribute("data-l10n-id", "managed-bookmarks-subfolder");
         }
         submenu.setAttribute("container", "true");
-        submenu.setAttribute(
-          "class",
-          "menu-iconic bookmark-item subviewbutton"
-        );
+        submenu.setAttribute("class", "menu-iconic bookmark-item");
         let submenupopup = document.createXULElement("menupopup");
-        submenupopup.setAttribute("placespopup", "true");
         submenu.appendChild(submenupopup);
         menu.appendChild(submenu);
         this.addManagedBookmarks(submenupopup, entry.children);
@@ -1298,7 +1294,7 @@ var PlacesToolbarHelper = {
         menuitem.setAttribute("image", "page-icon:" + preferredURI.spec);
         menuitem.setAttribute(
           "class",
-          "menuitem-iconic bookmark-item menuitem-with-favicon subviewbutton"
+          "menuitem-iconic bookmark-item menuitem-with-favicon"
         );
         menuitem.link = preferredURI.spec;
         menu.appendChild(menuitem);
@@ -2269,7 +2265,6 @@ var BookmarkingUI = {
       is: "places-popup",
     });
     otherBookmarksPopup.setAttribute("placespopup", "true");
-    otherBookmarksPopup.setAttribute("type", "arrow");
     otherBookmarksPopup.setAttribute("context", "placesContext");
     otherBookmarksPopup.id = "OtherBookmarksPopup";
 

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
@@ -1076,6 +1076,18 @@ toolbarpaletteitem[place="palette"] > #downloads-button[indicator] > .toolbarbut
   display: none;
 }
 
+/* Give these menupopups an arrow panel styling */
+#BMB_bookmarksPopup,
+#PlacesToolbar menupopup {
+  background: transparent;
+  border: none;
+}
+
+#BMB_bookmarksPopup,
+#BMB_bookmarksPopup menupopup {
+  appearance: none;
+}
+
 @media (-moz-panel-animations) and (prefers-reduced-motion: no-preference) {
 @media (-moz-platform: macos) {
   /* On Mac, use the properties "-moz-window-transform" and "-moz-window-opacity"

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
@@ -2134,7 +2134,6 @@ var gBrowserInit = {
           );
           managedBookmarksPopup.setAttribute("placespopup", "true");
           managedBookmarksPopup.setAttribute("is", "places-popup");
-          managedBookmarksPopup.setAttribute("type", "arrow");
           managedBookmarksButton.appendChild(managedBookmarksPopup);
 
           gNavToolbox.palette.appendChild(managedBookmarksButton);

diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
@@ -546,7 +546,6 @@
           <menupopup id="PlacesChevronPopup"
                       is="places-popup"
                       placespopup="true"
-                      type="arrow"
                       tooltip="bhTooltip" popupsinherittooltip="true"
                       context="placesContext"/>
         </toolbarbutton>

diff --git a/browser/components/places/content/browserPlacesViews.js b/browser/components/places/content/browserPlacesViews.js
@@ -404,6 +404,7 @@ PlacesViewBase.prototype = {
     let type = aPlacesNode.type;
     if (type == Ci.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR) {
       element = document.createXULElement("menuseparator");
+      element.setAttribute("class", "small-separator");
     } else {
       if (type == Ci.nsINavHistoryResultNode.RESULT_TYPE_URI) {
         element = document.createXULElement("menuitem");
@@ -2106,6 +2107,7 @@ PlacesPanelMenuView.prototype = {
     let button;
     if (type == Ci.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR) {
       button = document.createXULElement("toolbarseparator");
+      button.setAttribute("class", "small-separator");
     } else {
       button = document.createXULElement("toolbarbutton");
       button.className = "bookmark-item";

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
@@ -84,6 +84,10 @@ menuitem.bookmark-item {
   margin-block: 0;
 }
 
+.bookmark-item > .menu-iconic-left > .menu-iconic-icon {
+  padding-inline-start: 0;
+}
+
 /* Bookmark drag and drop styles */
 .bookmark-item[dragover-into="true"] {
   background: SelectedItem !important;
@@ -100,6 +104,10 @@ menuitem.bookmark-item {
   opacity: 0.7;
 }
 
+#PlacesToolbar menu menupopup {
+  margin-top: -12px;
+}
+
 /* Address bar */
 #urlbar,
 #searchbar {

diff --git a/browser/themes/linux/customizableui/panelUI.css b/browser/themes/linux/customizableui/panelUI.css
@@ -4,11 +4,26 @@
 
 @import "chrome://browser/skin/customizableui/panelUI-shared.css";
 
+#PlacesToolbar menupopup {
+  color: var(--arrowpanel-color);
+  --panel-background: var(--arrowpanel-background);
+  --panel-border-color: var(--arrowpanel-border-color);
+}
+
 menupopup::part(drop-indicator) {
   /* To account for the shadow margin + border of the panel */
   margin-inline-start: 5px;
 }
 
+/* Styled differently to allow for user interaction with menu separator */
+#PlacesToolbar menupopup[placespopup="true"] menuseparator {
+  appearance: none !important;
+}
+
+menuitem.subviewbutton {
+  appearance: none !important;
+}
+
 .subviewradio > .radio-label-box {
   appearance: none;
 }
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
@@ -170,6 +170,19 @@
   list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg");
 }
 
+#PlacesToolbar menupopup[placespopup=true]::part(content) {
+  border: 1px solid var(--arrowpanel-border-color) !important;
+}
+
+#PlacesToolbar menupopup > menu .menu-iconic-icon,
+#PlacesToolbar menupopup > menuitem .menu-iconic-icon {
+  margin-inline-end: 0;
+}
+
+#PlacesToolbar menu menupopup {
+  margin-top: -8px;
+}
+
 /* Inactive elements are faded out on OSX */
 .toolbarbutton-1:not(:hover):-moz-window-inactive,
 .bookmark-item:not(:hover):-moz-window-inactive,

diff --git a/browser/themes/osx/customizableui/panelUI.css b/browser/themes/osx/customizableui/panelUI.css
@@ -29,6 +29,20 @@
   display: none;
 }
 
+#BMB_bookmarksPopup .subviewbutton > .menu-iconic-left {
+  margin-inline-end: 3px;
+}
+
+#BMB_bookmarksPopup .subviewbutton > .menu-iconic-text {
+  padding-inline-start: 0;
+}
+
+/* Override OSX-specific toolkit styles for the bookmarks panel */
+menu.subviewbutton > .menu-right {
+  margin-inline-end: -4px;
+  appearance: none;
+}
+
 .PanelUI-remotetabs-clientcontainer > label[itemtype="client"] {
   padding-inline-start: 6px;
 }