diff options
| author | zeripath <art27@cantab.net> | 2023-02-13 17:59:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-13 17:59:59 +0000 |
| commit | 51383ec0841ec2562e5c4a9dadd4fef82974dd5c (patch) | |
| tree | ca77ae07a74536297ded91b51e6a1eb6d55047d9 /web_src/js/components/PullRequestMergeForm.vue | |
| parent | 00b18ab42fdd49a437249f57c0b9086fd0ee1d03 (diff) | |
| download | gitea-51383ec0841ec2562e5c4a9dadd4fef82974dd5c.tar.gz gitea-51383ec0841ec2562e5c4a9dadd4fef82974dd5c.zip | |
Move helpers to be prefixed with `gt-` (#22879)
As discussed in #22847 the helpers in helpers.less need to have a
separate prefix as they are causing conflicts with fomantic styles
This will allow us to have the `.gt-hidden { display:none !important; }`
style that is needed to for the reverted PR.
Of note in doing this I have noticed that there was already a conflict
with at least one chroma style which this PR now avoids.
I've also added in the `gt-hidden` style that matches the tailwind one
and switched the code that needed it to use that.
Signed-off-by: Andrew Thornton <art27@cantab.net>
---------
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'web_src/js/components/PullRequestMergeForm.vue')
| -rw-r--r-- | web_src/js/components/PullRequestMergeForm.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue index 1e0ebc5a47..2e10ce2531 100644 --- a/web_src/js/components/PullRequestMergeForm.vue +++ b/web_src/js/components/PullRequestMergeForm.vue @@ -47,14 +47,14 @@ {{ mergeForm.textCancel }} </button> - <div class="ui checkbox ml-2" v-if="mergeForm.isPullBranchDeletable && !autoMergeWhenSucceed"> + <div class="ui checkbox gt-ml-2" v-if="mergeForm.isPullBranchDeletable && !autoMergeWhenSucceed"> <input name="delete_branch_after_merge" type="checkbox" v-model="deleteBranchAfterMerge" id="delete-branch-after-merge"> <label for="delete-branch-after-merge">{{ mergeForm.textDeleteBranch }}</label> </div> </form> </div> - <div v-if="!showActionForm" class="df"> + <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)" > <button class="ui button"> @@ -95,7 +95,7 @@ </div> <!-- the cancel auto merge button --> - <form v-if="mergeForm.hasPendingPullRequestMerge" :action="mergeForm.baseLink+'/cancel_auto_merge'" method="post" class="ml-4"> + <form v-if="mergeForm.hasPendingPullRequestMerge" :action="mergeForm.baseLink+'/cancel_auto_merge'" method="post" class="gt-ml-4"> <input type="hidden" name="_csrf" :value="csrfToken"> <button class="ui button"> {{ mergeForm.textAutoMergeCancelSchedule }} |