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.

Sign up for GitHub

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

refactor: improve article card hover style #300

Merged
merged 7 commits into from
Oct 30, 2023
Merged

refactor: improve article card hover style #300

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6ca0fdb
wip
crnkovic Oct 26, 2023
8384b3d
style: resolve style guide violations
crnkovic Oct 26, 2023
7e06033
Merge branch 'feat/articles' into refactor/article-hover
crnkovic Oct 27, 2023
25532d4
style: resolve style guide violations
crnkovic Oct 27, 2023
c56059b
add space for the outline
alfonsobries Oct 27, 2023
cad8cf6
use built-on padding and fix spacing
alfonsobries Oct 27, 2023
5fac232
Update ArticlesScroll.tsx
alfonsobries Oct 27, 2023
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
8 changes: 5 additions & 3 deletions resources/js/Components/Articles/ArticleCard/ArticleCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ export type ArticleCardVariant = "normal" | "large";
export const ArticleCard = ({
article,
variant,
className,
}: {
article: App.Data.Articles.ArticleData;
variant?: ArticleCardVariant;
className?: string;
}): JSX.Element => {
const { t } = useTranslation();
const { user } = useActiveUser();
Expand All @@ -27,9 +29,10 @@ export const ArticleCard = ({
className={cn(
"transition-default group flex h-full w-full flex-col overflow-hidden rounded-xl border border-theme-secondary-300",
{
"bg-white ring-inset ring-theme-primary-100 hover:ring": !isLargeVariant,
"bg-white ring-theme-primary-100 hover:ring": !isLargeVariant,
"bg-theme-dark-900 hover:bg-theme-primary-700": isLargeVariant,
},
className,
)}
>
<div className="mx-2 mt-2 aspect-video overflow-hidden rounded-lg bg-theme-secondary-300">
Expand Down Expand Up @@ -71,8 +74,7 @@ export const ArticleCard = ({

<div
className={cn("transition-default flex items-center rounded-b-lg px-6 py-3", {
"bg-theme-secondary-50 group-hover:mx-[3px] group-hover:mx-[3px] group-hover:mb-[3px] group-hover:px-[21px] group-hover:pb-[9px]":
!isLargeVariant,
"bg-theme-secondary-50": !isLargeVariant,
"bg-theme-dark-950 group-hover:bg-theme-primary-800": isLargeVariant,
})}
>
Expand Down
7 changes: 5 additions & 2 deletions resources/js/Pages/Collections/Components/Articles/ArticlesScroll.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const ArticlesScroll = ({ articles }: { articles: App.Data.Articles.Artic
<Carousel
horizontalOffset={horizontalOffset}
headerClassName="mx-6 sm:mx-8 2xl:mx-0"
swiperClassName="m-0 lg:mx-8 2xl:m-0"
swiperClassName="-m-1 lg:mx-7 2xl:-m-1"
spaceBetween={8}
slidesPerView={slidesPerView}
title={
Expand All @@ -30,7 +30,10 @@ export const ArticlesScroll = ({ articles }: { articles: App.Data.Articles.Artic
>
{articles.map((article) => (
<CarouselItem key={article.id}>
<ArticleCard article={article} />
<ArticleCard
className="m-1"
article={article}
/>
</CarouselItem>
))}
</Carousel>
Expand Down
Loading