Skip to content

fix/#58 수정 #59

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
a1rhun merged 1 commit into from
Aug 20, 2025
Merged

fix/#58 수정 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/components/ServerManagement/AddServerModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ const AddServerModal = ({ onClose, onSubmit, teamCode }) => {
/>
<label>Auth Token</label>
<input
type="password"
name="authToken"
value={formData.authToken}
onChange={handleInputChange}
Expand Down Expand Up @@ -196,6 +197,7 @@ const AddServerModal = ({ onClose, onSubmit, teamCode }) => {
/>
<label>Auth Token</label>
<input
type="password"
name="authToken"
value={formData.authToken}
onChange={handleInputChange}
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Login.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,19 @@ const LoginPage = () => {
type="login"
placeholder="이메일"
name="loginId"
autoComplete="off"
value={form.loginId} // ✅ 수정
onChange={handleChange}
autoComplete="off"
/>
<InputField
type={showPassword ? "text" : "password"}
name="password"
placeholder="비밀번호"
value={form.password}
autoComplete="off"
onChange={handleChange}
showPassword={showPassword}
toggleVisibility={togglePasswordVisibility}
autoComplete="off"
/>

<div className="login-remember">
Expand Down
36 changes: 34 additions & 2 deletions src/styles/css/sideBar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,41 @@
display: flex;
flex-direction: column;
}

.side-bar .github-container {
.side-bar .github-container .connected-github-header {
margin: 20px 0 0 8px;
color: #666666;
font-size: 16px;
line-height: 24px;
font-weight: 500;
letter-spacing: -2.5%;
}
.side-bar .github-container .modal-github-button {
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 40px;
background-color: #FFFFFF;
border-radius: 12px; /* 모서리 둥글게 */
cursor: pointer;
transition: background-color 0.2s ease;
}
.side-bar .github-container .modal-github-button:hover {
background-color: #E0E0E0;
}
.side-bar .github-container .modal-github-button .github-icon {
width: 20px;
height: 20px;
margin-right: 8px; /* 아이콘과 텍스트 사이의 간격 */
fill: #999; /* 아이콘 색상 */
transition: fill 0.2s;
}
.side-bar .github-container .modal-github-button .github-text {
color: #666666;
font-size: 14px;
line-height: 20px;
font-weight: 400;
letter-spacing: -2.5%;
}
.side-bar .sidebar-footer {
margin-top: auto;
Expand Down
36 changes: 35 additions & 1 deletion src/styles/scss/components/sideBar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,42 @@
}

.github-container {
margin: 20px 0 0 8px;
.connected-github-header {
margin: 20px 0 0 8px;

@include text-color("text-sub1");
@include font-style("headline6");
}

.modal-github-button {
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 40px;
background-color: #FFFFFF;
border-radius: 12px; /* 모서리 둥글게 */
cursor: pointer;
transition: background-color 0.2s ease;

&:hover {
background-color: #E0E0E0;
}

.github-icon {
width: 20px;
height: 20px;
margin-right: 8px; /* 아이콘과 텍스트 사이의 간격 */
fill: #999; /* 아이콘 색상 */
transition: fill 0.2s;
}

.github-text {
@include text-color("text-sub1");
@include font-style("body2");
}
}

}

.sidebar-footer {
Expand Down