From e331135eed3e101cabaa5a03b2f52293a4bc4b09 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 31 十二月 2024 18:11:11 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/aviationEtiquette/assets/main.less | 119 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 95 insertions(+), 24 deletions(-)
diff --git a/src/books/aviationEtiquette/assets/main.less b/src/books/aviationEtiquette/assets/main.less
index 604427f..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;
}
@@ -249,6 +245,10 @@
.mb-20 {
margin-bottom: 20px !important;
}
+
+ .mb-10 {
+ margin-bottom: 10px !important;
+ }
.pNum{
font-size:18px !important;
font-style: italic;
@@ -361,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);
}
@@ -614,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;
@@ -678,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%;
}
@@ -929,10 +960,18 @@
margin: 15px;
}
- div.bodystyle {
+ .bodystyle:nth-of-type(odd) {
font-family: 'FZLTXIHJW';
text-align: justify;
- margin: 0 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;
}
@@ -1007,7 +1046,7 @@
margin-bottom: 0.2em !important;
text-indent: 2em;
line-height: 30px;
- font-size: 16px;
+ font-size: 17px;
text-align: justify;
}
@@ -1022,10 +1061,10 @@
.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;
@@ -1208,17 +1247,17 @@
}
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.2em;
@@ -1398,7 +1437,7 @@
border: 0.15em dotted #FAAD70;
padding: 1em;
margin-bottom: 2em;
- margin-top: 0.5em;
+ margin-top: 2em;
border-radius: 0em;
position: relative;
@@ -1433,7 +1472,7 @@
.span-text {
font-size: 16px;
font-weight: 100;
- padding: 0em 0.15em 0em 0.3em;
+ padding: 0em 0.5em 0em 0.5em;
}
@@ -1454,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;
}
@@ -1547,6 +1586,38 @@
margin-top: -2em;
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;
@@ -1694,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.25em;
+ padding: 0.26em 0.7em;
background-color: #EEAF68;
color: #FFFFFF;
}
--
Gitblit v1.9.1