Skip to content

Commit

Permalink
Merging
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher Bohlman authored and Christopher Bohlman committed Jan 12, 2024
1 parent b9f2e5e commit 28ebb4f
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 16 deletions.
Binary file removed public/Hubot-Sans.woff2
Binary file not shown.
2 changes: 1 addition & 1 deletion src/components/Header.astro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
import Navigation from "./Navigation.astro";
---
<header class="lg:my-12 lg:py-6">
<header class="">
<Navigation />
</header>
4 changes: 0 additions & 4 deletions src/components/Navigation.astro
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
import NavigationItem from "./NavigationItem.astro";
const navItems = [
{
"name": "About",
"ref": "/#about",
},
{
"name": "Experience",
"ref": "/#experience",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Portfolio.astro
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const elements = [
];
---
<h2 class="text-serif text-3xl mb-5 font-serif">Projects</h2>
<ul role="list" class="link-card-grid grid-cols-4">
<ul role="list" class="link-card-grid grid-cols-1 lg:grid-cols-4">
{elements.map(element => <ListLinkCard title={element.title} body={element.body} link={element.link} />)}
</ul>

Expand Down
6 changes: 3 additions & 3 deletions src/components/Resume.astro
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const skills = [
<a href="/christopher-bohlman-resume.pdf" class="block w-fit text-center no-underline p-1 border rounded-md border-solid transition duration-300 ease-in-out">PDF available - written using LaTeX</a>

<h3 class="font-serif text-2xl font-semibold my-5">Education</h3>
<ul role="list" class="link-card-grid grid-cols-3">
<ul role="list" class="link-card-grid grid-cols-1 lg:grid-cols-3">
<LinkCard
title="BSc, Computer Science"
subtitle="University of Arizona, '19"
Expand All @@ -54,12 +54,12 @@ const skills = [
</ul>

<h3 class="font-serif text-2xl font-semibold my-5">Work Experience</h3>
<ul role="list" class="link-card-grid grid-cols-3">
<ul role="list" class="link-card-grid grid-cols-1 lg:grid-cols-3">
{workExperience.map(element => <LinkCard title={element.title} subtitle={element.subtitle} body={element.body}/>)}
</ul>

<h3 class="font-serif text-2xl font-semibold my-5">Skills</h3>
<ul role="list" class="link-card-grid grid-cols-3">
<ul role="list" class="link-card-grid grid-cols-1 lg:grid-cols-3">
{skills.map(element => <ListLinkCard title={element.title} body={element.body}/>)}
</ul>

Expand Down
4 changes: 2 additions & 2 deletions src/layouts/Layout.astro
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ const { title } = Astro.props;
<title>{title}</title>
</head>
<body class="text-gray-300 bg-midnight text-desert grid max-w-7xl mx-auto">
<div class="m-3 lg:grid lg:grid-cols-4">
<div class="m-4 lg:m-12 lg:grid lg:grid-cols-4">
<div class="col-span-1">
<Header />
</div>
<div class="lg:col-span-3 m-1">
<div class="lg:col-span-3">
<slot />
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/blog.astro
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ allPosts.sort((a, b) => Date.parse(b.data.pubDate.toString()) - Date.parse(a.dat
---
<Layout title="Blog">
<main class="m-3 mb-12 lg:my-12">
<ul class="grid grid-cols-3 ">
<ul class="grid grid-cols-1 lg:grid-cols-3">
{allPosts.map((post) => <ListLinkCard title={post.data.title} body={post.data.description} link={`/posts/${post.slug}/`} />)}
</ul>
</main>
Expand Down
8 changes: 4 additions & 4 deletions src/pages/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ import About from '../components/About.astro';

<Layout title="Chris Bohlman: Software Engineer">
<main class="">
<section id="heading" class="m-3 mb-12 lg:my-12" >
<section id="heading" class="mb-12 lg:my-12" >
<Landing />
</section>

<section id="experience" class="m-3">
<section id="experience" class="">
<Resume />
</section>

<section id="projects" class="m-3 pt-28 md:pt-20">
<section id="projects" class="pt-28 md:pt-20">
<Portfolio />
</section>

<section id="contact" class="text-center m-3 mt-12 mb-20">
<section id="contact" class="text-center mt-12 mb-20">
<a class="text-3xl mx-auto text-center p-3 med:p-5 text-copper-crayola border rounded-md border-solid border-copper-crayola hover:bg-copper-crayola/25 transition duration-300 ease-in-out" href="mailto:cbohlman_inquiries@protonmail.com">Want to get in touch with me?</a>
</section>
</main>
Expand Down

0 comments on commit 28ebb4f

Please sign in to comment.