diff --git a/src/components/common/BreadcrumbCommon/BreadcrumbCommon.module.scss b/src/components/common/BreadcrumbCommon/BreadcrumbCommon.module.scss index 95c8526e1..8f6c05bf7 100644 --- a/src/components/common/BreadcrumbCommon/BreadcrumbCommon.module.scss +++ b/src/components/common/BreadcrumbCommon/BreadcrumbCommon.module.scss @@ -2,10 +2,7 @@ .breadcrumbCommon { color: var(--text-base); -<<<<<<< HEAD -======= .currentItem { cursor: default; } ->>>>>>> a9f9f06eb9dee2a1ddefe907ff804237a78c5210 } diff --git a/src/components/common/index.ts b/src/components/common/index.ts index 83e866808..0bd8331f0 100644 --- a/src/components/common/index.ts +++ b/src/components/common/index.ts @@ -35,7 +35,7 @@ export { default as ModalCreateUserInfo} from './ModalCreateUserInfo/ModalCreate export { default as CardBlog} from './CardBlog/CardBlog' export { default as RelevantBlogPosts} from './RelevantBlogPosts/RelevantBlogPosts' export { default as CollapseCommon} from './CollapseCommon/CollapseCommon' -export { default as BreadCrumbCommon } from './BreadcrumbCommon/BreadcrumbCommon' +export { default as BreadcrumbCommon } from './BreadcrumbCommon/BreadcrumbCommon' export { default as ImgWithLink} from './ImgWithLink/ImgWithLink' export { default as RecipeDetail} from './RecipeDetail/RecipeDetail' export { default as DrawerCommon} from './DrawerCommon/DrawerCommon' diff --git a/src/components/modules/blogs/FeaturedCardBlog/FeaturedCardBlog.module.scss b/src/components/modules/blogs/FeaturedCardBlog/FeaturedCardBlog.module.scss index ab86d30e0..b8551634c 100644 --- a/src/components/modules/blogs/FeaturedCardBlog/FeaturedCardBlog.module.scss +++ b/src/components/modules/blogs/FeaturedCardBlog/FeaturedCardBlog.module.scss @@ -1,10 +1,7 @@ @import "../../../../styles/utilities"; .featuredCard{ - @apply flex flex-row justify-start spacing-horizontal pb-16; - @screen lg{ - @apply justify-center; - } + @apply flex flex-row justify-center spacing-horizontal pb-16; .featuredCardWrapper{ @apply flex flex-col; @screen lg{ diff --git a/src/components/modules/blogs/index.tsx b/src/components/modules/blogs/index.tsx index ea9b5bee0..0f8e1b281 100644 --- a/src/components/modules/blogs/index.tsx +++ b/src/components/modules/blogs/index.tsx @@ -1,5 +1,4 @@ export { default as FeaturedCardBlog } from './FeaturedCardBlog/FeaturedCardBlog' export { default as BlogsList } from './BlogsList/BlogsList' export { default as BlogHeading } from './BlogHeading/BlogHeading' -export { default as BlogBreadCrumb } from './BlogBreadcrumb/BlogBreadcrumb' -export { default as BlogsPage } from './BlogsPage/BlogsPage' \ No newline at end of file +export { default as BlogBreadCrumb } from './BlogBreadcrumb/BlogBreadcrumb' \ No newline at end of file