Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

style and js updates

  • Loading branch information...
commit 4543a4d55fd552114c4fb8fd8f014b290a6681ff 1 parent 003993e
Alex Delegard authored
View
4 .idea/workspace.xml
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="75b54786-06db-45d6-b080-0ed1f5aa9624" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" />
- </list>
+ <list default="true" id="75b54786-06db-45d6-b080-0ed1f5aa9624" name="Default" comment="" />
<ignored path="kathrynandalex.iws" />
<ignored path=".idea/workspace.xml" />
<file path="/Dummy.txt" changelist="75b54786-06db-45d6-b080-0ed1f5aa9624" time="1390752253392" ignored="false" />
View
80 css/style.css
@@ -113,7 +113,7 @@ img {
}
h1 {
color: #333;
- font-family: 'gentium_book_basicregular', Helvetica, sans-serif;
+ font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-size: 2em;
font-weight: normal;
line-height: 1em;
@@ -122,9 +122,10 @@ h1 {
}
h2 {
color: #333;
- font-family: 'gentium_book_basicbold_italic', Helvetica, sans-serif;
+ font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-size: 30px;
- font-weight: normal;
+ font-weight: bold;
+ font-style: italic;
padding: 0;
margin: 45px 0 30px;
text-align: center;
@@ -310,7 +311,7 @@ section {
filter:alpha(opacity=65);
}
#rsvp input[type="text"] {
- font-family: 'gentium_book_basicregular', Helvetica, sans-serif;
+ font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-size: 1.25em;
color: #666;
margin: 100px 0 25px;
@@ -338,8 +339,9 @@ section {
-moz-border-radius: 3px;
border-radius: 3px;
color: #fff;
- font-family: 'gentium_book_basicitalic', Helvetica, sans-serif;
+ font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-size: .875em;
+ font-style: italic;
padding: 11px 18px;
-webkit-transition: background .7s ease;
-moz-transition: background .7s ease;
@@ -360,7 +362,7 @@ section {
color: #999;
display: inline-block;
margin: 0 5px;
- font-family: 'gentium_book_basicregular', Helvetica, sans-serif;
+ font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-size: .875em;
}
#rsvp p.error {
@@ -387,8 +389,10 @@ nav {
}
nav li {
float: left;
- font-family: 'gentium_book_basicbold_italic', Helvetica, sans-serif;
- font-size: 15px;
+ font-family: 'Gentium Book Basic', Helvetica, sans-serif;
+ font-size: 15px;
+ font-style: italic;
+ font-weight: bold;
overflow: hidden;
}
nav li a {
@@ -410,8 +414,10 @@ nav {
background: #000;
}
a.nav_hash {
- font-family: 'gentium_book_basicbold_italic', Helvetica, sans-serif;
- font-size: 15px;
+ font-family: 'Gentium Book Basic', Helvetica, sans-serif;
+ font-size: 15px;
+ font-weight: bold;
+ font-style: italic;
overflow: hidden;
float: right;
background: none;
@@ -467,7 +473,7 @@ header span {
color: #333;
display: inline-block;
letter-spacing: 1px;
- font-family: 'gentium_book_basicregular', Helvetica, sans-serif;
+ font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-size: .75em;
text-transform: uppercase;
}
@@ -502,7 +508,8 @@ header span {
width: 100%;
}
#story span {
- font-family: 'gentium_book_basicbold', Helvetica, sans-serif;
+ font-family: 'Gentium Book Basic', Helvetica, sans-serif;
+ font-weight: bold;
font-size: 1em;
letter-spacing: 2px;
text-transform: uppercase;
@@ -605,8 +612,9 @@ header span {
overflow: hidden;
}
#party span {
- font-family: 'gentium_book_basicbold', Helvetica, sans-serif;
+ font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-size: 1em;
+ font-weight: bold;
letter-spacing: 2px;
text-transform: uppercase;
display: block;
@@ -648,7 +656,8 @@ header span {
}
#party dl dd {
color: #333;
- font-family: 'gentium_book_basicitalic', Helvetica, sans-serif;
+ font-family: 'Gentium Book Basic', Helvetica, sans-serif;
+ font-style: italic;
font-size: .875em;
margin: 0;
padding: 0;
@@ -681,8 +690,9 @@ header span {
}
#info .info span {
display: block;
- font-family: 'gentium_book_basicbold', Helvetica, sans-serif;
+ font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-size: 1em;
+ font-weight: bold;
letter-spacing: 2px;
margin-top: 35px;
text-transform: uppercase;
@@ -842,46 +852,6 @@ div.sb-message a:link,div.sb-message a:visited{color:#fff;text-decoration:underl
/*FONTS
**********************************
**********************************/
-@font-face {
- font-family: 'gentium_book_basicbold';
- src: url('fonts/genbkbasb-webfont.eot');
- src: url('fonts/genbkbasb-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/genbkbasb-webfont.woff') format('woff'),
- url('fonts/genbkbasb-webfont.ttf') format('truetype'),
- url('fonts/genbkbasb-webfont.svg#gentium_book_basicbold') format('svg');
- font-weight: normal;
- font-style: normal;
-}
-@font-face {
- font-family: 'gentium_book_basicbold_italic';
- src: url('fonts/genbkbasbi-webfont.eot');
- src: url('fonts/genbkbasbi-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/genbkbasbi-webfont.woff') format('woff'),
- url('fonts/genbkbasbi-webfont.ttf') format('truetype'),
- url('fonts/genbkbasbi-webfont.svg#gentium_book_basicbold_italic') format('svg');
- font-weight: normal;
- font-style: normal;
-}
-@font-face {
- font-family: 'gentium_book_basicitalic';
- src: url('fonts/genbkbasi-webfont.eot');
- src: url('fonts/genbkbasi-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/genbkbasi-webfont.woff') format('woff'),
- url('fonts/genbkbasi-webfont.ttf') format('truetype'),
- url('fonts/genbkbasi-webfont.svg#gentium_book_basicitalic') format('svg');
- font-weight: normal;
- font-style: normal;
-}
-@font-face {
- font-family: 'gentium_book_basicregular';
- src: url('fonts/genbkbasr-webfont.eot');
- src: url('fonts/genbkbasr-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/genbkbasr-webfont.woff') format('woff'),
- url('fonts/genbkbasr-webfont.ttf') format('truetype'),
- url('fonts/genbkbasr-webfont.svg#gentium_book_basicregular') format('svg');
- font-weight: normal;
- font-style: normal;
-}
/*MEDIA QUERIES
View
54 index.html
@@ -20,12 +20,12 @@
<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">
- <!--<link rel="stylesheet" href="http://danielhunninghake.com/alinick/?custom-content=css" type="text/css">-->
- <script src="http://cdnjs.cloudflare.com/ajax/libs/modernizr/2.7.1/modernizr.min.js" style=""></script>
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
+ <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">
@@ -241,8 +241,8 @@
<li>
<div class="avatar">
- <div class="background bridesmaid-0"><img src=
- "http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/meredith.jpg"></div>
+ <div class="background bridesmaid-0">
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/meredith.jpg"></div>
</div>
<div class="info">
@@ -256,8 +256,8 @@
<li>
<div class="avatar">
- <div class="background bridesmaid-1"><img src=
- "http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/kelly.jpg"></div>
+ <div class="background bridesmaid-1">
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/kelly.jpg"></div>
</div>
<div class="info">
@@ -271,8 +271,8 @@
<li>
<div class="avatar">
- <div class="background bridesmaid-2"><img src=
- "http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/elizabeth.jpg"></div>
+ <div class="background bridesmaid-2">
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/elizabeth.jpg"></div>
</div>
<div class="info">
@@ -286,8 +286,8 @@
<li>
<div class="avatar">
- <div class="background bridesmaid-3"><img src=
- "http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/allie.jpg"></div>
+ <div class="background bridesmaid-3">
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/allie.jpg"></div>
</div>
<div class="info">
@@ -301,8 +301,8 @@
<li>
<div class="avatar">
- <div class="background bridesmaid-4"><img src=
- "http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/meghan.jpg"></div>
+ <div class="background bridesmaid-4">
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/meghan.jpg"></div>
</div>
<div class="info">
@@ -316,8 +316,8 @@
<li>
<div class="avatar">
- <div class="background bridesmaid-5"><img src=
- "http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/danica.jpg"></div>
+ <div class="background bridesmaid-5">
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/danica.jpg"></div>
</div>
<div class="info">
@@ -335,7 +335,8 @@
<li>
<div class="avatar">
- <div class="background groomsman-0"><img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/kurt.jpg"></div>
+ <div class="background groomsman-0">
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/kurt.jpg"></div>
</div>
<div class="info">
@@ -349,7 +350,8 @@
<li>
<div class="avatar">
- <div class="background groomsman-1"><img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/chas.jpg"></div>
+ <div class="background groomsman-1">
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/chas.jpg"></div>
</div>
<div class="info">
@@ -363,8 +365,8 @@
<li>
<div class="avatar">
- <div class="background groomsman-2"><img src=
- "http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/richard.jpg"></div>
+ <div class="background groomsman-2">
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/richard.jpg"></div>
</div>
<div class="info">
@@ -378,7 +380,8 @@
<li>
<div class="avatar">
- <div class="background groomsman-3"><img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/evan.jpg"></div>
+ <div class="background groomsman-3">
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/evan.jpg"></div>
</div>
<div class="info">
@@ -392,8 +395,8 @@
<li>
<div class="avatar">
- <div class="background groomsman-4"><img src=
- "http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/connor.jpg"></div>
+ <div class="background groomsman-4">
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/connor.jpg"></div>
</div>
<div class="info">
@@ -407,7 +410,8 @@
<li>
<div class="avatar">
- <div class="background groomsman-5"><img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/alan.jpg"></div>
+ <div class="background groomsman-5">
+ <img src="http://danielhunninghake.com/alinick/wp-content/uploads/2012/11/alan.jpg"></div>
</div>
<div class="info">
@@ -490,9 +494,7 @@
<footer>
<div class="container">
- <p class="copyright">© 2013 Ali and Nick</p>
-
- <p><a href="http://resplen.de" target="_blank">resplendent theme</a></p>
+ <p class="copyright">© 2014 Alex and Kathryn</p>
</div>
</footer>
</div>
View
4 javascript/main.js
@@ -3,8 +3,8 @@ jQuery(function($) {
function initialize() {
var map_canvas = document.getElementById('map_canvas');
var map_options = {
- center: new google.maps.LatLng(44.5403, -78.5463),
- zoom: 8,
+ center: new google.maps.LatLng(44.974893,-93.269909),
+ zoom: 1,
mapTypeId: google.maps.MapTypeId.ROADMAP
}
var map = new google.maps.Map(map_canvas, map_options)
Please sign in to comment.
Something went wrong with that request. Please try again.