Revert "UX: replace closed topic icon with discourse-no-entry"

Revert “UX: replace closed topic icon with discourse-no-entry”

This reverts commit 040b8c00a4450cfb0ee306f96d18aa34ab15f931.

We decided to keep status quo for now

diff --git a/app/assets/javascripts/discourse/app/components/topic-status.js b/app/assets/javascripts/discourse/app/components/topic-status.js
index 834a3f3..569292e 100644
--- a/app/assets/javascripts/discourse/app/components/topic-status.js
+++ b/app/assets/javascripts/discourse/app/components/topic-status.js
@@ -23,17 +23,15 @@ export default Component.extend({
   @discourseComputed("topic.closed", "topic.archived")
   topicClosedArchived(closed, archived) {
     if (closed && archived) {
-      this._set("closedArchived", "discourse-no-entry", "locked_and_archived");
+      this._set("closedArchived", "lock", "locked_and_archived");
       this._reset("closed");
       this._reset("archived");
       return true;
     } else {
       this._reset("closedArchived");
-      closed
-        ? this._set("closed", "discourse-no-entry", "locked")
-        : this._reset("closed");
+      closed ? this._set("closed", "lock", "locked") : this._reset("closed");
       archived
-        ? this._set("archived", "discourse-no-entry", "archived")
+        ? this._set("archived", "lock", "archived")
         : this._reset("archived");
       return false;
     }
diff --git a/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
index ff98e57..723e7fe 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
@@ -30,7 +30,7 @@ addBulkButton("showChangeCategory", "change_category", {
   class: "btn-default"
 });
 addBulkButton("closeTopics", "close_topics", {
-  icon: "discourse-no-entry",
+  icon: "lock",
   class: "btn-default"
 });
 addBulkButton("archiveTopics", "archive_topics", {
diff --git a/app/assets/javascripts/discourse/app/helpers/topic-status-icons.js b/app/assets/javascripts/discourse/app/helpers/topic-status-icons.js
index f59edb4..2f2da65 100644
--- a/app/assets/javascripts/discourse/app/helpers/topic-status-icons.js
+++ b/app/assets/javascripts/discourse/app/helpers/topic-status-icons.js
@@ -10,10 +10,10 @@ export default ArrayProxy.extend({
     };
 
     if (topic.get("closed") && topic.get("archived")) {
-      renderIcon("discourse-no-entry", "locked_and_archived");
+      renderIcon("lock", "locked_and_archived");
     } else {
-      renderIconIf("closed", "discourse-no-entry", "locked");
-      renderIconIf("archived", "discourse-no-entry", "archived");
+      renderIconIf("closed", "lock", "locked");
+      renderIconIf("archived", "lock", "archived");
     }
 
     this.forEach(args => renderIconIf(...args));
diff --git a/app/assets/javascripts/discourse/app/raw-views/topic-status.js b/app/assets/javascripts/discourse/app/raw-views/topic-status.js
index 5e2a0d8..d6b2c74 100644
--- a/app/assets/javascripts/discourse/app/raw-views/topic-status.js
+++ b/app/assets/javascripts/discourse/app/raw-views/topic-status.js
@@ -38,14 +38,11 @@ export default EmberObject.extend({
     }
 
     if (topic.get("closed") && topic.get("archived")) {
-      results.push({
-        icon: "discourse-no-entry",
-        key: "locked_and_archived"
-      });
+      results.push({ icon: "lock", key: "locked_and_archived" });
     } else if (topic.get("closed")) {
-      results.push({ icon: "discourse-no-entry", key: "locked" });
+      results.push({ icon: "lock", key: "locked" });
     } else if (topic.get("archived")) {
-      results.push({ icon: "discourse-no-entry", key: "archived" });
+      results.push({ icon: "lock", key: "archived" });
     }
 
     if (topic.get("pinned")) {
diff --git a/app/assets/javascripts/discourse/app/templates/user.hbs b/app/assets/javascripts/discourse/app/templates/user.hbs
index ceed565..9290b1d 100644
--- a/app/assets/javascripts/discourse/app/templates/user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user.hbs
@@ -233,7 +233,7 @@
           {{#if showNotificationsTab}}
             <li>
               {{#link-to 'userNotifications'}}
-                {{d-icon "discourse-comment" class="glyph"}}{{i18n 'user.notifications'}}
+                {{d-icon "comment" class="glyph"}}{{i18n 'user.notifications'}}
               {{/link-to}}
             </li>
           {{/if}}
diff --git a/app/assets/javascripts/discourse/app/widgets/post-small-action.js b/app/assets/javascripts/discourse/app/widgets/post-small-action.js
index 6c3293a..709d701 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-small-action.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-small-action.js
@@ -32,8 +32,10 @@ export function actionDescription(actionCode, createdAt, username) {
 }
 
 const icons = {
-  "closed.enabled": "discourse-no-entry",
-  "autoclosed.enabled": "discourse-no-entry",
+  "closed.enabled": "lock",
+  "closed.disabled": "unlock-alt",
+  "autoclosed.enabled": "lock",
+  "autoclosed.disabled": "unlock-alt",
   "archived.enabled": "folder",
   "archived.disabled": "folder-open",
   "pinned.enabled": "thumbtack",
@@ -50,7 +52,7 @@ const icons = {
   user_left: "minus-circle",
   removed_user: "minus-circle",
   removed_group: "minus-circle",
-  public_topic: "discourse-comment",
+  public_topic: "comment",
   private_topic: "envelope",
   autobumped: "hand-point-right"
 };
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
index c7f8567..e5c8138 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
+++ b/app/assets/javascripts/discourse/app/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: "unlock",
           label: "actions.open"
         });
       } else {
@@ -173,7 +173,7 @@ export default createWidget("topic-admin-menu", {
           className: "topic-admin-close",
           buttonClass: "btn-default",
           action: "toggleClosed",
-          icon: "discourse-no-entry",
+          icon: "lock",
           label: "actions.close"
         });
       }
@@ -239,7 +239,7 @@ export default createWidget("topic-admin-menu", {
           action: isPrivateMessage
             ? "convertToPublicTopic"
             : "convertToPrivateMessage",
-          icon: isPrivateMessage ? "discourse-comment" : "envelope",
+          icon: isPrivateMessage ? "comment" : "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 0bd2eca..f2c4bcd 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -62,8 +62,6 @@ module SvgSprite
     "discourse-bell-one",
     "discourse-bell-slash",
     "discourse-compress",
-    "discourse-comment",
-    "discourse-no-entry",
     "discourse-expand",
     "download",
     "ellipsis-h",
diff --git a/test/javascripts/widgets/topic-status-test.js b/test/javascripts/widgets/topic-status-test.js
index 45d4e73..5cc6f9d 100644
--- a/test/javascripts/widgets/topic-status-test.js
+++ b/test/javascripts/widgets/topic-status-test.js
@@ -12,7 +12,7 @@ widgetTest("basics", {
     });
   },
   test(assert) {
-    assert.ok(find(".topic-status .d-icon-discourse-no-entry").length);
+    assert.ok(find(".topic-status .d-icon-discourse-comment-slash").length);
   }
 });
 
diff --git a/vendor/assets/svg-icons/discourse-additional.svg b/vendor/assets/svg-icons/discourse-additional.svg
index f7458e6..343b5b6 100644
--- a/vendor/assets/svg-icons/discourse-additional.svg
+++ b/vendor/assets/svg-icons/discourse-additional.svg
@@ -19,7 +19,7 @@ Additional SVG icons
   <symbol id='discourse-bell-exclamation' viewBox="0 0 448 512">

[... diff too long, it was truncated ...]

GitHub sha: 1f6eaf26