reorg

neicnordic · May 21, 2017 · e45570a · e45570a
1 parent 91b843f
commit e45570a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 27 deletions.
diff --git a/_includes/head.html b/_includes/head.html
@@ -1,23 +1,20 @@
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="shortcut icon" href="{{ site.baseurl }}/assets/ico/favicon.ico">
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="description" content="">
+<meta name="author" content="">
+<link rel="shortcut icon" href="{{ site.baseurl }}/assets/ico/favicon.ico">
 
-    {% if page.collection %}
-      {% assign title = page.name %}
-    {% else %}
-      {% assign title = page.name | replace: '.md','' | capitalize %}
-      {% assign title = page.title | default: title %}
-    {% endif %}
-    <title>{{ title }} - NeIC web</title>
+{% if page.collection %}
+  {% assign title = page.name %}
+{% else %}
+  {% assign title = page.name | replace: '.md','' | capitalize %}
+  {% assign title = page.title | default: title %}
+{% endif %}
+<title>{{ title }} - NeIC web</title>
 
-    <link href="https://fonts.googleapis.com/css?family=Roboto:100,100i,300,300i,400,400i,500,500i,700,700i,900,900i" rel="stylesheet">
-    <link href="{{ site.baseurl }}/assets/css/neic-styles.css" rel="stylesheet">
-    <link href="{{ site.baseurl }}/assets/css/vue-cloaking.css" rel="stylesheet">
-    <link href="{{ site.baseurl }}/assets/css/bootstrap-3.3.7.min.css" rel="stylesheet">
-    <link href="{{ site.baseurl }}/assets/css/responsive.css" rel="stylesheet">
-
-</head>
+<link href="https://fonts.googleapis.com/css?family=Roboto:100,100i,300,300i,400,400i,500,500i,700,700i,900,900i" rel="stylesheet">
+<link href="{{ site.baseurl }}/assets/css/neic-styles.css" rel="stylesheet">
+<link href="{{ site.baseurl }}/assets/css/vue-cloaking.css" rel="stylesheet">
+<link href="{{ site.baseurl }}/assets/css/bootstrap-3.3.7.min.css" rel="stylesheet">
+<link href="{{ site.baseurl }}/assets/css/responsive.css" rel="stylesheet">
diff --git a/news/index.html → _includes/news.html b/news/index.html → _includes/news.html
@@ -1,5 +1,3 @@
----
----
 <section class="latest-page">
   <div class="container">
     <div class="row">

diff --git a/_layouts/master.html b/_layouts/master.html
@@ -1,10 +1,10 @@
 <!doctype html>
 <html lang="en">
-    {% include head.html %}
-
-    <body>
+    <head>
+        {% include head.html %}
         {% include header.html %}
-
+    </head>
+    <body>
         {% if page.include %}
             {% include {{ page.include }}.html %}
         {% endif %}

diff --git a/news.md b/news.md
@@ -0,0 +1,4 @@
+---
+layout: master
+include: news
+---