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

[SMH-48] tab 스타일 & input color 수정 #29

Merged
merged 5 commits into from
Jun 15, 2024
Merged

[SMH-48] tab 스타일 & input color 수정 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1bbd47d
[SMH-48] tab 스타일 & input color 수정
ysnarmi Jun 3, 2024
d752980
[SMH-48] color 삭제
ysnarmi Jun 3, 2024
063f065
[SMH-48] 린트에러 수정
ysnarmi Jun 3, 2024
e09e46d
[SMH-48] 불필요한 모듈 삭제
ysnarmi Jun 6, 2024
ff6b2c9
[SMH-48] 불필요한 모듈 삭제 후 pnpm i
ysnarmi Jun 6, 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
15 changes: 8 additions & 7 deletions packages/design-system/src/components/input/InputLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use client';

import styled from '@emotion/styled';
import { colors } from '@styles/color';

interface InputLayoutProps {
active?: boolean;
Expand All @@ -19,28 +20,28 @@ export const InputBox = styled.div<InputLayoutProps>`
padding: 13px 16px;
border-radius: 8px;

background-color: var(--gray98);
background-color: ${colors.gray98};

color: var(--black);
color: ${colors.black};

input {
border: 0;

background-color: var(--gray98);
background-color: ${colors.gray98};

&:focus {
outline: none;
}

&::placeholder {
color: var(--gray70);
color: ${colors.gray70};
}
}

input[disabled] {
background-color: var(--gray95);
background-color: ${colors.gray95};

color: var(--primary70);
color: ${colors.primary70};
}

svg {
Expand All @@ -53,6 +54,6 @@ export const InputBox = styled.div<InputLayoutProps>`
export const InputError = styled.div<InputLayoutProps>`
margin-top: 5px;

color: var(--error40);
color: ${colors.error40};
font-size: 12px;
`;
19 changes: 8 additions & 11 deletions packages/design-system/src/components/tab/TabLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
'use client';

import styled from '@emotion/styled';
import { colors } from '@styles/color';

export const TabLayout = styled.div`
display: flex;
gap: 10px;
`;
interface TabListProps {
active: boolean;
}

export const TabList = styled.div<TabListProps>`
padding: 10px 20px;
border: 1px solid transparent;
border-radius: 5px;
padding: 10px;
border-bottom: ${(props) =>
props.active ? '1px solid ' + colors.primary20 : '0'};

background-color: ${(props) => (props.active ? '#0056b3' : '#007bff')};

color: #fff;
color: ${(props) => (props.active ? colors.primary20 : colors.primary70)};
font-weight: 700;
font-size: 16px;
line-height: 22px;
text-align: center;

cursor: pointer;

&:hover {
background-color: #0056b3;
}
`;
2 changes: 1 addition & 1 deletion packages/design-system/src/components/tab/index.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const Primary: Story = {
label: '선교팀',
},
]}
selectedValue={''}
selectedValue={TeamType.PREPARE_TEAM}
onChange={() => null}
/>
),
Expand Down
60 changes: 0 additions & 60 deletions packages/design-system/src/styles/_color.scss
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions packages/design-system/src/styles/_global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
@use "./_typography";
@use "./_color";
@use "./_typography";
Loading