summaryrefslogtreecommitdiffstats
path: root/web_src/js
diff options
context:
space:
mode:
Diffstat (limited to 'web_src/js')
-rw-r--r--web_src/js/components/PullRequestMergeForm.vue6
-rw-r--r--web_src/js/features/common-global.js2
-rw-r--r--web_src/js/features/comp/ConfirmModal.js6
3 files changed, 7 insertions, 7 deletions
diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue
index cca8b9dd6e..03d1f99683 100644
--- a/web_src/js/components/PullRequestMergeForm.vue
+++ b/web_src/js/components/PullRequestMergeForm.vue
@@ -29,8 +29,8 @@ export default {
}),
computed: {
mergeButtonStyleClass() {
- if (this.mergeForm.allOverridableChecksOk) return 'green';
- return this.autoMergeWhenSucceed ? 'blue' : 'red';
+ if (this.mergeForm.allOverridableChecksOk) return 'primary';
+ return this.autoMergeWhenSucceed ? 'primary' : 'red';
},
forceMerge() {
return this.mergeForm.canMergeNow && !this.mergeForm.allOverridableChecksOk;
@@ -135,7 +135,7 @@ export default {
<div v-if="!showActionForm" class="gt-df">
<!-- the merge button -->
- <div class="ui buttons merge-button" :class="[mergeForm.emptyCommit ? 'grey' : mergeForm.allOverridableChecksOk ? 'green' : 'red']" @click="toggleActionForm(true)">
+ <div class="ui buttons merge-button" :class="[mergeForm.emptyCommit ? 'grey' : mergeForm.allOverridableChecksOk ? 'primary' : 'red']" @click="toggleActionForm(true)">
<button class="ui button">
<svg-icon name="octicon-git-merge"/>
<span class="button-text">
diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js
index b30e21d0c0..96fad7eee6 100644
--- a/web_src/js/features/common-global.js
+++ b/web_src/js/features/common-global.js
@@ -275,7 +275,7 @@ async function linkAction(e) {
}
const isRisky = el.classList.contains('red') || el.classList.contains('yellow') || el.classList.contains('orange') || el.classList.contains('negative');
- if (await confirmModal({content: modalConfirmContent, buttonColor: isRisky ? 'orange' : 'green'})) {
+ if (await confirmModal({content: modalConfirmContent, buttonColor: isRisky ? 'orange' : 'primary'})) {
await doRequest();
}
}
diff --git a/web_src/js/features/comp/ConfirmModal.js b/web_src/js/features/comp/ConfirmModal.js
index 1edcfd9522..e64996a352 100644
--- a/web_src/js/features/comp/ConfirmModal.js
+++ b/web_src/js/features/comp/ConfirmModal.js
@@ -4,14 +4,14 @@ import {htmlEscape} from 'escape-goat';
const {i18n} = window.config;
-export async function confirmModal(opts = {content: '', buttonColor: 'green'}) {
+export async function confirmModal(opts = {content: '', buttonColor: 'primary'}) {
return new Promise((resolve) => {
const $modal = $(`
<div class="ui g-modal-confirm modal">
<div class="content">${htmlEscape(opts.content)}</div>
<div class="actions">
- <button class="ui basic cancel button">${svg('octicon-x')} ${i18n.modal_cancel}</button>
- <button class="ui ${opts.buttonColor || 'green'} ok button">${svg('octicon-check')} ${i18n.modal_confirm}</button>
+ <button class="ui cancel button">${svg('octicon-x')} ${i18n.modal_cancel}</button>
+ <button class="ui ${opts.buttonColor || 'primary'} ok button">${svg('octicon-check')} ${i18n.modal_confirm}</button>
</div>
</div>
`);