Skip to content

Commit

Permalink
Merge branch 'v2' into late-bound-enables
Browse files Browse the repository at this point in the history
  • Loading branch information
KevinVandy committed Dec 5, 2023
2 parents 57e6492 + 121c855 commit 2e5a286
Show file tree
Hide file tree
Showing 229 changed files with 47,144 additions and 30,660 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Tabs } from '@mantine/core';
import { SampleCodeSnippet } from './SampleCodeSnippet';

const packagesString =
'mantine-react-table @mantine/core@6.0.21 @mantine/hooks@6.0.21 @mantine/dates@6.0.21 @emotion/react @tabler/icons-react dayjs';
'mantine-react-table @mantine/core @mantine/hooks @mantine/dates @tabler/icons-react dayjs';

export function InstallCommand() {
const tabValues = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
gap: 16px;
align-items: center;
margin: 2rem auto;
justify-content: center;
font-size: 22px;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@ import {
CodeHighlight,
type CodeHighlightProps,
} from '@mantine/code-highlight';
import { Code, Paper, useMantineTheme } from '@mantine/core';
import { Code, Paper, rgba, useMantineTheme } from '@mantine/core';

export function SampleCodeSnippet(props: CodeHighlightProps) {
const { primaryColor } = useMantineTheme();
const theme = useMantineTheme();

if (!props.language && !props.className) {
return <Code color={primaryColor} fz="0.9em" {...props} />;
return (
<Code color={rgba(theme.colors[theme.primaryColor][7], 0.2)} fz="0.9em">
{props.code}
</Code>
);
}

return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
display: flex;
flex-wrap: wrap;
gap: 16px;
align-items: center;
}

.wrapper2 {
Expand Down
690 changes: 426 additions & 264 deletions apps/mantine-react-table-docs/examples/advanced/sandbox/package-lock.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@
"start": "vite"
},
"dependencies": {
"@mantine/core": "^7.1.5",
"@mantine/dates": "^7.1.5",
"@mantine/hooks": "^7.1.5",
"@tabler/icons-react": "2.39.0",
"@mantine/core": "^7.3.0",
"@mantine/dates": "^7.3.0",
"@mantine/hooks": "^7.3.0",
"@tabler/icons-react": "2.42.0",
"dayjs": "^1.11.10",
"mantine-react-table": "^2.0.0-alpha.5",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.2.32",
"@types/react-dom": "^18.2.14",
"@vitejs/plugin-react": "^4.1.0",
"typescript": "^5.2.2",
"vite": "^4.5.0"
"@types/react": "^18.2.41",
"@types/react-dom": "^18.2.17",
"@vitejs/plugin-react": "^4.2.1",
"typescript": "^5.3.2",
"vite": "^5.0.5"
}
}
Loading

0 comments on commit 2e5a286

Please sign in to comment.