Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: adelegard/kathrynandalex
base: a66943e3c8
...
head fork: adelegard/kathrynandalex
compare: 9f8b3f7e5d
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jan 29, 2014
Alex Delegard mark up fixes 67a6a3e
Alex Delegard removing old_index 9f8b3f7
View
24 _includes/party.html
@@ -8,7 +8,7 @@
<li>
<div class="avatar">
<div class="background bridesmaid-0">
- <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/meredith.jpg"/></div>
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/meredith.jpg"/>
</div>
<div class="info">
@@ -23,7 +23,7 @@
<li>
<div class="avatar">
<div class="background bridesmaid-1">
- <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/kelly.jpg"/></div>
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/kelly.jpg"/>
</div>
<div class="info">
@@ -38,7 +38,7 @@
<li>
<div class="avatar">
<div class="background bridesmaid-2">
- <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/elizabeth.jpg"/></div>
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/elizabeth.jpg"/>
</div>
<div class="info">
@@ -53,7 +53,7 @@
<li>
<div class="avatar">
<div class="background bridesmaid-3">
- <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/allie.jpg"></div>
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/allie.jpg">
</div>
<div class="info">
@@ -68,7 +68,7 @@
<li>
<div class="avatar">
<div class="background bridesmaid-4">
- <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/meghan.jpg"></div>
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/meghan.jpg">
</div>
<div class="info">
@@ -83,7 +83,7 @@
<li>
<div class="avatar">
<div class="background bridesmaid-5">
- <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/danica.jpg"></div>
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/danica.jpg">
</div>
<div class="info">
@@ -102,7 +102,7 @@
<li>
<div class="avatar">
<div class="background groomsman-0">
- <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/kurt.jpg"></div>
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/kurt.jpg">
</div>
<div class="info">
@@ -117,7 +117,7 @@
<li>
<div class="avatar">
<div class="background groomsman-1">
- <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/chas.jpg"></div>
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/chas.jpg">
</div>
<div class="info">
@@ -132,7 +132,7 @@
<li>
<div class="avatar">
<div class="background groomsman-2">
- <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/richard.jpg"></div>
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/richard.jpg">
</div>
<div class="info">
@@ -148,7 +148,7 @@
<li>
<div class="avatar">
<div class="background groomsman-3">
- <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/evan.jpg"></div>
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/evan.jpg">
</div>
<div class="info">
@@ -164,7 +164,7 @@
<li>
<div class="avatar">
<div class="background groomsman-4">
- <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/connor.jpg"></div>
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/connor.jpg">
</div>
<div class="info">
@@ -180,7 +180,7 @@
<li>
<div class="avatar">
<div class="background groomsman-5">
- <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/alan.jpg"></div>
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/alan.jpg">
</div>
<div class="info">
View
4 _layouts/default.html
@@ -25,7 +25,7 @@
<input autocomplete="off" id="name" name="name" type="text" value="type the names of all attendees or regrets...">
<input id="accomodate" name="accomodate" type="checkbox" value="I need accomadations">
<a class="rsvp_trigger" href="">
- <img src="https://raw2.github.com/adelegard/kathrynandalex/gh-pages/images/close_rsvp_icon.png">
+ <img src="/images/close_rsvp_icon.png">
</a>
<div class="submits" style="display: block;">
@@ -50,7 +50,7 @@
<li><a class="rsvp_trigger" href="">RSVP</a></li>
<li style="list-style: none">
<a class="top" href="#top" style="display: none;">
- <img src="https://raw2.github.com/adelegard/kathrynandalex/gh-pages/images/up_arrow.png">
+ <img src="/images/up_arrow.png">
</a>
<a class="nav_hash" href="#">#kathrynandalex</a>
</li>
View
5 index.html
@@ -13,15 +13,14 @@
{% include our_story.html %}
{% include photos.html %}
{% include party.html %}
- {% include party.html %}
{% include info.html %}
{% include instagram.html %}
{% include footer.html %}
</div>
</div>
<script src="https://maps.googleapis.com/maps/api/js?sensor=false"></script>
- <script src="https://rawgithub.com/adelegard/kathrynandalex/gh-pages/javascript/plugins.js" type="text/javascript"></script>
- <script src="https://rawgithub.com/adelegard/kathrynandalex/gh-pages/javascript/main.js" type="text/javascript"></script>
+ <script src="/javascript/plugins.js" type="text/javascript"></script>
+ <script src="/javascript/main.js" type="text/javascript"></script>
<div id="sb-container">
<div id="sb-overlay"></div>
View
119 old_index_old.html
@@ -1,119 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
- <link href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" rel="stylesheet" type="text/css">
- <meta charset="utf-8">
- <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
-
- <title>Kathryn &amp; Alex ~ 9.6.2014</title>
- <meta content="" name="description">
- <meta content="width=device-width" name="viewport">
- <link href="https://rawgithub.com/adelegard/kathrynandalex/gh-pages/images/favicon.ico" rel="shortcut icon" type="image/x-icon">
- <link href='http://fonts.googleapis.com/css?family=Gentium+Book+Basic:400,400italic,700,700italic' rel='stylesheet' type='text/css'>
- <link href="https://rawgithub.com/adelegard/kathrynandalex/gh-pages/css/normalize.css" rel="stylesheet" type="text/css">
- <link href="https://rawgithub.com/adelegard/kathrynandalex/gh-pages/css/style.css" media="screen" rel="stylesheet" type="text/css">
-
- <script src="http://cdnjs.cloudflare.com/ajax/libs/modernizr/2.7.1/modernizr.min.js"></script>
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
-</head>
-
-<body id="top">
- <div class="loader" style="display: none;"></div>
-
- <div class="peek" id="dropdown">
- <div id="rsvp">
- <div class="container">
- <form action="alex.delegard@gmail.com">
- <input autocomplete="off" id="name" name="name" type="text" value="type the names of all attendees or regrets..."> <input id="accomodate"
- name="accomodate" type="checkbox" value="I need accomadations">
- <a class="rsvp_trigger" href=""><img src="https://raw2.github.com/adelegard/kathrynandalex/gh-pages/images/close_rsvp_icon.png"></a>
-
- <div class="submits" style="display: block;">
- <input class="accept" id="rsvp_accept" type="submit" value="confirm rsvp"> <span>or</span> <input class="regret" id="rsvp_regret" type="submit" value="regretfully decline">
- </div>
- <p class="error">*There was an error submitting the form</p>
- </form>
- </div>
- </div>
-
- <nav>
- <div class="container">
- <ul>
- <li><a class="story" href="#story">our story</a></li>
-
- <li><a class="photos" href="#photos">photos</a></li>
-
- <li><a class="party" href="#party">wedding party</a></li>
-
- <li><a class="info" href="#info">information</a></li>
-
- <li><a class="instagram" href="#instagram">instagram</a></li>
-
- <li><a class="rsvp_trigger" href="">RSVP</a></li>
-
- <li style="list-style: none"><a class="top" href="#top" style="display: none;"><img src="https://raw2.github.com/adelegard/kathrynandalex/gh-pages/images/up_arrow.png"></a> <a class="nav_hash" href="#">#kathrynandalex</a></li>
- </ul>
- </div>
- </nav>
- </div>
-
- <div class="i fadeIn" id="fade">
- <div class="sideline"></div>
-
- <div id="feature">
- header.html
-
- <div id="content">
- our_story.html
-
- photos.html
-
- party.html
-
- info.html
-
- instagram.html
-
- footer.html
- </div>
- </div>
- <script src="https://maps.googleapis.com/maps/api/js?sensor=false"></script>
- <script src="https://rawgithub.com/adelegard/kathrynandalex/gh-pages/javascript/plugins.js" type="text/javascript"></script>
- <script src="https://rawgithub.com/adelegard/kathrynandalex/gh-pages/javascript/main.js" type="text/javascript"></script>
-
- <div id="sb-container">
- <div id="sb-overlay"></div>
-
- <div id="sb-wrapper">
- <div id="sb-title">
- <div id="sb-title-inner"></div>
- </div>
-
- <div id="sb-wrapper-inner">
- <div id="sb-body">
- <div id="sb-body-inner"></div>
-
- <div id="sb-loading">
- <div id="sb-loading-inner">
- <span>loading</span>
- </div>
- </div>
- </div>
- </div>
-
- <div id="sb-info">
- <div id="sb-info-inner">
- <div id="sb-counter"></div>
-
- <div id="sb-nav">
- <a id="sb-nav-close" onclick="Shadowbox.close()" title="Close"></a><a id="sb-nav-next" onclick="Shadowbox.next()" title=
- "Next"></a><a id="sb-nav-play" onclick="Shadowbox.play()" title="Play"></a><a id="sb-nav-pause" onclick="Shadowbox.pause()" title=
- "Pause"></a><a id="sb-nav-previous" onclick="Shadowbox.previous()" title="Previous"></a>
- </div>
- </div>
- </div>
- </div>
- </div>
- </body>
- </html>

No commit comments for this range

Something went wrong with that request. Please try again.