Merge branch 'master' into dev

# Conflicts:
#	public/static-home.html
This commit is contained in:
Zyronon
2025-11-22 17:23:53 +08:00
4 changed files with 36 additions and 13 deletions

View File

@@ -1,8 +1,8 @@
name: Deploy to Aliyun OSS
on:
# push:
# branches: [ 'master' ]
push:
branches: [ 'master' ]
workflow_dispatch:
permissions:

View File

@@ -2,7 +2,7 @@ name: Deploy to GitHub Pages
on:
push:
branches: [ 'feat/mobile' ]
branches: [ 'master' ]
workflow_dispatch:
permissions:
@@ -13,7 +13,8 @@ permissions:
jobs:
build:
runs-on: ubuntu-latest
outputs:
build-path: dist
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -41,14 +42,6 @@ jobs:
# Upload dist repository
path: './dist'
deploy:
needs: build
runs-on: ubuntu-latest
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4

View File

@@ -214,6 +214,7 @@
transform: translate(-50%, -50%);
background: rgb(247, 247, 247);
width: 30rem;
max-width: 85vw;
border-radius: 1rem;
display: none;
opacity: 0;
@@ -310,7 +311,7 @@
}
.container {
width: min(1200px, 90%);
width: min(1200px, 92%);
}
.sky-img {
@@ -325,6 +326,27 @@
gap: 1rem;
}
.card { width: auto; }
@media (max-width: 768px) {
h1 { font-size: 3rem !important; }
.content { margin-top: 4rem; gap: 1.4rem; }
.base-button { width: 100%; margin: .5rem 0; height: 2.8rem; font-size: 1rem; }
.base-button + .base-button{margin-left: 0;}
.bottom { flex-direction: column; align-items: flex-start; gap: .6rem; }
.sky a { width: 100% !important; }
.sky-img { width: 100%; }
}
@media (max-width: 480px) {
h1 { font-size: 2.4rem !important; }
.content { margin-top: 3.2rem; gap: 1.2rem; }
}
html, body { -webkit-tap-highlight-color: transparent; }
.icon { padding: .2rem; }
.bottom {
display: flex;
gap: 1rem;

View File

@@ -631,6 +631,14 @@ function importOldData() {
</div>
<div v-if="tabIndex === 5">
<div class="log-item">
<div class="mb-2">
<div>
<div>日期2025/11/22</div>
<div>内容适配移动端</div>
</div>
</div>
</div>
<div class="log-item">
<div class="mb-2">
<div>