From 0ac722771ed2e1ae8858407ea5349eb18d18ed9d Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 13 六月 2024 16:37:09 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/artAndDrama/assets/main.less | 85 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 85 insertions(+), 0 deletions(-)
diff --git a/src/books/artAndDrama/assets/main.less b/src/books/artAndDrama/assets/main.less
index 8e97bab..862de56 100644
--- a/src/books/artAndDrama/assets/main.less
+++ b/src/books/artAndDrama/assets/main.less
@@ -510,9 +510,94 @@
outline: none;
}
}
+<<<<<<< HEAD
+ .page-footer {
+ position: relative;
+ display: flex;
+ align-items: center;
+ /* 鍨傜洿灞呬腑 */
+ }
+
+ .page-footer-image {
+ /* 鍥剧墖鏍峰紡 */
+ max-width: 100%;
+ height: auto;
+ position: relative;
+ /* 纭繚.page-footer-number鍙互鐩稿浜庡浘鐗囧畾浣� */
+ z-index: 1;
+ /* 纭繚椤电爜鏁板瓧鍦ㄥ浘鐗囦笂鏂� */
+ }
+
+ .page-footer-number-left {
+ color: black;
+ left: 15%;
+ position: absolute;
+ /* 缁濆瀹氫綅椤电爜 */
+ font-size: 2em;
+ /* 浣犲彲浠ユ牴鎹渶瑕佽皟鏁村瓧浣撳ぇ灏� */
+ z-index: 2;
+
+ /* 纭繚椤电爜鏁板瓧鍦ㄥ浘鐗囦笂鏂� */
+ /* 浣跨敤::before浼厓绱犲垱寤虹豢鑹插渾褰㈣儗鏅� */
+ &::before {
+ content: "";
+ position: absolute;
+ top: 50%;
+ /* 鍨傜洿灞呬腑 */
+ left: 50%;
+ /* 姘村钩灞呬腑 */
+ transform: translate(-50%, -50%);
+ /* 绉诲姩鍒颁腑蹇� */
+ width: 1.2em;
+ /* 浣犲彲浠ユ牴鎹渶瑕佽皟鏁村渾褰㈠ぇ灏� */
+ height: 1.2em;
+ border-radius: 50%;
+ /* 鍦嗗舰 */
+ background-color: rgba(208, 226, 179);
+ /* 鑳屾櫙棰滆壊 */
+ z-index: -1;
+ /* 纭繚鍦嗗舰鑳屾櫙鍦ㄦ枃鏈笅鏂� */
+ }
+ }
+ .page-footer-number-right {
+ color: black;
+ right: 15%;
+ position: absolute;
+ /* 缁濆瀹氫綅椤电爜 */
+ font-size: 2em;
+ /* 浣犲彲浠ユ牴鎹渶瑕佽皟鏁村瓧浣撳ぇ灏� */
+ z-index: 2;
+
+ /* 纭繚椤电爜鏁板瓧鍦ㄥ浘鐗囦笂鏂� */
+ /* 浣跨敤::before浼厓绱犲垱寤虹豢鑹插渾褰㈣儗鏅� */
+ &::before {
+ content: "";
+ position: absolute;
+ top: 50%;
+ /* 鍨傜洿灞呬腑 */
+ left: 50%;
+ /* 姘村钩灞呬腑 */
+ transform: translate(-50%, -50%);
+ /* 绉诲姩鍒颁腑蹇� */
+ width: 1.2em;
+ /* 浣犲彲浠ユ牴鎹渶瑕佽皟鏁村渾褰㈠ぇ灏� */
+ height: 1.2em;
+ border-radius: 50%;
+ /* 鍦嗗舰 */
+ background-color: rgba(208, 226, 179);
+ /* 鑳屾櫙棰滆壊 */
+ z-index: -1;
+ /* 纭繚鍦嗗舰鑳屾櫙鍦ㄦ枃鏈笅鏂� */
+ }
+ }
+}
+/* 濯掍綋鏌ヨ鍋氬熀纭�鍝嶅簲寮忓竷灞� */
+@media (max-width: 430px) {
+=======
}
/* 濯掍綋鏌ヨ鍋氬熀纭�鍝嶅簲寮忓竷灞� */
@media (max-width: 430px) {
+>>>>>>> ba76798a669c6d859d0f8b9a913e7637d3e8d7e2
.ans-drama {
.page-box {
min-height: 750px;
--
Gitblit v1.9.1