diff --git a/.github/workflows/deploy-aliyun-oss.yml b/.github/workflows/deploy-aliyun-oss.yml index 831ed349..6829e3b3 100644 --- a/.github/workflows/deploy-aliyun-oss.yml +++ b/.github/workflows/deploy-aliyun-oss.yml @@ -1,8 +1,8 @@ name: Deploy to Aliyun OSS on: -# push: -# branches: [ 'master' ] + push: + branches: [ 'master' ] workflow_dispatch: permissions: diff --git a/.github/workflows/deploy-pages.yml b/.github/workflows/deploy-pages.yml index b724bda3..dfc8fbe7 100644 --- a/.github/workflows/deploy-pages.yml +++ b/.github/workflows/deploy-pages.yml @@ -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 diff --git a/public/static-home.html b/public/static-home.html index 6f7a7078..0aee95d2 100644 --- a/public/static-home.html +++ b/public/static-home.html @@ -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; diff --git a/src/pages/setting/Setting.vue b/src/pages/setting/Setting.vue index 976ae0ee..88b94b22 100644 --- a/src/pages/setting/Setting.vue +++ b/src/pages/setting/Setting.vue @@ -631,6 +631,14 @@ function importOldData() {