UI adjuestment

go-gitea · Jun 9, 2022 · 9bd5f97 · 9bd5f97
1 parent 0502a21
commit 9bd5f97
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -1600,7 +1600,7 @@ pulls.merge_instruction_hint = `You can also view <a class="show-instruction">co
 pulls.merge_instruction_step1_desc = From your project repository, check out a new branch and test the changes.
 pulls.merge_instruction_step2_desc = Merge the changes and update on Gitea.
 
-pulls.auto_merge_button_title = When Checks Succeed
+pulls.auto_merge_button_when_succeed = (When checks succeed)
 pulls.auto_merge_when_succeed = Auto merge when all checks succeed
 pulls.auto_merge_newly_scheduled = The pull request was scheduled to merge when all checks succeed.
 pulls.auto_merge_has_pending_schedule = %[1]s scheduled this pull request to auto merge when all checks succeed %[2]s.

diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
@@ -342,7 +342,7 @@
 									'baseLink': {{.Link}},
 									'textCancel': {{$.i18n.Tr "cancel"}},
 									'textDeleteBranch': {{$.i18n.Tr "repo.branch.delete" .HeadTarget}},
-									'textAutoMergeButtonTitle': {{$.i18n.Tr "repo.pulls.auto_merge_button_title"}},
+									'textAutoMergeButtonWhenSucceed': {{$.i18n.Tr "repo.pulls.auto_merge_button_when_succeed"}},
 									'textAutoMergeWhenSucceed': {{$.i18n.Tr "repo.pulls.auto_merge_when_succeed"}},
 									'textAutoMergeCancelSchedule': {{$.i18n.Tr "repo.pulls.auto_merge_cancel_schedule"}},
 

diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue
@@ -31,7 +31,7 @@
         <button class="ui button" :class="mergeButtonStyleClass" type="submit" name="do" :value="mergeStyle">
           {{ mergeStyleDetail.textDoMerge }}
           <template v-if="autoMergeWhenSucceed">
-            ({{ mergeForm.textAutoMergeButtonTitle }})
+            ({{ mergeForm.textAutoMergeButtonWhenSucceed }})
           </template>
         </button>
 
@@ -54,7 +54,7 @@
           <span class="button-text">
             {{ mergeStyleDetail.textDoMerge }}
             <template v-if="autoMergeWhenSucceed">
-              ({{ mergeForm.textAutoMergeButtonTitle }})
+              {{ mergeForm.textAutoMergeButtonWhenSucceed }}
             </template>
           </span>
         </button>
@@ -78,14 +78,9 @@
               <!-- if can NOT merge now, only show one action "auto merge when succeed" -->
               <div class="item" v-if="msd.allowed && !mergeForm.canMergeNow && !msd.hideAutoMerge" :key="msd.name" @click.stop="switchMergeStyle(msd.name, true)">
                 <div class="action-text">
-                  {{ msd.textDoMerge }}
-                </div>
-                <div class="auto-merge-full">
-                  <svg-icon name="octicon-clock" :size="14"/>
-                  <span class="auto-merge-text">{{ mergeForm.textAutoMergeWhenSucceed }}</span>
+                  {{ msd.textDoMerge }} {{ mergeForm.textAutoMergeButtonWhenSucceed }}
                 </div>
               </div>
-
             </template>
           </div>
         </div>
@@ -211,14 +206,7 @@ export default {
   padding: 0.8rem;
   flex: 1
 }
-.auto-merge-full {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.auto-merge-full .auto-merge-text {
-  padding: 0 1rem 0 0.25rem;
-}
+
 .auto-merge-small {
   width: 40px;
   display: flex;