Skip to content

[홍성현] sprint4 #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
addiescode-sj merged 2 commits into from
May 14, 2025
Merged

[홍성현] sprint4 #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
110e556
feat : sprint4 제출
May 2, 2025
14ea09d
충돌 해
May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions assets/css/global.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,30 @@ img {
max-width: 100%;
height: auto;
}

.input-error {
border: 1px solid var(--color-border-error);
}

.text-error {
color: var(--color-text-input-error);
font-size: 0.875rem;
margin-top: 4px;
margin-left: 20px;
}

.error-message {
min-height: 1.2em;
font-size: 0.875rem;
margin-top: 10px;
}

.form__input-button:disabled {
background-color: var(--color-button-disabled);
color: var(--color-button-disabled-text);
cursor: not-allowed;
}

.form__input-button.active {
background-color: var(--color-button-active);
}
23 changes: 17 additions & 6 deletions assets/css/pages/login-signup.css → assets/css/pages/auth.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,22 @@
flex-direction: column;
justify-content: center;
align-items: center;
margin: 100px 600px;
margin: 100px 300px;
}

.header__login,
.header__signup {
margin-bottom: 40px;
}

.form__field {
margin-bottom: 20px;
}

.logo-image {
width: 400px;
}

.form__login,
.form__signup {
display: flex;
Expand All @@ -23,16 +31,16 @@
.form__label-email,
.form__label-nickname,
.form__label-password,
.form__label-password-confirm {
.form__label-passwordCheck {
color: var(--color-text-label);
margin-bottom: 20px;
}

.form__input-email,
.form__input-nickname,
.form__input-password,
.form__input-password-confirm {
.form__input-passwordCheck {
background-color: var(--color-surface-input);
margin: 20px 0;
padding: 20px;
border-radius: 8px;
width: 100%;
Expand All @@ -47,11 +55,10 @@
position: relative;
display: flex;
align-items: center;
margin-bottom: 20px;
}

.form__toggle-password,
.form__toggle-password-confirm {
.form__toggle-passwordCheck {
position: absolute;
right: 20px;
cursor: pointer;
Expand Down Expand Up @@ -91,6 +98,10 @@
margin: 80px 16px 231px;
max-width: 400px;
}

.logo-image {
width: 200px;
}
}

/* login signup Tablet */
Expand Down
18 changes: 14 additions & 4 deletions assets/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@
padding-top: 200px;
}

.hero__title {
white-space: pre-line;
}

.feature-section__headline {
white-space: pre-line;
}

.hero__title,
.feature-section__headline,
.closing-banner__headline {
Expand Down Expand Up @@ -140,10 +148,6 @@

/* mobile */
@media (min-width: 375px) and (max-width: 767px) {
br.onlyPC {
display: none;
}

.header__nav {
padding: 0 24px;
}
Expand Down Expand Up @@ -195,6 +199,7 @@

.feature-section__headline {
font-size: 1.5rem;
white-space: normal;
}

.feature-section__description {
Expand Down Expand Up @@ -249,6 +254,7 @@
.hero__title {
font-size: 2rem;
line-height: 1.4;
white-space: normal;
}

.hero__link {
Expand All @@ -264,6 +270,10 @@
padding: 0 24px;
}

.feature-section__headline {
white-space: normal;
}

.feature-section__item {
display: flex;
flex-direction: column;
Expand Down
9 changes: 7 additions & 2 deletions assets/css/variables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
:root {
--color-primary-surface: #e6f2ff;
--color-primary: #3692ff;
--color-primary-hover: #1967d6;
--color-primary-active: #1251aa;
--color-primary-banner: #cfe5ff;

--color-button-hover: #1251aa;
--color-button-active: #3692ff;
--color-button-disabled: #9ca3af;
--color-button-disabled-text: #f3f4f6;

--color-text-title: var(--gray700);
--color-text-label: var(--gray800);
--color-text-muted: var(--gray500);
--color-text-placeholder: var(--gray400);
--color-text-button: var(--gray100);
--color-text-subtle: var(--gray50);
--color-text-input-error: #f74747;

--color-border-error: #f74747;
--color-border: var(--gray200);
--color-surface-input: var(--gray100);
--color-footer-background: var(--gray900);
Expand Down
11 changes: 11 additions & 0 deletions assets/images/icons/icon_visibilityOff.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 1 addition & 8 deletions assets/images/icons/icon_visibilityOn.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 34 additions & 13 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@
class="header__login-link"
href="/login.html"
aria-label="로그인으로 이동"
>로그인</a
>
로그인
</a>
</nav>
</header>
<main>
Expand Down Expand Up @@ -75,7 +76,9 @@ <h2 class="feature-section__headline">인기 상품을
확인해 보세요
</h2>
<p class="feature-section__description">
가장 HOT한 중고거래 물품을<br />판다 마켓에서 확인해 보세요
가장 HOT한 중고거래 물품을
<br />
판다 마켓에서 확인해 보세요
</p>
</div>
</article>
Expand All @@ -89,12 +92,21 @@ <h2 class="feature-section__headline">인기 상품을
class="feature-section__content feature-section__content--reverse"
>
<h3 class="feature-section__title">Search</h3>
<<<<<<< HEAD
Copy link
Collaborator

@addiescode-sj addiescode-sj May 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

여기 충돌해결하면서 생긴 라인들 그대로 남아있네요! 정리해주세요 :)

<!-- prettier-ignore -->
<h2 class="feature-section__headline">구매를 원하는
상품을 검색하세요
</h2>
=======
<!-- prettier-ignore -->
<h2 class="feature-section__headline">구매를 원하는
상품을 검색하세요
</h2>
>>>>>>> Basic-홍성현-sprint3
<p class="feature-section__description">
구매하고 싶은 물품은 검색해서<br />쉽게 찾아보세요
구매하고 싶은 물품은 검색해서
<br />
쉽게 찾아보세요
</p>
</div>
</article>
Expand All @@ -111,15 +123,19 @@ <h2 class="feature-section__headline">판매를 원하는
상품을 등록하세요
</h2>
<p class="feature-section__description">
어떤 물건이든 판매하고 싶은 상품을<br />쉽게 등록하세요
어떤 물건이든 판매하고 싶은 상품을
<br />
쉽게 등록하세요
</p>
</div>
</article>
</section>
<section class="closing-banner">
<div class="wrapper">
<h2 class="closing-banner__headline">
믿을수 있는<br />판다마켓 중고 거래
믿을수 있는
<br />
판다마켓 중고 거래
</h2>
<img
class="closing-banner__image"
Expand Down Expand Up @@ -147,37 +163,42 @@ <h2 class="closing-banner__headline">
aria-label="facebook으로 이동"
target="_blank"
rel="noopener noreferrer"
><img src="./assets/images/icons/icon_facebook.svg" alt="Facebook"
/></a>
>
<img src="./assets/images/icons/icon_facebook.svg" alt="Facebook" />
</a>
</li>
<li class="footer__social-item">
<a
href="https://www.twitter.com"
aria-label="twitter로 이동"
target="_blank"
rel="noopener noreferrer"
><img src="./assets/images/icons/icon_twitter.svg" alt="Twitter"
/></a>
>
<img src="./assets/images/icons/icon_twitter.svg" alt="Twitter" />
</a>
</li>
<li class="footer__social-item">
<a
href="https://www.youtube.com"
aria-label="youtube로 이동"
target="_blank"
rel="noopener noreferrer"
><img src="./assets/images/icons/icon_youtube.svg" alt="YouTube"
/></a>
>
<img src="./assets/images/icons/icon_youtube.svg" alt="YouTube" />
</a>
</li>
<li class="footer__social-item">
<a
href="https://www.instagram.com"
aria-label="instagram으로 이동"
target="_blank"
rel="noopener noreferrer"
><img
>
<img
src="./assets/images/icons/icon_instagram.svg"
alt="Instagram"
/></a>
/>
</a>
</li>
</ul>
</footer>
Expand Down
Loading
Loading