From 0fcbda11823ac21e26f6ec660d497749e6afd17f Mon Sep 17 00:00:00 2001
From: litian <2804272236@qq.com>
Date: 星期二, 31 十二月 2024 18:03:41 +0800
Subject: [PATCH] 合并
---
src/books/aviationEtiquette/assets/main.less | 363 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 271 insertions(+), 92 deletions(-)
diff --git a/src/books/aviationEtiquette/assets/main.less b/src/books/aviationEtiquette/assets/main.less
index 3917157..822dbcf 100644
--- a/src/books/aviationEtiquette/assets/main.less
+++ b/src/books/aviationEtiquette/assets/main.less
@@ -70,10 +70,6 @@
margin-top: 30px;
}
- .mb-10 {
- margin-bottom: 10px;
- }
-
.mb-30 {
margin-bottom: 30px !important;
}
@@ -118,6 +114,10 @@
font-size: 14px !important;
}
+ .fz-15 {
+ font-size: 15px !important;
+ }
+
.fz-16 {
font-size: 16px !important;
}
@@ -160,6 +160,10 @@
.ju-ev {
justify-content: space-evenly;
+ }
+
+ .jc-sb {
+ justify-content: space-between;
}
.jc-fs {
@@ -230,6 +234,9 @@
padding-left: 80px;
}
+ .pad-r-80 {
+ padding-right: 80px;
+ }
.mb-45 {
margin-bottom: 45px;
@@ -239,6 +246,20 @@
margin-bottom: 20px !important;
}
+ .mb-10 {
+ margin-bottom: 10px !important;
+ }
+ .pNum{
+ font-size:18px !important;
+ font-style: italic;
+ font-family: "kaiti";
+ padding-top:2px !important;
+ padding-bottom:2px !important;
+ }
+ .cloud{
+ padding: 0px 8px 0 0 !important;
+ }
+
.headerImg {
width: 30px;
}
@@ -246,7 +267,7 @@
.headerText {
font-size: 12px;
padding: 0 8px;
- color: #B98C64;
+ color: #B1BEDE;
}
.headerNumber {
@@ -257,18 +278,63 @@
}
.header-left-Number {
- color: #231F20;
- font-size: 12px;
+ color: #728DC0;
+ font-size: 14px;
padding-right: 8px;
- border-right: 1px solid #000;
+
+ .span-box-title {
+ margin: 0 5px;
+ display: inline-block;
+ width: 8px;
+ height: 8px;
+ background-color: #728DC0;
+ }
}
.header-left-text {
margin-left: 8px;
font-size: 12px;
- color: #fff;
- background-color: #0082D4;
+ text-align: right;
}
+
+ .header-right-Box {
+ color: #728DC0;
+ font-size: 14px;
+ padding-right: 8px;
+
+ }
+
+ .header-right-Number {
+ background-color: #92B0D5;
+ color: #fff;
+ font-size: 14px;
+ padding: 3px 0;
+ padding-right: 8px;
+
+ img {
+ height: 20.8px;
+ }
+ }
+
+ .header-right-title {
+ padding-left: 20px;
+ border-radius: 10px 0px 0px 10px;
+ }
+
+ .header-right-last {
+ background-color: #B799B6;
+ padding: 2px 0;
+ padding-left: 20px;
+
+ }
+
+ .header-right-end {
+ background-color: #738DC0;
+ padding: 2px 0;
+ padding-left: 50px;
+
+ }
+
table {
border-color: none !important;
@@ -295,13 +361,19 @@
}
.textarea-box {
- border: none;
- text-align: center;
- width: 84px;
- height: 36px;
+ width:88%;
+ margin-left:2em;
overflow: auto;
word-break: break-all;
resize: none;
+ border:1px solid #738DC0;
+ border-radius: 5px;
+ background-color:rgba(255, 255, 255, 0);
+ }
+ .input-box{
+ border:none;
+ border-bottom:1px solid #333;
+ background-color:rgba(255, 255, 255, 0);
}
@@ -338,11 +410,11 @@
}
.p-odd {
- padding-right: 8%;
+ padding-right: 1%;
}
.p-even {
- padding-left: 8%;
+ padding-left: 1%;
}
.p-continued {
@@ -548,7 +620,27 @@
margin-bottom: 18px;
}
- // 棰樼洰}
+
+ .imgBox {
+ display: flex !important;
+ flex-direction: column-reverse !important;
+ position: relative !important;
+
+ .img {
+ margin: 0 !important;
+ font-size: 14px !important;
+ position: absolute !important;
+ left: 50% !important;
+ transform: translateX(-50%);
+ bottom: -2% !important;
+ }
+
+ img {
+ height: 80%;
+ }
+ }
+
+ // 棰樼洰
.textarea-main {
background-color: transparent;
@@ -612,9 +704,14 @@
.event-header-text-bc {
background-color: #bbd4ec;
}
+ //瑙嗛
+ .video-box-cover {
+ border: 1px dashed #895B2E;
+ padding: 2% 2%;
+ }
.video-box {
- margin: 20px 0 20px 8%;
+ margin: 20px 0 20px 0;
border: 1px dashed #895B2E;
padding: 2% 2%;
}
@@ -863,12 +960,19 @@
margin: 15px;
}
-
- div.bodystyle {
+ .bodystyle:nth-of-type(odd) {
font-family: 'FZLTXIHJW';
- font-size: 18px;
text-align: justify;
- margin: 10%;
+ margin: 0 11% 0 9%;
+ padding-bottom: 80px;
+ line-height: 30px;
+ }
+
+ .bodystyle:nth-of-type(even) {
+ font-family: 'FZLTXIHJW';
+ text-align: justify;
+ margin: 0 9% 0 11%;
+ padding-bottom: 80px;
line-height: 30px;
}
@@ -936,14 +1040,13 @@
}
-
.block {
- font-family: "瀹嬩綋";
+ font-family: "kaiti";
margin-top: 0.2em;
margin-bottom: 0.2em !important;
text-indent: 2em;
line-height: 30px;
- font-size: 16px;
+ font-size: 17px;
text-align: justify;
}
@@ -952,16 +1055,16 @@
}
.block2 {
- font-family: "FANGSONG";
+ // font-family: "FANGSONG";
font-size: 17px;
}
.img {
- font-weight: bold;
+ font-weight: 100;
font-family: 'FZLTXIHJW';
text-align: center;
- font-size: 0.85em;
+ font-size: 0.65em;
margin-left: 0%;
margin-right: 0%;
text-indent: 0em;
@@ -1066,7 +1169,7 @@
line-height: 2em;
font-weight: bold;
color: #FFFFFF;
- font-size: 1.8em;
+ font-size: 2em;
margin-bottom: 1em;
margin-top: 1em;
}
@@ -1110,24 +1213,22 @@
text-align: center;
}
-
h2 {
-
font-family: 'FZLTZHJW';
color: #6A80B9;
- font-weight: bold;
+ font-weight: 100;
text-align: left;
- font-size: 1.6em;
+ font-size: 1.5em;
margin-top: 2em;
- margin-bottom: 1em;
- margin-left: 4em;
+ margin-bottom: 1.5em;
+ margin-left: 2.5em;
}
h3 {
font-family: 'FZLTZHJW';
- font-weight: bold;
+ font-weight: 100;
text-align: left;
- font-size: 1.4em;
+ font-size: 1em;
color: #EEAF68;
margin-top: 2em;
margin-bottom: 1.5em;
@@ -1138,7 +1239,7 @@
h4 {
font-family: 'FZHTJW';
color: #697DB8;
- font-weight: bold;
+ font-weight: 100;
margin-bottom: 0.5em;
margin-top: 1em;
font-size: 1.1em;
@@ -1146,21 +1247,21 @@
}
h5 {
-
font-family: 'FZHTJW';
color: #EEAF68;
margin-bottom: 0.5em;
margin-top: 1em;
font-size: 1.05em;
text-indent: 2em;
+ font-weight: 100;
}
h6 {
-
+ font-weight: 100;
font-family: "妤蜂綋";
color: #000000;
- margin-bottom: 0.5em;
- margin-top: 1em;
+ margin-bottom: 0.2em;
+ margin-top: 0.2em;
font-size: 1.15em;
text-indent: 2em;
}
@@ -1331,29 +1432,49 @@
font-size: 1.2em;
}
- div.bk {
- border: 2px dotted #FAAE72;
- padding: 3px 10px 3px 10px;
+
+ .bk {
+ border: 0.15em dotted #FAAD70;
+ padding: 1em;
+ margin-bottom: 2em;
margin-top: 2em;
- margin-bottom: 1em;
+ border-radius: 0em;
+ position: relative;
+
+ p {
+ // font-family: ZHONGDENGXIAN;
+ }
+
+ span {
+ // font-family: ZHUNYUAN;
+ }
}
-
-
p.bj1-qjms {
- background-color: #5392C7;
- color: #FFFFFF;
- display: inline-block;
- font-size: 1em;
- padding: 0.1em 0.7em 0.12em 0.7em;
+ background-color: #fff;
+ color: #FAAD70;
font-weight: bold;
border-radius: 1.5em;
margin-left: 0em;
text-align: center;
text-indent: 0em;
position: absolute;
- top: -2em;
+ top: -19px;
}
+
+ .span-box {
+ display: inline-block;
+ width: 8px;
+ height: 8px;
+ background-color: #FAAD70;
+ }
+
+ .span-text {
+ font-size: 16px;
+ font-weight: 100;
+ padding: 0em 0.5em 0em 0.5em;
+ }
+
.bj {
background-color: #E1E7F3;
@@ -1372,10 +1493,10 @@
span.bj2 {
background-color: #6E85AF;
- padding: 0.2em 1em 0.2em 1em;
+ padding: 0.2em 0.5em 0.2em 0.5em;
font-size: 1.1em;
font-weight: bold;
- border-radius: 0.5em;
+ border-radius: 1em;
color: #FFFFFF;
box-shadow: 0.3em 0.3em 0px 0px #C3C2C0;
}
@@ -1384,24 +1505,70 @@
border: 3px solid #93A8D5;
padding: 0.2em 1em 0.2em 1em;
border-radius: 1em;
- box-shadow: 0.5em 0.5em 0px 0px #DCDDDF;
margin-top: 2em;
margin-bottom: 1.5em;
}
+ .zt-zysx {
+ font-family: "DK-HEITI", "鏂规鍏颁涵榛戠畝浣�", "榛戜綋";
+ background-color: #24b8bc;
+ border-radius: 1.5em;
+ color: #FFFFFF;
+ font-weight: bold;
+ padding: 4px;
+ font-size: 1.2em;
+ box-shadow: 0.2em 0.2em 0px 0px #c1e3e4;
+ }
+ .zt-zysx1 {
+ font-family: "DK-HEITI", "鏂规鍏颁涵榛戠畝浣�", "榛戜綋";
+ background-color: #96A7D5;
+ border-radius: 1.5em;
+ color: #FFFFFF;
+ font-weight: 100;
+ padding: 4px;
+ font-size: 1em;
+ }
+
+ .zt-zysx2 {
+ font-family: "DK-HEITI", "鏂规鍏颁涵榛戠畝浣�", "榛戜綋";
+ background-color: #0071BD;
+ font-size: 1.2em;
+ }
+
+ .zt-1 {
+ color: #6F84AF;
+ font-weight: bold;
+ font-size: 1.1em;
+
+ }
div.bj3 {
background-color: #DED5E8;
- padding: 0.2em 0.2em 0.2em 0.2em;
+ padding: 1em 1em 1em 1.5em;
border-radius: 1em;
- margin-bottom: 0.2em;
+ margin-bottom: 0.1em;
margin-left: -0.6em;
margin-right: -0.6em;
- margin-top: -1.4em;
+ margin-top: -0.5em;
}
+ span.bj3-xyx {
+ background-color: #92B03D;
+ color: #FFFFFF;
+ border-radius: 5px;
+ padding: 5px 10px 5px 10px;
+ font-size: 1em;
+ font-weight: bold;
+ }
+
+ div.bj3-xyx {
+ position: absolute;
+ top: -15px;
+ left: -25px;
+
+ }
@@ -1417,9 +1584,40 @@
div.bk1 {
margin-top: -2em;
- margin-bottom: 1.5em;
margin-left: -1.6em;
}
+
+
+ .bk-video{
+ border: 0.15em dashed #92A1CB;
+ padding: 1.8em 5px;
+ margin-bottom: 2em;
+ margin-top: 2em;
+ border-radius: 0em;
+ position: relative;
+ }
+
+ p.bj4-qjms {
+ background-color: #fff;
+ color: #92A1CB;
+ font-size: 20px;
+ font-weight: bold;
+ border-radius: 1.5em;
+ margin-left: 0em;
+ text-align: center;
+ text-indent: 0em;
+ position: absolute;
+ top: -32px;
+ }
+
+ .span-text-video {
+ padding: 0em 0.15em 0em 0.3em;
+ }
+
+ .span-svg {
+ padding: 0.3em 0.15em 0em 0.3em;
+ }
+
.ts-1 {
font-weight: bold;
@@ -1534,30 +1732,12 @@
}
.zysx {
- margin-top: -2.2em;
+ margin-top: -1.2em;
margin-left: -2em;
- }
-
- .zt-zysx {
- font-family: "DK-HEITI", "鏂规鍏颁涵榛戠畝浣�", "榛戜綋";
- background-color: #24b8bc;
- border-radius: 1.5em;
- color: #FFFFFF;
- font-weight: bold;
- padding: 4px;
- font-size: 1.2em;
- box-shadow: 0.2em 0.2em 0px 0px #c1e3e4;
- }
-
- .zt-zysx1 {
- font-family: "DK-HEITI", "鏂规鍏颁涵榛戠畝浣�", "榛戜綋";
- background-color: #96A7D5;
- border-radius: 1.5em;
- color: #FFFFFF;
- font-weight: bold;
- padding: 6px;
- font-size: 1.2em;
+ p {
+ margin: 0 !important;
+ }
}
.zt-zysx2 {
@@ -1585,13 +1765,13 @@
.bk5 {
- margin-top: -2em;
- margin-bottom: 1.5em;
+ margin-top: -1.4em;
+ margin-bottom: 0.5em;
margin-left: -1.6em;
}
.h3-zt1 {
- padding: 0.5em;
+ padding: 0.26em 0.7em;
background-color: #EEAF68;
color: #FFFFFF;
}
@@ -1599,7 +1779,7 @@
.h3-bk {
border: 1px solid #EEAF68;
margin: 5em 5em 5em 0em;
- padding: 0.5em 1.5em 0.5em 1em;
+ padding: 0.2em 1em 0.2em 0.4em;
border-radius: 0em 1em 1em 0em;
}
@@ -1612,14 +1792,13 @@
.tp-3 {
- margin-top: -5em;
- margin-left: -25em;
+ margin-top: -4.5em;
margin-bottom: 1em;
}
.rwmb-4 {
- height: 5em;
+ height: 2.5em;
}
@@ -1749,7 +1928,7 @@
}
@media (max-width: 660px) {
- .civilServices-book {
+ .aviationEtiquette-book {
/* 鍒嗛〉padding */
.padding-93 {
@@ -1794,7 +1973,7 @@
}
@media (min-width: 660px) {
- .civilServices-book {
+ .aviationEtiquette-book {
.padding-93 {
padding: 0 93px 0px 93px;
}
--
Gitblit v1.9.1