From bf0c055a9a610f6638659f05a4ab34ce407530bf Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 22 Apr 2020 12:29:27 -0400
Subject: [PATCH] UX: add comment-plus icon for reopening topics

---
 .../javascripts/discourse/widgets/post-small-action.js    | 6 +++---
 .../javascripts/discourse/widgets/topic-admin-menu.js     | 4 ++--
 lib/svg_sprite/svg_sprite.rb                              | 1 +
 vendor/assets/svg-icons/discourse-additional.svg          | 8 ++++++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/post-small-action.js b/app/assets/javascripts/discourse/widgets/post-small-action.js
index 19e4531259e..b456d3d0395 100644
--- a/app/assets/javascripts/discourse/widgets/post-small-action.js
+++ b/app/assets/javascripts/discourse/widgets/post-small-action.js
@@ -33,9 +33,9 @@ export function actionDescription(actionCode, createdAt, username) {
 
 const icons = {
   "closed.enabled": "discourse-comment-slash",
-  "closed.disabled": "discourse-comment",
+  "closed.disabled": "discourse-comment-plus",
   "autoclosed.enabled": "discourse-comment-slash",
-  "autoclosed.disabled": "discourse-comment",
+  "autoclosed.disabled": "discourse-comment-plus",
   "archived.enabled": "folder",
   "archived.disabled": "folder-open",
   "pinned.enabled": "thumbtack",
@@ -52,7 +52,7 @@ const icons = {
   user_left: "minus-circle",
   removed_user: "minus-circle",
   removed_group: "minus-circle",
-  public_topic: "discourse-comment",
+  public_topic: "discourse-comment-plus",
   private_topic: "envelope",
   autobumped: "hand-point-right"
 };
diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js
index edf9d4a14a6..904269d5ba3 100644
--- a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js
+++ b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js
@@ -165,7 +165,7 @@ export default createWidget("topic-admin-menu", {
           className: "topic-admin-open",
           buttonClass: "btn-default",
           action: "toggleClosed",
-          icon: "discourse-comment",
+          icon: "discourse-comment-plus",
           label: "actions.open"
         });
       } else {
@@ -239,7 +239,7 @@ export default createWidget("topic-admin-menu", {
           action: isPrivateMessage
             ? "convertToPublicTopic"
             : "convertToPrivateMessage",
-          icon: isPrivateMessage ? "discourse-comment" : "envelope",
+          icon: isPrivateMessage ? "discourse-comment-plus" : "envelope",
           label: isPrivateMessage
             ? "actions.make_public"
             : "actions.make_private"
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index 4fdc3e5a87e..d28044c96a7 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -63,6 +63,7 @@ module SvgSprite
     "discourse-bell-slash",
     "discourse-compress",
     "discourse-comment",
+    "discourse-comment-plus",
     "discourse-comment-slash",
     "discourse-expand",
     "download",
diff --git a/vendor/assets/svg-icons/discourse-additional.svg b/vendor/assets/svg-icons/discourse-additional.svg
index e3adf58e0c2..e1d9f8dbf3b 100644
--- a/vendor/assets/svg-icons/discourse-additional.svg
+++ b/vendor/assets/svg-icons/discourse-additional.svg
@@ -32,8 +32,12 @@ Additional SVG icons
     <path d="M634 471L481.6 351.8l-6.8-5.3L36 3.5C29.1-2 19-.9 13.5 6l-10 12.5C-2 25.4-.9 35.5 6 41l598 467.5c6.9 5.5 17 4.4 22.5-2.5l10-12.5c5.5-6.9 4.4-17-2.5-22.5zM224.2 89.9c36.8-19.6 81.2-29.1 127.6-24.6 59 5.6 113 33.3 148 76.1 29.5 36 43.3 80 38.8 123.7-2.1 20.4-8 39.7-17 57.3l41.6 32.5c14.8-25.9 24.1-54.4 27.2-84.5 5.9-57.7-11.9-115.2-50.3-162-43.8-53.4-110.7-88-183.4-94.9-63.4-6.1-125.6 8.8-176.5 42l44 34.4zM407.1 416c-22 7.2-45.8 11.1-70.4 11.1-7.4 0-14.9-.4-22.5-1.1-29.6-2.8-57.7-11-83.6-24.4-3.7-1.9-7.8-2.9-11.9-2.9-2.2 0-4.4.3-6.6.9l-102.9 27 38.5-87c3.9-8.7 2.6-18.9-3.2-26.5-15.2-19.6-20.9-48.8-17-86.9.9-8.6 2.5-17 4.7-25.2l-43.6-34.1c-6.5 17.2-10.8 35.3-12.8 54-4.6 44.6 1.7 81.8 18.6 110.7L39.7 454.9c-4 9.1-2.5 19.8 4 27.4 5 5.9 12.3 9.2 19.8 9.2 2.2 0 4.4-.3 6.6-.9l145.8-38.2c29.3 13.8 60.6 22.3 93.4 25.4 9.2.9 18.5 1.3 27.6 1.3 41.4 0 81.5-8.9 117.7-25.9L407.1 416z"/>
   </symbol>
   <!-- "Discourse Comment" is a Discourse derivative of https://fontawesome.com/icons/comment?style=regular that has been built to match the custom discourse-comment-slash icon  -->
-  <symbol id='discourse-comment' viewBox="0 0 554 479.3">
+  <symbol id='discourse-comment' viewBox="0 0 550 512">
     <path d="M26 479.3c-7.5 0-14.8-3.3-19.8-9.2-6.5-7.6-8-18.3-4-27.4l54.6-123.2c-17-28.9-23.2-66.1-18.6-110.7C44.6 146.2 77.8 90.2 131.6 51 184.4 12.4 251.1-5.2 319.2 1.3c72.8 7 139.6 41.5 183.3 94.9 38.4 46.8 56.3 104.4 50.3 162-6.5 62.5-39.6 118.5-93.4 157.7-45.7 33.3-101.7 51-160 51-9.2 0-18.4-.4-27.6-1.3-32.8-3.1-64.2-11.7-93.4-25.4L32.6 478.4c-2.2.6-4.4.9-6.6.9zm155.2-92.7c4.1 0 8.2 1 11.9 2.9 25.9 13.4 54 21.6 83.6 24.4 7.5.7 15 1.1 22.5 1.1 104 0 192.3-69.1 201.9-162 4.5-43.8-9.3-87.7-38.8-123.7-35-42.7-89-70.4-148-76.1-113.5-10.9-214.1 61.4-224.4 161-3.9 38.1 1.8 67.3 17 86.9 5.9 7.6 7.1 17.7 3.2 26.5l-38.5 87 102.9-27c2.3-.7 4.5-1 6.7-1z"/>
   </symbol>
-
+  <!-- "Discourse Comment Plus" is a version of https://fontawesome.com/icons/comment-plus?style=regular that has been recreated to match the custom discourse-comment-slash icon  -->
+  <symbol id='discourse-comment-plus' viewBox="0 0 550 512">
+    <path d="M26 479.3c-7.5 0-14.8-3.3-19.8-9.2-6.5-7.6-8-18.3-4-27.4l54.6-123.2c-17-28.9-23.2-66.1-18.6-110.7C44.6 146.2 77.8 90.2 131.6 51 184.4 12.4 251.1-5.2 319.2 1.3c72.8 7 139.6 41.5 183.3 94.9 38.4 46.8 56.3 104.4 50.3 162-6.5 62.5-39.6 118.5-93.4 157.7-45.7 33.3-101.7 51-160 51-9.2 0-18.4-.4-27.6-1.3-32.8-3.1-64.2-11.7-93.4-25.4L32.6 478.4c-2.2.6-4.4.9-6.6.9zm155.2-92.7c4.1 0 8.2 1 11.9 2.9 25.9 13.4 54 21.6 83.6 24.4 7.5.7 15 1.1 22.5 1.1 104 0 192.3-69.1 201.9-162 4.5-43.8-9.3-87.7-38.8-123.7-35-42.7-89-70.4-148-76.1-113.5-10.9-214.1 61.4-224.4 161-3.9 38.1 1.8 67.3 17 86.9 5.9 7.6 7.1 17.7 3.2 26.5l-38.5 87 102.9-27c2.3-.7 4.5-1 6.7-1z"/>
+    <path d="M375.6 207.7h-54.2v-54.2c0-10.6-8.6-19.2-19.2-19.2h-13.3c-10.6 0-19.2 8.6-19.2 19.2v54.2h-54.2c-10.6 0-19.2 8.6-19.2 19.2v13.3c0 10.6 8.6 19.2 19.2 19.2h54.2v54.2c0 10.6 8.6 19.2 19.2 19.2h13.3c10.6 0 19.2-8.6 19.2-19.2v-54.2h54.2c10.6 0 19.2-8.6 19.2-19.2V227c0-10.6-8.6-19.3-19.2-19.3z"/>
+  </symbol>
 </svg>