aboutsummaryrefslogtreecommitdiff
path: root/_includes
diff options
context:
space:
mode:
Diffstat (limited to '_includes')
-rw-r--r--_includes/external_links.html11
-rw-r--r--_includes/footer.html13
-rw-r--r--_includes/head.html7
-rw-r--r--_includes/image.html11
-rw-r--r--_includes/navbar.html21
5 files changed, 16 insertions, 47 deletions
diff --git a/_includes/external_links.html b/_includes/external_links.html
deleted file mode 100644
index f18abed..0000000
--- a/_includes/external_links.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<p class="social-links">
- {% for link in site.data.external_links %}
- <a href="{{ link.url | strip_newlines | strip_html | strip | normalize_whitespace | uri_escape }}">
- {{ link.name | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}
- </a>
- <!-- Separation -->
- {% unless forloop.last %}
- <span>|</span>
- {% endunless %}
- {% endfor %}
-</p>
diff --git a/_includes/footer.html b/_includes/footer.html
deleted file mode 100644
index e60815d..0000000
--- a/_includes/footer.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<footer class="footer">
- <small>
- {% for link in site.data.footer_links %}
- <a href="{{ link.path | strip_newlines | strip_html | strip | normalize_whitespace | uri_escape }}">
- {{ link.name | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}
- </a>
- <!-- Separation -->
- {% unless forloop.last %}
- <span>|</span>
- {% endunless %}
- {% endfor %}
- </small>
-</footer>
diff --git a/_includes/head.html b/_includes/head.html
index e7766cb..cd01190 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -1,6 +1,6 @@
<head>
<!-- Meta tags -->
- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1" />
+ <meta name="viewport" content="initial-scale=1.0, maximum-scale=1, shrink-to-fit=no, width=device-width" />
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<link rel="canonical" href="{{ page.url | absolute_url | uri_escape }}" />
@@ -18,8 +18,7 @@
<title>{{ page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | truncate: 64 | xml_escape }}</title>
<!-- CSS -->
- <link rel="stylesheet" href="{{ '/assets/css/fonts.css' | relative_url | uri_escape }}" />
- <link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url | uri_escape }}" />
+ <link rel="stylesheet" href="{{ '/assets/css/styles.css' | relative_url | uri_escape }}" />
<!-- Favicon -->
<link rel="apple-touch-icon" sizes="180x180" href="{{ '/assets/apple-touch-icon.png' | relative_url | uri_escape }}" />
@@ -30,6 +29,6 @@
<link rel="alternate" type="application/atom+xml" title="RSS" href="{{ site.rss | relative_url | uri_escape }}" />
<!--[if lte IE 9]>
- <script type="text/javascript" src="{{ '/assets/javascript/html5shiv.min.js' | relative_url | uri_escape }}"></script>
+ <script type="text/javascript" src="{{ '/assets/javascript/html5shiv-3.7.3.min.js' | relative_url | uri_escape }}"></script>
<![endif]-->
</head>
diff --git a/_includes/image.html b/_includes/image.html
deleted file mode 100644
index f5684d1..0000000
--- a/_includes/image.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% assign alternative = include.alt | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %}
-{% assign identifier = include.id | strip_newlines | strip_html | strip | normalize_whitespace | slugify %}
-{% assign source = include.src | strip_newlines | strip_html | strip | normalize_whitespace | uri_escape %}
-
-<a href="#{{ identifier }}">
- <img alt="{{ alternative }}" src="{{ source }}" />
-</a>
-
-<a href="#" class="fullscreen" id="{{ identifier }}">
- <img alt="{{ alternative }}" src="{{ source }}" />
-</a>
diff --git a/_includes/navbar.html b/_includes/navbar.html
index c5d1de8..752be0a 100644
--- a/_includes/navbar.html
+++ b/_includes/navbar.html
@@ -1,11 +1,16 @@
{% assign pages = site.pages | where: "show", true %}
-<nav class="navigation">
- <a href="{{ site.url | uri_escape }}">Home</a>
-
- {% for page in pages %}
- <a href="{{ page.url | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape }}">
- {{ page.title | default: "Page" | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}
- </a>
- {% endfor %}
+<nav role="navigation">
+ <div class="container">
+ <ul class="nav nav-pills pull-right">
+ <li role="presentation"><a href="/">Home</a></li>
+ {% for page in pages %}
+ <li role="presentation">
+ <a href="{{ page.url | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape }}">
+ {{ page.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}
+ </a>
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
</nav>