Skip to content
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

fix: tailwind prettier errors #4442

Merged
merged 1 commit into from
Dec 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ const UnknownModulePreview: FC<UnknownModulePreviewProps> = ({ module }) => {
<Card className="flex bg-gray-50 p-5" forceRounded>
<div className="w-full space-y-1.5 text-left">
<div className="flex items-center justify-between space-x-2">
<div className="flex items-center space-x-2 w-full">
<div className="flex w-full items-center space-x-2">
<GetOpenActionModuleIcon
className="text-brand-500"
module={module}
/>
{loading ? (
<div className="shimmer h-4 my-1.5 w-4/12 rounded-full" />
<div className="shimmer my-1.5 h-4 w-4/12 rounded-full" />
) : (
<b className="text-lg font-bold">
{data?.moduleMetadata?.metadata.title || 'Unknown Module'}
Expand Down
6 changes: 3 additions & 3 deletions apps/web/src/components/Shared/Oembed/Embed.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ interface EmbedProps {

const Embed: FC<EmbedProps> = ({ og, publicationId }) => {
return (
<div className="mt-4 text-sm w-full md:w-4/6">
<div className="mt-4 w-full text-sm md:w-4/6">
<Link
href={og.url}
onClick={(event) => {
Expand Down Expand Up @@ -44,7 +44,7 @@ const Embed: FC<EmbedProps> = ({ og, publicationId }) => {
{!og.isLarge && og.image ? (
<Image
alt="Thumbnail"
className="size-28 md:size-36 rounded-l-xl border-r dark:border-gray-700"
className="size-28 rounded-l-xl border-r md:size-36 dark:border-gray-700"
height={144}
onError={({ currentTarget }) => {
currentTarget.src = og.image as string;
Expand All @@ -64,7 +64,7 @@ const Embed: FC<EmbedProps> = ({ og, publicationId }) => {
</div>
) : null}
{og.site ? (
<div className="items-center space-x-2 pt-1.5 hidden md:flex">
<div className="hidden items-center space-x-2 pt-1.5 md:flex">
{og.favicon ? (
<img
alt="Favicon"
Expand Down
6 changes: 3 additions & 3 deletions apps/web/src/components/Shared/Sidebar/SidebarMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const SidebarMenu: FC<SidebarProps> = ({ items }) => {
<>
<Menu.Button
className={cn(
'focus:border-brand-500 focus:ring-brand-400 w-full rounded-xl border border-gray-300 bg-white outline-none dark:border-gray-700 dark:bg-gray-800 text-left px-3 py-2 flex items-center space-x-2',
'focus:border-brand-500 focus:ring-brand-400 flex w-full items-center space-x-2 rounded-xl border border-gray-300 bg-white px-3 py-2 text-left outline-none dark:border-gray-700 dark:bg-gray-800',
{
'bg-gray-200 text-black dark:bg-gray-800 dark:text-white':
open,
Expand All @@ -47,7 +47,7 @@ const SidebarMenu: FC<SidebarProps> = ({ items }) => {
<div>{selectedItem.title}</div>
</Menu.Button>
<MenuTransition>
<Menu.Items className="mt-2 absolute w-full z-10" static>
<Menu.Items className="absolute z-10 mt-2 w-full" static>
<Card forceRounded>
{menuItems.map((item) => (
<Menu.Item
Expand All @@ -57,7 +57,7 @@ const SidebarMenu: FC<SidebarProps> = ({ items }) => {
{
'dropdown-active': active || selectedItem === item
},
'm-2 p-2 rounded-lg flex items-center space-x-2'
'm-2 flex items-center space-x-2 rounded-lg p-2'
)
}
href={item.url}
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/Shared/UserPreview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ const UserPreview: FC<UserPreviewProps> = ({
<HoverCard.Portal>
<HoverCard.Content
asChild
className="w-64 z-10"
className="z-10 w-64"
side="bottom"
sideOffset={5}
>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"devDependencies": {
"husky": "^8.0.3",
"prettier": "^3.1.1",
"prettier-plugin-tailwindcss": "^0.5.9",
"prettier-plugin-tailwindcss": "^0.5.10",
"start-server-and-test": "^2.0.0",
"turbo": "^1.11.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/Alert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export const Alert: FC<AlertProps> = ({
leaveFrom="opacity-100 translate-y-0 sm:scale-100"
leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
>
<div className="inline-block w-full scale-100 space-y-6 rounded-xl bg-white p-5 text-left align-bottom shadow-xl transition-all dark:bg-gray-800 sm:max-w-sm sm:align-middle">
<div className="inline-block w-full scale-100 space-y-6 rounded-xl bg-white p-5 text-left align-bottom shadow-xl transition-all sm:max-w-sm sm:align-middle dark:bg-gray-800">
<div className="space-y-2">
<b className="text-xl">{title}</b>
<p>{description}</p>
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/Modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export const Modal: FC<ModalProps> = ({
{ 'sm:max-w-3xl': size === 'md' },
{ 'sm:max-w-lg': size === 'sm' },
{ 'sm:max-w-sm': size === 'xs' },
'inline-block w-full scale-100 rounded-xl bg-white text-left align-bottom shadow-xl transition-all dark:bg-gray-800 sm:my-8 sm:align-middle'
'inline-block w-full scale-100 rounded-xl bg-white text-left align-bottom shadow-xl transition-all sm:my-8 sm:align-middle dark:bg-gray-800'
)}
>
{title ? (
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/Tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const Tooltip: FC<TooltipProps> = ({
</RadixTooltip.Trigger>
<RadixTooltip.Portal>
<RadixTooltip.Content
className="hidden !rounded-lg !text-xs !leading-6 tracking-wide sm:block bg-gray-700 text-white px-3 py-0.5 z-10"
className="z-10 hidden !rounded-lg bg-gray-700 px-3 py-0.5 !text-xs !leading-6 tracking-wide text-white sm:block"
side={placement}
sideOffset={5}
>
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions prettier.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ module.exports = {
trailingComma: 'none',
singleQuote: true,
tabWidth: 2,
endOfLine: 'lf'
// plugins: [require.resolve('prettier-plugin-tailwindcss')]
endOfLine: 'lf',
plugins: [require.resolve('prettier-plugin-tailwindcss')]
};
Loading