Merge branch 'master' into LEXUpgrade2023-Deloitte

buli

2023-07-14 e6068da47c1bef5517c9e5fdc8c726766867ad4e

 force-app/main/default/lwc/lexCustomInventoryColor/lexCustomInventoryColor.html

@@ -1,7 +1,6 @@
<template>
    <template if:true={showNormal}>
        <div
<<<<<<< HEAD
            style="
                margin-left: 10px;
                margin-right: 10px;
@@ -15,15 +14,10 @@
            <lightning-formatted-number
                value={value}
            ></lightning-formatted-number>
=======
            style="margin-left: 10px;margin-right: 10px;margin-top: 10px;margin-bottom: 10px;font-size:14px;text-align: right;padding-right:10px;">
            <lightning-formatted-number value={value}></lightning-formatted-number>
>>>>>>> LEXCommunityLiJun
        </div>
    </template>
    <template if:true={showRed}>
        <div
<<<<<<< HEAD
            style="
                margin-left: 10px;
                margin-right: 10px;
@@ -38,15 +32,10 @@
            <lightning-formatted-number
                value={value}
            ></lightning-formatted-number>
=======
            style="margin-left: 10px;margin-right: 10px;margin-top: 10px;margin-bottom: 10px;font-size:14px;background-color:red;text-align: right;padding-right:10px;">
            <lightning-formatted-number value={value}></lightning-formatted-number>
>>>>>>> LEXCommunityLiJun
        </div>
    </template>
    <template if:true={showYellow}>
        <div
<<<<<<< HEAD
            style="
                margin-left: 10px;
                margin-right: 10px;
@@ -64,10 +53,3 @@
        </div>
    </template>
</template>
=======
            style="margin-left: 10px;margin-right: 10px;margin-top: 10px;margin-bottom: 10px;font-size:14px;background-color:yellow;text-align: right;padding-right:10px;">
            <lightning-formatted-number value={value}></lightning-formatted-number>
        </div>
    </template>
</template>
>>>>>>> LEXCommunityLiJun