From f65a5c5f022a3c6a970126f037edb9222c1c211f Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 7 Mar 2024 10:50:11 -0500
Subject: [PATCH] UX: clean up invite buttons (#26068)

---
 .../discourse/app/templates/user-invited-show.hbs   |  4 ++--
 app/assets/stylesheets/common/base/user.scss        | 13 +++++++++++++
 app/assets/stylesheets/desktop/user.scss            | 13 -------------
 app/assets/stylesheets/mobile/user.scss             | 12 ------------
 4 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
index 196d000c004..90f4333f50b 100644
--- a/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
@@ -21,7 +21,7 @@
           @icon="plus"
           @action={{this.createInvite}}
           @label="user.invited.create"
-          class="btn-flat"
+          class="btn-default"
         />
         {{#if this.canBulkInvite}}
           {{#if this.siteSettings.allow_bulk_invite}}
@@ -30,7 +30,7 @@
                 @icon="upload"
                 @action={{this.createInviteCsv}}
                 @label="user.invited.bulk_invite.text"
-                class="btn-flat"
+                class="btn-default"
               />
             {{/unless}}
           {{/if}}
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 572e85379bc..600ae3c0c85 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -949,6 +949,19 @@
   }
 }
 
+.user-additional-controls {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: end;
+}
+
+.user-invite-buttons {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.5em;
+  margin-left: auto;
+}
+
 .notification-schedule {
   .instruction {
     margin-top: 12px;
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index a3da4e45f7a..cf09b4f3d0b 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -73,19 +73,6 @@
     }
   }
 }
-.user-additional-controls {
-  display: flex;
-  flex-wrap: wrap;
-  padding-top: 15px;
-  .single-select-header,
-  button {
-    margin-bottom: 1em;
-    margin-right: 0.75em;
-  }
-  .user-invite-buttons {
-    margin-left: auto;
-  }
-}
 
 .user-content {
   padding: 0;
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index 501d4514c27..3a1cfd2eea4 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -359,18 +359,6 @@
     .user-invite-search {
       width: 100%;
     }
-    .user-invite-buttons {
-      width: 100%;
-      display: flex;
-      flex-direction: row;
-      flex-wrap: wrap;
-      .btn {
-        margin-bottom: 0.5em;
-      }
-      .btn:not(:last-of-type) {
-        margin-right: 0.5em;
-      }
-    }
   }
 
   table.user-invite-list {