From 870e0b3c8361cfa8af3facf67b08f1f5be66252a Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期四, 13 六月 2024 10:13:49 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout

---
 src/books/math/assets/main.less |  856 ++++++++++++++++++++++++++++++++------------------------
 1 files changed, 484 insertions(+), 372 deletions(-)

diff --git a/src/books/math/assets/main.less b/src/books/math/assets/main.less
index 8d1dbdb..a735352 100644
--- a/src/books/math/assets/main.less
+++ b/src/books/math/assets/main.less
@@ -2,331 +2,387 @@
   width: 100%;
   height: 100%;
   font-family: "瀹嬩綋", SimSun, sans-serif;
-  ul {
-    list-style-type: none;
-  }
-
-  li {
-    list-style-type: none;
-  }
-
-  .ls1 {
-    font-family: "HiFont Hei GB";
-    color: #30aad1;
-    font-weight: bold;
-  }
-  .hs {
-    font-family: "HiFont Hei GB";
-    color: #ea6b00;
-    font-weight: bold;
-  }
-
-  .zs1 {
-    font-family: "HiFont Hei GB";
-    color: #857eb4;
-    font-weight: bold;
-  }
-
-  span.under1 {
-    border-bottom: 2px solid #f0bd4a;
-    border-width: 2px;
-  }
-
-  div.bodystyle {
-    font-size: 18px;
-    text-align: justify;
-    margin: 5%;
-    line-height: 30px;
-  }
-
-  span.zt-0 {
-    color: #0087af;
-  }
-
-  p.pzt-0 {
-    color: #0087af;
-    font-size: 18px;
-  }
-  p.pzt-0-right {
-    font-size: 18px;
-    color: #0087af;
-    text-align: right;
-  }
-  p.pzt-1 {
-    font-weight: bold;
-    color: #0087af;
-    font-size: 18px;
-  }
-
-  .note {
+  mn{
+    font-size:1em;
+    }
+    mi{
+    font-size:1em;
+    }
+    
+        ul {
+            list-style-type:none;
+        }
+    
+        li {
+            list-style-type:none;
+        }
+    
+    div.bodystyle {
+      font-family:'FZLTXIHJW',"Times New Roman";
+      font-size:18px;
+      text-align:justify;
+      margin:5%;
+      line-height:30px;
+    }
+    .info {
+        position: relative;
+    }
+    
+    
+    .em_circle {
+      text-decoration:dashed;
+    }
+    
+    .fieldset {
+      background: #E7F4FC;
+      padding:1em;
+      border-radius: 5px;
+      border-radius: 0.6em;
+    }
+    
+    .inline{
+    height:1.2em;
+      vertical-align:top;
+    
+    }
+    .inline2{
+    height:2.9em;
+    margin-top:2em;
+    margin-bottom:-0.4em;
+    }
+    .imz{
+         height:96%;
+         text-align:center;
+    
+    
+    }
+    
+    .note{
     font-size: 0.85em;
-  }
-
-  .img {
+    }
+    
+    
+    .block{
+      font-family:"STKaiti";
+    }
+    
+    .block1
+    {
+      font-family:"STKaiti";
+      text-align:right;
+      margin-left:0%;
+      margin-right:2em;
+    }
+    
+    .block2
+    {
+      font-family:"STKaiti";
+      text-indent:0em;
+      text-align:center;
+      margin-left:0%;
+      margin-right:0%;
+    }
+    
+    .block3
+    {
+      font-family:"STKaiti";
+      text-align:left;
+      text-indent:0em;
+      margin-left:0%;
+      margin-right:0%;
+    
+    }
+    
+    .img{color:#146Eb4;
     text-align: center;
-    font-size:18px;
-    color: #000;
-    margin-left: 0%;
-    margin-right: 0%;
+    font-size:0.85em;
     text-indent: 0em;
-  }
-
-  .img1 {
-    text-align: right;
-    font-size: 0.85em;
-    margin-left: 0%;
-    margin-right: 2em;
-    text-indent: 0em;
-  }
-
-  p {
-    // margin-top: 1em;
-    margin: 0;
-    text-indent: 2em;
-    line-height: 30px;
-    font-size: 18px;
-    text-align: justify;
-  }
-  .cover {
-    width: 100%;
-    padding: 0px;
-  }
-  .center {
-    text-align: center;
-    margin-left: 0%;
-    margin-right: 0%;
-    text-indent: 0em;
-  }
-
-  .center1 {
-    font-family: "STKaiti";
-    text-align: center;
-    margin-left: 0%;
-    margin-right: 0%;
-    text-indent: 0em;
-  }
-
-  .left {
-    text-indent: 0em;
-    margin-left: 0%;
-    margin-right: 0%;
-  }
-  .right {
-    text-align: right;
-    margin-left: 0%;
-    margin-right: 0%;
-  }
-  .right1 {
-    font-family: "STKaiti";
-    text-align: right;
-    margin-left: 0%;
-    margin-right: 0%;
-  }
-  .quote {
-    margin-top: 0%;
-    margin-bottom: 0%;
-    margin-left: 1em;
-    margin-right: 1em;
-    text-align: justify;
-    font-family: "cnepub", serif;
-  }
-  h1 {
-    font-family: "STKaiti";
-    text-align: center;
-    font-size: 1.8em;
-    color: #515594;
-    margin-bottom: 0.5cm;
-    margin-top: 0.5cm;
-  }
-
-  h2 {
-    font-family: "STKaiti";
-    text-align: center;
-    font-size: 1.2em;
-    margin-top: 0.2em;
-    margin-bottom: 0.2em;
-    text-indent: 0em;
-  }
-
-  h2.lefth2 {
-    text-align: left;
-    font-size: 1.2em;
-    margin-top: 0.2em;
-    margin-bottom: 0.2em;
-    text-indent: 0em;
-  }
-
-  h2.whleft2 {
-    text-align: left;
-    color: #af0206;
-    font-size: 38px;
-    margin-top: 0.2em;
-    margin-bottom: 0.2em;
-    text-indent: 0em;
-  }
-
-  h3 {
-    font-family: "STKaiti";
-    color: #ef495d;
-    font-weight: bold;
-    // font-size: 1.15em;
-    font-size: 26px;
-    margin-top: 2em;
-    text-align: center;
-    margin-bottom: 20px;
-    text-indent: 0em;
-  }
-
-  h4 {
-    font-weight: bold;
-    color: #5877ba;
-    font-size: 1.1em;
-    margin-top: 0.2em;
-    margin-bottom: 1em;
-    text-indent: 0em;
-  }
-  h5 {
-    font-weight: bold;
-    color: #c96653;
-    font-size: 1em;
-    margin-top: 0.2em;
-    margin-bottom: 1em;
-    text-indent: 2em;
-  }
-  h6 {
-    font-family: "cnepub", serif;
-    color: #36c3f4;
-    font-size: 1.1em;
-    margin-top: 10px;
-    text-indent: 2em;
-    margin-bottom: 10px;
-  }
-  .u {
-    text-decoration: underline;
-  }
-
-  .img-0 {
-    width: 100%;
-  }
-  .imz {
-    width: 96%;
-    text-align: center;
-  }
-
-  .img-a {
-    width: 95%;
-  }
-  .img-b {
-    width: 80%;
-  }
-  .img-c {
-    width: 70%;
-  }
-  .img-d {
-    width: 60%;
-  }
-  .img-e {
-    width: 50%;
-  }
-  .img-f {
-    width: 40%;
-  }
-  .img-g {
-    width: 30%;
-  }
-  .img-gh1 {
-    width: 30%;
-    text-align: right;
-  }
-  .img-gh2 {
-    width: 45%;
-    text-align: right;
-  }
-  .img-h {
-    width: 25%;
-  }
-  .img-i {
-    width: 10%;
-  }
-  .img-j {
-    width: 5%;
-  }
-  .img-gn {
-    width: 48%;
-  }
-  .img-gn1 {
-    width: 18%;
-  }
-  .inline {
-    height: 2em;
-    margin-bottom: -0.5em;
-  }
-  .inline1 {
-    height: 1.5em;
-    margin-top: -1em;
-    margin-bottom: -0.4em;
-  }
-  .inline2 {
-    height: 2.5em;
-    margin-top: 2em;
-    margin-bottom: -0.4em;
-  }
-  .inline3 {
-    height: 4em;
-    margin-top: 2em;
-    margin-bottom: -0.4em;
-  }
-  .block {
-    font-family: "STKaiti";
-    font-size: 1.15em;
-  }
-
-  .block1 {
-    font-family: "STKaiti";
-    color: #08a496;
-    text-align: right;
-    font-size: 1.15em;
-    margin-right: 2em;
-    text-indent: 0em;
-  }
-  .block2 {
-    font-family: "STKaiti";
-    // font-size: 1.15em;
-    font-size: 26px;
-    text-align: center;
-    text-indent: 0em;
-    margin: 6px 0;
-  }
-
-  .bj1 {
-    border: 2px solid #0aa19c;
-    background: #e3efd7;
-    border-style: solid none none none;
-    padding: 0.2em 0.4em 0.2em 0.4em;
-    margin-top: 1em;
-    margin-left: 0.5em;
-    margin-right: 0.5em;
-    margin-bottom: 1em;
-    font-size: 1.1em;
-    box-shadow: 0.3em 0.3em 0px 0px #c3c2c0;
-  }
-
-  .bj2 {
-    border: 2px solid #e04239;
-    background: #fdecd2;
-    border-style: solid none none none;
-    padding: 0.2em 0.4em 0.2em 0.4em;
-    margin-top: 1em;
-    margin-left: 0.5em;
-    margin-right: 0.5em;
-    margin-bottom: -0.8em;
-    font-size: 1.1em;
-    box-shadow: 0.3em 0.3em 0px 0px #c3c2c0;
-  }
-
-  .kaiti {
-    font-family: "STKaiti";
-  }
+    }
+    
+    body {
+      font-family:"Times New Roman", "锟斤拷锟斤拷";
+    }
+    
+    
+    
+    
+    p
+    {
+      margin-top: 0.5em;
+      text-indent: 2em;
+      line-height: 1.5em;
+    }
+    .cover {
+      width:100%;
+      padding:0px;
+    }
+    .center {
+      text-align: center;
+      margin-left: 0%;
+      margin-right: 0%;
+      text-indent: 0em
+    }
+    .left1 {
+      text-indent: 1em;
+      text-align: left;
+    }
+    .left {
+      text-indent: 0em;
+      margin-left: 0%;
+      margin-right: 0%;
+    }
+    .right {
+      text-align: right;
+      margin-left: 0%;
+      margin-right: 0%;
+    }
+    .quote {
+      margin-top: 0%;
+      margin-bottom: 0%;
+      margin-left: 1em;
+      margin-right: 1em;
+      text-align: justify;
+      font-family:"Times New Roman", "锟斤拷锟斤拷";
+    }
+    h1 {
+      color: #9f052f;
+      font-family:"Times New Roman", "锟斤拷锟斤拷";
+      text-align: center;
+      font-size:1.5em;
+      margin-top: 1em;
+      margin-bottom: 1em;
+      font-family:"Times New Roman", "锟斤拷锟斤拷";
+    }
+    
+    h2 {
+      font-family:"Times New Roman", "锟斤拷锟斤拷";
+      font-weight:bold;
+      font-size:1.3em;
+      margin-top: 1em;
+      margin-bottom: 0.2em;
+    }
+    h3 {
+    
+      font-family:"Times New Roman", "锟斤拷锟斤拷";
+      text-align: left;
+      font-size:1.2em;
+      margin-top: 1em;
+      margin-bottom: 0.2em;
+    }
+    h4 {
+    
+      font-family:"Times New Roman", "锟斤拷锟斤拷";
+      color: #00A1E9;
+      text-align: left;
+      font-weight:bold;
+      font-size:medium;
+      margin-top: 1em;
+      margin-bottom: 0.2em;
+    }
+    h5 {
+    
+      font-family:"Times New Roman", "锟斤拷锟斤拷";
+      text-align: left;
+      font-weight:bold;
+      font-size:small;
+      margin-top: 0.8em;
+      margin-bottom: 0.2em;
+    }
+    h6 {
+    
+      font-family:"Times New Roman", "锟斤拷锟斤拷";
+      text-align: left;
+      font-weight:bold;
+      font-size:x-small;
+      margin-top: 1em;
+      margin-bottom: 0.2em;
+    }
+    .u { 
+    
+          text-decoration: underline; }
+    
+    .img-0{	
+    width:100%;
+    }
+    .img-a{	
+      width:90%;
+    }
+    .img-b{
+      width:80%;
+    }
+    .img-c{	
+      width:70%;
+    }
+    .img-d{	
+      width:60%;
+    }
+    .img-e{	
+      width:50%;
+    }
+    .img-f{	
+      width:40%;
+    }
+    .img-g{	
+      width:30%;
+    }
+    .img-h{	
+      width:20%;
+    }
+    .img-i{       
+      width:10%;
+    }
+    .img-j{        
+      width:5%;
+    }
+    .img-n{        
+      height:1em;
+    }
+    
+    .img-gn{	
+      height:3em;
+    }
+    .img-gn1{	
+      height:2.2em;
+    }
+    .img-gn2{
+      height:1.9em;
+    }
+    .border-1{
+      border: 1px solid #E6E6FA;
+      background-color:#E6E6FA;
+      border-radius: 0.6em;
+      padding-top: 30%;
+      padding-bottom: 70%;
+      margin: 20% 10% 20% 10%;
+    }
+    .border-2{
+      border: 1px solid #FFF5EE;
+      background-color:#FFF5EE;
+      border-radius: 0.6em;
+      padding-top: 30%;
+      padding-bottom: 70%;
+      margin: 20% 10% 20% 10%;
+    }
+    /*锟铰伙拷锟斤拷*/
+    .em_dot {
+      -webkit-text-emphasis-style:dot;
+         -moz-text-emphasis-style:dot;
+          -ms-text-emphasis-style:dot;
+              text-emphasis-style:dot;
+      -webkit-text-emphasis-position:under;
+         -moz-text-emphasis-position:under;
+          -ms-text-emphasis-position:under;
+              text-emphasis-position:under;
+    }
+    blockquote.kindle-cn-blockquote {
+      background: #f9f9f9;
+      border-left: 0.5em solid #ccc;
+      margin: 1.5em;
+      padding: 1em;
+      text-indent:2em;
+      line-height:1.5em;
+    }
+    div.bj{	background-color:#D3EDFA;
+      padding: 0.3em;
+      margin-top:1em;
+      margin-bottom:1em;
+    }
+    .hs
+    {
+      font-family:"Times New Roman", "锟斤拷锟斤拷";
+      color:red;
+    }
+    
+    
+    .zt-ls{
+      color: #00A1E9;
+    }
+    .zt-ls1{
+      color: #00A1E9;
+      font-weight:bold;
+      font-size:0.9em;
+    }
+    
+    .zt-ls2{
+      font-family:'FZLTXIHJW',"Times New Roman";
+      color: #00A1E9;
+      font-weight:bold;
+    }
+    
+    .fontsz1
+    {
+      color: #00A1E9;
+      font-size:0.8em;
+    }
+    .fontsz2
+    {
+      color: #00A1E9;
+      font-size:0.6em;
+    }
+    
+    
+    div.bk-hzjl{
+      border:2px solid #00A1E9;
+      background:#F6FBFF;
+      border-radius: 0 0 0 5px;
+      padding:15px;
+      margin-bottom:2em;
+      margin-top:2em;
+      border-radius:0em 0em 2em 0em;
+    }
+    
+    div.bj1-hzjl{
+      padding:0.01em 1em 0.01em 1em;
+      margin-top:-2.4em;
+      margin-left:-0.5em;
+      margin-right:-1em;
+    }
+    
+    div.bk{
+      border:2px solid #00A1E9;
+      padding:0.8em;
+      margin-bottom:2em;
+      margin-top:2em;
+      box-shadow: inset -0.5em -0.5em 0 0 #E0F2FC;
+    }
+    
+    div.bj1{
+      padding:0.01em 1em 0.01em 1em;
+      margin-top:-2.6em;
+      margin-left:-0.5em;
+      margin-right:-1em;
+    }
+    
+    
+    p.bj2{
+      background-color:#81CFF5;
+      color:#FFFFFF;
+      display: inline-block;
+      padding:1px;
+      font-size: 1.1em;
+      padding: 3px 10px 3px 10px;
+      font-weight: bold;
+      box-shadow: -0.3em -0.3em 0px 0px #2FBDEF; 
+      margin: 0;
+      text-indent: 0em;
+      margin-top:1em;
+      margin-bottom:1em;
+    }
+    
+    .bj-sp{
+      background-color:#FFFFFF;
+      color:#53C3F1;
+      padding:0.3em 1em 0.3em 1em;
+      margin-top:0em;
+      margin-left:-3em;
+    }
+    
+    .fieldset1 {
+      border:2px solid #33BCF0;
+      padding:1em;
+      border-radius: 5px;
+      border-radius: 0.6em;
+    }
 
   // 鑷畾涔�
   .page-box {
@@ -418,6 +474,9 @@
   .fl-cn {
     align-items: center;
   }
+  .al-end {
+    align-items: flex-end;
+  }
   .fz-18 {
     font-size: 18px;
   }
@@ -485,54 +544,73 @@
   .lh2 {
     line-height: 2em;
   }
-
-  .header-box {
-    position: relative;
-    display: flex;
-    justify-content: flex-end;
-    margin-bottom: 20px;
-  }
-
-  .header-border-box {
-    width: 90%;
-    height: 100px;
-    border-bottom: 1px solid #00aeef;
-    border-left: 1px solid #00aeef;
-  }
-
-  .header-num-box {
-    box-sizing: border-box;
-    position: absolute;
-    top: 50px;
-    width: 100%;
-    height: 26px !important;
-    line-height: 26px;
-    background-color: #15c0f2;
-    color: #fff;
-    padding-left: 50px;
-  }
+  // 濂囨暟椤甸〉鐪�
   .page-header-box {
-    padding-top: 96px;
+    margin: 0;
+    margin-bottom: 20px;
+    width: 100%;
+    height: 104px;
     display: flex;
-    justify-content: flex-end;
-    align-items: flex-end;
-    margin-bottom: 28px;
+    li:first-child {
+      height: 100%;
+      width: 88%;
+      display: flex;
+      align-items: flex-end;
+      P {
+        margin: 0 !important;
+        width: 100%;
+        height: 24px;
+        background-color: #97a4d3;
+        text-align: right;
+        padding-right: 20px;
+        color: #fff;
+      }
+    }
+    li:last-child {
+      margin-left: 20px;
+      p {
+        margin: 0 !important;
+        height: 100%;
+        padding:0 4px;
+        width: min-content;
+        border: 1px solid #7b8cc5; 
+        text-indent: 0em;
+        display: flex;
+        align-items: flex-end;
+        justify-content: center;
+      }
+    }
   }
-  .page-header-text {
-    color: #616161;
-    font-size: 14px;
-  }
-  .page-header-num {
-    display: inline-block;
-    width: 100px;
-    height: 30px;
-    line-height: 30px;
-    padding-left: 20px;
-    box-sizing: border-box;
-    background-color: #15c0f2;
-    color: #fff;
-    margin-left: 20px;
-    font-weight: bold;
+  .page-header-odd {
+    margin: 0;
+    margin-bottom: 20px;
+    width: 100%;
+    height: 104px;
+    display: flex;
+    justify-content: space-between;
+    li:first-child {
+      border: 1px solid #7b8cc5;
+      width: 15%;
+      height: 24px;
+      text-align: right;
+      padding-right: 4px;
+      box-sizing: border-box;
+    }
+    li:nth-child(2) {
+      padding: 0 4px;
+      min-width:132px;
+      height: 24px;
+      border: 1px solid #7b8cc5;
+      text-align: center;
+      box-sizing: border-box;
+      color: #5f7abc;
+      font-weight: bold;
+    }
+    li:last-child {
+      width: 64%;
+      height: 24px;
+      background-color: #97a4d3;
+    }
   }
   .fw-b {
     font-weight: bold;
@@ -582,7 +660,8 @@
     color: #15c0f2;
   }
   .video-border {
-    border: 1px dotted #15c0f2;
+    border: 1px solid #15c0f2;
+    border-radius: 30px;
   }
   .fm-st {
     font-family: "STKaiti";
@@ -653,6 +732,39 @@
   a {
     cursor: default;
   }
+  ul {
+    list-style: none;
+  }
+  li {
+    list-style: none !important;
+  }
+  .collect-btn {
+    cursor: pointer;
+    width: 20px;
+    height: 20px;
+    margin-left: 10px;
+  }
+  // 鏄剧ず绛旀鎸夐挳
+  .btn-box {
+    margin-left: 5px;
+    cursor: pointer;
+    text-indent: 0;
+    display: inline-block;
+    border:1px solid #8281ED;
+    height: 22px;
+    padding: 5px;
+    background-color:#8281ED ;
+    border-radius: 5px;
+    svg {
+      fill: #fff;
+    }
+    &:hover {
+      background-color: #fff;
+      svg {
+        fill:#8281ED ;
+      }
+    }
+  }
 }
 
 /* 濯掍綋鏌ヨ鍋氬熀纭�鍝嶅簲寮忓竷灞� */
@@ -667,13 +779,13 @@
   }
 }
 @media (max-width: 660px) {
-  .ans-dance {
+  .math-book {
     /* 鍒嗛〉padding */
     .page-padding {
       padding: 104px 20px;
     }
     .padding-96 {
-      padding: 0 20px;
+      padding: 0 20px 40px 20px;
     }
     /* video澶у皬 */
     .video-box {
@@ -692,12 +804,12 @@
   }
 }
 @media (min-width: 660px) {
-  .ans-dance {
+  .math-book{
     .page-padding {
       padding: 104px 96px;
     }
     .padding-96 {
-      padding: 0 96px;
+      padding: 0 96px 104px 96px;
     }
     .video-box {
       max-width: 370px;

--
Gitblit v1.9.1