Skip to content

Commit c646d1d

Browse files
committed
As per @silverwind
1 parent 1e6a46b commit c646d1d

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

templates/repo/issue/view_content/pull.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,8 @@
363363
{{end}}
364364
</div>
365365
</div>
366-
<div class="instruct dib ml-3">{{$.i18n.Tr "repo.pulls.merge_instruction_hint" | Safe}}</div>
367-
<div class="instruct content" style="display:none">
366+
<div class="instruct-toggle ml-3">{{$.i18n.Tr "repo.pulls.merge_instruction_hint" | Safe}}</div>
367+
<div class="instruct-content" style="display:none">
368368
<div class="ui divider"></div>
369369
<div><h3 class="di">{{$.i18n.Tr "step1"}} </h3>{{$.i18n.Tr "repo.pulls.merge_instruction_step1_desc"}}</div>
370370
<div class="ui secondary segment">

web_src/js/index.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,7 +1123,8 @@ async function initRepository() {
11231123
e.preventDefault();
11241124
$(`.${$(this).data('do')}-fields`).show();
11251125
$(this).parent().hide();
1126-
$('.instruct').hide();
1126+
$('.instruct-toggle').hide();
1127+
$('.instruct-content').hide();
11271128
});
11281129
$('.merge-button > .dropdown').dropdown({
11291130
onChange(_text, _value, $choice) {
@@ -1137,7 +1138,7 @@ async function initRepository() {
11371138
e.preventDefault();
11381139
$(this).closest('.form').hide();
11391140
$mergeButton.parent().show();
1140-
$('.instruct.dib').show();
1141+
$('.instruct-toggle').show();
11411142
});
11421143
initReactionSelector();
11431144
}
@@ -1204,7 +1205,7 @@ async function initRepository() {
12041205

12051206
function initPullRequestMergeInstruction() {
12061207
$('.show-instruction').on('click', () => {
1207-
$('.instruct.content').toggle();
1208+
$('.instruct-content').toggle();
12081209
});
12091210
}
12101211

web_src/less/_repository.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,10 @@
593593
}
594594

595595
&.view.issue {
596+
.instruct-toggle {
597+
display: inline-block;
598+
}
599+
596600
.title {
597601
padding-bottom: 0 !important;
598602

0 commit comments

Comments
 (0)