fix layout

uetuluk · Jul 19, 2019 · f01793b · f01793b
1 parent 622a0c8
commit f01793b
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 34 deletions.
diff --git a/404.html b/404.html
@@ -1,24 +1,3 @@
 ---
-layout: default
----
-
-<style type="text/css" media="screen">
-  .container {
-    margin: 10px auto;
-    max-width: 600px;
-    text-align: center;
-  }
-  h1 {
-    margin: 30px 0;
-    font-size: 4em;
-    line-height: 1;
-    letter-spacing: -1px;
-  }
-</style>
-
-<div class="container">
-  <h1>404</h1>
-
-  <p><strong>Page not found :(</strong></p>
-  <p>The requested page could not be found.</p>
-</div>
+layout: 404
+---
diff --git a/_layouts/404.html b/_layouts/404.html
@@ -0,0 +1,20 @@
+<style type="text/css" media="screen">
+  .container {
+    margin: 10px auto;
+    max-width: 600px;
+    text-align: center;
+  }
+  h1 {
+    margin: 30px 0;
+    font-size: 4em;
+    line-height: 1;
+    letter-spacing: -1px;
+  }
+</style>
+
+<div class="container">
+  <h1>404</h1>
+
+  <p><strong>Page not found :(</strong></p>
+  <p>The requested page could not be found.</p>
+</div>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-
+    <meta charset="utf-8">
+    <title> {{ page.title }}</title>
 </head>
 <body>
     <div id="root"></div>

diff --git a/_layouts/page.html b/_layouts/page.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title> {{ page.title }}</title>
+</head>
+<body>
+    {{content}}<!-- Test -->
+</body>
+<script type="text/javascript" src="/js/main.js" charset="utf-8"></script>
+</html>
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title> {{ page.title }}</title>
+</head>
+<body>
+    {{content}}<!-- Test -->
+</body>
+<script type="text/javascript" src="/js/main.js" charset="utf-8"></script>
+</html>
diff --git a/_posts/2019-07-18-welcome-to-jekyll.markdown b/_posts/2019-07-18-welcome-to-jekyll.markdown
@@ -4,7 +4,7 @@ title:  "Welcome to Jekyll!"
 date:   2019-07-18 18:02:08 +0800
 categories: jekyll update
 ---
-You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.
+You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a aweb server and auto-regenerates your site when a file is updated.
 
 To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works.
 

diff --git a/about.md b/about.md
@@ -14,5 +14,5 @@ You can find the source code for Jekyll at GitHub:
 [jekyll][jekyll-organization] /
 [jekyll](https://github.com/jekyll/jekyll)
 
-
-[jekyll-organization]: https://github.com/jekyll
+a
+[jekyll-organization]: https://github.com/jekyll
diff --git a/index.html b/index.html
@@ -0,0 +1,4 @@
+---
+layout: default
+title: Home
+---
diff --git a/index.md b/index.md
diff --git a/webpack/components/Hello.js b/webpack/components/Hello.js
@@ -4,7 +4,10 @@ import './Hello.scss';
 class Hello extends Component {
  render() {
  return (
- <div className="test">Hey, y’alal!!</div>
+    <div>
+        <h1>Title</h1>
+        <div className="test">Hey, y’alal!!</div>
+    </div>
  )
  }
 }