Merge branch 'susu' into dev
This commit is contained in:
@@ -1159,11 +1159,20 @@ button,
|
||||
[type=button],
|
||||
[type=reset],
|
||||
[type=submit] {
|
||||
outline: none;
|
||||
-webkit-appearance: button;
|
||||
-moz-appearance: button;
|
||||
appearance: button;
|
||||
}
|
||||
|
||||
button:focus-visible {
|
||||
outline: 1px solid #007bff;
|
||||
}
|
||||
|
||||
button:focus:not(:focus-visible) {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
/*
|
||||
* Remove the inner border and padding in Firefox.
|
||||
*/
|
||||
@@ -4292,6 +4301,7 @@ button.swiper-pagination-bullet {
|
||||
.btn.btn-tertiary {
|
||||
border-color: #f1f3f5;
|
||||
background: #e9ecef;
|
||||
color: #343a40;
|
||||
}
|
||||
.btn.btn-tertiary .btn-txt {
|
||||
color: #343a40;
|
||||
@@ -5096,6 +5106,12 @@ button.swiper-pagination-bullet {
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.component-input .input-label .label-txt {
|
||||
display: -webkit-box;
|
||||
display: -webkit-flex;
|
||||
display: flex;
|
||||
-webkit-box-align: center;
|
||||
-webkit-align-items: center;
|
||||
align-items: center;
|
||||
position: relative;
|
||||
font-size: 1.8rem;
|
||||
line-height: 140%;
|
||||
@@ -5103,6 +5119,7 @@ button.swiper-pagination-bullet {
|
||||
color: #343a40;
|
||||
}
|
||||
.component-input .input-label .label-txt span {
|
||||
display: inline-block;
|
||||
font-size: 1.7rem;
|
||||
line-height: 140%;
|
||||
font-weight: 400;
|
||||
@@ -6061,6 +6078,9 @@ button.swiper-pagination-bullet {
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.select-group .select-label .label-txt {
|
||||
display: -webkit-inline-box;
|
||||
display: -webkit-inline-flex;
|
||||
display: inline-flex;
|
||||
position: relative;
|
||||
font-size: 1.8rem;
|
||||
line-height: 140%;
|
||||
@@ -8447,6 +8467,7 @@ button.swiper-pagination-bullet {
|
||||
justify-content: space-between;
|
||||
}
|
||||
.regist-item-area .item-list .list-item .item-tit-group .item-name {
|
||||
max-width: 70%;
|
||||
font-size: 2rem;
|
||||
line-height: 140%;
|
||||
font-weight: 700;
|
||||
@@ -8502,6 +8523,7 @@ button.swiper-pagination-bullet {
|
||||
line-height: 140%;
|
||||
}
|
||||
.regist-item-area .item-list .list-item .detail-list li span {
|
||||
max-width: 80%;
|
||||
color: #212529;
|
||||
}
|
||||
|
||||
@@ -8766,6 +8788,9 @@ button.swiper-pagination-bullet {
|
||||
flex: 1;
|
||||
}
|
||||
.form-group .input-flex-group.type-num .label-txt {
|
||||
display: -webkit-inline-box;
|
||||
display: -webkit-inline-flex;
|
||||
display: inline-flex;
|
||||
font-size: 1.8rem;
|
||||
line-height: 140%;
|
||||
font-weight: 700;
|
||||
|
||||
@@ -105,31 +105,12 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="d-flex">
|
||||
<div class="select-group">
|
||||
|
||||
|
||||
<div id="phone1Id" class="component-select bottom-sheet"
|
||||
th:data-props-default="${userInfo.phone1}" data-props-type="bottomSheet">
|
||||
<input type="hidden" th:field="*{phone1}" data-type="select">
|
||||
<button type="button" class="select-box">
|
||||
<span class="select-txt"></span>
|
||||
</button>
|
||||
<div class="select-options">
|
||||
<div class="select-header">
|
||||
<p>휴대폰 번호</p>
|
||||
<button type="button" class="select-close">
|
||||
<span class="hide-txt">닫기</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="select-scroll">
|
||||
<ul class="">
|
||||
<li class="option" data-value="010" th:classappend="${userInfo.phone1 == '010'?' current':'' }">010</li>
|
||||
<li class="option" data-value="011" th:classappend="${userInfo.phone1 == '011'?' current':'' }">011</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="component-input">
|
||||
<div class="input-field">
|
||||
<input type="number" id="phone1Id" th:value="${userInfo.phone1}" readonly>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="component-input">
|
||||
<div class="input-field">
|
||||
<input type="text" id="temp_input_0006" th:field="*{phone2}"
|
||||
|
||||
@@ -85,7 +85,6 @@
|
||||
<li class="terms-list-item">
|
||||
"회원"은 관계법령, 이 약관의 규정, 이용안내 및 "서비스"와 관련하여 고지한 주의사항, "회사"가 통지하는 사항 등을 준수하여야 하며, 기타 "회사"의 업무에 방해되는 행위를 하여서는 안 됩니다. 만약 이를 위반할 경우 “회사”가 “회원”자격을 박탈할 수 있습니다
|
||||
</li>
|
||||
<li class="terms-list-item"></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="terms-group">
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field">
|
||||
<input autofocus class="" id="floatingInput" name="username" placeholder="임가번호를 입력해 주세요" value="11111"
|
||||
type="number" maxlength="5">
|
||||
<input autofocus maxlength="5" id="floatingInput" pattern="[0-9]*" name="username" placeholder="임가번호를 입력해 주세요"
|
||||
type="text" inputmode="numeric">
|
||||
</div>
|
||||
<ul class="input-info" id="username-error" style="display: none;">
|
||||
<li>임가번호를 입력해주세요</li>
|
||||
@@ -35,7 +35,7 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field">
|
||||
<input type="password" name="password" id="floatingPassword" placeholder="비밀번호 4자리를 입력해 주세요" value="1111" maxlength="4">
|
||||
<input type="password" name="password" id="floatingPassword" placeholder="비밀번호 4자리를 입력해 주세요" maxlength="4">
|
||||
</div>
|
||||
<ul class="input-info" id="password-error" style="display: none;">
|
||||
<li>비밀번호를 입력해주세요</li>
|
||||
@@ -43,7 +43,7 @@
|
||||
</div>
|
||||
<div class="component-input" roleDto="group" aria-label="Basic checkbox toggle button group">
|
||||
<label for="btn_ck1" class="checkbox-inner">
|
||||
<input autocomplete="off" type="checkbox" id="btn_ck1" name="remember-me">
|
||||
<input autocomplete="off" type="checkbox" id="btn_ck1" name="remember-me" checked>
|
||||
<span class="checkbox-item">
|
||||
<span class="checkbox-txt">로그인 상태 유지</span>
|
||||
</span>
|
||||
@@ -95,7 +95,8 @@
|
||||
const userNameValue = floatingInput.value;
|
||||
const errorContainer = document.getElementById('username-error');
|
||||
const parentComponent = floatingInput.closest('.component-input');
|
||||
if (userNameValue.length < 5) {
|
||||
const isNumeric = /^[0-9]+$/.test(userNameValue);
|
||||
if (userNameValue.length < 5 || !isNumeric) {
|
||||
parentComponent.classList.add('input-invalid');
|
||||
errorContainer.style.display = 'block';
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user