Skip to content

Commit

Permalink
merged photo changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ACharbonneau committed Oct 5, 2016
2 parents 4e792ca + cf4635b commit 49168f3
Show file tree
Hide file tree
Showing 5 changed files with 283 additions and 5 deletions.
7 changes: 4 additions & 3 deletions 404.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
---

<div class="text-center">
<h1>Whoops, this page doesn't exist.</h1>
<h1>Move along. (404 error)</h1>
<h1>Nothing to see here.</h1>
<h1>Bigfoot isn't real.</h1>
<h1>(404 error)</h1>
<br/>

<img src="{{ site.baseurl }}/img/404-southpark.jpg" />
<img src="{{ site.baseurl }}/img/smallfoot.jpg" />
</div>
7 changes: 7 additions & 0 deletions aboutme.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,12 @@ Follow <a href="https://twitter.com/procrastinomics">@procrastinomics</a> for oc

<span class="fa fa-steam-square about-icon"></span>
Have some free time? Help me save Pandora from Handsome Jack. I'm Procrastinomics
</p>

<p class="about-text">

<span class="fa fa-camera-retro about-icon"></span>
I also like to decorate pastries and wear <a href="../hats"> silly hats</a>



228 changes: 228 additions & 0 deletions css/photo.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,228 @@
body {
font-family: "Source Sans Pro", sans-serif;
padding: 0;
margin: 0;
font-size: 20px;
background: #1D1D1D;
}

p {
line-height: 1.6em;
}

a {
color: #000;
}

h1,
h2 {
padding: 0;
margin: 0;
}

h1 {
font-weight: normal;
}

h2 {
font-size: 60px;
text-align: center;
}

h3 {
font-size: 1.8em;
margin: 15px 0;
}

img {
max-width: 100%;
height: auto;
}

div.container,
div.small-container {
margin: 0 auto;
padding: 0 20px;
}

div.container {
max-width: 940px;
}

div.small-container {
max-width: 700px;
}

header,
footer {
background: #1D1D1D;
color: #ffffff;
}

section.hero {
color: #fff;
background-image: url('/images/bg.jpg');
background-size: cover;
}

p.post-hero {
width: 80%;
margin: 0 auto;
}

header a,
section.hero a,
footer a {
text-decoration: none;
color: #ffffff;
}

header,
footer {
padding: 10px 0;
}

nav.main-nav ul {
margin: 0;
padding: 0;
list-style: none;
float: right;
}

nav.main-nav li,
nav.main-nav a {
display: inline-block;
}

nav.main-nav li a {
padding: 10px;
}

div.content {
background: #fff;
}

section.hero {
padding: 120px 0;
}

p.sub-text {
font-size: 20px;
text-align: center;
line-height: 28px;
}

.center-text {
text-align: center;
}

.columns:after {
content: "";
display: table;
clear: both;
}

.spacing {
padding: 50px 0;
}

.column {
box-sizing: border-box;
float: left;
}

.column.third {
width: 33%;
padding: 0 20px;
text-align: center;
}

.column.half {
width: 50%;
padding-left: 20px;
padding-right: 20px;
}

.blog-post {
width: 750px;
margin-left: auto;
margin-right: auto;
}

.blog-post .date {
float: right;
}

.comment {
border: 1px solid #CCC;
padding: 20px 50px;
color: #777;
position: relative;
font-size: .9em;
margin: 30px 0;
}

.comment h4 {
padding: 0;
margin: 0;
position: absolute;
top: 40px;
left: 143px;
}

.comment span.date {
position: absolute;
top: 64px;
left: 142px;
}

.comment .profile-image img {
width: 80px;
height: 80px;
border-radius: 100px;
}

hr {
border: 1px solid #eee;
margin: 60px 0;
}

textarea,
input[type="text"] {
width: 100%;
padding: 10px;
font-size: 18px;
display: block;
box-sizing: padding-box;
}

textarea {
height: 250px;
line-height: 1.5em;
border: 1px solid #ccc;
resize: none;
}

label {
margin: 30px 0 10px 0;
display: block;
}

input[type="submit"] {
margin: 30px 0 0 0;
font-size: 20px;
}

.photo-gallery, .photo-gallery li {
list-style: none;
padding: 0;
}

.photo-gallery li {
display: inline-block;
width: 33%;
}

.photo-gallery li img {
width: 100%;
}
42 changes: 42 additions & 0 deletions hats.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
images:
-
image_path: /img/sillyhats/small_IMG_0011.jpg
title: Viking
-
image_path: /img/sillyhats/small_IMG_0181_2.jpg
title: Sun
-
image_path: /img/sillyhats/small_IMG_0182_2.jpg
title: Monster
-
image_path: /img/sillyhats/small_IMG_0183_2.jpg
title: Leopard
-
image_path: /img/sillyhats/small_IMG_0184_2.jpg
title: Cowboy
-
image_path: /img/sillyhats/small_IMG_0185_2.jpg
title: Parrot
-
image_path: /img/sillyhats/small_IMG_0187_2.jpg
title: "Captain Seuss"
-
image_path: /img/sillyhats/small_IMG_0188_2.jpg
title: "Tiny Sombrero"
-
image_path: /img/sillyhats/small_IMG_0189_2.jpg
title: Chicken
-
image_path: /img/sillyhats/small_IMG_0190_2.jpg
title: Umbrella
-
image_path: /img/sillyhats/small_IMG_0988.jpg
title: Octopus
layout: minimal
---
<ul class="photo-gallery">
{% for image in page.images %}
<li><img src="{{ image.image_path }}" alt="{{ image.title}}"/></li>
{% endfor %}
</ul>
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
- "/img/coverphotos/small_AmandaBaldEagle1.jpg" : "Bald Eagle Training"
- "/img/coverphotos/small_AmandaBaldEagle2.jpg" : "Bald Eagle Training"
- "/img/coverphotos/small_AmandaPorcupine.jpg" : "American Porcupine"
- "/img/coverphotos/small_IMG_0057.JPG" : "GK 12 Teaching"
- "/img/coverphotos/small_IMG_0057.JPG" : "NGS 2015"
- "/img/coverphotos/small_IMG_0074.JPG" : "NGS 2015 Group Photo"
- "/img/coverphotos/small_IMG_0082.JPG" : "Software Carpentry at U of M"
- "/img/coverphotos/small_IMG_0102_2.jpg" : "Found my soulmate on a bike trip"
- "/img/coverphotos/small_IMG_1119.JPG" : "NGS 2016"
- "/img/coverphotos/small_IMG_2620.JPG" : "NGS 2015"
- "/img/coverphotos/small_9L8A0118.jpg : "Data Carpentry Workshop, MSU"
- "/img/coverphotos/small_9L8A0120.jpg : "Data Carpentry Workshop, MSU"
- "/img/coverphotos/small_IMG_2620.JPG" : "NGS 2014"
- "/img/coverphotos/small_IMG_3142.JPG" : "GK 12 Teaching"
- "/img/coverphotos/small_IMG_3258.jpg" : "GK 12 Chemistry"
- "/img/coverphotos/small_IMG_3259.JPG" : "GK 12 Chemistry"
Expand Down

0 comments on commit 49168f3

Please sign in to comment.