-
Notifications
You must be signed in to change notification settings - Fork 233
Tailwind V4 Upgrade 💾 #93
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
9691fae
new attempt at tw4 upgrade
tnylea fb757b6
Adding upgrade steps
tnylea a51b5f2
Adding some final updates
tnylea fcb8c41
Final touches for V4 upgrade
tnylea b739e04
removing autoprefixer
tnylea 3650b77
replacing tailwind-animate with tw-animate-css
tnylea 3f7a5b8
updating comments to latest version since last release
tnylea ee5bd13
removing autoprefixer from dependencies
tnylea 96ade79
Delete composer.lock
taylorotwell File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,18 @@ | ||
| <script setup lang="ts"> | ||
| import { cn } from '@/lib/utils'; | ||
| import { AvatarRoot } from 'reka-ui'; | ||
| import type { HTMLAttributes } from 'vue'; | ||
| import { avatarVariant, type AvatarVariants } from '.'; | ||
| import type { HTMLAttributes } from 'vue' | ||
| import { cn } from '@/lib/utils' | ||
| import { AvatarRoot } from 'reka-ui' | ||
|
|
||
| const props = withDefaults( | ||
| defineProps<{ | ||
| class?: HTMLAttributes['class']; | ||
| size?: AvatarVariants['size']; | ||
| shape?: AvatarVariants['shape']; | ||
| }>(), | ||
| { | ||
| size: 'sm', | ||
| shape: 'circle', | ||
| }, | ||
| ); | ||
| const props = defineProps<{ | ||
| class?: HTMLAttributes['class'] | ||
| }>() | ||
| </script> | ||
|
|
||
| <template> | ||
| <AvatarRoot :class="cn(avatarVariant({ size, shape }), props.class)"> | ||
| <slot /> | ||
| </AvatarRoot> | ||
| <AvatarRoot | ||
| data-slot="avatar" | ||
| :class="cn('relative flex size-8 shrink-0 overflow-hidden rounded-full', props.class)" | ||
| > | ||
| <slot /> | ||
| </AvatarRoot> | ||
| </template> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,23 @@ | ||
| <script setup lang="ts"> | ||
| import { AvatarFallback, type AvatarFallbackProps } from 'reka-ui'; | ||
| import { cn } from '@/lib/utils' | ||
| import { AvatarFallback, type AvatarFallbackProps } from 'reka-ui' | ||
| import { computed, type HTMLAttributes } from 'vue' | ||
| const props = defineProps<AvatarFallbackProps>(); | ||
| const props = defineProps<AvatarFallbackProps & { class?: HTMLAttributes['class'] }>() | ||
| const delegatedProps = computed(() => { | ||
| const { class: _, ...delegated } = props | ||
| return delegated | ||
| }) | ||
| </script> | ||
|
|
||
| <template> | ||
| <AvatarFallback v-bind="props"> | ||
| <slot /> | ||
| </AvatarFallback> | ||
| <AvatarFallback | ||
| data-slot="avatar-fallback" | ||
| v-bind="delegatedProps" | ||
| :class="cn('bg-muted flex size-full items-center justify-center rounded-full', props.class)" | ||
| > | ||
| <slot /> | ||
| </AvatarFallback> | ||
| </template> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why was this
outline-ring/50not just added to the previous@layer basea few lines above?