From 28ae9e323d8ce3eff8a02860d0527fb89e5ea530 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 19 十一月 2024 17:15:37 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/civilAviationServices/assets/main.less | 461 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 395 insertions(+), 66 deletions(-)
diff --git a/src/books/civilAviationServices/assets/main.less b/src/books/civilAviationServices/assets/main.less
index c65e1ac..6043e71 100644
--- a/src/books/civilAviationServices/assets/main.less
+++ b/src/books/civilAviationServices/assets/main.less
@@ -31,9 +31,18 @@
margin: 0;
}
+ .mt-10 {
+ margin-top: 10px !important;
+ }
+
.mt-20 {
margin-top: 20px !important;
}
+
+ .table-pad {
+ padding: 1em 0.8em !important;
+ }
+
.mt-30 {
margin-top: 30px;
@@ -48,7 +57,11 @@
}
.ma-l {
- margin-left: 10%;
+ margin-left: 8%;
+ }
+
+ .ma-0 {
+ margin: 0% !important;
}
.pd-5 {
@@ -61,6 +74,14 @@
.w80 {
width: 80%;
+ }
+
+ .w70 {
+ width: 70%;
+ }
+
+ .w25 {
+ width: 25%;
}
.w20 {
@@ -84,7 +105,7 @@
}
.fz-20 {
- font-size: 20px ;
+ font-size: 20px;
}
.img-0 {
@@ -103,6 +124,10 @@
text-indent: 0em !important;
}
+ td {
+ padding: 5px 10px;
+ }
+
.fl {
display: flex;
}
@@ -115,11 +140,11 @@
justify-content: space-evenly;
}
- .jc-fs{
+ .jc-fs {
justify-content: flex-start;
}
- .fw-w{
+ .fw-w {
flex-wrap: wrap;
}
@@ -133,6 +158,10 @@
.al-c {
align-items: center;
+ }
+
+ .al-fe {
+ align-items: flex-end;
}
.ac-f {
@@ -167,6 +196,10 @@
margin-top: 30px;
}
+ .ma-t-20 {
+ margin-top: 20px;
+ }
+
.pad-l-60 {
padding-left: 60px;
}
@@ -178,6 +211,10 @@
.mb-45 {
margin-bottom: 45px;
+ }
+
+ .mb-20 {
+ margin-bottom: 20px !important;
}
.headerImg {
@@ -245,9 +282,10 @@
resize: none;
}
+
.b0 {
border: 0;
- }
+ }
.task {
width: 16%;
@@ -256,14 +294,49 @@
border-top: 0.7em solid #5192C6;
}
+ .task2 {
+ width: 16%;
+ margin-bottom: 5em;
+ margin-top: 0;
+ border-top: 0.7em solid #F89C1C;
+ }
+
+ .task3 {
+ width: 16%;
+ margin-bottom: 5em;
+ margin-top: 0;
+ border-top: 0.7em solid #448D9C;
+ }
+
+ .task4 {
+ width: 16%;
+ margin-bottom: 5em;
+ margin-top: 0;
+ border-top: 0.7em solid #9EAA60;
+ }
+
+ hr{
+ margin-left: 0;
+ margin-bottom: 4px;
+ width: 15.5%;
+ border: none;
+ height: 1.5px;
+ background-color: #000;
+ }
+
.p-odd {
- padding-right: 10%;
+ padding-right: 8%;
}
.p-even {
- padding-left: 10%;
+ padding-left: 8%;
}
+ .p-continued {
+ text-align: right;
+ font-size: 14px;
+ margin-bottom: 10px;
+ }
.img-float {
width: 310px;
@@ -295,6 +368,62 @@
p {
margin: 0 !important;
}
+ }
+
+ .w430 {
+ width: 430px;
+ }
+
+ .w395 {
+ width: 395px;
+ }
+
+ .w350 {
+ width: 350px;
+ }
+
+ .w290 {
+ width: 290px;
+ }
+
+ .w280 {
+ width: 280px;
+ }
+
+ .w275 {
+ width: 275px;
+ }
+
+ .w270 {
+ width: 270px;
+ }
+
+ .w250 {
+ width: 250px;
+ }
+
+ .w230 {
+ width: 230px;
+ }
+
+ .w220 {
+ width: 220px;
+ }
+
+ .w200 {
+ width: 200px;
+ }
+
+ .w180 {
+ width: 180px;
+ }
+
+ .w150 {
+ width: 150px;
+ }
+
+ .w115 {
+ width: 115px;
}
.pdf-text {
@@ -393,11 +522,10 @@
.link-float {
- width: 120px;
+ width: 150px;
float: left;
height: auto;
margin: auto;
- margin-top: 12px;
margin-right: 20px;
}
@@ -409,7 +537,7 @@
// 棰樼洰}
- .textarea-main{
+ .textarea-main {
background-color: transparent;
max-width: 95%;
min-width: 95%;
@@ -472,8 +600,14 @@
background-color: #bbd4ec;
}
- .video-box{
- margin: 20px 0 20px 10% ;
+ .video-box {
+ margin: 20px 0 20px 8%;
+ border: 1px dashed #895B2E;
+ padding: 2% 2%;
+ }
+
+ .video-box-left {
+ margin: 20px 8% 20px 0;
border: 1px dashed #895B2E;
padding: 2% 2%;
}
@@ -481,34 +615,44 @@
.videoname {
display: flex;
justify-content: center;
- }
-
- .collect-btn {
+ }
+
+ .collect-btn {
cursor: pointer;
width: 20px;
height: 20px;
margin-left: 10px;
margin-top: 0.8%;
- }
- .collect-btn1 {
+ }
+
+ .collect-btn1 {
cursor: pointer;
width: 10px;
height: 10px;
margin-left: 10px;
margin-top: 0.8%;
- }
+ }
- .unitImg{
+ .unitImg {
position: relative;
z-index: 1;
}
- .unitBox{
+
+ .unitBox {
z-index: 99;
position: absolute;
top: -5px;
left: 40px;
}
- .unitGraphic{
+
+ .unit2Box {
+ z-index: 99;
+ position: absolute;
+ top: -200px;
+ left: 40px;
+ }
+
+ .unitGraphic {
display: inline-block;
width: 10px;
height: 10px;
@@ -516,10 +660,55 @@
border-radius: 50%;
margin-right: 15px;
}
- .unitText{
+
+ .unit2Graphic {
+ display: inline-block;
+ width: 10px;
+ height: 10px;
+ background-color: #F89C1C;
+ border-radius: 50%;
+ margin-right: 15px;
+ }
+
+ .unit3Graphic {
+ display: inline-block;
+ width: 10px;
+ height: 10px;
+ background-color: #448D9C;
+ border-radius: 50%;
+ margin-right: 15px;
+ }
+
+ .unit4Graphic {
+ display: inline-block;
+ width: 10px;
+ height: 10px;
+ background-color: #9EAA60;
+ border-radius: 50%;
+ margin-right: 15px;
+ }
+
+
+ .unitText {
color: #5192C6;
font-size: 18px;
}
+
+ .unit2Text {
+ color: #F89C1C;
+ font-size: 16px;
+ }
+
+ .unit3Text {
+ color: #448D9C;
+ font-size: 16px;
+ }
+
+ .unit4Text {
+ color: #9EAA60;
+ font-size: 16px;
+ }
+
// 杩佺Щ
@@ -757,12 +946,10 @@
.block {
- font-family: "瀹嬩綋";
- margin-top: 0.2em;
- margin-bottom: 0.2em !important;
+ font-family: "kaiTi";
text-indent: 2em;
line-height: 30px;
- font-size: 16px;
+ font-size: 17px;
text-align: justify;
}
@@ -773,7 +960,7 @@
.img {
font-family: 'FZLTXIHJW';
text-align: center;
- font-size: 0.85em;
+ font-size: 14px;
margin-left: 0%;
margin-right: 0%;
text-indent: 0em;
@@ -791,11 +978,10 @@
p {
font-family: "瀹嬩綋";
- margin-top: 0.2em;
+ margin-top: 0em;
margin-bottom: 0.2em;
text-indent: 2em;
line-height: 30px;
- // font-size: 18px;
text-align: justify;
}
@@ -822,7 +1008,7 @@
.left {
text-indent: 0em;
- margin: 0 !important;
+ margin-bottom: 0px;
line-height: 20px;
}
@@ -844,6 +1030,16 @@
margin-left: 0%;
margin-right: 0%;
}
+ .input-bottom-border{
+ background-color: transparent;
+ border-top:none ;
+ border-left:none ;
+ border-right:none ;
+ &:focus {
+ outline: none;
+ }
+ }
+
.left1 {
text-indent: 0em;
@@ -899,6 +1095,7 @@
h2 {
font-family: 'FZLTZHJW';
+ font-size: 30px;
line-height: 2em;
font-weight: 400;
color: #5192C6;
@@ -910,7 +1107,7 @@
font-family: 'FZHTJW';
color: #5192C6;
font-weight: 500;
- font-size: 1.6em;
+ font-size: 1.5em;
margin-top: 1.5em;
margin-bottom: 5px;
text-indent: 0em;
@@ -948,10 +1145,9 @@
}
.zt-h6 {
- font-family: 'FZHTJW';
margin-bottom: 0.5em;
margin-top: 0.5em;
- font-weight: 100;
+ font-weight: 200;
text-indent: 2em;
}
@@ -1088,6 +1284,18 @@
color: #5192C6;
}
+ .unit2-c {
+ color: #F89C1C !important;
+ }
+
+ .unit3-c {
+ color: #448D9C !important;
+ }
+
+ .unit4-c {
+ color: #9EAA60 !important;
+ }
+
.h2-zt2 {
padding: 10px;
margin-right: 2em;
@@ -1104,7 +1312,35 @@
position: relative;
}
- .bk1{
+ .bk2 {
+ border: 0.15em dashed #F89C1C;
+ padding: 15px 10px;
+ margin-bottom: 2em;
+ margin-top: 0.5em;
+ border-radius: 0em;
+ position: relative;
+ }
+
+ .bk3 {
+ border: 0.15em dashed #448D9C;
+ padding: 15px 10px;
+ margin-bottom: 2em;
+ margin-top: 0.5em;
+ border-radius: 0em;
+ position: relative;
+ }
+
+ .bk4 {
+ border: 0.15em dashed #9EAA60;
+ padding: 15px 10px;
+ margin-bottom: 2em;
+ margin-top: 0.5em;
+ border-radius: 0em;
+ position: relative;
+ }
+
+
+ .bk1 {
border: 0.15em dashed #CBE6D3;
padding: 1.5em 5px;
margin-bottom: 2em;
@@ -1117,22 +1353,21 @@
p.bj1-qjms {
background-color: #fff;
color: #5192C6;
- display: inline-block;
- font-size: 1em;
+ font-size: 20px;
font-weight: bold;
border-radius: 1.5em;
margin-left: 0em;
text-align: center;
text-indent: 0em;
position: absolute;
- top: -1.2em;
+ top: -16px;
}
p.bj2-qjms {
background-color: #fff;
line-height: 20px;
color: #61C29C;
- font-size: 1.4em;
+ font-size: 20px;
font-weight: bold;
border-radius: 1.5em;
margin-left: 0em;
@@ -1150,10 +1385,31 @@
background-color: #5192C6;
}
+ .span-box2 {
+ display: inline-block;
+ width: 8px;
+ height: 8px;
+ background-color: #F89C1C;
+ }
+
+ .span-box3 {
+ display: inline-block;
+ width: 8px;
+ height: 8px;
+ background-color: #448D9C;
+ }
+
+ .span-box4 {
+ display: inline-block;
+ width: 8px;
+ height: 8px;
+ background-color: #9EAA60;
+ }
.span-text {
padding: 0em 0.15em 0em 0.3em;
}
- .span-svg{
+
+ .span-svg {
padding: 0.1em 0.15em 0em 0.3em;
}
@@ -1170,33 +1426,57 @@
color: #FFFFFF;
}
+ .bj2-unit2 {
+ background-color: #F89C1C;
+ padding: 0.2em 0.1em 0.2em 0.1em;
+ font-weight: bold;
+ border-radius: 0.2em;
+ color: #FFFFFF;
+ }
+
+ .bj2-unit3 {
+ background-color: #448D9C;
+ padding: 0.2em 0.1em 0.2em 0.1em;
+ font-weight: bold;
+ border-radius: 0.2em;
+ color: #FFFFFF;
+ }
+
+ .bj2-unit4 {
+ background-color: #9EAA60;
+ padding: 0.2em 0.1em 0.2em 0.1em;
+ font-weight: bold;
+ border-radius: 0.2em;
+ color: #FFFFFF;
+ }
+
.bj3 {
- background-color: #FDE6BC;
- padding: 20px;
- border-radius: 1.5em;
- margin-bottom: 2em;
- margin-top: 2.5em;
+ background-color: #FEDDB4;
+ padding: 20px 10px 10px 15px;
+ margin-bottom: 10px;
+ position: relative;
}
span.bj3-xyx {
background-color: #F5A101;
color: #FFFFFF;
- border-radius: 10px;
+ border-radius: 5px;
padding: 5px 10px 5px 10px;
font-weight: bold;
- position: absolute;
- top: -15px;
}
div.bj3-xyx {
+ position: absolute;
+ top: -15px;
+ left: 10px;
+
+ }
+
+ div.bj3-xyx-left {
background-color: #FEDDB4;
border-radius: 10px;
-
- padding: 5% 5%;
+ padding: 20px 10px;
position: relative;
- // margin-top: -3em;
- // margin-bottom: 1.5em;
- // margin-left: -3em;
}
.ts-1 {
@@ -1221,6 +1501,23 @@
margin-bottom: 1em;
margin-top: 1em;
position: relative;
+
+ b{
+ font-weight: 600;
+ font-family: "kaiTi";
+ text-indent: 2em;
+ line-height: 30px;
+ font-size: 17px;
+ text-align: justify;
+ }
+
+ .block{
+ font-family: "kaiTi";
+ text-indent: 2em;
+ line-height: 30px;
+ font-size: 17px;
+ text-align: justify;
+ }
}
.bj4-1 {
@@ -1232,13 +1529,17 @@
position: relative;
}
- .bj4-2{
+ .bj4-2 {
background-color: #D7E2F0;
- padding: 30px 15px 10px 15px;
+ padding: 10px 15px 10px 15px;
border-radius: 0.1em;
margin-bottom: 1em;
margin-top: 1em;
position: relative;
+ }
+
+ .pad-t-10 {
+ padding-top: 10px;
}
div.bj4-xyx {
@@ -1248,7 +1549,7 @@
padding: 1px 10px 1px 8px;
margin-right: 10px;
background-color: #61C29C;
- border-radius: 10px;
+ border-radius: 8px;
position: absolute;
top: -15px;
}
@@ -1263,25 +1564,31 @@
border-radius: 0.1em;
margin-bottom: 2em;
margin-top: 2.5em;
- }
-
- span.bj5-xyx {
- background-color: #95B321;
- color: #FFFFFF;
- border-radius: 1.5em;
- padding: 5px 20px 5px 20px;
- font-size: 1em;
- font-weight: bold;
-
+ position: relative;
}
div.bj5-xyx {
margin-top: -3em;
margin-bottom: 1.5em;
margin-left: -2.5em;
+ position: absolute;
+ top: 40px;
+ left: 30px;
}
+ span.bj5-xyx {
+ background-color: #95B321;
+ color: #FFFFFF;
+ border-radius: 6px;
+ padding: 5px 10px 5px 10px;
+ font-size: 1em;
+ font-weight: bold;
+ }
+
+
+
.zt-lvs1 {
+ font-size: 15px;
color: #95B321;
}
@@ -1451,6 +1758,14 @@
src: url('./Fonts/FZHTJW.ttf');
}
+
+// 闅愯棌椤甸潰
+.hidePage {
+ min-height: 0 !important;
+ height: 0 !important;
+ box-shadow: none !important;
+}
+
/* 濯掍綋鏌ヨ鍋氬熀纭�鍝嶅簲寮忓竷灞� */
@media screen and (max-width: 1024px) {
@@ -1503,10 +1818,24 @@
.btn-w {
width: 42px;
}
- .unitText{
+
+ .unitText {
color: #5192C6;
font-size: 10px;
}
+
+ .unit2Text {
+ color: #F89C1C;
+ font-size: 10px;
+ }
+
+ .wh-no {
+ white-space: wrap;
+ }
+
+ td {
+ padding: 5px 10px;
+ }
}
}
--
Gitblit v1.9.1