Merge branch 'master' of github.com:thallada/thallada.github.io

This commit is contained in:
Tyler Hallada 2016-05-17 15:09:35 -04:00
commit 68777c4eb5
5 changed files with 11 additions and 11 deletions

View File

@ -21,13 +21,13 @@
<link rel="stylesheet" href="/css/main.css"> <link rel="stylesheet" href="/css/main.css">
<!-- Web Fonts --> <!-- Web Fonts -->
<link href='http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700' rel='stylesheet' type='text/css'> <link href="http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700" rel="stylesheet" type="text/css">
<!-- RSS Feed --> <!-- RSS Feed -->
<link href='/feed.xml' rel='alternate' type='application/atom+xml'> <link href="/feed.xml" rel="alternate" type="application/atom+xml">
<!-- Favicon --> <!-- Favicon -->
<link rel="shortcut icon" href="/favicon.png" /> <link rel="shortcut icon" href="/favicon.png">
<!-- Google Analytics --> <!-- Google Analytics -->
<script> <script>

View File

@ -21,16 +21,16 @@
<link rel="stylesheet" href="/css/main.css"> <link rel="stylesheet" href="/css/main.css">
<!-- RSS Feed --> <!-- RSS Feed -->
<link href='/feed.xml' rel='alternate' type='application/atom+xml'> <link href="/feed.xml" rel="alternate" type="application/atom+xml">
<!-- Web Fonts --> <!-- Web Fonts -->
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,400italics,300,300italics,200' rel='stylesheet' type='text/css'> <link href="http://fonts.googleapis.com/css?family=Open+Sans:400,400italics,300,300italics,200" rel="stylesheet" type="text/css">
<!-- Icon Fonts --> <!-- Icon Fonts -->
<link rel="stylesheet" href="/css/ionicons.min.css"> <link rel="stylesheet" href="/css/ionicons.min.css">
<!-- Favicon --> <!-- Favicon -->
<link rel="shortcut icon" href="/favicon.png" /> <link rel="shortcut icon" href="/favicon.png">
<!-- Scripts --> <!-- Scripts -->
<script src="/js/AnimationFrame.min.js"></script> <script src="/js/AnimationFrame.min.js"></script>

View File

@ -66,7 +66,7 @@ title: Tyler Hallada
</div> </div>
<div class="column fourth mobile-half"> <div class="column fourth mobile-half">
<a href="https://flic.kr/ps/2Vy25U" rel="me" class="no-decoration link-card card"> <a href="https://flic.kr/ps/2Vy25U" rel="me" class="no-decoration link-card card">
<img src="img/photos.png" alt="photos"/></br> <img src="img/photos.png" alt="photos"/><br/>
<span>Photos</span> <span>Photos</span>
</a> </a>
</div> </div>

View File

@ -3,8 +3,8 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="refresh" content="1;url=http://laundry.hallada.net"> <meta http-equiv="refresh" content="1;url=http://laundry.hallada.net">
<link rel="shortcut icon" href="/favicon.png" /> <link rel="shortcut icon" href="/favicon.png">
<link rel="canonical" href="http://laundry.hallada.net"/> <link rel="canonical" href="http://laundry.hallada.net">
<script type="text/javascript"> <script type="text/javascript">
window.location.href = "http://laundry.hallada.net" window.location.href = "http://laundry.hallada.net"
</script> </script>

View File

@ -3,8 +3,8 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="refresh" content="1;url=/resume.pdf"> <meta http-equiv="refresh" content="1;url=/resume.pdf">
<link rel="shortcut icon" href="/favicon.png" /> <link rel="shortcut icon" href="/favicon.png">
<link rel="canonical" href="/resume.pdf"/> <link rel="canonical" href="/resume.pdf">
<script type="text/javascript"> <script type="text/javascript">
window.location.href = "/resume.pdf" window.location.href = "/resume.pdf"
</script> </script>