From 22d23c4af1a8b1e53fbc59ad2662c5bad83a2ee3 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 26 Apr 2021 18:56:01 -0400
Subject: [PATCH] UX: consistent topic timer message button order (#12826)

---
 .../templates/components/topic-timer-info.hbs | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs
index 5ff6ab22078..df46dad3426 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs
@@ -4,23 +4,23 @@
       {{clockIcon}} {{notice}}
     </span>
     <div class="topic-timer-modify">
-      {{#if showTrashCan}}
-        {{d-button
-          ariaLabel="post.controls.remove_timer"
-          title="post.controls.remove_timer"
-          icon="trash-alt"
-          class="btn topic-timer-remove no-text"
-          action=removeTopicTimer
-        }}
-      {{/if}}
       {{#if showEdit}}
-        {{d-button
+        {{~d-button
           ariaLabel="post.controls.edit_timer"
           title="post.controls.edit_timer"
           icon="pencil-alt"
           class="btn topic-timer-edit no-text"
           action=showTopicTimerModal
-        }}
+        ~}}
+      {{/if}}
+      {{#if showTrashCan}}
+        {{~d-button
+          ariaLabel="post.controls.remove_timer"
+          title="post.controls.remove_timer"
+          icon="trash-alt"
+          class="btn topic-timer-remove no-text"
+          action=removeTopicTimer
+        ~}}
       {{/if}}
     </div>
   </h3>