From 01170adfb56a988b8f67fc6d5fd3dfb73aeca47a Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期四, 13 六月 2024 17:27:23 +0800
Subject: [PATCH] 1
---
src/books/artAndDrama/assets/main.less | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/books/artAndDrama/assets/main.less b/src/books/artAndDrama/assets/main.less
index 862de56..30b61f5 100644
--- a/src/books/artAndDrama/assets/main.less
+++ b/src/books/artAndDrama/assets/main.less
@@ -510,7 +510,6 @@
outline: none;
}
}
-<<<<<<< HEAD
.page-footer {
position: relative;
display: flex;
@@ -593,11 +592,6 @@
}
/* 濯掍綋鏌ヨ鍋氬熀纭�鍝嶅簲寮忓竷灞� */
@media (max-width: 430px) {
-=======
-}
- /* 濯掍綋鏌ヨ鍋氬熀纭�鍝嶅簲寮忓竷灞� */
- @media (max-width: 430px) {
->>>>>>> ba76798a669c6d859d0f8b9a913e7637d3e8d7e2
.ans-drama {
.page-box {
min-height: 750px;
@@ -620,6 +614,9 @@
.video-box {
max-width: 260px;
}
+ .page-box{
+ min-height: 500px;
+ }
}
}
@media (min-width: 660px) {
@@ -633,6 +630,7 @@
.video-box {
max-width: 370px;
}
+
}
}
::-webkit-scrollbar {
--
Gitblit v1.9.1