Skip to content
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

test-merge github actions #458

Merged
merged 3 commits into from
Jan 17, 2024
Merged

test-merge github actions #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3cb85eb
fix: button behavior
yumincho Jan 4, 2024
7a1fc3f
fix: font style in select
yumincho Jan 4, 2024
40e203d
Merge pull request #456 from sparcs-kaist/feat/tag-modal-ui
yumincho Jan 10, 2024
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
4 changes: 2 additions & 2 deletions packages/web/src/components/atoms/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ export const Button = styled.button<{
}

&:disabled {
cursor: none;
background-color: ${theme.colors.white};
cursor: not-allowed;
background-color: ${theme.colors.gray100};
}
`,
);
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/components/atoms/Label.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const Select = styled.select<{ w: number; h: number }>`
border: 1px solid ${props => props.theme.colors.gray200};
background-color: ${props => props.theme.colors.white};

font-family: "Noto Sansf KR";
font-family: "Noto Sans KR";
font-size: 10px;
font-style: normal;
font-weight: 500;
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/components/atoms/SelectBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const SelectBox: React.FC<SelectBoxProps> = ({
onChange={e => onChange(e.target.value)}
defaultValue=""
>
<option value="">전체보기</option>
<option value="">전체 보기</option>
{options.map(option => (
<option key={option} value={option}>
{option}
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/components/atoms/placeholder.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
::placeholder {
color: #d9d9d9;

font-family: "Noto Sansf KR";
font-family: "Noto Sans KR";
font-size: 11px;
font-style: normal;
font-weight: 500;
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/components/molecules/UserTagCards.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const UserTagCards: React.FC<Props> = ({ tag }) => {
const navigate = useNavigate();
const openModal = () => navigate(`tagEdit?tagId=${tag.id}`);
return (
<Card primary={false} round={5} onClick={openModal}>
<Card primary={false} round={5} onClick={openModal} clickable>
<Box gap={8}>
<Box gap={8} dir="row">
<AdminTag tags={adminTags} suffix={tag.users.length} />
Expand Down
5 changes: 4 additions & 1 deletion packages/web/src/components/organisms/CreateUserTagModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,10 @@ export const CreateUserTagModal: React.FC = () => {
style={{ textDecoration: "none" }}
>
<Button w={300} h={42} onClick={onSubmit} disabled={!validated}>
<Text variant="boldtitle3" color="blue600">
<Text
variant="boldtitle3"
color={validated ? "blue600" : "gray300"}
>
태그 생성하기
</Text>
</Button>
Expand Down
Loading