Skip to content

Commit

Permalink
style and js updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Delegard committed Jan 28, 2014
1 parent 003993e commit 4543a4d
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 86 deletions.
4 changes: 1 addition & 3 deletions .idea/workspace.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

80 changes: 25 additions & 55 deletions css/style.css
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ img {
} }
h1 { h1 {
color: #333; color: #333;
font-family: 'gentium_book_basicregular', Helvetica, sans-serif; font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-size: 2em; font-size: 2em;
font-weight: normal; font-weight: normal;
line-height: 1em; line-height: 1em;
Expand All @@ -122,9 +122,10 @@ h1 {
} }
h2 { h2 {
color: #333; color: #333;
font-family: 'gentium_book_basicbold_italic', Helvetica, sans-serif; font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-size: 30px; font-size: 30px;
font-weight: normal; font-weight: bold;
font-style: italic;
padding: 0; padding: 0;
margin: 45px 0 30px; margin: 45px 0 30px;
text-align: center; text-align: center;
Expand Down Expand Up @@ -310,7 +311,7 @@ section {
filter:alpha(opacity=65); filter:alpha(opacity=65);
} }
#rsvp input[type="text"] { #rsvp input[type="text"] {
font-family: 'gentium_book_basicregular', Helvetica, sans-serif; font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-size: 1.25em; font-size: 1.25em;
color: #666; color: #666;
margin: 100px 0 25px; margin: 100px 0 25px;
Expand Down Expand Up @@ -338,8 +339,9 @@ section {
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
color: #fff; color: #fff;
font-family: 'gentium_book_basicitalic', Helvetica, sans-serif; font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-size: .875em; font-size: .875em;
font-style: italic;
padding: 11px 18px; padding: 11px 18px;
-webkit-transition: background .7s ease; -webkit-transition: background .7s ease;
-moz-transition: background .7s ease; -moz-transition: background .7s ease;
Expand All @@ -360,7 +362,7 @@ section {
color: #999; color: #999;
display: inline-block; display: inline-block;
margin: 0 5px; margin: 0 5px;
font-family: 'gentium_book_basicregular', Helvetica, sans-serif; font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-size: .875em; font-size: .875em;
} }
#rsvp p.error { #rsvp p.error {
Expand All @@ -387,8 +389,10 @@ nav {
} }
nav li { nav li {
float: left; float: left;
font-family: 'gentium_book_basicbold_italic', Helvetica, sans-serif; font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-size: 15px; font-size: 15px;
font-style: italic;
font-weight: bold;
overflow: hidden; overflow: hidden;
} }
nav li a { nav li a {
Expand All @@ -410,8 +414,10 @@ nav {
background: #000; background: #000;
} }
a.nav_hash { a.nav_hash {
font-family: 'gentium_book_basicbold_italic', Helvetica, sans-serif; font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-size: 15px; font-size: 15px;
font-weight: bold;
font-style: italic;
overflow: hidden; overflow: hidden;
float: right; float: right;
background: none; background: none;
Expand Down Expand Up @@ -467,7 +473,7 @@ header span {
color: #333; color: #333;
display: inline-block; display: inline-block;
letter-spacing: 1px; letter-spacing: 1px;
font-family: 'gentium_book_basicregular', Helvetica, sans-serif; font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-size: .75em; font-size: .75em;
text-transform: uppercase; text-transform: uppercase;
} }
Expand Down Expand Up @@ -502,7 +508,8 @@ header span {
width: 100%; width: 100%;
} }
#story span { #story span {
font-family: 'gentium_book_basicbold', Helvetica, sans-serif; font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-weight: bold;
font-size: 1em; font-size: 1em;
letter-spacing: 2px; letter-spacing: 2px;
text-transform: uppercase; text-transform: uppercase;
Expand Down Expand Up @@ -605,8 +612,9 @@ header span {
overflow: hidden; overflow: hidden;
} }
#party span { #party span {
font-family: 'gentium_book_basicbold', Helvetica, sans-serif; font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-size: 1em; font-size: 1em;
font-weight: bold;
letter-spacing: 2px; letter-spacing: 2px;
text-transform: uppercase; text-transform: uppercase;
display: block; display: block;
Expand Down Expand Up @@ -648,7 +656,8 @@ header span {
} }
#party dl dd { #party dl dd {
color: #333; color: #333;
font-family: 'gentium_book_basicitalic', Helvetica, sans-serif; font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-style: italic;
font-size: .875em; font-size: .875em;
margin: 0; margin: 0;
padding: 0; padding: 0;
Expand Down Expand Up @@ -681,8 +690,9 @@ header span {
} }
#info .info span { #info .info span {
display: block; display: block;
font-family: 'gentium_book_basicbold', Helvetica, sans-serif; font-family: 'Gentium Book Basic', Helvetica, sans-serif;
font-size: 1em; font-size: 1em;
font-weight: bold;
letter-spacing: 2px; letter-spacing: 2px;
margin-top: 35px; margin-top: 35px;
text-transform: uppercase; text-transform: uppercase;
Expand Down Expand Up @@ -842,46 +852,6 @@ div.sb-message a:link,div.sb-message a:visited{color:#fff;text-decoration:underl
/*FONTS /*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 /*MEDIA QUERIES
Expand Down
54 changes: 28 additions & 26 deletions index.html
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<meta content="" name="description"> <meta content="" name="description">
<meta content="width=device-width" name="viewport"> <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="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/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 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://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" type="text/javascript"></script> <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
</head> </head>


<body id="top"> <body id="top">
Expand Down Expand Up @@ -241,8 +241,8 @@ <h2>wedding party</h2>


<li> <li>
<div class="avatar"> <div class="avatar">
<div class="background bridesmaid-0"><img src= <div class="background bridesmaid-0">
"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> </div>


<div class="info"> <div class="info">
Expand All @@ -256,8 +256,8 @@ <h2>wedding party</h2>


<li> <li>
<div class="avatar"> <div class="avatar">
<div class="background bridesmaid-1"><img src= <div class="background bridesmaid-1">
"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> </div>


<div class="info"> <div class="info">
Expand All @@ -271,8 +271,8 @@ <h2>wedding party</h2>


<li> <li>
<div class="avatar"> <div class="avatar">
<div class="background bridesmaid-2"><img src= <div class="background bridesmaid-2">
"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> </div>


<div class="info"> <div class="info">
Expand All @@ -286,8 +286,8 @@ <h2>wedding party</h2>


<li> <li>
<div class="avatar"> <div class="avatar">
<div class="background bridesmaid-3"><img src= <div class="background bridesmaid-3">
"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> </div>


<div class="info"> <div class="info">
Expand All @@ -301,8 +301,8 @@ <h2>wedding party</h2>


<li> <li>
<div class="avatar"> <div class="avatar">
<div class="background bridesmaid-4"><img src= <div class="background bridesmaid-4">
"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> </div>


<div class="info"> <div class="info">
Expand All @@ -316,8 +316,8 @@ <h2>wedding party</h2>


<li> <li>
<div class="avatar"> <div class="avatar">
<div class="background bridesmaid-5"><img src= <div class="background bridesmaid-5">
"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> </div>


<div class="info"> <div class="info">
Expand All @@ -335,7 +335,8 @@ <h2>wedding party</h2>


<li> <li>
<div class="avatar"> <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>


<div class="info"> <div class="info">
Expand All @@ -349,7 +350,8 @@ <h2>wedding party</h2>


<li> <li>
<div class="avatar"> <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>


<div class="info"> <div class="info">
Expand All @@ -363,8 +365,8 @@ <h2>wedding party</h2>


<li> <li>
<div class="avatar"> <div class="avatar">
<div class="background groomsman-2"><img src= <div class="background groomsman-2">
"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> </div>


<div class="info"> <div class="info">
Expand All @@ -378,7 +380,8 @@ <h2>wedding party</h2>


<li> <li>
<div class="avatar"> <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>


<div class="info"> <div class="info">
Expand All @@ -392,8 +395,8 @@ <h2>wedding party</h2>


<li> <li>
<div class="avatar"> <div class="avatar">
<div class="background groomsman-4"><img src= <div class="background groomsman-4">
"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> </div>


<div class="info"> <div class="info">
Expand All @@ -407,7 +410,8 @@ <h2>wedding party</h2>


<li> <li>
<div class="avatar"> <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>


<div class="info"> <div class="info">
Expand Down Expand Up @@ -490,9 +494,7 @@ <h3>#aliandnickallen</h3>


<footer> <footer>
<div class="container"> <div class="container">
<p class="copyright">© 2013 Ali and Nick</p> <p class="copyright">© 2014 Alex and Kathryn</p>

<p><a href="http://resplen.de" target="_blank">resplendent theme</a></p>
</div> </div>
</footer> </footer>
</div> </div>
Expand Down
4 changes: 2 additions & 2 deletions javascript/main.js
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ jQuery(function($) {
function initialize() { function initialize() {
var map_canvas = document.getElementById('map_canvas'); var map_canvas = document.getElementById('map_canvas');
var map_options = { var map_options = {
center: new google.maps.LatLng(44.5403, -78.5463), center: new google.maps.LatLng(44.974893,-93.269909),
zoom: 8, zoom: 1,
mapTypeId: google.maps.MapTypeId.ROADMAP mapTypeId: google.maps.MapTypeId.ROADMAP
} }
var map = new google.maps.Map(map_canvas, map_options) var map = new google.maps.Map(map_canvas, map_options)
Expand Down

0 comments on commit 4543a4d

Please sign in to comment.