From ba32a9384afe96a4ff14cee319c827c73ce9f6a2 Mon Sep 17 00:00:00 2001
From: litian <2804272236@qq.com>
Date: 星期五, 07 三月 2025 10:09:48 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/aurturingAndEducationAged0to3/assets/main.less | 94 ++++++++++++++++++++++++++++++----------------
1 files changed, 61 insertions(+), 33 deletions(-)
diff --git a/src/books/aurturingAndEducationAged0to3/assets/main.less b/src/books/aurturingAndEducationAged0to3/assets/main.less
index e97bdf8..26a10e2 100644
--- a/src/books/aurturingAndEducationAged0to3/assets/main.less
+++ b/src/books/aurturingAndEducationAged0to3/assets/main.less
@@ -12,7 +12,7 @@
position: relative;
}
- .max-400{
+ .max-400 {
max-width: 400px;
}
@@ -114,6 +114,7 @@
sup {
+ cursor: pointer;
vertical-align: super;
/* 淇濇寔涓婃爣瀵归綈鏂瑰紡 */
font-size: smaller;
@@ -155,6 +156,13 @@
.fm-st {
font-family: "瀹嬩綋";
+ }
+ .fm-fzs3{
+ font-family: "鏂规瀹嬩笁绠�浣�";
+ }
+
+ .fm-fzdbs{
+ font-family: "鏂规澶ф爣瀹�" !important;
}
.img-0 {
@@ -964,6 +972,20 @@
list-style-type: none;
}
+ @font-face {
+ font-family: '鏂规瀹嬩笁绠�浣�';
+ src: url('Fonts/FZS3JW.TTF');
+ }
+
+ @font-face {
+ font-family: '鏂规澶ф爣瀹�';
+ src: url('Fonts/FZDBSK.TTF');
+ }
+
+ @font-face {
+ font-family: '鏂规灏忔爣瀹�';
+ src: url('Fonts/FZXBSK.TTF');
+ }
@font-face {
font-family: 'FZLTZHJW';
@@ -1113,7 +1135,7 @@
.page-box:nth-child(even) .bodystyle {
- font-family: 'FZLTXIHJW';
+ font-family: '鏂规瀹嬩笁绠�浣�';
text-align: justify;
margin: 0 15% 0 13%;
padding-bottom: 80px;
@@ -1130,7 +1152,7 @@
}
.page-box:nth-child(odd) .bodystyle {
- font-family: 'FZLTXIHJW';
+ font-family: '鏂规瀹嬩笁绠�浣�';
text-align: justify;
margin: 0 13% 0 15%;
padding-bottom: 80px;
@@ -1206,6 +1228,7 @@
}
+
.note {
margin: 0;
font-size: 12px;
@@ -1242,9 +1265,9 @@
font-weight: bold;
font-family: 'FZLTXIHJW';
text-align: center;
- font-size: 0.85em;
- margin-left: 0%;
- margin-right: 0%;
+ font-size: 12px;
+ line-height: 20px;
+ margin: 0% !important;
text-indent: 0em;
}
@@ -1263,9 +1286,8 @@
margin-bottom: 0.5em;
text-indent: 2em;
line-height: 30px;
- font-size: 18px;
text-align: justify;
- font-family: 'msyh';
+ font-family: '鏂规瀹嬩笁绠�浣�';
}
.cover {
@@ -1396,24 +1418,28 @@
text-align: center;
font-family: 'FZHTJW';
font-weight: bold;
- font-size: 1.6em;
+ font-size: 1.7em;
margin-bottom: 1.5em;
margin-top: 1.5em;
- text-indent: 2em;
+ text-indent: 0em;
}
.h2-zt {
+ font-family: "鏂规灏忔爣瀹�";
color: #000;
margin-right: 30px;
+ font-weight: 400;
}
.h2-zt1 {
+ font-weight: 400;
+ font-family: "鏂规灏忔爣瀹�";
color: #000;
}
h3 {
- font-family: 'FZHTJW';
- font-weight: bold;
+ font-family: '鏂规澶ф爣瀹�';
+ font-weight: 400;
color: #000;
font-size: 1.1em;
margin-bottom: 1em;
@@ -1427,12 +1453,11 @@
margin-bottom: 0em;
margin-top: -0.5em;
padding: 0.1em 0.2em 0.1em 0.2em;
- margin-left: -3.5em;
}
h4 {
- font-family: 'FZHTJW';
- font-weight: bold;
+ font-family: '鏂规澶ф爣瀹�';
+ font-weight: 400;
margin-bottom: 0.5em;
margin-top: 0.5em;
font-size: 1em;
@@ -1440,10 +1465,11 @@
}
h5 {
- font-family: 'FZHTJW';
+ font-family: '鏂规澶ф爣瀹�';
+ font-weight: 400;
margin-bottom: 0.4em;
margin-top: 0.4em;
- font-size: 1.15em;
+ font-size: 19px;
text-indent: 2em;
}
@@ -1639,19 +1665,23 @@
margin-top: 1em;
border-radius: 1.5em;
margin-bottom: 1em;
+ p{
+ line-height: 30px;
+ margin: 0;
+ }
}
div.bk-1 {
border: 3px dotted #B2B2B2;
- padding: 3px 10px 3px 10px;
- margin-top: 2em;
+ padding: 15px 10px 3px 10px;
+ margin-top: 1em;
border-radius: 1.5em;
margin-bottom: 1em;
position: relative;
p {
- line-height: 30px;
+ line-height: 24px;
font-size: 16px;
font-family: "kaiti";
}
@@ -1660,8 +1690,8 @@
div.bk-2 {
position: absolute;
- top: -13px;
- left: -30px;
+ top: -15px;
+ left: -35px;
}
.bj2 {
@@ -1753,7 +1783,7 @@
span.bj2 {
background-color: #B2B2B2;
- padding: 0.2em 1.5em 0.2em 1em;
+ padding: 0.2em 1em 0.2em 0.5em;
font-size: 1.1em;
font-weight: bold;
text-indent: 0em;
@@ -1872,7 +1902,8 @@
}
.zt-ht {
- font-weight: bold;
+ text-indent: 0em;
+ font-weight: 100;
font-size: 1.2em;
font-family: "HiFont Hei GB";
}
@@ -1930,26 +1961,23 @@
}
.rwmb-1 {
- margin-left: -2.4em;
- margin-bottom: -0.6em;
- margin-top: 0.5em;
- height: 3em;
+ height: 1.8em;
}
div.tp-2 {
margin-bottom: 0.2em;
- margin-top: -2.3em;
- margin-left: 5.9em;
+ margin-top: -1.8em;
+ margin-left: 4.8em;
}
div.tp-1 {
margin-bottom: 0.2em;
- margin-top: -2.3em;
+ margin-top: -1.75em;
margin-left: 5em;
}
.rwmb-2 {
- height: 1.8em;
+ height: 1.5em;
}
.rwmb-7 {
@@ -2262,7 +2290,7 @@
min-height: 500px;
}
- .max-400{
+ .max-400 {
max-width: 200px;
}
--
Gitblit v1.9.1