merge 충돌 해결

This commit is contained in:
hong
2026-07-28 14:35:21 +09:00
59 changed files with 3651 additions and 666 deletions
+362 -135
View File
@@ -711,75 +711,6 @@ hr {
--transition-smooth: all 0.4s cubic-bezier(0.16, 1, 0.3, 1);
}
.design-survey-bar {
position: fixed;
top: 0;
left: 0;
right: 0;
height: 48px;
background: linear-gradient(90deg, #667eea 0%, #764ba2 100%);
z-index: 400;
display: flex;
align-items: center;
justify-content: center;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
}
.design-survey-bar .survey-container {
display: flex;
align-items: center;
gap: 16px;
}
.design-survey-bar .survey-label {
color: #ffffff;
font-size: 14px;
font-weight: 500;
}
.design-survey-bar .survey-buttons {
display: flex;
gap: 8px;
}
.design-survey-bar .survey-btn {
padding: 6px 16px;
border: 2px solid rgba(255, 255, 255, 0.5);
border-radius: 20px;
background: transparent;
color: #ffffff;
font-size: 14px;
font-weight: 600;
cursor: pointer;
transition: all 0.3s ease;
}
.design-survey-bar .survey-btn:hover {
background: rgba(255, 255, 255, 0.2);
border-color: #ffffff;
}
.design-survey-bar .survey-btn.active {
background: #ffffff;
color: #667eea;
border-color: #ffffff;
}
@media (max-width: 768px) {
.design-survey-bar {
height: 40px;
}
.design-survey-bar .survey-label {
display: none;
}
.design-survey-bar .survey-btn {
padding: 4px 12px;
font-size: 12px;
}
}
body.design-survey-active .global-header {
margin-top: 48px;
}
@media (max-width: 768px) {
body.design-survey-active .global-header {
margin-top: 40px;
}
}
.blind {
position: absolute;
width: 1px;
@@ -7571,69 +7502,6 @@ button.djb-comment-submit:disabled {
font-size: 13px;
}
.password-policy-checklist {
list-style: none;
padding: 0;
margin: 12px 0 0 0;
}
.password-policy-checklist li {
display: flex;
align-items: center;
gap: 8px;
font-size: 15px;
line-height: 20px;
margin-bottom: 6px;
transition: color 0.15s ease;
}
.password-policy-checklist li:last-child {
margin-bottom: 0;
}
.password-policy-checklist li .policy-icon {
display: inline-flex;
align-items: center;
justify-content: center;
width: 18px;
height: 18px;
flex-shrink: 0;
font-size: 13px;
font-weight: 700;
line-height: 1;
}
.password-policy-checklist li .policy-icon::before {
content: "•";
}
.password-policy-checklist li.is-idle {
color: #888;
}
.password-policy-checklist li.is-idle .policy-icon {
color: #b5b5b5;
}
.password-policy-checklist li.is-pass {
color: #1a8f4c;
}
.password-policy-checklist li.is-pass .policy-icon {
color: #1a8f4c;
}
.password-policy-checklist li.is-pass .policy-icon::before {
content: "✔";
}
.password-policy-checklist li.is-fail {
color: #d63a3a;
}
.password-policy-checklist li.is-fail .policy-icon {
color: #d63a3a;
}
.password-policy-checklist li.is-fail .policy-icon::before {
content: "✖";
}
.password-policy-note {
margin: 10px 0 0 0;
font-size: 14px;
line-height: 18px;
color: #888;
}
.board-header {
margin-bottom: 24px;
}
@@ -7651,6 +7519,330 @@ button.djb-comment-submit:disabled {
line-height: 1.5;
}
.tfa-card {
position: relative;
width: 520px;
max-width: 100%;
padding: 0;
border: 1px solid #DCE2ED;
border-radius: 4px;
background: #fff;
box-shadow: 0 4px 20px rgba(0, 0, 0, 0.08);
color: #0D0E11;
letter-spacing: -0.02em;
}
.tfa-close {
position: absolute;
top: 16px;
right: 16px;
width: 28px;
height: 28px;
padding: 0;
border: 0;
background: none;
color: #7F8A95;
cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
border-radius: 4px;
transition: background 0.12s ease, color 0.12s ease;
}
.tfa-close:hover {
background: #F4F5F9;
color: #0D0E11;
}
.tfa-head {
padding: 24px 32px;
padding-right: 60px;
border-bottom: 1px solid #DCE2ED;
display: flex;
align-items: center;
justify-content: space-between;
gap: 16px;
}
.tfa-head .tfa-head-title {
font-size: 27px;
font-weight: 700;
line-height: 1.35;
color: #0D0E11;
}
.tfa-head .tfa-head-brand {
font-size: 14px;
font-weight: 500;
color: #7F8A95;
}
.tfa-body {
padding: 28px 32px 32px;
}
.tfa-step {
display: flex;
align-items: center;
gap: 8px;
margin-bottom: 12px;
}
.tfa-step .tfa-step-num {
display: inline-flex;
align-items: center;
justify-content: center;
width: 20px;
height: 20px;
border-radius: 100px;
background: #BDC7CF;
color: #fff;
font-size: 11px;
font-weight: 500;
flex: none;
}
.tfa-step .tfa-step-num.is-active {
background: #4685EF;
}
.tfa-step .tfa-step-text {
font-size: 15px;
font-weight: 500;
color: #7F8A95;
}
.tfa-step .tfa-step-text.is-active {
color: #0D0E11;
}
.tfa-segment {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 8px;
margin-bottom: 28px;
}
.tfa-segment .tfa-seg-btn {
padding: 14px 16px;
text-align: left;
cursor: pointer;
border: 1px solid #DCE2ED;
border-radius: 4px;
background: #fff;
transition: border-color 0.12s ease, background 0.12s ease;
}
.tfa-segment .tfa-seg-btn .tfa-seg-label {
display: block;
font-size: 15px;
font-weight: 500;
color: #0D0E11;
}
.tfa-segment .tfa-seg-btn .tfa-seg-masked {
display: block;
font-size: 14px;
font-weight: 300;
color: #7F8A95;
margin-top: 2px;
}
.tfa-segment .tfa-seg-btn:hover {
border-color: #4685EF;
}
.tfa-segment .tfa-seg-btn.is-active {
border: 1.5px solid #4685EF;
background: #ECF0FA;
}
.tfa-segment .tfa-seg-btn.is-active .tfa-seg-label {
color: #2A69DE;
}
.tfa-hint {
border: 1px solid #DCE2ED;
border-radius: 4px;
background: #F4F5F9;
padding: 16px;
font-size: 14px;
font-weight: 300;
line-height: 1.5;
color: #7F8A95;
margin-bottom: 20px;
}
.tfa-cta {
width: 100%;
height: 56px;
border: 0;
border-radius: 4px;
background: #4685EF;
color: #fff;
cursor: pointer;
font-size: 16px;
font-weight: 500;
letter-spacing: -0.02em;
transition: background 0.12s ease;
}
.tfa-cta:hover {
background: #2A69DE;
}
.tfa-cta:disabled {
background: #F4F5F9;
color: #BDC7CF;
cursor: default;
}
.tfa-code-row {
display: flex;
gap: 8px;
margin-bottom: 8px;
}
.tfa-code-row .tfa-code-input-wrap {
flex: 1;
display: flex;
align-items: center;
height: 56px;
padding: 0 14px;
border: 1px solid #BDC7CF;
border-radius: 4px;
background: #fff;
transition: border-color 0.12s ease;
}
.tfa-code-row .tfa-code-input-wrap:focus-within {
border-color: #4685EF;
}
.tfa-code-row .tfa-code-input {
flex: 1;
min-width: 0;
border: 0;
outline: none;
background: transparent;
font-size: 16px;
font-weight: 500;
letter-spacing: 0.02em;
color: #0D0E11;
}
.tfa-code-row .tfa-code-input::placeholder {
color: #BDC7CF;
font-weight: 400;
}
.tfa-code-row .tfa-resend {
flex: none;
height: 56px;
padding: 0 18px;
border: 1px solid #7F8A95;
border-radius: 4px;
background: #fff;
color: #0D0E11;
cursor: pointer;
font-size: 15px;
font-weight: 500;
white-space: nowrap;
transition: background 0.12s ease;
}
.tfa-code-row .tfa-resend:hover {
background: #F4F5F9;
}
.tfa-code-row .tfa-resend:disabled {
opacity: 0.5;
cursor: default;
}
.tfa-timer-row {
display: flex;
align-items: center;
justify-content: space-between;
gap: 12px;
border: 1px solid #DCE2ED;
border-radius: 4px;
background: #F4F5F9;
padding: 12px 14px;
margin-bottom: 12px;
}
.tfa-timer-row .tfa-timer-label {
font-size: 14px;
font-weight: 300;
color: #7F8A95;
}
.tfa-timer-row .tfa-timer-clock {
display: flex;
align-items: baseline;
gap: 6px;
}
.tfa-timer-row .tfa-timer {
font-size: 20px;
font-weight: 500;
letter-spacing: 0.02em;
color: #4685EF;
font-variant-numeric: tabular-nums;
}
.tfa-timer-row .tfa-timer.is-warning {
color: #F4253C;
}
.tfa-timer-row .tfa-timer.is-expired {
color: #7F8A95;
}
.tfa-timer-row .tfa-timer-total {
font-size: 13px;
font-weight: 300;
color: #7F8A95;
}
.tfa-progress {
height: 3px;
background: #DCE2ED;
border-radius: 2px;
overflow: hidden;
margin-bottom: 12px;
}
.tfa-progress .tfa-progress-bar {
height: 100%;
width: 100%;
background: #4685EF;
transition: width 1s linear;
}
.tfa-progress .tfa-progress-bar.is-warning {
background: #F4253C;
}
.tfa-message {
min-height: 21px;
margin: 0 0 20px;
font-size: 14px;
font-weight: 300;
line-height: 1.5;
color: #7F8A95;
}
.tfa-message.is-error {
color: #F4253C;
}
.tfa-test-notice {
margin: 0 0 16px;
padding: 10px 14px;
border: 1px dashed #F59E0B;
border-radius: 4px;
background: #FFFBEB;
color: #B45309;
font-size: 13px;
text-align: center;
}
.tfa-foot {
margin-top: 24px;
padding-top: 16px;
border-top: 1px solid #DFDFDF;
font-size: 14px;
font-weight: 300;
line-height: 1.5;
color: #7F8A95;
}
@media (max-width: 768px) {
.tfa-head {
padding: 20px 22px;
}
.tfa-head .tfa-head-title {
font-size: 23px;
}
.tfa-body {
padding: 22px 22px 26px;
}
.tfa-segment {
margin-bottom: 22px;
}
}
.hero-carousel-section {
position: relative;
width: 100%;
@@ -10975,6 +11167,8 @@ body.index-page-body {
transition: all 0.3s ease;
position: relative;
bottom: -2px;
display: inline-block;
text-decoration: none;
}
.api-detail-tabs .tab-button:hover {
color: #0049b4;
@@ -11003,6 +11197,39 @@ body.index-page-body {
margin: 24px 0;
}
.testbed-auth-gate {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
gap: 16px;
padding: calc(32px * 2) 24px;
text-align: center;
background: #FFFFFF;
border: 1px solid #E2E8F0;
border-radius: 12px;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
}
.testbed-auth-gate .testbed-auth-gate__icon {
font-size: 40px;
line-height: 1;
}
.testbed-auth-gate .testbed-auth-gate__title {
margin: 0;
font-size: 20px;
font-weight: 700;
color: #1A1A2E;
}
.testbed-auth-gate .testbed-auth-gate__desc {
margin: 0;
font-size: 16px;
color: #64748B;
}
.testbed-auth-gate .btn {
margin-top: 8px;
min-width: 160px;
}
.testbed-app-panel {
margin: 8px 0 0;
padding: 24px;
@@ -11452,11 +11679,11 @@ body.index-page-body {
display: flex;
align-items: center;
justify-content: center;
padding: 80px 20px;
padding: 100px 20px;
position: relative;
border-radius: 12px;
margin-top: 60px;
margin-bottom: 60px;
margin-bottom: 50px;
}
.login-container {
@@ -11751,7 +11978,7 @@ body.index-page-body {
@media (max-width: 768px) {
.login-page {
min-height: calc(100vh - 44px);
padding: 40px 20px;
padding: 100px 20px;
margin-top: 0;
margin-bottom: 0;
border-radius: 0;