aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--_includes/common/bootstrap_css.html5
-rw-r--r--_includes/common/bootstrap_js.html5
-rw-r--r--_includes/common/footer.html9
-rw-r--r--_includes/common/header.html19
-rw-r--r--_includes/common/ie_compat.html11
-rw-r--r--_includes/common/jquery.html5
6 files changed, 22 insertions, 32 deletions
diff --git a/_includes/common/bootstrap_css.html b/_includes/common/bootstrap_css.html
deleted file mode 100644
index 72c078b..0000000
--- a/_includes/common/bootstrap_css.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% if site.settings.3rdparty.minified %}
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.settings.3rdparty.versions.bootstrap }}/css/bootstrap.min.css">
-{% else %}
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.settings.3rdparty.versions.bootstrap }}/css/bootstrap.css">
-{% endif %}
diff --git a/_includes/common/bootstrap_js.html b/_includes/common/bootstrap_js.html
deleted file mode 100644
index 3f80e7d..0000000
--- a/_includes/common/bootstrap_js.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% if site.settings.3rdparty.minified %}
- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.settings.3rdparty.versions.bootstrap }}/js/bootstrap.min.js"></script>
-{% else %}
- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.settings.3rdparty.versions.bootstrap }}/js/bootstrap.js"></script>
-{% endif %}
diff --git a/_includes/common/footer.html b/_includes/common/footer.html
index 769ac7c..cce57cc 100644
--- a/_includes/common/footer.html
+++ b/_includes/common/footer.html
@@ -19,7 +19,12 @@
</footer>
</div>
</div>
- {% include common/jquery.html %}
- {% include common/bootstrap_js.html %}
+ {% if site.settings.3rdparty.minified %}
+ <script src="https://code.jquery.com/jquery-{{ site.settings.3rdparty.versions.jquery }}.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.settings.3rdparty.versions.bootstrap }}/js/bootstrap.min.js"></script>
+ {% else %}
+ <script src="https://code.jquery.com/jquery-{{ site.settings.3rdparty.versions.jquery }}.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.settings.3rdparty.versions.bootstrap }}/js/bootstrap.js"></script>
+ {% endif %}
</body>
</html>
diff --git a/_includes/common/header.html b/_includes/common/header.html
index bff0657..e5af5b4 100644
--- a/_includes/common/header.html
+++ b/_includes/common/header.html
@@ -11,7 +11,21 @@
<title>{{ page.title }} - {{ site.settings.author.name }}</title>
{% endif %}
- {% include common/bootstrap_css.html %}
+ {% if site.settings.3rdparty.minified %}
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.settings.3rdparty.versions.bootstrap }}/css/bootstrap.min.css">
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/html5shiv/{{ site.settings.3rdparty.versions.html5shiv }}/html5shiv.min.js"></script>
+ <script src="https://oss.maxcdn.com/respond/{{ site.settings.3rdparty.versions.respond }}/respond.min.js"></script>
+ <![endif]-->
+ {% else %}
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.settings.3rdparty.versions.bootstrap }}/css/bootstrap.css">
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/html5shiv/{{ site.settings.3rdparty.versions.html5shiv }}/html5shiv.js"></script>
+ <script src="https://oss.maxcdn.com/respond/{{ site.settings.3rdparty.versions.respond }}/respond.js"></script>
+ <![endif]-->
+ {% endif %}
+
+ {% include common/mathjax.html %}
<link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
@@ -20,9 +34,6 @@
<link rel="stylesheet" href="{{ '/assets/css/' | relative_url }}{{ css }}"/>
{% endfor %}
{% endif %}
-
- {% include common/ie_compat.html %}
- {% include common/mathjax.html %}
</head>
<body>
<div class="top-level-footer-wrapper">
diff --git a/_includes/common/ie_compat.html b/_includes/common/ie_compat.html
deleted file mode 100644
index 494d971..0000000
--- a/_includes/common/ie_compat.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% if site.settings.3rdparty.minified %}
- <!--[if lt IE 9]>
- <script src="https://oss.maxcdn.com/html5shiv/{{ site.settings.3rdparty.versions.html5shiv }}/html5shiv.min.js"></script>
- <script src="https://oss.maxcdn.com/respond/{{ site.settings.3rdparty.versions.respond }}/respond.min.js"></script>
- <![endif]-->
-{% else %}
- <!--[if lt IE 9]>
- <script src="https://oss.maxcdn.com/html5shiv/{{ site.settings.3rdparty.versions.html5shiv }}/html5shiv.js"></script>
- <script src="https://oss.maxcdn.com/respond/{{ site.settings.3rdparty.versions.respond }}/respond.js"></script>
- <![endif]-->
-{% endif %}
diff --git a/_includes/common/jquery.html b/_includes/common/jquery.html
deleted file mode 100644
index 7e59177..0000000
--- a/_includes/common/jquery.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% if site.settings.3rdparty.minified %}
- <script src="https://code.jquery.com/jquery-{{ site.settings.3rdparty.versions.jquery }}.min.js"></script>
-{% else %}
- <script src="https://code.jquery.com/jquery-{{ site.settings.3rdparty.versions.jquery }}.js"></script>
-{% endif %}