Skip to content

Commit 9f89fff

Browse files
authored
Resolved the Tailwind CSS conflicts (#5814)
* Resolved the CSS conflict * Resolved the CSS conflicts in other files
1 parent 8a12d33 commit 9f89fff

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/components/Layout/HomeContent.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ export function HomeContent() {
124124
<div className="mx-5 mt-12 lg:mt-24 mb-20 lg:mb-32 flex flex-col justify-center">
125125
<Logo
126126
className={cn(
127-
'mt-4 mb-3 text-link dark:text-link-dark w-24 lg:w-28 self-center text-sm mr-0 text-link dark:text-link-dark flex origin-center transition-all ease-in-out'
127+
'mt-4 mb-3 text-link dark:text-link-dark w-24 lg:w-28 self-center text-sm mr-0 flex origin-center transition-all ease-in-out'
128128
)}
129129
/>
130130
<h1 className="text-5xl font-display lg:text-6xl self-center flex font-semibold leading-snug text-primary dark:text-primary-dark">
@@ -284,7 +284,7 @@ export function HomeContent() {
284284
<div className="relative overflow-hidden">
285285
<div className="absolute inset-0 bg-gradient-right" />
286286
<div className="bg-wash relative h-14 w-full" />
287-
<div className="relative flex items-start justify-center flex-col flex-1 flex-col pb-16 pt-5 gap-3 px-5 lg:px-10 lg:pt-8">
287+
<div className="relative flex items-start justify-center flex-col flex-1 pb-16 pt-5 gap-3 px-5 lg:px-10 lg:pt-8">
288288
<h4 className="leading-tight text-primary font-semibold text-3xl lg:text-4xl">
289289
Stay true to the web
290290
</h4>
@@ -412,7 +412,7 @@ export function HomeContent() {
412412

413413
<Section background="right-card">
414414
<div className="max-w-7xl mx-auto flex flex-col lg:flex-row px-5">
415-
<div className="max-w-3xl lg:max-w-7xl gap-5 flex flex-col lg:flex-row lg:px-5 gap-5">
415+
<div className="max-w-3xl lg:max-w-7xl gap-5 flex flex-col lg:flex-row lg:px-5">
416416
<div className="w-full lg:w-6/12 max-w-3xl flex flex-col items-start justify-start lg:pl-5 lg:pr-10">
417417
<Header>Upgrade when the future is ready</Header>
418418
<Para>
@@ -528,7 +528,7 @@ function CTA({children, icon, href}) {
528528
<Tag
529529
{...extraProps}
530530
href={href}
531-
className="outline-none focus:outline-none focus-visible:outline focus-visible:outline-link focus:outline-offset-2 focus-visible:dark:focus:outline-link-dark group cursor-pointer w-auto justify-center inline-flex font-bold items-center mt-10 outline-none hover:bg-gray-40/5 active:bg-gray-40/10 hover:dark:bg-gray-60/5 active:dark:bg-gray-60/10 leading-tight hover:bg-opacity-80 text-lg py-2.5 rounded-full px-4 sm:px-6 ease-in-out shadow-secondary-button-stroke dark:shadow-secondary-button-stroke-dark text-primary dark:text-primary-dark">
531+
className="focus:outline-none focus-visible:outline focus-visible:outline-link focus:outline-offset-2 focus-visible:dark:focus:outline-link-dark group cursor-pointer w-auto justify-center inline-flex font-bold items-center mt-10 outline-none hover:bg-gray-40/5 active:bg-gray-40/10 hover:dark:bg-gray-60/5 active:dark:bg-gray-60/10 leading-tight hover:bg-opacity-80 text-lg py-2.5 rounded-full px-4 sm:px-6 ease-in-out shadow-secondary-button-stroke dark:shadow-secondary-button-stroke-dark text-primary dark:text-primary-dark">
532532
{icon === 'native' && (
533533
<svg
534534
className="mr-2.5 text-primary dark:text-primary-dark"

src/components/Layout/SidebarNav/SidebarNav.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export default function SidebarNav({
4141
}}>
4242
<aside
4343
className={cn(
44-
`lg:grow lg:flex flex-col w-full pb-8 lg:pb-0 lg:max-w-xs z-10 hidden lg:block`
44+
`lg:grow flex-col w-full pb-8 lg:pb-0 lg:max-w-xs z-10 hidden lg:block`
4545
)}>
4646
<nav
4747
role="navigation"

0 commit comments

Comments
 (0)