File tree Expand file tree Collapse file tree 3 files changed +10
-5
lines changed
templates/repo/issue/view_content Expand file tree Collapse file tree 3 files changed +10
-5
lines changed Original file line number Diff line number Diff line change 363
363
{{end}}
364
364
</div>
365
365
</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">
368
368
<div class="ui divider"></div>
369
369
<div><h3 class="di">{{$.i18n.Tr "step1"}} </h3>{{$.i18n.Tr "repo.pulls.merge_instruction_step1_desc"}}</div>
370
370
<div class="ui secondary segment">
Original file line number Diff line number Diff line change @@ -1123,7 +1123,8 @@ async function initRepository() {
1123
1123
e . preventDefault ( ) ;
1124
1124
$ ( `.${ $ ( this ) . data ( 'do' ) } -fields` ) . show ( ) ;
1125
1125
$ ( this ) . parent ( ) . hide ( ) ;
1126
- $ ( '.instruct' ) . hide ( ) ;
1126
+ $ ( '.instruct-toggle' ) . hide ( ) ;
1127
+ $ ( '.instruct-content' ) . hide ( ) ;
1127
1128
} ) ;
1128
1129
$ ( '.merge-button > .dropdown' ) . dropdown ( {
1129
1130
onChange ( _text , _value , $choice ) {
@@ -1137,7 +1138,7 @@ async function initRepository() {
1137
1138
e . preventDefault ( ) ;
1138
1139
$ ( this ) . closest ( '.form' ) . hide ( ) ;
1139
1140
$mergeButton . parent ( ) . show ( ) ;
1140
- $ ( '.instruct.dib ' ) . show ( ) ;
1141
+ $ ( '.instruct-toggle ' ) . show ( ) ;
1141
1142
} ) ;
1142
1143
initReactionSelector ( ) ;
1143
1144
}
@@ -1204,7 +1205,7 @@ async function initRepository() {
1204
1205
1205
1206
function initPullRequestMergeInstruction ( ) {
1206
1207
$ ( '.show-instruction' ) . on ( 'click' , ( ) => {
1207
- $ ( '.instruct. content' ) . toggle ( ) ;
1208
+ $ ( '.instruct- content' ) . toggle ( ) ;
1208
1209
} ) ;
1209
1210
}
1210
1211
Original file line number Diff line number Diff line change 593
593
}
594
594
595
595
& .view.issue {
596
+ .instruct-toggle {
597
+ display : inline-block ;
598
+ }
599
+
596
600
.title {
597
601
padding-bottom : 0 !important ;
598
602
You can’t perform that action at this time.
0 commit comments