Skip to content

Commit

Permalink
Merge branch 'main' into refact/textarea
Browse files Browse the repository at this point in the history
  • Loading branch information
Brokyeom authored Oct 9, 2024
2 parents faace10 + 39d8ed5 commit f1b0ae4
Show file tree
Hide file tree
Showing 13 changed files with 159 additions and 250 deletions.
6 changes: 6 additions & 0 deletions packages/colors/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @sopt-makers/colors

## 3.0.2

### Patch Changes

- 5eae36b: backgroundDimmed 컬러 80%로 수정

## 3.0.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/colors/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sopt-makers/colors",
"version": "3.0.1",
"version": "3.0.2",
"description": "sopt-makers의 frontend repository에 사용되는 colors를 제공해요.",
"license": "MIT",
"main": "./dist/index.js",
Expand Down
216 changes: 108 additions & 108 deletions packages/colors/src/colors.ts
Original file line number Diff line number Diff line change
@@ -1,121 +1,121 @@
export const colors = {
white: "#FFFFFF",
gray10: "#FCFCFC",
gray30: "#F0F0F0",
gray50: "#E4E4E5",
gray100: "#C3C3C6",
gray200: "#9D9DA4",
gray300: "#808087",
gray400: "#66666D",
gray500: "#515159",
gray600: "#3F3F47",
gray700: "#2E2E35",
gray800: "#202025",
gray900: "#17181C",
gray950: "#0F1012",
black: "#000000",
white: '#FFFFFF',
gray10: '#FCFCFC',
gray30: '#F0F0F0',
gray50: '#E4E4E5',
gray100: '#C3C3C6',
gray200: '#9D9DA4',
gray300: '#808087',
gray400: '#66666D',
gray500: '#515159',
gray600: '#3F3F47',
gray700: '#2E2E35',
gray800: '#202025',
gray900: '#17181C',
gray950: '#0F1012',
black: '#000000',

blue50: "#C8E1FF",
blue100: "#8FC0FF",
blue200: "#619EFF",
blue300: "#4485FF",
blue400: "#346FFA",
blue500: "#2C53DF",
blue600: "#2649B3",
blue700: "#253B8C",
blue800: "#23306A",
blue900: "#20274D",
blue50: '#C8E1FF',
blue100: '#8FC0FF',
blue200: '#619EFF',
blue300: '#4485FF',
blue400: '#346FFA',
blue500: '#2C53DF',
blue600: '#2649B3',
blue700: '#253B8C',
blue800: '#23306A',
blue900: '#20274D',

red50: "#FFD1D3",
red100: "#FFA8AD",
red200: "#FE818B",
red300: "#FA616D",
red400: "#F04251",
red500: "#CA2F3D",
red600: "#9E2733",
red700: "#7A242D",
red800: "#562025",
red900: "#3C2020",
red50: '#FFD1D3',
red100: '#FFA8AD',
red200: '#FE818B',
red300: '#FA616D',
red400: '#F04251',
red500: '#CA2F3D',
red600: '#9E2733',
red700: '#7A242D',
red800: '#562025',
red900: '#3C2020',

green50: "#CCFFEC",
green100: "#82F6CB",
green200: "#4EE4AD",
green300: "#26CF91",
green400: "#16BF81",
green500: "#13A06C",
green600: "#138A5E",
green700: "#136D4C",
green800: "#13533C",
green900: "#15372B",
green50: '#CCFFEC',
green100: '#82F6CB',
green200: '#4EE4AD',
green300: '#26CF91',
green400: '#16BF81',
green500: '#13A06C',
green600: '#138A5E',
green700: '#136D4C',
green800: '#13533C',
green900: '#15372B',

yellow50: "#FFF4D4",
yellow100: "#FFE9B2",
yellow200: "#FFDE8A",
yellow300: "#FFCD59",
yellow400: "#FFC234",
yellow500: "#FFB326",
yellow600: "#EBA01E",
yellow700: "#B57B1D",
yellow800: "#72531E",
yellow900: "#3D301A",
yellow50: '#FFF4D4',
yellow100: '#FFE9B2',
yellow200: '#FFDE8A',
yellow300: '#FFCD59',
yellow400: '#FFC234',
yellow500: '#FFB326',
yellow600: '#EBA01E',
yellow700: '#B57B1D',
yellow800: '#72531E',
yellow900: '#3D301A',

orange50: "#FFECE5",
orange100: "#FFCEBD",
orange200: "#FFA480",
orange300: "#FF834A",
orange400: "#F77234",
orange500: "#D4591C",
orange600: "#AD4E17",
orange700: "#853D11",
orange800: "#5C2B0C",
orange900: "#422109",
orange50: '#FFECE5',
orange100: '#FFCEBD',
orange200: '#FFA480',
orange300: '#FF834A',
orange400: '#F77234',
orange500: '#D4591C',
orange600: '#AD4E17',
orange700: '#853D11',
orange800: '#5C2B0C',
orange900: '#422109',

attention: "#FFC234",
error: "#F04251",
background: "#0F1012", // gray950
backgroundDimmed: "rgba(15, 15, 18, 0.1)", // grayAlpha100
secondary: "#F77234",
success: "#346FFA",
information: "#16BF81",
attention: '#FFC234',
error: '#F04251',
background: '#0F1012', // gray950
backgroundDimmed: 'rgba(15, 15, 18, 0.8)', // grayAlpha800
secondary: '#F77234',
success: '#346FFA',
information: '#16BF81',

// opacity가 포함된 alpha 색상
redAlpha100: "rgba(240, 66, 81, 0.1)",
redAlpha200: "rgba(240, 66, 81, 0.2)",
redAlpha300: "rgba(240, 66, 81, 0.3)",
redAlpha400: "rgba(240, 66, 81, 0.4)",
redAlpha500: "rgba(240, 66, 81, 0.5)",
redAlpha600: "rgba(240, 66, 81, 0.6)",
redAlpha700: "rgba(240, 66, 81, 0.7)",
redAlpha800: "rgba(240, 66, 81, 0.8)",
redAlpha900: "rgba(240, 66, 81, 0.9)",
redAlpha100: 'rgba(240, 66, 81, 0.1)',
redAlpha200: 'rgba(240, 66, 81, 0.2)',
redAlpha300: 'rgba(240, 66, 81, 0.3)',
redAlpha400: 'rgba(240, 66, 81, 0.4)',
redAlpha500: 'rgba(240, 66, 81, 0.5)',
redAlpha600: 'rgba(240, 66, 81, 0.6)',
redAlpha700: 'rgba(240, 66, 81, 0.7)',
redAlpha800: 'rgba(240, 66, 81, 0.8)',
redAlpha900: 'rgba(240, 66, 81, 0.9)',

orangeAlpha100: "rgba(247, 114, 52, 0.1)",
orangeAlpha200: "rgba(247, 114, 52, 0.2)",
orangeAlpha300: "rgba(247, 114, 52, 0.3)",
orangeAlpha400: "rgba(247, 114, 52, 0.4)",
orangeAlpha500: "rgba(247, 114, 52, 0.5)",
orangeAlpha600: "rgba(247, 114, 52, 0.6)",
orangeAlpha700: "rgba(247, 114, 52, 0.7)",
orangeAlpha800: "rgba(247, 114, 52, 0.8)",
orangeAlpha900: "rgba(247, 114, 52, 0.9)",
orangeAlpha100: 'rgba(247, 114, 52, 0.1)',
orangeAlpha200: 'rgba(247, 114, 52, 0.2)',
orangeAlpha300: 'rgba(247, 114, 52, 0.3)',
orangeAlpha400: 'rgba(247, 114, 52, 0.4)',
orangeAlpha500: 'rgba(247, 114, 52, 0.5)',
orangeAlpha600: 'rgba(247, 114, 52, 0.6)',
orangeAlpha700: 'rgba(247, 114, 52, 0.7)',
orangeAlpha800: 'rgba(247, 114, 52, 0.8)',
orangeAlpha900: 'rgba(247, 114, 52, 0.9)',

blueAlpha100: "rgba(52, 111, 250, 0.1)",
blueAlpha200: "rgba(52, 111, 250, 0.2)",
blueAlpha300: "rgba(52, 111, 250, 0.3)",
blueAlpha400: "rgba(52, 111, 250, 0.4)",
blueAlpha500: "rgba(52, 111, 250, 0.5)",
blueAlpha600: "rgba(52, 111, 250, 0.6)",
blueAlpha700: "rgba(52, 111, 250, 0.7)",
blueAlpha800: "rgba(52, 111, 250, 0.8)",
blueAlpha900: "rgba(52, 111, 250, 0.9)",
blueAlpha100: 'rgba(52, 111, 250, 0.1)',
blueAlpha200: 'rgba(52, 111, 250, 0.2)',
blueAlpha300: 'rgba(52, 111, 250, 0.3)',
blueAlpha400: 'rgba(52, 111, 250, 0.4)',
blueAlpha500: 'rgba(52, 111, 250, 0.5)',
blueAlpha600: 'rgba(52, 111, 250, 0.6)',
blueAlpha700: 'rgba(52, 111, 250, 0.7)',
blueAlpha800: 'rgba(52, 111, 250, 0.8)',
blueAlpha900: 'rgba(52, 111, 250, 0.9)',

grayAlpha100: "rgba(15, 15, 18, 0.1)",
grayAlpha200: "rgba(15, 15, 18, 0.2)",
grayAlpha300: "rgba(15, 15, 18, 0.3)",
grayAlpha400: "rgba(15, 15, 18, 0.4)",
grayAlpha500: "rgba(15, 15, 18, 0.5)",
grayAlpha600: "rgba(15, 15, 18, 0.6)",
grayAlpha700: "rgba(15, 15, 18, 0.7)",
grayAlpha800: "rgba(15, 15, 18, 0.8)",
grayAlpha900: "rgba(15, 15, 18, 0.9)",
grayAlpha100: 'rgba(15, 15, 18, 0.1)',
grayAlpha200: 'rgba(15, 15, 18, 0.2)',
grayAlpha300: 'rgba(15, 15, 18, 0.3)',
grayAlpha400: 'rgba(15, 15, 18, 0.4)',
grayAlpha500: 'rgba(15, 15, 18, 0.5)',
grayAlpha600: 'rgba(15, 15, 18, 0.6)',
grayAlpha700: 'rgba(15, 15, 18, 0.7)',
grayAlpha800: 'rgba(15, 15, 18, 0.8)',
grayAlpha900: 'rgba(15, 15, 18, 0.9)',
};
3 changes: 1 addition & 2 deletions packages/eslint-config-custom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"private": true,
"devDependencies": {
"@vercel/style-guide": "^5.0.0",
"eslint-config-turbo": "^1.10.12",
"eslint-plugin-vitest": "^0.5.4"
"eslint-config-turbo": "^1.10.12"
}
}
7 changes: 1 addition & 6 deletions packages/ui/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
const vitest = require('eslint-plugin-vitest');

module.exports = {
extends: ['custom/react-internal'],
plugins: ['vitest'],
rules: {
...vitest.configs.recommended.rules,
},
ignorePatterns: ['**/*.test.tsx'],
};
1 change: 0 additions & 1 deletion packages/ui/Button/test/Button.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { render, screen, fireEvent } from '@testing-library/react';
import { it, expect, vi } from 'vitest';
import Button from '../Button';

it('Button 컴포넌트가 정상적으로 렌더링됩니다.', () => {
Expand Down
6 changes: 6 additions & 0 deletions packages/ui/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @sopt-makers/ui

## 2.3.2

### Patch Changes

- 9956291: vitest globals 옵션 활성화로 인한 import문 제거

## 2.3.1

### Patch Changes
Expand Down
1 change: 0 additions & 1 deletion packages/ui/Control/test/Checkbox.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { render, screen, fireEvent } from '@testing-library/react';
import { describe, expect, it, vi } from 'vitest';
import type { CheckBoxProps } from 'Control/CheckBox';
import { CheckBox } from '../index';

Expand Down
1 change: 0 additions & 1 deletion packages/ui/Control/test/Radio.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import type { RadioProps } from 'Control/Radio';
import { describe, expect, it, vi } from 'vitest';
import { render, screen, fireEvent } from '@testing-library/react';
import { Radio } from '../index';

Expand Down
1 change: 0 additions & 1 deletion packages/ui/Control/test/Toggle.test.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { describe, expect, it, vi, beforeEach } from 'vitest';
import { render, screen, fireEvent } from '@testing-library/react';
import type { ToggleProps } from 'Control/Toggle';
import { Toggle } from '../index';
Expand Down
1 change: 0 additions & 1 deletion packages/ui/Tab/test/Tab.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { render, screen, fireEvent } from '@testing-library/react';
import { describe, it, expect, vi } from 'vitest';
import Tab from '../Tab';

describe('Tab 컴포넌트는', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sopt-makers/ui",
"version": "2.3.1",
"version": "2.3.2",
"description": "sopt-makers의 frontend repository에 사용되는 ui를 제공해요.",
"main": "./dist/index.js",
"module": "./dist/index.mjs",
Expand Down
Loading

0 comments on commit f1b0ae4

Please sign in to comment.