Merge branch 'rosewiper'

This commit is contained in:
rosewiper 2023-10-18 10:27:14 +09:00
commit e3cfead2ab

View File

@ -40,6 +40,12 @@ tbody tr td.sms_detail p {overflow:hidden;text-overflow:ellipsis;white-space:now
tbody tr td.sms_detail .sms_detail_hover {overflow:hidden;text-overflow:ellipsis;display:none;word-wrap:break-word;-webkit-line-clamp:20;-webkit-box-orient:vertical;position:absolute;left:155px;top:1px;width:calc(100% + 230px);padding:15px;line-height:20px;white-space:normal;border:1px solid #e5e5e5;background:#fff;border-radius:5px;box-sizing:border-box;box-shadow:0px 3px 10px 0px rgb(0 0 0 / 0.2);z-index:1;font-size:14px;text-align:left;} tbody tr td.sms_detail .sms_detail_hover {overflow:hidden;text-overflow:ellipsis;display:none;word-wrap:break-word;-webkit-line-clamp:20;-webkit-box-orient:vertical;position:absolute;left:155px;top:1px;width:calc(100% + 230px);padding:15px;line-height:20px;white-space:normal;border:1px solid #e5e5e5;background:#fff;border-radius:5px;box-sizing:border-box;box-shadow:0px 3px 10px 0px rgb(0 0 0 / 0.2);z-index:1;font-size:14px;text-align:left;}
tbody tr td.sms_detail .sms_detail_hover:after {content:'';position:absolute;left:0;bottom:0;width:100%;height:10px;background:#fff;border-radius:0 0 5px 5px;} tbody tr td.sms_detail .sms_detail_hover:after {content:'';position:absolute;left:0;bottom:0;width:100%;height:10px;background:#fff;border-radius:0 0 5px 5px;}
tbody tr td.sms_detail:hover .sms_detail_hover {display:-webkit-box;} tbody tr td.sms_detail:hover .sms_detail_hover {display:-webkit-box;}
tbody tr td.sms_detail .kakao_detail_hover {overflow:hidden;text-overflow:ellipsis;display:none;word-wrap:break-word;-webkit-line-clamp:20;-webkit-box-orient:vertical;position:absolute;left:60px;top:1px;width:calc(100% + 230px);padding:15px;line-height:20px;white-space:normal;border:1px solid #e5e5e5;background:#fff;border-radius:5px;box-sizing:border-box;box-shadow:0px 3px 10px 0px rgb(0 0 0 / 0.2);z-index:1;font-size:14px;text-align:left;}
tbody tr td.sms_detail .kakao_detail_hover:after {content:'';position:absolute;left:0;bottom:0;width:100%;height:10px;background:#fff;border-radius:0 0 5px 5px;}
tbody tr td.sms_detail:hover .kakao_detail_hover {display:-webkit-box;}
</style> </style>
<script src="/publish/js/jquery-3.5.0.js"></script> <script src="/publish/js/jquery-3.5.0.js"></script>
@ -4566,9 +4572,13 @@ function kakaoATDelayCancel(msgGroupId){
<c:otherwise> <c:otherwise>
<div class="ellipsis_line"> <div class="ellipsis_line">
<c:out value="${kakaoResultList.smsTxt}"/> <c:out value="${kakaoResultList.smsTxt}"/>
<div class="kakao_detail_hover">
<c:out value="${kakaoResultList.smsTxt}"/>
</div>
</div> </div>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</td> </td>
<td><fmt:formatNumber value="${kakaoResultList.msgGroupCnt}" type="number" /></td> <td><fmt:formatNumber value="${kakaoResultList.msgGroupCnt}" type="number" /></td>
<td><fmt:formatNumber value="${kakaoResultList.successCount}" type="number" /></td> <td><fmt:formatNumber value="${kakaoResultList.successCount}" type="number" /></td>
@ -4704,6 +4714,9 @@ function kakaoATDelayCancel(msgGroupId){
<c:otherwise> <c:otherwise>
<div class="ellipsis_line"> <div class="ellipsis_line">
<c:out value="${kakaoReserveList.smsTxt}"/> <c:out value="${kakaoReserveList.smsTxt}"/>
<div class="kakao_detail_hover">
<c:out value="${kakaoReserveList.smsTxt}"/>
</div>
</div> </div>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>