Skip to content

Commit

Permalink
Merge pull request #141 from ZivFisher/fix-the-style-in-projects-page
Browse files Browse the repository at this point in the history
fix: Fixed the style in projects page.
  • Loading branch information
UrielOfir authored Jan 3, 2024
2 parents 8c94d70 + 6224f76 commit 33ece98
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
6 changes: 4 additions & 2 deletions app/projects/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,11 @@ const ProjectsPage = () => {
};

return (
<section className="h-full">
<section className="self-center w-full h-[90vh] px-20 pb-6 flex flex-col justify-center gap-4">
<FiltersBar />
<ProjectCard {...exampleProjectCardData}></ProjectCard>
<div className="projects flex flex-col justify-center gap-4">
<ProjectCard {...exampleProjectCardData}></ProjectCard>
</div>
</section>
);
};
Expand Down
8 changes: 4 additions & 4 deletions components/Footer/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import Link from 'next/link';
import FacebookIconLink from './FacebookIconLink';
import LinkedinIconLink from './LinkedinIconLink';
import TwitterIconLink from './TwitterIconLink';
import React from "react";
import GithubIconLink from "@/components/Footer/GithubIconLink";
import React from 'react';
import GithubIconLink from '@/components/Footer/GithubIconLink';

const links = [
{
Expand Down Expand Up @@ -45,7 +45,7 @@ const FooterLink = ({ href, text }: FooterLinkProps) => (

const Footer: React.FC = () => {
return (
<footer className="grid py-6 font-inter md:grid-cols-2 border-t-[1px] w-full h-96 md:h-40 border-blue-600 bg-lightBg dark:bg-darkAccBg text-darkText dark:text-lightText">
<footer className="sticky bottom-0 grid py-6 font-inter md:grid-cols-2 border-t-[1px] w-full h-96 md:h-40 border-blue-600 bg-lightBg dark:bg-darkAccBg text-darkText dark:text-lightText">
<div className="grid w-full grid-cols-2 2xl:w-2/3 md:px-16 lg:px-24 ">
{links.map((link, index) => (
<FooterLink key={index} href={link.href} text={link.text} />
Expand Down Expand Up @@ -73,4 +73,4 @@ const Footer: React.FC = () => {
</footer>
);
};
export default Footer;
export default Footer;
2 changes: 1 addition & 1 deletion components/Home/TitleSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default function TitleSection() {
</DiscordLink>
</div>

<div className="absolute xl:w-[650px] top-0 left-0 w-full h-full -z-10 md:z-0 opacity-40 md:w-1/2 md:opacity-100 md:static">
<div className="absolute top-0 left-0 w-full h-full opacity-40 -z-10 2xl:h-[90%] xl:w-[650px] md:z-0 md:w-1/2 md:opacity-100 md:static">
<div
className={
'bg-[url("/images/skeleton_loader.png")] dark:bg-[url("/images/skeleton_loader_dark.png")] w-full h-full bg-top bg-no-repeat bg-contain '
Expand Down
2 changes: 1 addition & 1 deletion components/Projects/FiltersBar/FiltersBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const FiltersBar: React.FC = () => {
useFocusTrap(filterRef, toggleFiltersWindow);

return (
<div className="px-4 md:px-14 flex flex-col justify-center items-center gap-[51px]">
<div className="w-full flex flex-col justify-center items-center gap-[51px]">
<div className="flex flex-col items-center gap-[5px]">
<h1 className="h1 font-bold">הפרויקטים</h1>
<h2 className="h4-roman text-xl text-center">
Expand Down
2 changes: 1 addition & 1 deletion components/Projects/ProjectCard/ProjectCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default function ProjectCard({

return (
<article
className="flex p-4 sm:p-6 gap-7 rounded-lg bg-purple-100 dark:bg-darkAccBg
className="w-full flex p-4 sm:p-6 gap-7 rounded-lg bg-purple-100 dark:bg-darkAccBg
hover:bg-purple-200 dark:hover:bg-[#253245] item-hover-transition"
>
<aside className="hidden sm:flex flex-col items-center gap-4">
Expand Down

0 comments on commit 33ece98

Please sign in to comment.