Skip to content

Commit

Permalink
Change template from Jade to Pug
Browse files Browse the repository at this point in the history
  • Loading branch information
stunstunstun committed May 18, 2017
1 parent 9e4044c commit 817a667
Show file tree
Hide file tree
Showing 16 changed files with 84 additions and 70 deletions.
2 changes: 1 addition & 1 deletion _config.yml
Expand Up @@ -3,7 +3,7 @@ menu:
블로그: /archives/
깃허브: https://github.com/stunstunstun
구독하기: https://www.facebook.com/holaxprogramming
RSS: http://holaxprogramming.com/atom.xml
RSS: https://www.holaxprogramming.com/atom.xml

favicon: /favicon.ico
logo: /logo.png
Expand Down
3 changes: 3 additions & 0 deletions layout/.pug-lintrc
@@ -0,0 +1,3 @@
{
"extends": "canner"
}
12 changes: 0 additions & 12 deletions layout/archive.jade

This file was deleted.

21 changes: 21 additions & 0 deletions layout/archive.pug
@@ -0,0 +1,21 @@
extends base.pug

block site_title
config.title

block description
meta(name="description", content=config.description)
meta(name="og:title", content=config.title)
meta(name="og:description", content=desc)
meta(name="og:image", content="http://holaxprogramming.com/logo.png")

block container
include mixins/post.pug
+postList

block pagination
include mixins/paginator.pug
+home

block copyright
include partial/copyright.pug
26 changes: 26 additions & 0 deletions layout/base.pug
@@ -0,0 +1,26 @@
doctype
html(lang=config.language)
head
meta(charset="utf-8")
meta(name="X-UA-Compatible", content="IE=edge")
title
block site_title
block description
meta(name="og:type", content="website")
meta(name="viewport", content="width=device-width, initial-scale=1")
link(rel="icon", href=url_for(theme.favicon))
link(rel="stylesheet", href=url_for("css/apollo.css"))
- var xml = config.url + '/atom.xml'
link(rel="search", type="application/opensearchdescription+xml", href=xml, title=config.title)
body
.wrap
header
a.logo-link(href=url_for())
img(src=url_for(theme.logo) alt="logo")
include partial/nav.pug
main.container
block container
footer
block pagination
block copyright
include partial/scripts.pug
12 changes: 0 additions & 12 deletions layout/index.jade

This file was deleted.

21 changes: 21 additions & 0 deletions layout/index.pug
@@ -0,0 +1,21 @@
extends base.pug

block site_title
config.title

block description
meta(name="description", content=config.description)
meta(name="og:title", content=config.title)
meta(name="og:description", content=desc)
meta(name="og:image", content="http://holaxprogramming.com/logo.png")

block container
include mixins/post.pug
+posts

block pagination
include mixins/paginator.pug
+home

block copyright
include partial/copyright.pug
6 changes: 3 additions & 3 deletions layout/mixins/paginator.jade → layout/mixins/paginator.pug
@@ -1,4 +1,4 @@
mixin home()
mixin home
- var prev = page.prev_link
- var next = page.next_link
.paginator
Expand All @@ -7,11 +7,11 @@ mixin home()
if page.next
a.next(href=url_for(next))!= __('next')

mixin post()
mixin post
- var prev = page.prev ? page.prev.path : false;
- var next = page.next ? page.next.path : false;
.paginator
if prev
a.prev(href=url_for(prev))!= __('prev_post')
if next
a.next(href=url_for(next))!= __('next_post')
a.next(href=url_for(next))!= __('next_post')
4 changes: 2 additions & 2 deletions layout/mixins/post.jade → layout/mixins/post.pug
Expand Up @@ -3,7 +3,7 @@ mixin postInfo(item)
!= full_date(item.date, 'll')

//- Index Page
mixin posts()
mixin posts
ul.home.post-list
- page.posts.each(function (item) {
li.post-list-item
Expand All @@ -18,7 +18,7 @@ mixin posts()
- })

//- Archive Page
mixin postList()
mixin postList
.archive
- var year = 0;
- var change = false;
Expand Down
File renamed without changes.
File renamed without changes.
17 changes: 0 additions & 17 deletions layout/partial/head.jade

This file was deleted.

16 changes: 0 additions & 16 deletions layout/partial/layout.jade

This file was deleted.

File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions layout/post.jade → layout/post.pug
@@ -1,4 +1,4 @@
extends partial/layout
extends base.pug

block site_title
!= page.title + " · " + config.title
Expand All @@ -12,13 +12,13 @@ block description
meta(name="og:image", content=image)

block container
include mixins/post
include mixins/post.pug
+post(page)

block pagination
include mixins/paginator
+post()
include partial/comment
include mixins/paginator.pug
+post
include partial/comment.pug

block copyright
include partial/copyright
block copyright.pug
include partial/copyright.pug

0 comments on commit 817a667

Please sign in to comment.