Skip to content

Commit

Permalink
Merge pull request #319 from Fuynkio/dev_shawn
Browse files Browse the repository at this point in the history
固定settings中各元素的样式
  • Loading branch information
ZhaoZuohong authored Sep 30, 2023
2 parents 7ff2cc0 + df86048 commit 4965600
Showing 1 changed file with 13 additions and 8 deletions.
21 changes: 13 additions & 8 deletions ui/src/pages/Settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function render_label(option) {
<template>
<div class="home-container">
<div class="waterfall">
<div style="break-inside: avoid; page-break-inside: avoid">
<div class="watterfall-items">
<n-card title="Mower设置">
<n-form
:label-placement="mobile ? 'top' : 'left'"
Expand Down Expand Up @@ -164,7 +164,7 @@ function render_label(option) {
</n-form>
</n-card>
</div>
<div style="break-inside: avoid; page-break-inside: avoid">
<div class="watterfall-items">
<n-card title="基建设置">
<n-form
:label-placement="mobile ? 'top' : 'left'"
Expand Down Expand Up @@ -285,14 +285,14 @@ function render_label(option) {
</n-form>
</n-card>
</div>
<div style="break-inside: avoid; page-break-inside: avoid"><maa-basic /></div>
<div style="break-inside: avoid; page-break-inside: avoid"><email /></div>
<div class="watterfall-items"><maa-basic /></div>
<div class="watterfall-items"><email /></div>
<!-- <SKLand /> -->
<div style="break-inside: avoid; page-break-inside: avoid"><clue /></div>
<div style="break-inside: avoid; page-break-inside: avoid"><Recruit /></div>
<div style="break-inside: avoid; page-break-inside: avoid"><maa-weekly /></div>
<div class="watterfall-items"><clue /></div>
<div class="watterfall-items"><Recruit /></div>
<div class="watterfall-items"><maa-weekly /></div>
<!-- <maa-weekly-new /> -->
<div style="break-inside: avoid; page-break-inside: avoid"><maa-long-tasks /></div>
<div class="watterfall-items"><maa-long-tasks /></div>
</div>
</div>
</template>
Expand Down Expand Up @@ -380,6 +380,11 @@ ul {
column-gap: 10px;
column-rule: 2px dotted rgb(79, 185, 227);
}
.watterfall-items {
margin: 0 0 10px 0;
break-inside: avoid;
page-break-inside: avoid;
}
@media (max-width: 1399px) {
.waterfall {
column-count: 1;
Expand Down

0 comments on commit 4965600

Please sign in to comment.