Explicit button styling

See WoltLab/WCF#4834

diff --git a/templates/conversationAdd.tpl b/templates/conversationAdd.tpl
index ced41203dcbc21181c89f1dfcadb9915d18a0693..a1b624fb3d98bc7d71b7230be18e270e5701eda2 100644 (file)
--- 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 cca3719d6b4714d91067145c1afc840cf49db3b8..e8a2818c15a85bdf0164c849578fdeeb96e86280 100644 (file)
--- 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 92c637d292ecc174818fbfa5d9be162904dce4e6..42c5dfb625e30fff72d294a9d8f7a5d7822be36b 100644 (file)
--- 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 b915eef36eb7ca15cb3efbfa25b585d71a54a81c..d63df56c0a3f81330b29791890ed4fe4ecaed0de 100644 (file)
--- 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 7350529203dc69c23003946bc58ce3bfc75fd891..b19d5cc8ceb97bbabe04ff564d6fc86d31363e49 100644 (file)
--- 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 18b3241046e27c79c1ea22cf7e680aba042c5267..d2a5ae93a5d7b818c1739a700f2121fbf3861c0e 100644 (file)
--- 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 6eee8d52157740dc0c89479932819c2b47081982..77b185d6acd593461f4f447b0dcaf6d075b8437a 100644 (file)
--- 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 cc215757eee2e74b87f5e8bdad1fa23557621457..f969a0eaf0789c812201da506309362f85dc80b4 100644 (file)
--- 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 08cf8531f0f8b1556ccd687158133546f4483484..2810780301e8524815e706b9a15783682fbe9dd8 100644 (file)
--- 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>
       `,
     };