From 05cab9010c8d03f31403223bd1c5c0142e98551e Mon Sep 17 00:00:00 2001
From: Molly Howell <mhowell@mozilla.com>
Date: Wed, 21 Apr 2021 00:25:22 +0000
Subject: [PATCH] Bug 1702298 - Allow the bookmark create/edit panel to scroll.
 r=mconley

Differential Revision: https://phabricator.services.mozilla.com/D112644
---
 browser/base/content/browser.xhtml                 | 14 ++++++++------
 .../themes/shared/places/editBookmarkPanel.inc.css |  4 ++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
index df36fed48a5e..6f3db4d97281 100644
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -303,13 +303,14 @@
             <image/>
           </toolbarbutton>
         </box>
-        <html:div id="editBookmarkPanelInfoArea">
-          <html:div id="editBookmarkPanelRecommendation"></html:div>
-          <html:div id="editBookmarkPanelFaviconContainer">
-            <html:img id="editBookmarkPanelFavicon"/>
+        <vbox class="panel-subview-body">
+          <html:div id="editBookmarkPanelInfoArea">
+            <html:div id="editBookmarkPanelRecommendation"></html:div>
+            <html:div id="editBookmarkPanelFaviconContainer">
+              <html:img id="editBookmarkPanelFavicon"/>
+            </html:div>
+            <html:div id="editBookmarkPanelImage"></html:div>
           </html:div>
-          <html:div id="editBookmarkPanelImage"></html:div>
-        </html:div>
 #include ../../components/places/content/editBookmarkPanel.inc.xhtml
           <vbox id="editBookmarkPanelBottomContent"
                 flex="1">
@@ -341,6 +342,7 @@
                     oncommand="StarUI.panel.hidePopup();"/>
 #endif
           </hbox>
+        </vbox>
       </panel>
     </html:template>
 
diff --git a/browser/themes/shared/places/editBookmarkPanel.inc.css b/browser/themes/shared/places/editBookmarkPanel.inc.css
index 1d9ac92984a3..9a3696773178 100644
--- a/browser/themes/shared/places/editBookmarkPanel.inc.css
+++ b/browser/themes/shared/places/editBookmarkPanel.inc.css
@@ -4,6 +4,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 %endif
 
+#editBookmarkPanel > .panel-subview-body {
+  padding-block: 0;
+}
+
 #editBookmarkPanelTitle {
   margin-inline-start: 32px;
 }