From 6d6436e9e71b013f4aa3f03a2680b2bab1b7621a Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 4 Feb 2021 14:35:47 -0500
Subject: [PATCH] UX: Fix & clarify bulk notification change modal (#11969)

---
 .../modal/bulk-notification-level.hbs         | 20 ++++++++++---------
 app/assets/stylesheets/common/base/modal.scss | 14 +++++++++++++
 config/locales/client.en.yml                  |  1 +
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/modal/bulk-notification-level.hbs b/app/assets/javascripts/discourse/app/templates/modal/bulk-notification-level.hbs
index 26e9d7df3c9..5a40fd79389 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/bulk-notification-level.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/bulk-notification-level.hbs
@@ -1,13 +1,15 @@
-{{#each notificationLevels as |level|}}
-  <div class="controls">
-    <label class="radio">
-      {{radio-button value=level.id name="notification_level" selection=notificationLevelId}} <strong>{{level.name}}</strong>
-      <div class="description">{{html-safe level.description}}</div>
-    </label>
-  </div>
-{{/each}}
+<div class="bulk-notification-list">
+  {{#each notificationLevels as |level|}}
+    <div class="controls">
+      <label class="radio notification-level-radio">
+        {{radio-button value=level.id name="notification_level" selection=notificationLevelId}} <strong>{{level.name}}</strong>
+        <div class="description">{{html-safe level.description}}</div>
+      </label>
+    </div>
+  {{/each}}
+</div>
 
 {{d-button
   disabled=disabled
   action=(action "changeNotificationLevel")
-  label="topics.bulk.notification_level"}}
+  label="topics.bulk.change_notification_level"}}
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index a6ef072f02b..432f2a4070c 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -672,6 +672,20 @@
   }
 }
 
+.bulk-notification-list {
+  margin-bottom: 1.5em;
+}
+
+.notification-level-radio {
+  flex-wrap: wrap;
+  align-items: baseline;
+  margin-bottom: 0.5em;
+  .description {
+    width: 100%;
+    margin-top: 0.25em;
+  }
+}
+
 .modal.edit-slow-mode-modal {
   .slow-mode-label {
     display: inline-flex;
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index dc54758f622..5b1ab5f3202 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2257,6 +2257,7 @@ en:
         close_topics: "Close Topics"
         archive_topics: "Archive Topics"
         notification_level: "Notifications"
+        change_notification_level: "Change Notification Level"
         choose_new_category: "Choose the new category for the topics:"
         selected:
           one: "You have selected <b>%{count}</b> topic."