From 30d147c4c92dbfd5ca1b2f8c24a617dc82d2d25b Mon Sep 17 00:00:00 2001 From: zhongshujie <2862698242@qq.com> Date: 星期一, 28 四月 2025 18:34:51 +0800 Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout --- src/books/civilAviation/assets/main.less | 257 ++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 212 insertions(+), 45 deletions(-) diff --git a/src/books/civilAviation/assets/main.less b/src/books/civilAviation/assets/main.less index 40b596e..3264e1f 100644 --- a/src/books/civilAviation/assets/main.less +++ b/src/books/civilAviation/assets/main.less @@ -35,6 +35,10 @@ margin-top: 30px; } + .mb-30 { + margin-bottom: 30px; + } + .mb-10 { margin-bottom: 10px; } @@ -47,8 +51,22 @@ width: 100%; } + .w90 { + width: 90%; + } + + .w80 { width: 80%; + } + + + sup { + vertical-align: super; + /* 淇濇寔涓婃爣瀵归綈鏂瑰紡 */ + font-size: smaller; + // position: relative; /* 鐩稿浜庢甯镐綅缃皟鏁� */ + // top: -0.2em; /* 鏍规嵁闇�瑕佽皟鏁磋繖涓�� */ } .fz-13 { @@ -70,10 +88,6 @@ .img-0 { width: 100%; - } - - .img-c { - width: 70% !important; } .pt-20 { @@ -108,6 +122,10 @@ align-items: center; } + .al-fe { + align-items: flex-end; + } + .ac-f { align-content: flex-end; } @@ -126,6 +144,10 @@ .mr-70 { margin-right: 70px; + } + + .mr-45 { + margin-right: 45px; } .mr-10 { @@ -190,6 +212,36 @@ border-top: 0.7em solid #5192C6; } + .task-u2-c { + width: 16%; + margin-bottom: 3.5em; + margin-top: 0; + border-top: 0.7em solid #F89C1C; + } + + .task-u3-c { + width: 16%; + margin-bottom: 3.5em; + margin-top: 0; + border-top: 0.7em solid #0A9CAC; + } + + .task-u4-c { + width: 16%; + margin-bottom: 3.5em; + margin-top: 0; + border-top: 0.7em solid #92B03D; + } + + .task-u5-c { + width: 16%; + margin-bottom: 3.5em; + margin-top: 0; + border-top: 0.7em solid #0180CD; + } + + + .p-odd { padding-right: 10%; } @@ -232,8 +284,21 @@ } } - .img-rights { + + .img-float-formula { width: 310px; + float: left; + height: auto; + margin: auto; + margin-right: 20px; + + p { + margin: 0; + } + } + + .img-rights { + width: 47%; float: right; height: auto; margin: auto; @@ -247,6 +312,76 @@ margin: 0 !important; } } + + .references { + margin-top: 140px; + + hr { + font-weight: bold; + margin-left: 0; + width: 15%; + } + } + + .w395 { + width: 395px; + } + + .w430 { + width: 430px; + } + + .w280 { + width: 280px; + } + + .w270 { + width: 270px; + } + + .w250 { + width: 250px; + } + + .w230 { + width: 230px; + } + + .w220 { + width: 220px; + } + + .w200 { + width: 200px; + } + + .w180 { + width: 180px; + } + + .w115 { + width: 115px; + } + + + + .text-rights { + width: 230px; + float: right; + height: auto; + margin: auto; + margin-left: 20px; + + img { + width: 100%; + } + + p { + margin: 0 !important; + } + } + + .pdf-text { display: flex; @@ -320,7 +455,7 @@ div.bk-ztgs { border: 0.15em dotted #5192c6; - padding: 0.5em; + padding: 1.5em 0.5em; margin-bottom: 2em; margin-top: 2em; border-radius: 1em; @@ -339,7 +474,7 @@ text-align: center; text-indent: 0em; position: absolute; - top: -2em; + top: -1.2em; } @@ -361,7 +496,22 @@ // 棰樼洰 .textarea-box { background-color: transparent; - margin-left: 80px; + max-width: 85%; + min-width: 85%; + outline: none; + } + + .textarea-box-left { + background-color: transparent; + margin-left: 12%; + max-width: 85%; + min-width: 85%; + outline: none; + } + + .textarea-box-right { + background-color: transparent; + margin-left: 8%; max-width: 85%; min-width: 85%; outline: none; @@ -574,24 +724,10 @@ div.bodystyle { font-family: 'FZLTXIHJW'; text-align: justify; - margin: 0 82px; + margin: 0 10%; padding-bottom: 80px; line-height: 30px; } - - // .bodystyle-left{ - // margin: 0 120px 0 82px; - // padding-bottom: 80px; - // } - - // .bodystyle-right{ - // font-family: 'FZLTXIHJW'; - // font-size: 18px; - // text-align: justify; - // margin: 0 82px 0 120px; - // padding-bottom: 80px; - // line-height: 30px; - // } span.zt-0 { color: #0087AF; @@ -653,7 +789,9 @@ } .note { - font-size: 0.85em; + margin: 0; + font-size: 14px; + line-height: 22px; } @@ -672,9 +810,10 @@ } .img { + text-indent: 0; font-family: 'FZLTXIHJW'; text-align: center; - font-size: 0.85em; + font-size: 14px; margin-left: 0%; margin-right: 0%; text-indent: 0em; @@ -696,7 +835,6 @@ margin-bottom: 0.2em !important; text-indent: 2em; line-height: 30px; - // font-size: 18px; text-align: justify; } @@ -728,7 +866,7 @@ } .left3 { - margin: 20 0 0 0 !important; + margin: 20px 0 0 0 !important; line-height: 20px; } @@ -818,6 +956,22 @@ text-indent: 0em; } + .unit2-c { + color: #F89C1C !important; + } + + .unit3-c { + color: #0A9CAC !important; + } + + .unit4-c { + color: #92B03D !important; + } + + .unit5-c { + color: #0180CD !important; + } + h4 { font-family: 'FZHTJW'; color: #5192C6; @@ -836,22 +990,20 @@ font-weight: 400; margin-bottom: 0.5em; margin-top: 0.5em; - font-size: 0.9em; + font-size: 18px; text-indent: 0em; } h6 { - font-family: 'FZHTJW'; - font-weight: bold; - margin-bottom: 0.5em; - margin-top: 2em; - font-size: 1em; + font-weight: 400; + margin-bottom: 5px; + margin-top: 10px; + font-size: 18px; text-indent: 2em; } .zt-h6 { - font-family: 'FZHTJW'; color: #65C097; margin-bottom: 0.5em; @@ -938,6 +1090,12 @@ .inline1 { height: 2.5em; + margin-top: 0.5em; + margin-bottom: -0.5em; + } + + .inline2 { + height: 1.5em; margin-top: 0.5em; margin-bottom: -0.5em; } @@ -1054,28 +1212,29 @@ } .bj3 { - background-color: #FDE6BC; - padding: 20px; - border-radius: 1.5em; - margin-bottom: 2em; - margin-top: 2.5em; + background-color: #FEDDB4; + padding: 20px 10px 10px 10px; + border-radius: 10px; + margin-bottom: 10px; + margin-top: 10px; + position: relative; } span.bj3-xyx { background-color: #F5A101; color: #FFFFFF; - box-shadow: 0.3em 0.3em 0px 0px #FDF0D8; - border-radius: 1.5em; - padding: 5px 20px 5px 20px; + border-radius: 5px; + padding: 5px 10px 5px 10px; font-size: 1em; font-weight: bold; } div.bj3-xyx { - margin-top: -3em; - margin-bottom: 1.5em; - margin-left: -3em; + position: absolute; + top: -15px; + left: -25px; + } .ts-1 { @@ -1130,6 +1289,7 @@ .bj4-xyx-icon { color: #5192C6; + text-wrap: nowrap; } .bj5 { @@ -1351,7 +1511,14 @@ @media (max-width: 660px) { .civilAviation-book { + + .pad-l-60 { + padding-left: 10px; + } + .mr-70 { + margin-right: 15px; + } /* 鍒嗛〉padding */ .padding-93 { padding: 0 20px; -- Gitblit v1.9.1