2 files changed, 40 insertions, 21 deletions
diff --git a/_includes/common/footer.html b/_includes/common/footer.html
index 6fe7d65..e8fd04b 100644
--- a/_includes/common/footer.html
+++ b/_includes/common/footer.html
@@ -48,16 +48,28 @@
     </div>
     <script src="https://code.jquery.com/jquery-1.12.4.min.js"></script>
     <script src="{{ '/assets/bootstrap/js/bootstrap.min.js' | relative_url }}"></script>
-    {% if page.custom_js %}
-      {% for js in page.custom_js %}
-        {% assign abs_check = js | downcase | split: '//' %}
-        {% if abs_check[0] == 'http:' or abs_check[0] == 'https:' or abs_check[0] == blank %}
-          {% assign url = js %}
+
+    {% assign scripts = '' | split: '' %}
+    {% if site.settings.scripts %}
+      {% assign scripts = scripts | concat: site.settings.scripts %}
+    {% endif %}
+    {% if page.scripts %}
+      {% assign scripts = scripts | concat: page.scripts %}
+    {% endif %}
+
+    {% for script in scripts %}
+      {% assign abs_check = script.src | downcase | split: '//' %}
+      {% if abs_check[0] == 'http:' or abs_check[0] == 'https:' or abs_check[0] == '' %}
+        {% assign url = script.src %}
+      {% else %}
+        {% assign abs_check = script.src | slice: 0 %}
+        {% if abs_check == '/' %}
+          {% assign url = script.src %}
         {% else %}
-          {% assign url = '/assets/js/' | relative_url | append: js %}
+          {% assign url = script.src | relative_url %}
         {% endif %}
-        <script src="{{ url }}"></script>
-      {% endfor %}
-    {% endif %}
+      {% endif %}
+      <script src="{{ url }}"{% for attr in script %}{% if attr[0] == 'src' %}{% continue %}{% endif %} {{ attr[0] }}="{{ attr[1] }}"{% endfor %}></script>
+    {% endfor %}
   </body>
 </html>
diff --git a/_includes/common/header.html b/_includes/common/header.html
index 6798ec1..82c3801 100644
--- a/_includes/common/header.html
+++ b/_includes/common/header.html
@@ -47,20 +47,27 @@
 
     <link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
 
-    {% if page.custom_css %}
-      {% for css in page.custom_css %}
-        {% assign abs_check = css | downcase | split: '//' %}
-        {% if abs_check[0] == 'http:' or abs_check[0] == 'https:' or abs_check[0] == blank %}
-          {% assign url = css %}
-        {% else %}
-          {% assign url = '/assets/css/' | relative_url | append: css %}
-        {% endif %}
-        <link rel="stylesheet" href="{{ url }}">
-      {% endfor %}
+    {% assign links = '' | split: '' %}
+    {% if site.settings.links %}
+      {% assign links = links | concat: site.settings.links %}
+    {% endif %}
+    {% if page.links %}
+      {% assign links = links | concat: page.links %}
     {% endif %}
 
-    {% for link in site.settings.links %}
-      <link{% for attr in link %} {{ attr[0] }}="{{ attr[1] }}"{% endfor %}>
+    {% for link in links %}
+      {% assign abs_check = link.href | downcase | split: '//' %}
+      {% if abs_check[0] == 'http:' or abs_check[0] == 'https:' or abs_check[0] == '' %}
+        {% assign url = link.href %}
+      {% else %}
+        {% assign abs_check = link.href | slice: 0 %}
+        {% if abs_check == '/' %}
+          {% assign url = link.href %}
+        {% else %}
+          {% assign url = link.href | relative_url %}
+        {% endif %}
+      {% endif %}
+      <link href="{{ url }}"{% for attr in link %}{% if attr[0] == 'href' %}{% continue %}{% endif %} {{ attr[0] }}="{{ attr[1] }}"{% endfor %}>
     {% endfor %}
 
     {% if site.settings.ga_tag %}