Skip to content

Commit 495ddbc

Browse files
committed
Merge branch 'develop' of https://github.com/D3vPals/frontend into feat/#148
2 parents 99f9bba + 761fb63 commit 495ddbc

28 files changed

+211
-93
lines changed

.github/workflows/chromatic.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: 'Chromatic'
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- develop
7+
8+
jobs:
9+
chromatic:
10+
name: Run Chromatic
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout code
14+
uses: actions/checkout@v4
15+
with:
16+
fetch-depth: 0
17+
- uses: actions/setup-node@v4
18+
with:
19+
node-version: 20
20+
- name: Install dependencies
21+
run: npm ci
22+
- name: Run Chromatic
23+
uses: chromaui/action@latest
24+
with:
25+
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}

.github/workflows/front_ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: 'front ci'
2-
on: pull_request
2+
on:
3+
pull_request:
4+
branches:
5+
- develop
36
jobs:
47
Component-test:
58
runs-on: ubuntu-latest

package-lock.json

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"storybook": "storybook dev -p 6006",
1212
"build-storybook": "storybook build",
1313
"test": "vitest",
14-
"test:run": "vitest run"
14+
"test:run": "vitest run",
15+
"chromatic": "chromatic --exit-zero-on-changes"
1516
},
1617
"dependencies": {
1718
"@heroicons/react": "^2.2.0",
@@ -50,6 +51,7 @@
5051
"@types/testing-library__react": "^10.0.1",
5152
"@vitejs/plugin-react-swc": "^3.5.0",
5253
"@vitest/ui": "^2.1.8",
54+
"chromatic": "^11.25.2",
5355
"eslint": "^9.17.0",
5456
"eslint-plugin-import": "^2.31.0",
5557
"eslint-plugin-jsx-a11y": "^6.10.2",

src/components/common/infoCard/InfoCard.styled.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const Container = styled.div`
77
border: 2px solid #f0f0f0;
88
border-radius: ${({ theme }) => theme.borderRadius.large};
99
width: 80%;
10-
min-width: 530px;
10+
min-width: 500px;
1111
height: 80vh;
1212
padding-bottom: 1rem;
1313
position: relative;

src/components/common/layout/ApplicantViewLayout.styled.ts

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/components/common/layout/ApplicantViewLayout.tsx

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/components/common/layout/sidebar/LayoutSidebar.styled.ts

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/components/common/layout/sidebar/LayoutSidebar.tsx

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/components/common/sidebar/Sidebar.styled.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ export const MenuItem = styled.div<{ $isActive: boolean }>`
4545
background-color: ${({ $isActive }) =>
4646
$isActive ? '#f9f9f9' : 'transparent'};
4747
48-
@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
49-
font-size: ${({ theme }) => theme.heading['semiSmall'].tabletFontSize};
48+
@media ${({ theme }) => theme.mediaQuery.tablet} {
49+
font-size: 0.7rem;
5050
}
5151
5252
&:hover {
@@ -58,9 +58,9 @@ export const MenuItem = styled.div<{ $isActive: boolean }>`
5858
width: 30px;
5959
height: 30px;
6060
61-
@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
62-
width: 23px;
63-
height: 23px;
61+
@media ${({ theme }) => theme.mediaQuery.tablet} {
62+
width: 20px;
63+
height: 20px;
6464
}
6565
}
6666
`;

0 commit comments

Comments
 (0)