From 9673e2cfc8a0c92fedb064574255f9508235de76 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 10 Jul 2019 11:53:25 -0400
Subject: [PATCH] UX: Improve styling, rename staff notes to user notes in
 translations

---
 .../discourse/templates/modal/staff-notes.hbs |  1 -
 assets/stylesheets/staff_notes.scss           | 21 ++++++++++++++++---
 config/locales/client.en.yml                  |  8 +++----
 config/locales/server.en.yml                  |  6 +++---
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/assets/javascripts/discourse/templates/modal/staff-notes.hbs b/assets/javascripts/discourse/templates/modal/staff-notes.hbs
index 7d198a1..d1deff1 100644
--- a/assets/javascripts/discourse/templates/modal/staff-notes.hbs
+++ b/assets/javascripts/discourse/templates/modal/staff-notes.hbs
@@ -1,7 +1,6 @@
 {{#d-modal-body class="staff-notes-modal"}}
   {{textarea value=newNote}}
   {{d-button action="attachNote" label="staff_notes.attach" class="btn-primary" disabled=attachDisabled}}
-  <hr/>
 
   {{#each model as |n|}}
     <div class='staff-note'>
diff --git a/assets/stylesheets/staff_notes.scss b/assets/stylesheets/staff_notes.scss
index eaed0ba..55a01f3 100644
--- a/assets/stylesheets/staff_notes.scss
+++ b/assets/stylesheets/staff_notes.scss
@@ -1,12 +1,19 @@
-.modal-body.staff-notes-modal {
-  height: 300px;
+#discourse-modal {
+  .modal-body.staff-notes-modal {
+    max-height: 80vh !important;
+  }
+}
 
+.modal-body.staff-notes-modal {
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
 
   textarea {
     width: 98%;
+    @include breakpoint(mobile, min-width) {
+      min-width: 400px;
+    }
   }
 
   .posted-by {
@@ -30,7 +37,15 @@
   }
 
   .staff-note {
-    margin-bottom: 1em;
+    border-top: 1px solid $primary-low;
+    padding-top: 1em;
+
+    &:first-of-type {
+      margin-top: 1em;
+    }
+    @include breakpoint(mobile, min-width) {
+      max-width: 530px;
+    }
   }
 
   .controls {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index ba4e497..2bc4296 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1,9 +1,9 @@
 en:
   js:
     staff_notes:
-      title: "Staff Notes"
+      title: "User Notes"
       attach: "Add User Note"
-      remove: "Remove Staff Note"
-      show: "Staff Notes ({{count}})"
-      delete_confirm: "Are you sure you want to delete that staff note?"
+      remove: "Remove User Note"
+      show: "User Notes ({{count}})"
+      delete_confirm: "Are you sure you want to delete that user note?"
       show_post: "Show Post"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index bc20e80..ec8ceb8 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1,7 +1,7 @@
 en:
   site_settings:
     staff_notes_enabled: "Allow staff users to attach notes to users"
-    staff_notes_moderators_delete: "Allow moderators to delete staff notes"
+    staff_notes_moderators_delete: "Allow moderators to delete user notes"
 
   staff_notes:
     official_warning: "Received an official warning from @%{username} -- %{warning_link}"
@@ -10,8 +10,8 @@ en:
 
   reports:
     staff_notes:
-      title: "Staff notes"
-      description: "List most recent staff notes."
+      title: "User notes"
+      description: "List most recent user notes."
       labels:
         user: User
         note: Note