Skip to content

Commit 4dc832c

Browse files
committed
Merge branch 'main' of github.com:Tap30/web-components into feat/react-components/add-events-to-jenerated-code
2 parents 60e6cde + 0c5cd68 commit 4dc832c

File tree

4 files changed

+60
-60
lines changed

4 files changed

+60
-60
lines changed

packages/theme/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tapsioss/theme",
3-
"version": "0.5.0",
3+
"version": "0.5.1",
44
"type": "module",
55
"files": [
66
"./dist"

packages/theme/src/default-theme/tokens.css

+47-47
Original file line numberDiff line numberDiff line change
@@ -71,55 +71,55 @@
7171
--tapsi-palette-purple-700: #5a0a00;
7272
--tapsi-palette-purple-800: #000000;
7373
--tapsi-palette-purple-900: #402926;
74-
--tapsi-colors-brand: var(--tapsi-palette-orange-400);
75-
--tapsi-colors-gradient-brand: linear-gradient(
74+
--tapsi-color-brand: var(--tapsi-palette-orange-400);
75+
--tapsi-color-gradient-brand: linear-gradient(
7676
91.39deg,
7777
#ff7733 0%,
7878
#ff5722 50.15%,
7979
#e64917 100%
8080
);
81-
--tapsi-colors-surface-black: var(--tapsi-palette-black);
82-
--tapsi-colors-surface-white: var(--tapsi-palette-white);
83-
--tapsi-colors-surface-primary: var(--tapsi-palette-white);
84-
--tapsi-colors-surface-secondary: var(--tapsi-palette-gray-50);
85-
--tapsi-colors-surface-tertiary: var(--tapsi-palette-gray-100);
86-
--tapsi-colors-surface-disabled: var(--tapsi-palette-gray-50);
87-
--tapsi-colors-surface-accent: var(--tapsi-palette-blue-400);
88-
--tapsi-colors-surface-accent-light: var(--tapsi-palette-blue-50);
89-
--tapsi-colors-surface-negative: var(--tapsi-palette-red-400);
90-
--tapsi-colors-surface-negative-light: var(--tapsi-palette-red-50);
91-
--tapsi-colors-surface-warning: var(--tapsi-palette-yellow-400);
92-
--tapsi-colors-surface-warning-light: var(--tapsi-palette-yellow-50);
93-
--tapsi-colors-surface-positive: var(--tapsi-palette-green-400);
94-
--tapsi-colors-surface-positive-light: var(--tapsi-palette-green-50);
95-
--tapsi-colors-surface-background-primary: var(--tapsi-palette-gray-50);
96-
--tapsi-colors-surface-background-secondary: var(--tapsi-palette-gray-100);
97-
--tapsi-colors-surface-inverse-primary: var(--tapsi-palette-black);
98-
--tapsi-colors-surface-inverse-secondary: var(--tapsi-palette-gray-700);
99-
--tapsi-colors-surface-overlay-dark: #0000004d;
100-
--tapsi-colors-surface-overlay-light: #0000001f;
101-
--tapsi-colors-content-primary: var(--tapsi-palette-black);
102-
--tapsi-colors-content-secondary: var(--tapsi-palette-gray-600);
103-
--tapsi-colors-content-tertiary: var(--tapsi-palette-gray-500);
104-
--tapsi-colors-content-disabled: var(--tapsi-palette-gray-400);
105-
--tapsi-colors-content-accent: var(--tapsi-palette-blue-400);
106-
--tapsi-colors-content-negative: var(--tapsi-palette-red-400);
107-
--tapsi-colors-content-warning: var(--tapsi-palette-yellow-500);
108-
--tapsi-colors-content-positive: var(--tapsi-palette-green-400);
109-
--tapsi-colors-content-on-inverse: var(--tapsi-palette-white);
110-
--tapsi-colors-content-on-brand: var(--tapsi-palette-white);
111-
--tapsi-colors-content-on-accent: var(--tapsi-palette-white);
112-
--tapsi-colors-content-on-negative: var(--tapsi-palette-white);
113-
--tapsi-colors-content-on-warning: var(--tapsi-palette-black);
114-
--tapsi-colors-content-on-positive: var(--tapsi-palette-white);
115-
--tapsi-colors-border-primary: var(--tapsi-palette-gray-200);
116-
--tapsi-colors-border-selected: var(--tapsi-palette-gray-700);
117-
--tapsi-colors-border-focus: var(--tapsi-palette-gray-700);
118-
--tapsi-colors-border-accent: var(--tapsi-palette-blue-200);
119-
--tapsi-colors-border-negative: var(--tapsi-palette-red-200);
120-
--tapsi-colors-border-positive: var(--tapsi-palette-green-200);
121-
--tapsi-colors-border-warning: var(--tapsi-palette-yellow-200);
122-
--tapsi-colors-border-inverse-primary: var(--tapsi-palette-gray-700);
81+
--tapsi-color-surface-black: var(--tapsi-palette-black);
82+
--tapsi-color-surface-white: var(--tapsi-palette-white);
83+
--tapsi-color-surface-primary: var(--tapsi-palette-white);
84+
--tapsi-color-surface-secondary: var(--tapsi-palette-gray-50);
85+
--tapsi-color-surface-tertiary: var(--tapsi-palette-gray-100);
86+
--tapsi-color-surface-disabled: var(--tapsi-palette-gray-50);
87+
--tapsi-color-surface-accent: var(--tapsi-palette-blue-400);
88+
--tapsi-color-surface-accent-light: var(--tapsi-palette-blue-50);
89+
--tapsi-color-surface-negative: var(--tapsi-palette-red-400);
90+
--tapsi-color-surface-negative-light: var(--tapsi-palette-red-50);
91+
--tapsi-color-surface-warning: var(--tapsi-palette-yellow-400);
92+
--tapsi-color-surface-warning-light: var(--tapsi-palette-yellow-50);
93+
--tapsi-color-surface-positive: var(--tapsi-palette-green-400);
94+
--tapsi-color-surface-positive-light: var(--tapsi-palette-green-50);
95+
--tapsi-color-surface-background-primary: var(--tapsi-palette-gray-50);
96+
--tapsi-color-surface-background-secondary: var(--tapsi-palette-gray-100);
97+
--tapsi-color-surface-inverse-primary: var(--tapsi-palette-black);
98+
--tapsi-color-surface-inverse-secondary: var(--tapsi-palette-gray-700);
99+
--tapsi-color-surface-overlay-dark: #0000004d;
100+
--tapsi-color-surface-overlay-light: #0000001f;
101+
--tapsi-color-content-primary: var(--tapsi-palette-black);
102+
--tapsi-color-content-secondary: var(--tapsi-palette-gray-600);
103+
--tapsi-color-content-tertiary: var(--tapsi-palette-gray-500);
104+
--tapsi-color-content-disabled: var(--tapsi-palette-gray-400);
105+
--tapsi-color-content-accent: var(--tapsi-palette-blue-400);
106+
--tapsi-color-content-negative: var(--tapsi-palette-red-400);
107+
--tapsi-color-content-warning: var(--tapsi-palette-yellow-500);
108+
--tapsi-color-content-positive: var(--tapsi-palette-green-400);
109+
--tapsi-color-content-on-inverse: var(--tapsi-palette-white);
110+
--tapsi-color-content-on-brand: var(--tapsi-palette-white);
111+
--tapsi-color-content-on-accent: var(--tapsi-palette-white);
112+
--tapsi-color-content-on-negative: var(--tapsi-palette-white);
113+
--tapsi-color-content-on-warning: var(--tapsi-palette-black);
114+
--tapsi-color-content-on-positive: var(--tapsi-palette-white);
115+
--tapsi-color-border-primary: var(--tapsi-palette-gray-200);
116+
--tapsi-color-border-selected: var(--tapsi-palette-gray-700);
117+
--tapsi-color-border-focus: var(--tapsi-palette-gray-700);
118+
--tapsi-color-border-accent: var(--tapsi-palette-blue-200);
119+
--tapsi-color-border-negative: var(--tapsi-palette-red-200);
120+
--tapsi-color-border-positive: var(--tapsi-palette-green-200);
121+
--tapsi-color-border-warning: var(--tapsi-palette-yellow-200);
122+
--tapsi-color-border-inverse-primary: var(--tapsi-palette-gray-700);
123123
--tapsi-radius-0: 0;
124124
--tapsi-radius-1: 0.125rem;
125125
--tapsi-radius-2: 0.25rem;
@@ -145,9 +145,9 @@
145145
--tapsi-spacing-13: 5rem;
146146
--tapsi-spacing-14: 6rem;
147147
--tapsi-spacing-3-1: 0.375rem;
148-
--tapsi-strokes-0: 0px;
149-
--tapsi-strokes-1: 1px;
150-
--tapsi-strokes-2: 2px;
148+
--tapsi-stroke-0: 0px;
149+
--tapsi-stroke-1: 1px;
150+
--tapsi-stroke-2: 2px;
151151
--tapsi-typography-font-family: "Vazirmatn", sans-serif;
152152
--tapsi-typography-body-xs-font: var(--tapsi-font-family);
153153
--tapsi-typography-body-xs-size: 0.75rem;

packages/theme/src/default-theme/tokens.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import type {
2-
Colors,
2+
Color,
33
Palette,
44
Radius,
55
Spacing,
6-
Strokes,
6+
Stroke,
77
Tokens,
88
Typography,
99
} from "../types";
@@ -97,7 +97,7 @@ const palette = {
9797
},
9898
} as const satisfies Palette;
9999

100-
const colors = {
100+
const color = {
101101
brand: "var(--tapsi-palette-orange-400)",
102102
gradient: {
103103
brand: "linear-gradient(91.39deg,#ff7733 0%,#ff5722 50.15%,#e64917 100%)",
@@ -150,7 +150,7 @@ const colors = {
150150
warning: "var(--tapsi-palette-yellow-200)",
151151
"inverse-primary": "var(--tapsi-palette-gray-700)",
152152
},
153-
} as const satisfies Colors;
153+
} as const satisfies Color;
154154

155155
const radius = {
156156
"0": "0",
@@ -183,11 +183,11 @@ const spacing = {
183183
"14": "6rem",
184184
} as const satisfies Spacing;
185185

186-
const strokes = {
186+
const stroke = {
187187
"0": "0px",
188188
"1": "1px",
189189
"2": "2px",
190-
} as const satisfies Strokes;
190+
} as const satisfies Stroke;
191191

192192
const typography = {
193193
"font-family": '"Vazirmatn", sans-serif',
@@ -299,10 +299,10 @@ const typography = {
299299

300300
const tokens = {
301301
palette,
302-
colors,
302+
color,
303303
radius,
304304
spacing,
305-
strokes,
305+
stroke,
306306
typography,
307307
} as const satisfies Tokens;
308308

packages/theme/src/types.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export type Palette = {
2222
purple: Record<ColorSetSteps, string>;
2323
};
2424

25-
export type Colors = {
25+
export type Color = {
2626
brand: string;
2727
gradient: Record<"brand", string>;
2828
surface: Record<
@@ -103,7 +103,7 @@ export type Spacing = Record<
103103
string
104104
>;
105105

106-
export type Strokes = Record<"0" | "1" | "2", string>;
106+
export type Stroke = Record<"0" | "1" | "2", string>;
107107

108108
export type TypographyVariant = {
109109
font: string;
@@ -122,9 +122,9 @@ export type Typography = {
122122

123123
export type Tokens = {
124124
palette: Palette;
125-
colors: Colors;
125+
color: Color;
126126
radius: Radius;
127127
spacing: Spacing;
128-
strokes: Strokes;
128+
stroke: Stroke;
129129
typography: Typography;
130130
};

0 commit comments

Comments
 (0)