Skip to content

Commit 3bc717e

Browse files
bertiquebertique
committed
Initial site
Initial site push, no blog posts
1 parent 17292e3 commit 3bc717e

39 files changed

+12237
-468
lines changed

‎_config.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Site settings
2-
title: Your awesome title
3-
email: your-email@domain.com
2+
title: Michael Dick
3+
email: n.michael.dick@gmail.com
44
description: "Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description."
55
baseurl: ""
6-
url: "http://yourdomain.com"
7-
#twitter_username: midi2dot0
6+
url: "http://michaeldick.me"
7+
twitter_username: midi2dot0
88
github_username: jekyll
99

1010
# Build settings

‎_includes/footer.html

+14-56
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,19 @@
11
<footer class="site-footer">
2+
<div id="footerwrap">
3+
<div class="container">
4+
<h5>Artisanally Crafted in Seattle, WA - Copyright 2014 Michael Dick</h5>
5+
</div>
6+
</div>
27

3-
<div class="wrap">
8+
<!-- Bootstrap core JavaScript
9+
================================================== -->
10+
<!-- Placed at the end of the document so the pages load faster -->
11+
412

5-
<h2 class="footer-heading">{{ site.title }}</h2>
6-
7-
<div class="footer-col-1 column">
8-
<ul>
9-
<li>{{ site.title }}</li>
10-
<li><a href="mailto:{{ site.email }}">{{ site.email }}</a></li>
11-
</ul>
12-
</div>
13-
14-
<div class="footer-col-2 column">
15-
<ul>
16-
{% if site.github_username %}<li>
17-
<a href="https://github.com/{{ site.github_username }}">
18-
<span class="icon github">
19-
<svg version="1.1" class="github-icon-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
20-
viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
21-
<path fill-rule="evenodd" clip-rule="evenodd" fill="#C2C2C2" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761
22-
c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32
23-
c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472
24-
c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037
25-
C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65
26-
c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261
27-
c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082
28-
c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129
29-
c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/>
30-
</svg>
31-
</span>
32-
<span class="username">{{ site.github_username }}</span>
33-
</a>
34-
</li>{% endif %}
35-
{% if site.twitter_username %}<li>
36-
<a href="https://twitter.com/{{ site.twitter_username }}">
37-
<span class="icon twitter">
38-
<svg version="1.1" class="twitter-icon-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
39-
viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
40-
<path fill="#C2C2C2" d="M15.969,3.058c-0.586,0.26-1.217,0.436-1.878,0.515c0.675-0.405,1.194-1.045,1.438-1.809
41-
c-0.632,0.375-1.332,0.647-2.076,0.793c-0.596-0.636-1.446-1.033-2.387-1.033c-1.806,0-3.27,1.464-3.27,3.27
42-
c0,0.256,0.029,0.506,0.085,0.745C5.163,5.404,2.753,4.102,1.14,2.124C0.859,2.607,0.698,3.168,0.698,3.767
43-
c0,1.134,0.577,2.135,1.455,2.722C1.616,6.472,1.112,6.325,0.671,6.08c0,0.014,0,0.027,0,0.041c0,1.584,1.127,2.906,2.623,3.206
44-
C3.02,9.402,2.731,9.442,2.433,9.442c-0.211,0-0.416-0.021-0.615-0.059c0.416,1.299,1.624,2.245,3.055,2.271
45-
c-1.119,0.877-2.529,1.4-4.061,1.4c-0.264,0-0.524-0.015-0.78-0.046c1.447,0.928,3.166,1.469,5.013,1.469
46-
c6.015,0,9.304-4.983,9.304-9.304c0-0.142-0.003-0.283-0.009-0.423C14.976,4.29,15.531,3.714,15.969,3.058z"/>
47-
</svg>
48-
</span>
49-
<span class="username">{{ site.twitter_username }}</span>
50-
</a>
51-
</li>{% endif %}
52-
</ul>
53-
</div>
54-
55-
<div class="footer-col-3 column">
56-
<p class="text">{{ site.description }}</p>
57-
</div>
58-
59-
</div>
13+
<script type="text/javascript" src="{{ "/js/bootstrap.min.js" | prepend: site.baseurl }}"></script>
14+
<script type="text/javascript" src="{{ "/js/retina.js" | prepend: site.baseurl }}"></script>
15+
<script type="text/javascript" src="{{ "/js/jquery.easing.1.3.js" | prepend: site.baseurl }}"></script>
16+
<script type="text/javascript" src="{{ "/js/smoothscroll.js" | prepend: site.baseurl }}"></script>
17+
<!-- <script type="text/javascript" src="{{ "/js/jquery-func.js" | prepend: site.baseurl }}"></script> -->
6018

6119
</footer>

‎_includes/googleAnalytics.html

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<script>
2+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
3+
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
4+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
5+
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
6+
7+
ga('create', 'UA-53470458-1', 'auto');
8+
ga('send', 'pageview');
9+
10+
</script>

‎_includes/head.html

+14-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,19 @@
66
<meta name="description" content="{{ site.description }}">
77
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
88

9-
<!-- Custom CSS -->
10-
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
9+
<!-- Bootstrap core CSS -->
10+
<link href="{{ "/css/bootstrap.css" | prepend: site.baseurl }}" rel="stylesheet">
1111

12+
<!-- Custom styles for this template -->
13+
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
14+
<link rel="stylesheet" href="{{ "/css/icomoon.css" | prepend: site.baseurl }}">
15+
<link rel="stylesheet" href="{{ "/css/animate-custom.css" | prepend: site.baseurl }}">
16+
17+
<link href='http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic' rel='stylesheet' type='text/css'>
18+
<link href='http://fonts.googleapis.com/css?family=Raleway:400,300,700' rel='stylesheet' type='text/css'>
19+
20+
<script type="text/javascript" src="{{ "/js/jquery.min.js" | prepend: site.baseurl }}"></script>
21+
<script type="text/javascript" src="{{ "/js/modernizr.custom.js" | prepend: site.baseurl }}"></script>
22+
23+
{% include googleAnalytics.html %}
1224
</head>

‎_includes/header.html

+27-24
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
11
<header class="site-header">
22

3-
<div class="wrap">
4-
5-
<a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
6-
7-
<nav class="site-nav">
8-
<a href="#" class="menu-icon">
9-
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
10-
viewBox="0 0 18 15" enable-background="new 0 0 18 15" xml:space="preserve">
11-
<path fill="#505050" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0
12-
h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
13-
<path fill="#505050" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484
14-
h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
15-
<path fill="#505050" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0
16-
c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
17-
</svg>
18-
</a>
19-
<div class="trigger">
20-
{% for page in site.pages %}
21-
{% if page.title %}<a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>{% endif %}
22-
{% endfor %}
23-
</div>
24-
</nav>
25-
26-
</div>
3+
<div id="navbar-main">
4+
<!-- Fixed navbar -->
5+
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
6+
<div class="container">
7+
<div class="navbar-header">
8+
<a class="navbar-brand hidden-xs hidden-sm" href="{{ "/#greywrap" | prepend: site.baseurl }}"><strong>Michael Dick</strong></a>
9+
</div>
10+
<div class="navbar-collapse collapse">
11+
<ul class="nav navbar-nav">
12+
{% if page.ispost %}
13+
<li><a href="{{ "/#greywrap" | prepend: site.baseurl }}" class="smoothScroll">Home</a></li>
14+
<li><a href="{{ "/#projects" | prepend: site.baseurl }}" class="smoothScroll">Projects</a></li>
15+
{% if site.posts != empty %}<li class="active"><a href="#" class="smoothScroll">Blog</a></li> {% endif %}
16+
{% elsif page.ispage %}
17+
<li><a href="{{ "/#greywrap" | prepend: site.baseurl }}" class="smoothScroll">Home</a></li>
18+
<li class="active"><a href="#projects" class="smoothScroll">Projects</a></li>
19+
{% if site.posts != empty %}<li><a href="{{ "/#blog" | prepend: site.baseurl }}" class="smoothScroll">Blog</a></li> {% endif %}
20+
{% else %}
21+
<li><a href="#greywrap" class="smoothScroll">Home</a></li>
22+
<li><a href="#projects" class="smoothScroll">Projects</a></li>
23+
{% if site.posts != empty %}<li><a href="#blog" class="smoothScroll">Blog</a></li> {% endif %}
24+
{% endif %}
25+
</ul>
26+
</div><!--/.nav-collapse -->
27+
</div>
28+
</div>
29+
</div>
2730

2831
</header>

‎_layouts/default.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
{% include head.html %}
55

6-
<body>
6+
<body data-spy="scroll" data-offset="40" data-target="#navbar-main">
77

88
{% include header.html %}
99

@@ -13,7 +13,8 @@
1313
</div>
1414
</div>
1515

16+
{% if page.ispost != true and page.ispage != true %}
1617
{% include footer.html %}
17-
18+
{% endif %}
1819
</body>
1920
</html>

‎_layouts/page.html

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
layout: default
3+
ispage: true
34
---
45
<div class="post">
56

‎_layouts/post.html

+13-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
---
22
layout: default
3+
ispost: true
34
---
4-
<div class="post">
5-
6-
<header class="post-header">
7-
<h1>{{ page.title }}</h1>
8-
<p class="meta">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
9-
</header>
10-
11-
<article class="post-content">
12-
{{ content }}
13-
</article>
14-
5+
<div class="container">
6+
<br>
7+
<br>
8+
<div class="row">
9+
<h2 class="centered">{{ page.title }}</h2>
10+
<div class="centered">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</div>
11+
<hr>
12+
13+
<div class="col-lg-offset-2 col-lg-8">
14+
{{ content }}
15+
</div><!-- col-lg -->
16+
</div><!-- row -->
1517
</div>

‎_posts/2014-07-22-welcome-to-jekyll.markdown

-24
This file was deleted.

0 commit comments

Comments
 (0)