Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl
This commit is contained in:
@ -33,6 +33,7 @@
|
||||
src: url('../fonts/AlimamaShuHeiTi-Bold.ttf') format('truetype');
|
||||
}
|
||||
|
||||
|
||||
:root {
|
||||
--color-base1: 0, 255, 255;
|
||||
--color-sdk-auxiliary: 0, 66, 66;
|
||||
@ -487,6 +488,7 @@
|
||||
.YJ-custom-base-dialog>.content .table .table-body .tr:first-child {
|
||||
border-top: none;
|
||||
}
|
||||
|
||||
.YJ-custom-base-dialog>.content .table .table-body .tr:last-child {
|
||||
border-bottom: 1px solid rgba(var(--color-base1), 0.5);
|
||||
}
|
||||
@ -586,7 +588,6 @@
|
||||
}
|
||||
|
||||
|
||||
|
||||
.YJ-custom-base-dialog>.content .table .tr .td .link-edit {
|
||||
min-height: 32px;
|
||||
line-height: 18px;
|
||||
@ -721,6 +722,7 @@
|
||||
.YJ-custom-base-dialog>.content .input-number-unit input[type=number] {
|
||||
padding: 0 16px 0 10px;
|
||||
}
|
||||
|
||||
.YJ-custom-base-dialog>.content .input-number-unit input[type=number]::-webkit-outer-spin-button,
|
||||
.YJ-custom-base-dialog>.content .input-number-unit input[type=number]::-webkit-inner-spin-button {
|
||||
margin-left: 5px;
|
||||
@ -1821,6 +1823,7 @@
|
||||
border-color: rgba(var(--color-base1));
|
||||
color: rgba(var(--color-base1));
|
||||
}
|
||||
|
||||
.YJ-custom-base-dialog.trajectory-motion>.content .btn.is-active svg {
|
||||
fill: rgba(var(--color-base1));
|
||||
}
|
||||
@ -2091,6 +2094,7 @@
|
||||
.YJ-custom-base-dialog.cut-fill>.content>div .div-item:last-child .row .unit {
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
.YJ-custom-base-dialog.cut-fill>.content .firstTip {
|
||||
position: absolute;
|
||||
left: 340px;
|
||||
@ -2155,6 +2159,7 @@
|
||||
flex: 0 0 60px;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.YJ-custom-base-dialog.submerge>.content .rangeWords {
|
||||
font-size: 14px;
|
||||
font-weight: 500;
|
||||
@ -2316,6 +2321,7 @@
|
||||
.YJ-custom-base-dialog.circle-view-shed>.content {
|
||||
width: 290px;
|
||||
}
|
||||
|
||||
.YJ-custom-base-dialog.circle-view-shed>.content .firstTip {
|
||||
font-size: 14px;
|
||||
font-weight: 700;
|
||||
@ -3080,7 +3086,7 @@
|
||||
}
|
||||
|
||||
/* 文本框 */
|
||||
.popup-textarea{
|
||||
.popup-textarea {
|
||||
/* width: 212px; */
|
||||
width: 161px;
|
||||
/* height: 154px; */
|
||||
@ -3093,28 +3099,30 @@
|
||||
background-size: 100% 100%;
|
||||
padding: 5px 5px 0px 5px;
|
||||
}
|
||||
.popup-textarea textarea{
|
||||
|
||||
.popup-textarea textarea {
|
||||
width: 158px;
|
||||
height: 95px;
|
||||
background-color: unset!important;
|
||||
border: unset!important;
|
||||
background-color: unset !important;
|
||||
border: unset !important;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.popup-textarea textarea::-webkit-scrollbar {
|
||||
width: 8px!important;
|
||||
width: 8px !important;
|
||||
/* height: 8px!important; */
|
||||
}
|
||||
|
||||
.popup-textarea textarea::-webkit-scrollbar-thumb {
|
||||
border-radius: 5px!important;
|
||||
-webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2)!important;
|
||||
background-color: rgba(var(--color-base1))!important;
|
||||
border-radius: 5px !important;
|
||||
-webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
|
||||
background-color: rgba(var(--color-base1)) !important;
|
||||
}
|
||||
|
||||
.popup-textarea textarea::-webkit-scrollbar-track {
|
||||
-webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2)!important;
|
||||
border-radius: 5px!important;
|
||||
background-color: rgba(var(--color-base1), 0.1)!important;
|
||||
-webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
|
||||
border-radius: 5px !important;
|
||||
background-color: rgba(var(--color-base1), 0.1) !important;
|
||||
}
|
||||
|
||||
/* 贴地图片 */
|
||||
@ -3708,12 +3716,16 @@
|
||||
border: 1px solid rgba(var(--color-base1), 0.5);
|
||||
border-right: none;
|
||||
}
|
||||
.billboard-attribute-box .table .tr .th, .billboard-attribute-box .table .tr .td {
|
||||
|
||||
.billboard-attribute-box .table .tr .th,
|
||||
.billboard-attribute-box .table .tr .td {
|
||||
border-right: 1px solid rgba(var(--color-base1), 0.5);
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
}
|
||||
.billboard-attribute-box .table .tr .th:last-child, .billboard-attribute-box .table .tr .td:last-child {
|
||||
|
||||
.billboard-attribute-box .table .tr .th:last-child,
|
||||
.billboard-attribute-box .table .tr .td:last-child {
|
||||
border-right: none;
|
||||
}
|
||||
|
||||
@ -3761,19 +3773,18 @@
|
||||
#YJ-custom-message.success {
|
||||
/* background-color: #f0f9eb;
|
||||
color: rgb(82, 196, 26); */
|
||||
background:
|
||||
linear-gradient(180deg, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)),
|
||||
linear-gradient(0deg, rgba(27, 248, 195, 0.5) 0%, rgba(27, 248, 195, 0) 100%);
|
||||
background: linear-gradient(180deg, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)),
|
||||
linear-gradient(0deg, rgba(27, 248, 195, 0.5) 0%, rgba(27, 248, 195, 0) 100%);
|
||||
font-size: 14px !important;
|
||||
font-weight: 500 !important;
|
||||
color: rgba(27, 248, 195, 1);
|
||||
}
|
||||
|
||||
#YJ-custom-message.warning {
|
||||
/* background-color: #fdf6ec;
|
||||
color: #e6a23c; */
|
||||
background:
|
||||
linear-gradient(180deg, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)),
|
||||
linear-gradient(0deg, rgba(255, 161, 69, 0.5) 0%, rgba(255, 161, 69, 0) 100%);
|
||||
background: linear-gradient(180deg, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)),
|
||||
linear-gradient(0deg, rgba(255, 161, 69, 0.5) 0%, rgba(255, 161, 69, 0) 100%);
|
||||
font-size: 14px !important;
|
||||
font-weight: 500 !important;
|
||||
color: rgba(255, 161, 69, 1)
|
||||
@ -3872,4 +3883,4 @@
|
||||
.yj-custom-icon.pic-line6 {
|
||||
background: url(../../img/arrow/6.png) 100% 100% no-repeat;
|
||||
background-size: 100% 100%;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user