From cd38ec2a4d6761128fa4f213ba6358f77eec0530 Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Wed, 18 Aug 2021 08:51:57 +1000
Subject: [PATCH] FIX: Move bookmark modal buttons into modal-footer (#14072)

---
 .../discourse/app/templates/components/bookmark.hbs          | 2 +-
 app/assets/stylesheets/common/components/bookmark-modal.scss | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs
index 90b3ae7e54c..56d6588da94 100644
--- a/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs
@@ -47,7 +47,7 @@
     {{/if}}
   </div>
 
-  <div class="control-group">
+  <div class="modal-footer control-group">
     {{d-button id="save-bookmark" label="bookmarks.save" class="btn-primary" action=(action "saveAndClose")}}
     {{d-modal-cancel close=(action "closeWithoutSavingBookmark")}}
     {{#if showDelete}}
diff --git a/app/assets/stylesheets/common/components/bookmark-modal.scss b/app/assets/stylesheets/common/components/bookmark-modal.scss
index 5d53ac81d70..11f4372b5b9 100644
--- a/app/assets/stylesheets/common/components/bookmark-modal.scss
+++ b/app/assets/stylesheets/common/components/bookmark-modal.scss
@@ -3,6 +3,11 @@
     box-sizing: border-box;
     min-width: 310px;
   }
+  .modal-footer {
+    margin: 0;
+    border-top: 0;
+    padding: 10px 0;
+  }
   .modal-body {
     width: 375px;
     box-sizing: border-box;