Skip to content
This repository was archived by the owner on Nov 13, 2024. It is now read-only.

Commit 31101b2

Browse files
authored
Merge branch 'master' into 952
2 parents d076b42 + acb082b commit 31101b2

File tree

5 files changed

+1360
-141
lines changed

5 files changed

+1360
-141
lines changed

.github/workflows/webpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
node-version: [14.x, 16.x, 18.16.0]
15+
node-version: [14.x, 16.x]
1616

1717
steps:
1818
- uses: actions/checkout@v3

src/app/views/InstanceDetail.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,10 @@ Copyright (C) 2022 MCSManager <[email protected]>
200200
{{ $t("instancesDetail.stopCmdInfo") }}
201201
</div>
202202
</div>
203-
<el-input v-model="instanceInfo.config.stopCommand" type="text"></el-input>
203+
<el-input v-model="instanceInfo.config.stopCommand"
204+
:rows="2"
205+
type="textarea"
206+
resize="none"></el-input>
204207
</el-col>
205208
<el-col :lg="8" class="row-mt">
206209
<div class="sub-title">

src/assets/css/responsive.css

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
/* Copyright (C) 2022 MCSManager <[email protected]> */
2-
3-
@media (max-width: 900px) {
4-
.only-pc-display {
5-
display: none;
6-
}
7-
.only-phone-display {
8-
display: block;
9-
}
10-
11-
.col-md-responsive > *,
12-
.col-responsive > * {
13-
margin-bottom: 10px;
14-
}
15-
}
16-
@media (min-width: 900px) {
17-
.only-phone-display {
18-
display: none;
19-
}
20-
}
21-
22-
@media (min-width: 900px) {
23-
.phone-row-mt {
24-
margin-top: 10px;
25-
}
26-
}
1+
/* Copyright (C) 2022 MCSManager <[email protected]> */
2+
3+
@media (max-width: 901px) {
4+
.only-pc-display {
5+
display: none;
6+
}
7+
.only-phone-display {
8+
display: block;
9+
}
10+
11+
.col-md-responsive > *,
12+
.col-responsive > * {
13+
margin-bottom: 10px;
14+
}
15+
}
16+
@media (min-width: 901px) {
17+
.only-phone-display {
18+
display: none;
19+
}
20+
}
21+
22+
@media (min-width: 901px) {
23+
.phone-row-mt {
24+
margin-top: 10px;
25+
}
26+
}

0 commit comments

Comments
 (0)