Skip to content

Commit 9f512c1

Browse files
RodrigoECRodrigoEC
authored
Merge pull request #74 from OCA-UFCG/chore/tailwind-hub
Add spacing between section and update design button colors
2 parents e8ffbe6 + fcd6ece commit 9f512c1

8 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎src/components/BannerImage/BannerImage.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ const MainBanner = ({ content }: { content: { fields: IMainBanner } }) => {
1212
className="absolute w-full min-h-[450px] h-full object-cover rounded-t-md md:rounded-l-md md:rounded-tr-none z-0"
1313
src={`https:${image.fields.file.url}`}
1414
alt=""
15-
width={1400}
16-
height={1400}
15+
width={1000}
16+
height={600}
1717
/>
1818
<div className="absolute top-0 right-0 h-full w-[100%] bg-gradient-to-l from-black via-transparent to-transparent"></div>
1919
<div className="absolute top-0 left-0 h-full w-[140%] bg-gradient-to-r from-black via-transparent to-transparent"></div>

‎src/components/DataSection/DataSection.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const DataSection = ({
2828

2929
return (
3030
<section
31-
className="w-full max-w-[1440px] px-4 py-6 content-center flex flex-col gap-6 box-border"
31+
className="w-full max-w-[1440px] px-4 py-10 my-0 lg:my-8 content-center flex flex-col gap-6 box-border"
3232
id={title}
3333
>
3434
<div className="flex flex-col gap-3">

‎src/components/Header/Header.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { macroThemes } from "@/utils/constants";
1313

1414
const Header = ({ content }: { content: { fields: ISection }[] }) => {
1515
return (
16-
<div className="flex items-center justify-between px-[80px] py-[18px] border-b-2 shadow-sm border-b bg-white">
16+
<div className="flex items-center justify-between px-[80px] py-[18px] border-b-2 shadow-sm bg-white">
1717
<Link href="/" className="flex items-center gap-2">
1818
<Icon id="logo-DNE" width={99} height={47} />
1919
</Link>
@@ -29,12 +29,12 @@ const Header = ({ content }: { content: { fields: ISection }[] }) => {
2929
<NavigationMenuTrigger className="text-md cursor-pointer">
3030
{item.fields.name}
3131
</NavigationMenuTrigger>
32-
<NavigationMenuContent className="bg-white shadow-md p-2 rounded-md w-auto flex flex-col mt-15">
32+
<NavigationMenuContent className="bg-white shadow-md p-2 rounded-md w-auto flex flex-col mt-15 ">
3333
{item.fields.children.map((child) => (
3434
<NavigationMenuLink
3535
key={child.fields.id}
3636
href={child.fields.path}
37-
className="flex flex-row items-center py-[6px] px-3 w-full whitespace-nowrap gap-2 hover:bg-green-100 rounded"
37+
className="flex flex-row items-center py-[6px] px-3 w-full whitespace-nowrap gap-2 rounded"
3838
>
3939
<Icon
4040
id={macroThemes[child.fields.id] || "list"}

‎src/components/Header/Modal/HeaderModal.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const HeaderModal = ({ content }: { content: { fields: ISection }[] }) => {
2222
<Sheet>
2323
<SheetTrigger asChild>
2424
<div className="flex items-center">
25-
<Menu className="h-[40px] w-[40px] text-green-900 hover:bg-green-100 p-2 box-border cursor-pointer rounded-lg transition duration-300" />
25+
<Menu className="h-[40px] w-[40px] text-green-900 hover:bg-green-neutro p-2 box-border cursor-pointer rounded-lg transition duration-300" />
2626
</div>
2727
</SheetTrigger>
2828
<Link href="/" className="flex items-center gap-2">
@@ -44,7 +44,7 @@ const HeaderModal = ({ content }: { content: { fields: ISection }[] }) => {
4444
>
4545
{item.fields.children && item.fields.children.length > 0 ? (
4646
<>
47-
<AccordionTrigger className="flex items-center font-inter font-semibold text-sm leading-5 px-2 py-[6px] h-[44px] hover:bg-green-100 cursor-pointer">
47+
<AccordionTrigger className="flex items-center font-inter font-semibold text-sm leading-5 px-2 py-[6px] h-[44px] hover:bg-green-neutro cursor-pointer">
4848
{item.fields.name}
4949
</AccordionTrigger>
5050
<AccordionContent className="py-2 px-2">
@@ -54,7 +54,7 @@ const HeaderModal = ({ content }: { content: { fields: ISection }[] }) => {
5454
return (
5555
<Link key={i} href={child.fields.path}>
5656
<div
57-
className={`flex items-center gap-2 py-[6px] px-2 h-[44px] hover:bg-green-100 cursor-pointer ${isActive ? "text-green-900" : "hover:text-black"}`}
57+
className={`flex items-center gap-2 py-[6px] px-2 h-[44px] hover:bg-green-neutro cursor-pointer ${isActive ? "text-green-900" : "hover:text-black"}`}
5858
>
5959
<Icon
6060
id={macroThemes[child.fields.id] || "list"}
@@ -72,7 +72,7 @@ const HeaderModal = ({ content }: { content: { fields: ISection }[] }) => {
7272
) : (
7373
<Link href={item.fields.path}>
7474
<div
75-
className={`flex items-center px-2 py-[6px] h-[44px] hover:bg-green-100 cursor-pointer ${pathname === item.fields.path ? "text-green-900" : ""}`}
75+
className={`flex items-center px-2 py-[6px] h-[44px] hover:bg-green-neutro cursor-pointer ${pathname === item.fields.path ? "text-green-900" : ""}`}
7676
>
7777
<span
7878
className={`font-semibold ${pathname === item.fields.path ? "" : "hover:text-black"}`}

‎src/components/Header/Section/HeaderSection.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const HeaderSection = ({ content }: { content: { fields: ISection }[] }) => {
1616

1717
return (
1818
<div className="sticky top-0 left-0 z-5 bg-white">
19-
<div className="lg:hidden w-full h-[80px] flex border-b-2 justify-between px-[24px] py-[18px]">
19+
<div className="lg:hidden w-full h-[80px] flex border-b-2 justify-between px-4 py-[18px]">
2020
<HeaderModal content={orderedContent} />
2121
</div>
2222

‎src/components/RecentSection/RecentSection.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const RecentSection = ({
2525

2626
return (
2727
<section
28-
className="w-full max-w-[1440px] px-4 py-6 content-center flex flex-col gap-6 box-border"
28+
className="w-full max-w-[1440px] px-4 pt-8 lg:pt-0 pb-8 ontent-center flex flex-col gap-6 box-border"
2929
id={id}
3030
>
3131
<div className="flex flex-col gap-3">

‎src/components/ui/button.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const buttonVariants = cva(
1616
outline:
1717
"border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50",
1818
secondary:
19-
"bg-white text-green-900 border border-grey-200 hover:bg-grey-100 w-[126px] font-sans text-sm leading-6 hover:underline",
19+
"bg-white hover:bg-green-neutro text-green-900 border border-grey-200 w-[126px] text-sm leading-6 font-medium",
2020
ghost:
2121
"hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
2222
link: "text-primary underline-offset-4 hover:underline",

‎src/components/ui/navigation-menu.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ function NavigationMenuItem({
5959
}
6060

6161
const navigationMenuTriggerStyle = cva(
62-
"group inline-flex h-9 w-max items-center justify-center rounded-md bg-background px-4 py-2 text-sm font-medium hover:bg-green-100 focus:bg-green-100 disabled:pointer-events-none disabled:opacity-50 data-[state=open]:bg-green-100 focus-visible:ring-ring/50 outline-none transition-[color,box-shadow] focus-visible:ring-[3px] focus-visible:outline-1",
62+
"group inline-flex h-9 w-max items-center justify-center rounded-md bg-background px-4 py-2 text-sm font-medium hover:bg-green-neutro focus:bg-green-neutro disabled:pointer-events-none disabled:opacity-50 data-[state=open]:bg-green-neutro focus-visible:ring-ring/50 outline-none transition-[color,box-shadow] focus-visible:ring-[3px] focus-visible:outline-1",
6363
);
6464

6565
function NavigationMenuTrigger({
@@ -132,7 +132,7 @@ function NavigationMenuLink({
132132
<NavigationMenuPrimitive.Link
133133
data-slot="navigation-menu-link"
134134
className={cn(
135-
"data-[active=true]:focus:bg-accent data-[active=true]:hover:bg-green-100 data-[active=true]:bg-green-100/50 data-[active=true]:text-accent-foreground hover:bg-green-100 hover:text-accent-foreground focus:bg-green-100 focus:text-accent-foreground focus-visible:ring-ring/50 [&_svg:not([class*='text-'])]:text-muted-foreground flex flex-col gap-1 rounded-sm p-2 text-sm transition-all outline-none focus-visible:ring-[3px] focus-visible:outline-1 [&_svg:not([class*='size-'])]:size-4 hover:bg-green-100",
135+
"data-[active=true]:focus:bg-accent data-[active=true]:hover:bg-green-neutro data-[active=true]:bg-green-neutro data-[active=true]:text-accent-foreground hover:text-accent-foreground focus:bg-green-neutro focus:text-accent-foreground focus-visible:ring-ring/50 [&_svg:not([class*='text-'])]:text-muted-foreground flex flex-col gap-1 rounded-sm p-2 text-sm transition-all outline-none focus-visible:ring-[3px] focus-visible:outline-1 [&_svg:not([class*='size-'])]:size-4 hover:bg-green-neutro ",
136136
isActive ? "text-green-900" : "",
137137
className,
138138
)}

0 commit comments

Comments
 (0)