diff --git a/backend/src/main/java/com/openisle/config/SecurityConfig.java b/backend/src/main/java/com/openisle/config/SecurityConfig.java index 852ea1c5c..5c9572837 100644 --- a/backend/src/main/java/com/openisle/config/SecurityConfig.java +++ b/backend/src/main/java/com/openisle/config/SecurityConfig.java @@ -77,8 +77,8 @@ public class SecurityConfig { "http://127.0.0.1", "http://localhost:8080", "http://localhost", - "http://30.211.97.254:8080", - "http://30.211.97.254", + "http://30.211.98.193:8080", + "http://30.211.98.193", "http://192.168.7.70", "http://192.168.7.70:8080", websiteUrl, diff --git a/frontend/public/manifest.json b/frontend/public/manifest.json index 5bc639a6d..4504e9927 100644 --- a/frontend/public/manifest.json +++ b/frontend/public/manifest.json @@ -2,7 +2,7 @@ "name": "OpenIsle", "short_name": "OpenIsle", "start_url": "/", - "display": "standalone", + "display": "fullscreen", "icons": [ { "src": "/icon-192.png", diff --git a/frontend/src/App.vue b/frontend/src/App.vue index f60db5054..0fb771ef4 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -68,9 +68,13 @@ export default { .menu-container {} .content { + /* height: calc(100vh - var(--header-height)); */ + padding-top: var(--header-height); flex: 1; max-width: 100%; transition: max-width 0.3s ease; + background-color: var(--background-color); + min-height: calc(100vh - var(--header-height)); } .content.menu-open { diff --git a/frontend/src/assets/global.css b/frontend/src/assets/global.css index 5f0786489..fd6eefb5e 100644 --- a/frontend/src/assets/global.css +++ b/frontend/src/assets/global.css @@ -8,7 +8,8 @@ --header-text-color: black; --menu-background-color: white; --background-color: white; - --background-color-blur: rgba(255, 255, 255, 0.57); + /* --background-color-blur: rgba(255, 255, 255, 0.57); */ + --background-color-blur: var(--background-color); --menu-border-color: lightgray; --normal-border-color: lightgray; --menu-selected-background-color: rgba(208, 250, 255, 0.659); @@ -34,7 +35,8 @@ --header-text-color: white; --menu-background-color: #333; --background-color: #333; - --background-color-blur: #333333a4; + /* --background-color-blur: #333333a4; */ + --background-color-blur: var(--background-color); --menu-border-color: #555; --normal-border-color: #555; --menu-selected-background-color: rgba(255, 255, 255, 0.1); @@ -54,10 +56,9 @@ body { font-family: 'Roboto', sans-serif; background-color: var(--normal-background-color); color: var(--text-color); - overflow: hidden; /* 禁止滚动 */ + /* overflow: hidden; 禁止滚动 */ } - /************************* * Vditor 自定义皮肤覆写 *************************/ diff --git a/frontend/src/components/CallbackPage.vue b/frontend/src/components/CallbackPage.vue index 003d12a62..764b15a11 100644 --- a/frontend/src/components/CallbackPage.vue +++ b/frontend/src/components/CallbackPage.vue @@ -18,8 +18,6 @@ export default { diff --git a/frontend/src/views/LoginPageView.vue b/frontend/src/views/LoginPageView.vue index 4a33fb508..26d926a90 100644 --- a/frontend/src/views/LoginPageView.vue +++ b/frontend/src/views/LoginPageView.vue @@ -125,8 +125,7 @@ export default { flex-direction: row; align-items: center; justify-content: center; - height: calc(100vh - var(--header-height)); - padding-top: var(--header-height); + height: 100%; width: 100%; background-color: var(--background-color); } diff --git a/frontend/src/views/MessagePageView.vue b/frontend/src/views/MessagePageView.vue index 75c5a357c..c11d82efa 100644 --- a/frontend/src/views/MessagePageView.vue +++ b/frontend/src/views/MessagePageView.vue @@ -626,11 +626,9 @@ export default { height: 300px; } - .message-page { background-color: var(--background-color); - height: calc(100vh - var(--header-height)); - padding-top: var(--header-height); + height: 100%; overflow-y: auto; } @@ -639,7 +637,6 @@ export default { top: 1px; z-index: 200; background-color: var(--background-color-blur); - backdrop-filter: blur(10px); display: flex; flex-direction: row; justify-content: space-between; diff --git a/frontend/src/views/NewPostPageView.vue b/frontend/src/views/NewPostPageView.vue index 83aff279d..1038df159 100644 --- a/frontend/src/views/NewPostPageView.vue +++ b/frontend/src/views/NewPostPageView.vue @@ -261,8 +261,7 @@ export default { display: flex; justify-content: center; background-color: var(--background-color); - height: calc(100vh - var(--header-height)); - padding-top: var(--header-height); + height: 100%; padding-right: 20px; padding-left: 20px; overflow-y: auto; diff --git a/frontend/src/views/NotFoundPageView.vue b/frontend/src/views/NotFoundPageView.vue index 86304faa9..5b623cafe 100644 --- a/frontend/src/views/NotFoundPageView.vue +++ b/frontend/src/views/NotFoundPageView.vue @@ -17,8 +17,7 @@ export default { display: flex; flex-direction: column; align-items: center; - height: calc(100vh - var(--header-height)); - padding-top: var(--header-height); + height: 100%; text-align: center; background-color: var(--background-color); } diff --git a/frontend/src/views/PostPageView.vue b/frontend/src/views/PostPageView.vue index 5e16bdd72..32119d98e 100644 --- a/frontend/src/views/PostPageView.vue +++ b/frontend/src/views/PostPageView.vue @@ -650,7 +650,7 @@ export default { background-color: var(--background-color); display: flex; flex-direction: row; - height: 100vh; + height: 100%; } .loading-container { @@ -665,13 +665,12 @@ export default { overflow-y: auto; scrollbar-width: none; padding: 20px; - height: calc(100% - 40px - var(--header-height)); + height: calc(100% - 40px); width: calc(85% - 40px); - padding-top: calc(var(--header-height) + 20px); + padding-top: 20px; } .post-page-scroller-container { - padding-top: var(--header-height); display: flex; flex-direction: column; width: 15%; @@ -974,7 +973,6 @@ export default { .post-page-main-container { width: calc(100% - 20px); padding: 10px; - padding-top: calc(var(--header-height) + 10px); } .article-title { diff --git a/frontend/src/views/ProfileView.vue b/frontend/src/views/ProfileView.vue index 3dd44c70f..4470100dd 100644 --- a/frontend/src/views/ProfileView.vue +++ b/frontend/src/views/ProfileView.vue @@ -497,8 +497,7 @@ export default { .profile-page { background-color: var(--background-color); - height: calc(100vh - var(--header-height)); - padding-top: var(--header-height); + height: 100%; overflow-y: auto; overflow-x: hidden; } @@ -643,7 +642,6 @@ export default { top: 1px; z-index: 200; background-color: var(--background-color-blur); - backdrop-filter: blur(10px); display: flex; flex-direction: row; padding: 0 20px; diff --git a/frontend/src/views/SettingsPageView.vue b/frontend/src/views/SettingsPageView.vue index 74ef61422..089ef7a77 100644 --- a/frontend/src/views/SettingsPageView.vue +++ b/frontend/src/views/SettingsPageView.vue @@ -239,8 +239,7 @@ export default { .settings-page { background-color: var(--background-color); padding: 40px; - height: calc(100vh - var(--header-height) - 80px); - padding-top: calc(var(--header-height) + 40px); + height: calc(100% - 80px); overflow-y: auto; } diff --git a/frontend/src/views/SignupPageView.vue b/frontend/src/views/SignupPageView.vue index eea683ebd..0868b5923 100644 --- a/frontend/src/views/SignupPageView.vue +++ b/frontend/src/views/SignupPageView.vue @@ -222,8 +222,7 @@ export default { flex-direction: row; align-items: center; justify-content: center; - height: calc(100vh - var(--header-height)); - padding-top: var(--header-height); + height: 100%; width: 100%; background-color: var(--background-color); } diff --git a/frontend/src/views/SignupReasonPageView.vue b/frontend/src/views/SignupReasonPageView.vue index 3f76bbea3..1bd4183e4 100644 --- a/frontend/src/views/SignupReasonPageView.vue +++ b/frontend/src/views/SignupReasonPageView.vue @@ -82,8 +82,7 @@ export default { justify-content: center; align-items: center; background-color: var(--background-color); - height: calc(100vh - var(--header-height)); - padding-top: var(--header-height); + height: 100%; } .reason-title { diff --git a/frontend/src/views/SiteStatsPageView.vue b/frontend/src/views/SiteStatsPageView.vue index aab6bca2d..f0c1904b1 100644 --- a/frontend/src/views/SiteStatsPageView.vue +++ b/frontend/src/views/SiteStatsPageView.vue @@ -48,7 +48,6 @@ onMounted(loadData) max-width: var(--page-max-width); background-color: var(--background-color); margin: 0 auto; - height: calc(100vh - var(--header-height) - 40px); - padding-top: calc(var(--header-height) + 20px); + height: 100%; }