From 6d92d7857eb47d2adbb63d32719b4c262957beb0 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 29 May 2022 18:13:45 +0200
Subject: [PATCH] Explicit button styling

See WoltLab/WCF#4834
---
 templates/conversationAdd.tpl                          | 2 +-
 templates/conversationAddParticipants.tpl              | 2 +-
 templates/conversationLabelAssignment.tpl              | 2 +-
 templates/conversationLabelManagement.tpl              | 6 +++---
 templates/conversationLeave.tpl                        | 2 +-
 templates/conversationList.tpl                         | 2 +-
 templates/conversationMessageInlineEditor.tpl          | 4 ++--
 templates/conversationQuickReply.tpl                   | 2 +-
 ts/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.ts | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/templates/conversationAdd.tpl b/templates/conversationAdd.tpl
index ced4120..a1b624f 100644
--- a/templates/conversationAdd.tpl
+++ b/templates/conversationAdd.tpl
@@ -124,7 +124,7 @@
 	
 	<div class="formSubmit">
 		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
-		<button name="draft" accesskey="d" value="1">{lang}wcf.conversation.button.saveAsDraft{/lang}</button>
+		<button class="button" name="draft" accesskey="d" value="1">{lang}wcf.conversation.button.saveAsDraft{/lang}</button>
 		{include file='messageFormPreviewButton' previewMessageObjectType='com.woltlab.wcf.conversation.message' previewMessageObjectID=0}
 		{csrfToken}
 	</div>
diff --git a/templates/conversationAddParticipants.tpl b/templates/conversationAddParticipants.tpl
index cca3719..e8a2818 100644
--- a/templates/conversationAddParticipants.tpl
+++ b/templates/conversationAddParticipants.tpl
@@ -22,5 +22,5 @@
 {/if}
 
 <div class="formSubmit">
-	<button id="addParticipants" class="buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
+	<button id="addParticipants" class="button buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
 </div>
\ No newline at end of file
diff --git a/templates/conversationLabelAssignment.tpl b/templates/conversationLabelAssignment.tpl
index 92c637d..42c5dfb 100644
--- a/templates/conversationLabelAssignment.tpl
+++ b/templates/conversationLabelAssignment.tpl
@@ -10,5 +10,5 @@
 </ul>
 
 <div class="formSubmit">
-	<button class="buttonPrimary" id="assignLabels">{lang}wcf.global.button.save{/lang}</button>
+	<button class="button buttonPrimary" id="assignLabels">{lang}wcf.global.button.save{/lang}</button>
 </div>
diff --git a/templates/conversationLabelManagement.tpl b/templates/conversationLabelManagement.tpl
index b915eef..d63df56 100644
--- a/templates/conversationLabelManagement.tpl
+++ b/templates/conversationLabelManagement.tpl
@@ -36,8 +36,8 @@
 	</dl>
 	
 	<div class="formSubmit">
-		<button id="addLabel" class="buttonPrimary">{lang}wcf.global.button.save{/lang}</button>
-		<button id="editLabel" style="display: none;" class="buttonPrimary">{lang}wcf.global.button.save{/lang}</button>
-		<button id="deleteLabel" style="display: none;">{lang}wcf.conversation.label.management.deleteLabel{/lang}</button>
+		<button id="addLabel" class="button buttonPrimary">{lang}wcf.global.button.save{/lang}</button>
+		<button id="editLabel" style="display: none;" class="button buttonPrimary">{lang}wcf.global.button.save{/lang}</button>
+		<button id="deleteLabel" style="display: none;" class="button">{lang}wcf.conversation.label.management.deleteLabel{/lang}</button>
 	</div>
 </section>
\ No newline at end of file
diff --git a/templates/conversationLeave.tpl b/templates/conversationLeave.tpl
index 7350529..b19d5cc 100644
--- a/templates/conversationLeave.tpl
+++ b/templates/conversationLeave.tpl
@@ -16,5 +16,5 @@
 </dl>
 
 <div class="formSubmit">
-	<button id="hideConversation" class="buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
+	<button id="hideConversation" class="button buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
 </div>
diff --git a/templates/conversationList.tpl b/templates/conversationList.tpl
index 18b3241..d2a5ae9 100644
--- a/templates/conversationList.tpl
+++ b/templates/conversationList.tpl
@@ -97,7 +97,7 @@
 		</div>
 		
 		<div class="boxContent">
-			<button id="manageLabel">{lang}wcf.conversation.label.management{/lang}</button>
+			<button class="button" id="manageLabel">{lang}wcf.conversation.label.management{/lang}</button>
 		</div>
 	</section>
 	
diff --git a/templates/conversationMessageInlineEditor.tpl b/templates/conversationMessageInlineEditor.tpl
index 6eee8d5..77b185d 100644
--- a/templates/conversationMessageInlineEditor.tpl
+++ b/templates/conversationMessageInlineEditor.tpl
@@ -8,11 +8,11 @@
 	{include file='messageFormTabsInline' inConversationInlineEdit=true wysiwygContainerID=$wysiwygContainerID}
 	
 	<div class="formSubmit">
-		<button class="buttonPrimary" data-type="save">{lang}wcf.global.button.save{/lang}</button>
+		<button class="button buttonPrimary" data-type="save">{lang}wcf.global.button.save{/lang}</button>
 		
 		{include file='messageFormPreviewButton' previewMessageFieldID=$wysiwygSelector previewButtonID=$wysiwygSelector|concat:'_PreviewButton' previewMessageObjectType='com.woltlab.wcf.conversation.message' previewMessageObjectID=$message->messageID}
 		
-		<button data-type="cancel">{lang}wcf.global.button.cancel{/lang}</button>
+		<button class="button" data-type="cancel">{lang}wcf.global.button.cancel{/lang}</button>
 	</div>
 	
 	{include file='wysiwyg' wysiwygEnableUpload=true}
diff --git a/templates/conversationQuickReply.tpl b/templates/conversationQuickReply.tpl
index cc21575..f969a0e 100644
--- a/templates/conversationQuickReply.tpl
+++ b/templates/conversationQuickReply.tpl
@@ -19,7 +19,7 @@
 			
 			<footer class="messageFooter">
 				<div class="formSubmit">
-					<button class="buttonPrimary" data-type="save" accesskey="s">{lang}wcf.global.button.reply{/lang}</button>
+					<button class="button buttonPrimary" data-type="save" accesskey="s">{lang}wcf.global.button.reply{/lang}</button>
 					{include file='messageFormPreviewButton' previewMessageObjectType='com.woltlab.wcf.conversation.message' previewMessageObjectID=0}
 				</div>
 			</footer>
diff --git a/ts/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.ts b/ts/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.ts
index 08cf853..2810780 100644
--- a/ts/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.ts
+++ b/ts/WoltLabSuite/Core/Conversation/Ui/Subject/Editor.ts
@@ -114,7 +114,7 @@ class UiSubjectEditor implements AjaxCallbackObject, DialogCallbackObject {
           </dd>
         </dl>
         <div class="formSubmit">
-          <button class="buttonPrimary jsButtonSave">${Language.get("wcf.global.button.save")}</button>
+          <button class="button buttonPrimary jsButtonSave">${Language.get("wcf.global.button.save")}</button>
         </div>
       `,
     };
-- 
2.20.1