Skip to content

Commit 1db7629

Browse files
authored
Merge branch 'vnext' into dependabot/npm_and_yarn/vite-6.3.4
2 parents c8330a2 + 59f5ba6 commit 1db7629

File tree

6 files changed

+169
-58
lines changed

6 files changed

+169
-58
lines changed

projects/finance-grid/package-lock.json

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

projects/finance-grid/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@
2727
"sass": "^1.86.3",
2828
"typescript": "~5.7.2",
2929
"typescript-eslint": "^8.24.1",
30-
"vite": "^6.2.0"
30+
"vite": "^6.3.3"
3131
}
3232
}

projects/sales-grid/index.scss

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
body {
2-
background: hsla(var(--ig-surface-500, 0 0% 100%));
3-
color: var(--ig-surface-500-contrast, black);
42
font-family: var(--ig-font-family);
53
padding: 0;
6-
/* font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
7-
"Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
8-
sans-serif; */
9-
-webkit-font-smoothing: antialiased;
10-
-moz-osx-font-smoothing: grayscale;
114
}
125

136
html, body, #root {
@@ -22,13 +15,3 @@ body, h1, h2, h3, h4, h5, h6, p {
2215
html {
2316
box-sizing: border-box;
2417
}
25-
26-
img, video {
27-
height: auto;
28-
max-width: 100%;
29-
}
30-
31-
code {
32-
font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
33-
monospace;
34-
}

projects/sales-grid/package-lock.json

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

projects/sales-grid/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"react": "^19.1.0",
1313
"react-app-polyfill": "^3.0.0",
1414
"react-dom": "^19.1.0",
15-
"react-router": "^7.5.0"
15+
"react-router": "^7.5.2"
1616
},
1717
"devDependencies": {
1818
"@types/react": "^19.1.0",
@@ -27,7 +27,7 @@
2727
"sass": "^1.86.3",
2828
"typescript": "~5.7.2",
2929
"typescript-eslint": "^8.24.1",
30-
"vite": "^6.2.5"
30+
"vite": "^6.3.3"
3131
},
3232
"scripts": {
3333
"start": "vite",

styles.css

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
body {
2-
background: hsla(var(--ig-surface-500, 0 0% 100%));
3-
color: var(--ig-surface-500-contrast, black);
42
font-family: var(--ig-font-family);
53
padding: 0;
6-
/* font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
7-
"Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
8-
sans-serif; */
9-
-webkit-font-smoothing: antialiased;
10-
-moz-osx-font-smoothing: grayscale;
114
}
125

136
html, body, #root {
@@ -23,16 +16,6 @@ html {
2316
box-sizing: border-box;
2417
}
2518

26-
img, video {
27-
height: auto;
28-
max-width: 100%;
29-
}
30-
31-
code {
32-
font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
33-
monospace;
34-
}
35-
3619
.loading-indicator {
3720
position: absolute;
3821
left: 50%;

0 commit comments

Comments
 (0)