fix conflicts

This commit is contained in:
Franco Arza
2020-10-26 21:03:12 -03:00
15 changed files with 173 additions and 94 deletions

View File

@@ -52,7 +52,7 @@ const ProductCard: FC<Props> = ({
}
return (
<Link href={`product${p.path}`}>
<Link href={`/product${p.path}`}>
<a
className={cn(s.root, { [s.simple]: variant === 'simple' }, className)}
>

View File

@@ -48,7 +48,8 @@
@apply hidden;
@screen sm {
@apply block absolute bottom-6 left-1/2 -translate-x-1/2 transform;
@apply block absolute bottom-6 left-1/2;
transform: translateX(-50%);
}
}