Browse Source

Fix topbar

Remove dependency from topbar to add styles to links.
master
TheoryOfNekomata 1 year ago
parent
commit
b9052d6e54
13 changed files with 49 additions and 6 deletions
  1. +2
    -4
      packages/base/src/plugin-tailwind.ts
  2. +3
    -2
      packages/kitchen-sink/react-next/package.json
  3. +1
    -0
      packages/kitchen-sink/react-next/src/pages/layouts/basic.tsx
  4. +2
    -0
      packages/kitchen-sink/react-next/src/pages/layouts/left-sidebar-with-menu.tsx
  5. +2
    -0
      packages/kitchen-sink/react-next/src/pages/layouts/left-sidebar.tsx
  6. +1
    -0
      packages/kitchen-sink/react-next/src/pages/layouts/left-sidebar/alternate.tsx
  7. +1
    -0
      packages/kitchen-sink/react-next/src/pages/layouts/right-sidebar-static.tsx
  8. +1
    -0
      packages/kitchen-sink/react-remix/app/routes/layouts.basic.tsx
  9. +2
    -0
      packages/kitchen-sink/react-remix/app/routes/layouts.left-sidebar-with-menu.tsx
  10. +2
    -0
      packages/kitchen-sink/react-remix/app/routes/layouts.left-sidebar._index.tsx
  11. +1
    -0
      packages/kitchen-sink/react-remix/app/routes/layouts.left-sidebar.alternate.tsx
  12. +1
    -0
      packages/kitchen-sink/react-remix/app/routes/layouts.right-sidebar-static.tsx
  13. +30
    -0
      pnpm-lock.yaml

+ 2
- 4
packages/base/src/plugin-tailwind.ts View File

@@ -49,14 +49,12 @@ export const plugin = tailwindPlugin.withOptions<ViewfinderPluginOptions>(
'& [data-viewfinder="menu"] > *': { '& [data-viewfinder="menu"] > *': {
'width': '100%', 'width': '100%',
'height': '100%', 'height': '100%',
'display': 'grid',
'place-content': 'center',
'position': 'relative',
}, },
'& [data-viewfinder="user"] > *': { '& [data-viewfinder="user"] > *': {
'width': '100%', 'width': '100%',
'height': '100%', 'height': '100%',
'display': 'grid',
'place-content': 'center',
'position': 'relative',
}, },
[`@media (min-width: ${baseWidth * 3}px)`]: { [`@media (min-width: ${baseWidth * 3}px)`]: {
'& ~ [data-viewfinder="main"] ~ *': { '& ~ [data-viewfinder="main"] ~ *': {


+ 3
- 2
packages/kitchen-sink/react-next/package.json View File

@@ -9,8 +9,8 @@
"lint": "next lint" "lint": "next lint"
}, },
"dependencies": { "dependencies": {
"@tesseract-design/viewfinder-base": "workspace:*",
"@tesseract-design/viewfinder-react": "workspace:*",
"@tesseract-design/viewfinder-base": "workspace:*",
"@tesseract-design/viewfinder-react": "workspace:*",
"@types/node": "20.4.5", "@types/node": "20.4.5",
"@types/react": "18.2.17", "@types/react": "18.2.17",
"@types/react-dom": "18.0.6", "@types/react-dom": "18.0.6",
@@ -21,6 +21,7 @@
"postcss": "^8.4.27", "postcss": "^8.4.27",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"react-markdown": "^8.0.7",
"tailwindcss": "^3.3.3", "tailwindcss": "^3.3.3",
"typescript": "5.1.6" "typescript": "5.1.6"
} }


+ 1
- 0
packages/kitchen-sink/react-next/src/pages/layouts/basic.tsx View File

@@ -22,6 +22,7 @@ const BasicLayoutPage: NextPage<BaseLayoutPageProps> = ({
span={span} span={span}
userLink={ userLink={
<Link <Link
className="w-full h-full flex items-center justify-center"
href={{ href={{
query: { query: {
open: 'sidebar', open: 'sidebar',


+ 2
- 0
packages/kitchen-sink/react-next/src/pages/layouts/left-sidebar-with-menu.tsx View File

@@ -167,6 +167,7 @@ const LeftSidebarWithMenuLayoutPage: NextPage<LeftSidebarWithMenuLayoutPageProps
} }
menuLink={ menuLink={
<Link <Link
className="w-full h-full flex items-center justify-center"
href={{ href={{
query: { query: {
open: 'sidebar', open: 'sidebar',
@@ -178,6 +179,7 @@ const LeftSidebarWithMenuLayoutPage: NextPage<LeftSidebarWithMenuLayoutPageProps
} }
userLink={ userLink={
<Link <Link
className="w-full h-full flex items-center justify-center"
href={{ href={{
query: { query: {
open: 'sidebar', open: 'sidebar',


+ 2
- 0
packages/kitchen-sink/react-next/src/pages/layouts/left-sidebar.tsx View File

@@ -71,6 +71,7 @@ const LeftSidebarLayoutPage: NextPage<LeftSidebarLayoutPageProps> = ({
open: 'sidebar', open: 'sidebar',
}, },
}} }}
className="w-full h-full flex items-center justify-center"
> >
Menu Menu
</Link> </Link>
@@ -82,6 +83,7 @@ const LeftSidebarLayoutPage: NextPage<LeftSidebarLayoutPageProps> = ({
open: 'sidebar', open: 'sidebar',
}, },
}} }}
className="w-full h-full flex items-center justify-center"
> >
User User
</Link> </Link>


+ 1
- 0
packages/kitchen-sink/react-next/src/pages/layouts/left-sidebar/alternate.tsx View File

@@ -130,6 +130,7 @@ const LeftSidebarWithMenuLayoutPage: NextPage<LeftSidebarWithMenuLayoutPageProps
} }
userLink={ userLink={
<Link <Link
className="w-full h-full flex items-center justify-center"
href={{ href={{
query: { query: {
open: 'sidebar', open: 'sidebar',


+ 1
- 0
packages/kitchen-sink/react-next/src/pages/layouts/right-sidebar-static.tsx View File

@@ -55,6 +55,7 @@ const RightSidebarStaticLayoutPage: NextPage = () => {
} }
userLink={ userLink={
<Link <Link
className="w-full h-full flex items-center justify-center"
href={{ href={{
query: { query: {
open: 'sidebar', open: 'sidebar',


+ 1
- 0
packages/kitchen-sink/react-remix/app/routes/layouts.basic.tsx View File

@@ -20,6 +20,7 @@ const BasicLayoutPage = () => {
userLink={ userLink={
<Link <Link
to="#" to="#"
className="w-full h-full flex items-center justify-center"
> >
User User
</Link> </Link>


+ 2
- 0
packages/kitchen-sink/react-remix/app/routes/layouts.left-sidebar-with-menu.tsx View File

@@ -47,6 +47,7 @@ const MoreLinkComponent: FC<LinkComponentProps> = ({


const menuLink = ( const menuLink = (
<Link <Link
className="w-full h-full flex items-center justify-center"
to="?open=sidebar" to="?open=sidebar"
> >
Menu Menu
@@ -55,6 +56,7 @@ const menuLink = (


const userLink = ( const userLink = (
<Link <Link
className="w-full h-full flex items-center justify-center"
to="?open=sidebar" to="?open=sidebar"
> >
User User


+ 2
- 0
packages/kitchen-sink/react-remix/app/routes/layouts.left-sidebar._index.tsx View File

@@ -60,6 +60,7 @@ const LeftSidebarLayoutPage = () => {
} }
menuLink={ menuLink={
<Link <Link
className="w-full h-full flex items-center justify-center"
to="?open=sidebar" to="?open=sidebar"
> >
Menu Menu
@@ -67,6 +68,7 @@ const LeftSidebarLayoutPage = () => {
} }
userLink={ userLink={
<Link <Link
className="w-full h-full flex items-center justify-center"
to="#" to="#"
> >
User User


+ 1
- 0
packages/kitchen-sink/react-remix/app/routes/layouts.left-sidebar.alternate.tsx View File

@@ -114,6 +114,7 @@ const LeftSidebarWithMenuLayoutPage = () => {
} }
userLink={ userLink={
<Link <Link
className="w-full h-full flex items-center justify-center"
to="?open=sidebar" to="?open=sidebar"
> >
User User


+ 1
- 0
packages/kitchen-sink/react-remix/app/routes/layouts.right-sidebar-static.tsx View File

@@ -54,6 +54,7 @@ const RightSidebarStaticLayoutPage = () => {
} }
userLink={ userLink={
<Link <Link
className="w-full h-full flex items-center justify-center"
to="#" to="#"
> >
User User


+ 30
- 0
pnpm-lock.yaml View File

@@ -75,6 +75,9 @@ importers:
react-dom: react-dom:
specifier: 18.2.0 specifier: 18.2.0
version: 18.2.0(react@18.2.0) version: 18.2.0(react@18.2.0)
react-markdown:
specifier: ^8.0.7
version: 8.0.7(@types/react@18.2.17)(react@18.2.0)
tailwindcss: tailwindcss:
specifier: ^3.3.3 specifier: ^3.3.3
version: 3.3.3 version: 3.3.3
@@ -9155,6 +9158,33 @@ packages:
- supports-color - supports-color
dev: false dev: false


/react-markdown@8.0.7(@types/react@18.2.17)(react@18.2.0):
resolution: {integrity: sha512-bvWbzG4MtOU62XqBx3Xx+zB2raaFFsq4mYiAzfjXJMEz2sixgeAfraA3tvzULF02ZdOMUOKTBFFaZJDDrq+BJQ==}
peerDependencies:
'@types/react': '>=16'
react: '>=16'
dependencies:
'@types/hast': 2.3.5
'@types/prop-types': 15.7.5
'@types/react': 18.2.17
'@types/unist': 2.0.7
comma-separated-tokens: 2.0.3
hast-util-whitespace: 2.0.1
prop-types: 15.8.1
property-information: 6.2.0
react: 18.2.0
react-is: 18.2.0
remark-parse: 10.0.2
remark-rehype: 10.1.0
space-separated-tokens: 2.0.2
style-to-object: 0.4.1
unified: 10.1.2
unist-util-visit: 4.1.2
vfile: 5.3.7
transitivePeerDependencies:
- supports-color
dev: false

/react-refresh@0.14.0: /react-refresh@0.14.0:
resolution: {integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==} resolution: {integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==}
engines: {node: '>=0.10.0'} engines: {node: '>=0.10.0'}


Loading…
Cancel
Save