From 47c906e52607ddd89a3c12a4bf90e33ca9579e7d Mon Sep 17 00:00:00 2001 From: birt <2499248221@qq.com> Date: 星期日, 13 四月 2025 22:41:01 +0800 Subject: [PATCH] 123 --- zhitan-vue/src/views/login.vue | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/zhitan-vue/src/views/login.vue b/zhitan-vue/src/views/login.vue index c99007b..a42fc6f 100644 --- a/zhitan-vue/src/views/login.vue +++ b/zhitan-vue/src/views/login.vue @@ -201,11 +201,7 @@ .login { display: flex; align-items: center; -<<<<<<< HEAD height: 100vh; -======= - height: 100%; ->>>>>>> bf185c5d6a86eaa6a27d93b6d5942234d5bebb24 background-image: url("@/assets/images/login-background.png"); background-repeat: no-repeat; background-size: cover; -- Gitblit v1.9.3