Skip to content

Commit 5bdfdc7

Browse files
committed
chore: update lockfile and copy react build into docs, update usage to correct font
1 parent 3c9605a commit 5bdfdc7

File tree

7 files changed

+14104
-13294
lines changed

7 files changed

+14104
-13294
lines changed

docs/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
},
1818
"scripts": {
1919
"start": "vitepress dev",
20-
"build": "run-s clean generate:components build:doc copy:angular copy:vue",
20+
"build": "run-s clean generate:components build:doc copy:angular copy:vue copy:react",
2121
"preview": "vitepress preview",
2222
"build:doc": "vitepress build",
2323
"copy:angular": "cpy '../examples/angular/dist/demo-app-angular/**/*' ./.vitepress/dist/demo/angular/",
2424
"copy:vue": "cpy '../examples/vue/dist/**/*' ./.vitepress/dist/demo/vue/",
25+
"copy:react": "cpy '../examples/react/dist/**/*' ./.vitepress/dist/demo/react/",
2526
"generate:components": "node scripts/components.mjs",
2627
"clean": "rimraf examples components .vitepress/dist"
2728
},

examples/react/app/globals.css

+18-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '@six-group/ui-library/dist/ui-library/ui-library.css';
2+
13
:root {
24
--background: #ffffff;
35
--foreground: #171717;
@@ -19,11 +21,26 @@ body {
1921
body {
2022
color: var(--foreground);
2123
background: var(--background);
22-
font-family: Arial, Helvetica, sans-serif;
2324
-webkit-font-smoothing: antialiased;
2425
-moz-osx-font-smoothing: grayscale;
2526
}
2627

28+
input,
29+
button,
30+
textarea,
31+
select {
32+
font-family: inherit;
33+
font-feature-settings: inherit;
34+
font-variation-settings: inherit;
35+
font-size: 100%;
36+
font-weight: inherit;
37+
line-height: inherit;
38+
letter-spacing: inherit;
39+
color: inherit;
40+
margin: 0;
41+
padding: 0;
42+
}
43+
2744
* {
2845
box-sizing: border-box;
2946
padding: 0;

examples/react/app/layout.tsx

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
import type { Metadata } from 'next';
2-
import { Geist, Geist_Mono } from 'next/font/google';
32
import './globals.css';
4-
import '@six-group/ui-library/dist/ui-library/ui-library.css';
5-
6-
const geistSans = Geist({
7-
variable: '--font-geist-sans',
8-
subsets: ['latin'],
9-
});
10-
11-
const geistMono = Geist_Mono({
12-
variable: '--font-geist-mono',
13-
subsets: ['latin'],
14-
});
153

164
export const metadata: Metadata = {
175
title: 'Create Next App',
@@ -25,7 +13,7 @@ export default function RootLayout({
2513
}>) {
2614
return (
2715
<html lang="en">
28-
<body className={`${geistSans.variable} ${geistMono.variable}`}>{children}</body>
16+
<body>{children}</body>
2917
</html>
3018
);
3119
}

examples/react/app/page.module.css

+3-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
min-height: 100svh;
1414
padding: 80px;
1515
gap: 64px;
16-
font-family: var(--font-geist-sans);
16+
font-family: inherit;
1717
}
1818

1919
@media (prefers-color-scheme: dark) {
@@ -35,7 +35,7 @@
3535
}
3636

3737
.main ol {
38-
font-family: var(--font-geist-mono);
38+
font-family: inherit;
3939
padding-left: 0;
4040
margin: 0;
4141
font-size: 14px;
@@ -125,8 +125,7 @@ a.secondary {
125125

126126
@media (max-width: 600px) {
127127
.page {
128-
padding: 32px;
129-
padding-bottom: 80px;
128+
padding: 32px 32px 80px;
130129
}
131130

132131
.main {

examples/react/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react",
3-
"version": "0.1.0",
3+
"version": "0.0.0",
44
"private": true,
55
"scripts": {
66
"dev": "next dev",

libraries/ui-library/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
"@stencil/react-output-target": "^0.8.2",
5353
"@stencil/vue-output-target": "0.x",
5454
"@stencil/sass": "^3.0.7",
55-
"@typescript-eslint/eslint-plugin": "^6.15.0",
56-
"@typescript-eslint/parser": "^6.15.0",
55+
"@typescript-eslint/eslint-plugin": "^7.0.0",
56+
"@typescript-eslint/parser": "^7.0.0",
5757
"replace-in-file": "^6.3.5",
5858
"rimraf": "^3.0.2"
5959
},

0 commit comments

Comments
 (0)