Backed out changeset 80e608691309 (bug 1561586) for causing failures in browser_asrouter_bookmarkpanel.js CLOSED TREE

browser/components/newtab/lib/BookmarkPanelHub.jsm

@@ -115,8 +115,6 @@ class _BookmarkPanelHub {
 
     if (!target.container.querySelector("#cfrMessageContainer")) {
       const recommendation = createElement("div");
-      const headerContainer = createElement("div");
-      headerContainer.classList.add("cfrMessageHeader");
       recommendation.setAttribute("id", "cfrMessageContainer");
       recommendation.addEventListener("click", async e => {
         target.hidePopup();
@@ -159,9 +157,8 @@ class _BookmarkPanelHub {
         cta.textContent = message.cta;
       }
 
-      headerContainer.appendChild(title);
-      headerContainer.appendChild(close);
-      recommendation.appendChild(headerContainer);
+      recommendation.appendChild(close);
+      recommendation.appendChild(title);
       recommendation.appendChild(content);
       recommendation.appendChild(cta);
       target.container.appendChild(recommendation);

browser/themes/shared/places/editBookmarkPanel.inc.css

@@ -68,11 +68,16 @@
   border: none;
 }
 
+#editBookmarkPanelRecommendation > div h1 {
+  max-width: 215px;
+}
+
 #editBookmarkPanelRecommendationTitle {
   font-size: 16px;
   font-weight: 400;
   line-height: 1.25;
-  margin: 0;
+  margin-bottom: 6px;
+  padding-top: 2px;
 }
 
 #editBookmarkPanelRecommendationContent {
@@ -98,17 +103,11 @@
   text-decoration: underline;
 }
 
-#editBookmarkPanelRecommendation .cfrMessageHeader {
-  display: flex;
-  justify-content: space-between;
-  align-items: start;
-  margin-bottom: 6px;
-  margin-top: 10px;
-  padding-top: 2px;
-}
-
 #editBookmarkPanelRecommendation #cfrClose {
+  position: absolute;
   padding: 10px;
+  inset-inline-end: 8px;
+  top: 15px;
   width: 12px;
   height: 12px;
   border: none;