Skip to content

Commit

Permalink
Merge branch 'main' of github.com:Lombardoc4/portfolio-v4
Browse files Browse the repository at this point in the history
  • Loading branch information
Lombardoc4 committed Jan 31, 2024
2 parents c4af6fa + e6a677b commit cb5a625
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 6 deletions.
14 changes: 14 additions & 0 deletions src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,14 @@ input:-webkit-autofill:active{
}
}

.work-grid {
display: grid;
grid-template-columns: repeat( auto-fit, minmax(250px, 1fr) );

gap: 2rem;
margin-block: 2rem;
}

@media (min-width: 768px) {

h1,h2,h3,h4,h5 {
Expand All @@ -398,6 +406,12 @@ input:-webkit-autofill:active{
.container {
padding-inline: 3rem;
}

.work-grid {
grid-template-columns: repeat(3, 1fr);
gap: 4rem 2rem;
margin-block: 4rem;
}
}


Expand Down
2 changes: 1 addition & 1 deletion src/pages/home/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { HorizontalBubbles } from "../../components/Bubble";
import { TransitionTitle } from "../../components/TransitionTitle";
import { StyledHomeLink } from "../../components/styledComponents/StyledHomePage";
import { ArtNav } from "../art";
import WorkPage from "../work";
// import WorkPage from "../work";

function HomePage() {
return (
Expand Down
7 changes: 6 additions & 1 deletion src/pages/work/WorkSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ export const DetailedWorkSection = (props: IDetailedWorkSection) => (
)


export const WorkSection = ({ img, title, role, link, description, details }: IWorkSection) => {
export const WorkSection = ({ img, title,
// role,
link,
// description,
// details
}: IWorkSection) => {
return (
<WorkSegment className='segment'>
<ImgLink img={img} link={link} />
Expand Down
8 changes: 4 additions & 4 deletions src/pages/work/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import { Clock, DigitalClock } from "../../components/Clock";
import {
StyledClockContainer,
StyledWorkPage,
StyledWorkPageContainer,
// StyledWorkPageContainer,
} from "../../components/styledComponents/StyledWorkPage";
import { StyledHomeLink } from "../../components/styledComponents/StyledHomePage";
// import { StyledHomeLink } from "../../components/styledComponents/StyledHomePage";
import { SpringBubbles } from "../../components/Bubble";
import { DetailedWorkSection, WorkSection } from "./WorkSection";
import { DetailedWorkSection } from "./WorkSection";
import { workLibrary } from "./workLib";


Expand Down Expand Up @@ -50,7 +50,7 @@ function WorkPage({ details = false }: { details?: boolean }) {

<TransitionTitle title='Work' className="mt-2" />

<div style={{display: 'grid', gridTemplateColumns: 'repeat(3, 1fr)', gap: '4rem 2rem', marginBlock: '4rem'}}>
<div className="work-grid">

<AllWorkSections details={details} />
</div>
Expand Down

0 comments on commit cb5a625

Please sign in to comment.