diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 3f52b692ec..dc298f88f4 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -195,13 +195,6 @@ export default Ember.Controller.extend({
}
},
- @computed("model.noBump")
- topicBumpText(noBump) {
- if (noBump) {
- return I18n.t("composer.no_topic_bump");
- }
- },
-
@computed
isStaffUser() {
const currentUser = this.currentUser;
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 712dd87018..94e8d44b64 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -21,8 +21,8 @@
{{#if whisperOrUnlistTopicText}}
({{whisperOrUnlistTopicText}})
{{/if}}
- {{#if topicBumpText}}
- {{topicBumpText}}
+ {{#if model.noBump}}
+ {{d-icon "anchor"}}
{{/if}}
{{/unless}}
@@ -123,10 +123,8 @@
{{d-icon "eye-slash"}}
{{/if}}
- {{#if topicBumpText}}
-
- {{d-icon "anchor"}}
-
+ {{#if model.noBump}}
+ {{d-icon "anchor"}}
{{/if}}
{{/if}}
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index fde1550de0..1d355ac9e8 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -153,7 +153,6 @@
}
.whisper,
- .no-bump,
.display-edit-reason {
font-style: italic;
}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 9c6f2f7482..b76a8e3b5d 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1318,7 +1318,6 @@ en:
whisper: "whisper"
unlist: "unlisted"
blockquote_text: "Blockquote"
- no_topic_bump: "(no bump)"
add_warning: "This is an official warning."
toggle_whisper: "Toggle Whisper"
diff --git a/test/javascripts/acceptance/composer-actions-test.js.es6 b/test/javascripts/acceptance/composer-actions-test.js.es6
index 7a104fb0a3..f94897e99c 100644
--- a/test/javascripts/acceptance/composer-actions-test.js.es6
+++ b/test/javascripts/acceptance/composer-actions-test.js.es6
@@ -261,10 +261,9 @@ QUnit.test("replying to post - toggle_topic_bump", async assert => {
await composerActions.expand();
await composerActions.selectRowByValue("toggle_topic_bump");
- assert.equal(
- find(".composer-fields .no-bump").text(),
- I18n.t("composer.no_topic_bump"),
- "no-bump text is visible"
+ assert.ok(
+ find(".composer-fields .no-bump").length === 1,
+ "no-bump icon is visible"
);
await composerActions.expand();
@@ -272,7 +271,7 @@ QUnit.test("replying to post - toggle_topic_bump", async assert => {
assert.ok(
find(".composer-fields .no-bump").length === 0,
- "no-bump text is not visible"
+ "no-bump icon is not visible"
);
});