Backed out changeset 80e608691309 (bug 1561586) for causing failures in browser_asrouter_bookmarkpanel.js CLOSED TREE
authorMihai Alexandru Michis <malexandru@mozilla.com>
Fri, 28 Jun 2019 18:25:47 +0300
changeset 480570 fca7c7bdf3ee5fa5dd4d306a5dc09e330609b75b
parent 480569 39db36060b8a5485553cda681f63af4b6dd8e641
child 480571 0d9da6d5f222397e3e43f2e2e603ed0cdc580c10
push id88774
push usermalexandru@mozilla.com
push dateFri, 28 Jun 2019 15:27:10 +0000
treeherderautoland@fca7c7bdf3ee [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1561586
milestone69.0a1
backs out80e608691309cba09049d7a85d981bf0a06e052b
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 80e608691309 (bug 1561586) for causing failures in browser_asrouter_bookmarkpanel.js CLOSED TREE
browser/components/newtab/lib/BookmarkPanelHub.jsm
browser/themes/shared/places/editBookmarkPanel.inc.css
--- a/browser/components/newtab/lib/BookmarkPanelHub.jsm
+++ b/browser/components/newtab/lib/BookmarkPanelHub.jsm
@@ -110,18 +110,16 @@ class _BookmarkPanelHub {
       this.toggleRecommendation(false);
       return;
     }
 
     const createElement = elem => target.document.createElementNS("http://www.w3.org/1999/xhtml", elem);
 
     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();
         const url = await FxAccounts.config.promiseEmailFirstURI("bookmark");
         win.ownerGlobal.openLinkIn(url, "tabshifted", {
           private: false,
           triggeringPrincipal: Services.scriptSecurityManager.createNullPrincipal({}),
           csp: null,
@@ -154,19 +152,18 @@ class _BookmarkPanelHub {
         this._l10n.setAttributes(cta, message.cta.string_id);
       } else {
         close.setAttribute("title", message.close_button.tooltiptext);
         title.textContent = message.title;
         content.textContent = message.text;
         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);
     }
 
     this.toggleRecommendation(true);
   }
 
--- a/browser/themes/shared/places/editBookmarkPanel.inc.css
+++ b/browser/themes/shared/places/editBookmarkPanel.inc.css
@@ -63,21 +63,26 @@
   position: relative;
   padding: 0 16px;
 }
 
 #editBookmarkPanelRecommendation > div::-moz-focus-inner {
   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 {
   font-size: 11px;
   line-height: 1.5;
   margin: 0;
 }
 
@@ -93,27 +98,21 @@
   padding: 0;
   text-align: start;
 }
 
 #editBookmarkPanelRecommendationCta:hover {
   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;
   border-radius: var(--toolbarbutton-border-radius);
   background-color: transparent;
   background-image: url(chrome://browser/skin/stop.svg);
   background-size: 12px;
   background-repeat: no-repeat;