From 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期三, 23 八月 2023 14:54:59 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/staticresources/EquipmentSetShippmentReceivedcss.css | 203 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 140 insertions(+), 63 deletions(-)
diff --git a/force-app/main/default/staticresources/EquipmentSetShippmentReceivedcss.css b/force-app/main/default/staticresources/EquipmentSetShippmentReceivedcss.css
index 1e909b0..2e1b9a1 100644
--- a/force-app/main/default/staticresources/EquipmentSetShippmentReceivedcss.css
+++ b/force-app/main/default/staticresources/EquipmentSetShippmentReceivedcss.css
@@ -1,109 +1,186 @@
@charset "utf-8";
.detail {
- margin-left:5px;
- width:310px;
+ /* margin-left:5px;*/
+ /*width:310px;*/
}
.menu {
- padding:0px;
- border-left:1px solid #D1D1D1;
- border-right:1px solid #D1D1D1;
+ padding:0px;
+ border-left:1px solid #D1D1D1;
+ border-right:1px solid #D1D1D1;
}
.menu h2{
- margin:0;
- padding:0;
- font-size:14px;
+ margin:0;
+ padding:0;
+ font-size:16px;
}
.menu h2 div {
- width: 308px;
- text-align: left;
- margin: 0;
- background:#DCDCDC;
+ /*width: 308px;*//*20230615 ljh*/
+ text-align: left;
+ margin: 0;
+ background:#DCDCDC;
}
-
+
.menu ul{
- margin:0;
- padding:1px;
- list-style: none;
- border-top:1px solid #ddd;
+ margin:0;
+ padding:1px;
+ list-style: none;
+ border-top:1px solid #ddd;
}
.menu li {
- padding:0;
- font-size:14px;
- line-height:1.0;
- /* 2023-04-23 zyh lightning鍗囩骇 start */
- height:33px;
- /* height:23px; */
- /* 2023-04-23 zyh lightning鍗囩骇 end */
- clear:both;
- /*border-bottom: 1px dotted #999;*/
+ padding:0;
+ font-size:16px;
+ /* line-height:1.0; */
+ /* 2023-04-23 zyh lightning鍗囩骇 start */
+ /* height:33px; */
+ /* height:23px; */
+ /* 2023-04-23 zyh lightning鍗囩骇 end */
+ clear:both;
+ /*border-bottom: 1px dotted #999;*/
+ border-bottom: var(--lwc-borderWidthThin,1px) solid var(--slds-g-color-border-base-1, var(--lwc-colorBorder,rgb(229, 229, 229)))
}
-.menu li span {
- width: 140px;
- text-align: right;
- float: left;
- margin: 5px 0px 0px 0px;
-}
+/* .menu li span {
+ width: 140px;
+ text-align: right;
+ float: left;
+ margin: 5px 0px 0px 0px;
+ height: 33px;
+ line-height:33px;
+} */
.menu li span span{
- text-align: left;
- margin-left: 3px;
- margin-top: 0px;
+ text-align: left;
+ margin-left: 3px;
+ margin-top: 0px;
}
.commandbutton {
- font-size: 13px !important;
+ font-size: 13px !important;
}
.tabsize {
- font-size: 14px !important;
+ font-size: 14px !important;
}
.detailtab {
- font-size: 14px;
+ font-size: 16px;
}
.detailhander {
- font-size: 16px;
+ font-size: 16px;
}
.deliveryslip {
- font-size: 15px;
+ font-size: 15px;
}
.modal {
- display:none;
- position: fixed; /* Stay in place */
- z-index: 10; /* Sit on top */
- left: 0;
- top: 0;
- width: 100%; /* Full width */
- height: 100%; /* Full height */
- overflow: auto; /* Enable scroll if needed */
- background-color: rgb(0,0,0); /* Fallback color */
- background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
+ display:none;
+ position: fixed; /* Stay in place */
+ z-index: 10; /* Sit on top */
+ left: 0;
+ top: 0;
+ width: 100%; /* Full width */
+ height: 100%; /* Full height */
+ overflow: auto; /* Enable scroll if needed */
+ background-color: rgb(0,0,0); /* Fallback color */
+ background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
}
/* Modal Content/Box */
.modal-content {
- background-color: #fefefe;
- margin-left: 6px;
- margin-top: 100px;
- padding: 20px;
- border: 1px solid #888;
- width: 265px; /* Could be more or less, depending on screen size */
+ background-color: #fefefe;
+ margin-left: 6px;
+ margin-top: 100px;
+ padding: 20px;
+ border: 1px solid #888;
+ width: 265px; /* Could be more or less, depending on screen size */
}
.freezehander {
- position: fixed;
- top: 0px;
- background-color:
- white;
- width: 320px;
- z-index: 1;
-}
\ No newline at end of file
+ /*20230615 ljh*/
+ position: fixed;
+ top: 0px;
+ background-color:white;
+ /*width: 320px;*/
+ z-index: 1;
+ /*20230615 ljh*/
+}
+
+/***********************/
+.menu ul{
+ /* display: flex; */
+ list-style: none;
+ margin-bottom: 5px;
+}
+.menu ul li{
+ /* flex: 1;
+ height: 55px;
+ max-width:200px; */
+ width: calc(50% - 30px);
+ display: inline-block;
+ margin-left: 0;
+}
+.menu ul li Span{
+ /* display:inline-block; */
+ height: 50px;
+ line-height:50px;
+}
+.menu ul li input[type="checkbox"]{
+ width:16px;
+ height:16px;
+}
+.myBtn .btn{
+ margin: 1px 20px;
+}
+body .btn{
+ -webkit-appearance: none;
+ position: relative;
+ // margin: 1px 20px;
+ display: inline-block;
+ border: 1px solid transparent;
+ font-size: .75rem;
+ line-height: 1.875rem;
+ text-decoration: none;
+ white-space: normal;
+ border-radius: 0.25rem;
+ background: transparent;
+ background-clip: border-box;
+ color: rgba(1, 118, 211, 1);
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ -webkit-transition: color .05s linear,background-color .05s linear;
+ transition: color .05s linear,background-color .05s linear;
+ padding-left: 1rem;
+ padding-right: 1rem;
+ text-align: center;
+ vertical-align: middle;
+ border: 1px solid rgb(201, 201, 201);
+ -webkit-transition: border 0.15s linear;
+ transition: border 0.15s linear;
+ border-color: rgb(201, 201, 201);
+ background-color: rgb(255, 255, 255);
+}
+body input.btn{
+ padding: 4px 1rem;
+}
+body input[type="text"],body select,span select{
+ border: 1px solid rgb(201, 201, 201);
+ border-radius: 0.25rem;
+ display: inline-block;
+ padding: 0 1rem 0 0.75rem;
+ min-height: calc(1.875rem + (1px * 2)) !important;
+ line-height: 1.875rem !important;
+ /* background-color: rgb(255, 255, 255); */
+ transition: border .1s linear,background-color .1s linear;
+ max-width: 100%;
+ color: rgb(24, 24, 24);
+}
+/***********************/
\ No newline at end of file
--
Gitblit v1.9.1