Skip to content

Commit

Permalink
Some improvements and Netease Gentie added.
Browse files Browse the repository at this point in the history
  • Loading branch information
tufu9441 committed Mar 31, 2017
1 parent efed5e4 commit 8973cd2
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 42 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2015 tufu9441
Copyright (c) 2017 tufu9441

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ fancybox: true ## If you want to use fancybox please set the value to true.
duoshuo: ## Your duoshuo_shortname, e.g. username
disqus: ## Your disqus_shortname, e.g. username
uyan: ## Your uyan_id, e.g. 1234567
gentie: ## Your gentie_productKey, e.g. fc799538c7ad4cf5a5a0c2877a90cbd7
google_search: true ## Use Google search, true/false.
baidu_search: ## Use Baidu search, true/false.
swiftype: ## Your swiftype_key, e.g. m7b11ZrsT8Me7gzApciT
Expand Down Expand Up @@ -93,6 +94,7 @@ version: 0.0.0
- duoshuo - [Duoshuo](http://duoshuo.com) shortname
- disqus - [Disqus](https://disqus.com) shortname
- uyan - [Uyan](http://www.uyan.cc) id
- gentie - [Gentie](https://gentie.163.com) productKey
- google_search - Default search engine
- baidu_search - Search engine for users in China
- swiftype - [Swiftype Search](https://swiftype.com) key
Expand Down
1 change: 1 addition & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ fancybox: true ## If you want to use fancybox please set the value to true.
duoshuo: ## Your duoshuo_shortname, e.g. username
disqus: ## Your disqus_shortname, e.g. username
uyan: ## Your uyan_id. e.g. 1234567
gentie: ## Your gentie_productKey, e.g. fc799538c7ad4cf5a5a0c2877a90cbd7
google_search: true ## Use Google search, true/false.
baidu_search: ## Use Baidu search, true/false.
swiftype: ## Your swiftype_key, e.g. m7b11ZrsT8Me7gzApciT
Expand Down
2 changes: 1 addition & 1 deletion languages/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ recent: Recent
next: Next
previous: Previous
notitle: No Title
blogroll: Blogroll
blogroll: Links
history: History
rss: RSS
guestbook: Guestbook
Expand Down
10 changes: 10 additions & 0 deletions layout/_partial/after_footer.jade
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@ if theme.duoshuo
|| document.getElementsByTagName('body')[0]).appendChild(ds);
})();

if theme.gentie
script.
var cloudTieConfig = {
url: document.location.href,
sourceId: "",
productKey: "#{theme.gentie}",
target: "cloud-tie-wrapper"
};
script(src='https://img1.cache.netease.com/f2e/tie/yun/sdk/loader.js')

if theme.tinysou
script.
var option = {
Expand Down
3 changes: 3 additions & 0 deletions layout/_partial/comments.jade
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ if theme.disqus
if theme.uyan
#uyan_frame
script(src="http://v2.uyan.cc/code/uyan.js?uid='#{theme.uyan}'")

if theme.gentie
.cloud-tie-wrapper#cloud-tie-wrapper
19 changes: 19 additions & 0 deletions layout/_partial/head.jade
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
head
meta(http-equiv='content-type', content='text/html; charset=utf-8')
meta(content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0', name='viewport')
meta(content='yes', name='apple-mobile-web-app-capable')
meta(content='black-translucent', name='apple-mobile-web-app-status-bar-style')
meta(content='telephone=no', name='format-detection')
meta(name='description', content=config.description)
block title
link(rel='stylesheet', type='text/css', href='//cdn.bootcss.com/normalize/5.0.0/normalize.min.css')
link(rel='stylesheet', type='text/css', href='//cdn.bootcss.com/pure/0.6.2/pure-min.css')
link(rel='stylesheet', type='text/css', href='//cdn.bootcss.com/pure/0.6.2/grids-responsive-min.css')
link(rel='stylesheet', type='text/css', href=url_for(theme.css) + '/style.css' + '?v=' + theme.version)
link(rel='stylesheet', href='//cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css')
script(type='text/javascript', src='//cdn.bootcss.com/jquery/3.1.1/jquery.min.js')
link(rel='Shortcut Icon', type='image/x-icon', href=url_for('favicon.ico'))
link(rel='apple-touch-icon', href=url_for('apple-touch-icon.png'))
link(rel='apple-touch-icon-precomposed', href=url_for('apple-touch-icon.png'))
if config.feed
link(rel='alternate', type=feed_type, href=url_for(config.feed.path))
25 changes: 4 additions & 21 deletions layout/base-without-sidebar.jade
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,8 @@ if config.feed

doctype html
html(lang='#{config.language}')
head
meta(http-equiv='content-type', content='text/html; charset=utf-8')
meta(content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0', name='viewport')
meta(content='yes', name='apple-mobile-web-app-capable')
meta(content='black-translucent', name='apple-mobile-web-app-status-bar-style')
meta(content='telephone=no', name='format-detection')
meta(name='description', content=config.description)
block title
link(rel='stylesheet', type='text/css', href='//cdn.bootcss.com/normalize/5.0.0/normalize.min.css')
link(rel='stylesheet', type='text/css', href='//cdn.bootcss.com/pure/0.6.2/pure-min.css')
link(rel='stylesheet', type='text/css', href='//cdn.bootcss.com/pure/0.6.2/grids-responsive-min.css')
link(rel='stylesheet', type='text/css', href=url_for(theme.css) + '/style.css' + '?v=' + theme.version)
link(rel='stylesheet', href='//cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css')
script(type='text/javascript', src='//cdn.bootcss.com/jquery/3.1.1/jquery.min.js')
link(rel='Shortcut Icon', type='image/x-icon', href=url_for('favicon.ico'))
link(rel='apple-touch-icon', href=url_for('apple-touch-icon.png'))
link(rel='apple-touch-icon-precomposed', href=url_for('apple-touch-icon.png'))
if config.feed
link(rel='alternate', type=feed_type, href=url_for(config.feed.path))

include _partial/head

body: .body_container
#header
Expand All @@ -46,9 +29,9 @@ html(lang='#{config.language}')
+a_with_current(theme.menu[i].directory, __(theme.menu[i].page), theme.menu[i].icon)

#layout.pure-g
.pure-u-1.pure-u-md-3-4: .content_container
.pure-u-1.pure-u-md-4-4: .content_container
block content
.pure-u-1.pure-u-md-3-4
.pure-u-1.pure-u-md-4-4
!= partial('_partial/footer.jade')

include _partial/totop
Expand Down
21 changes: 2 additions & 19 deletions layout/base.jade
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,8 @@ if config.feed

doctype html
html(lang='#{config.language}')
head
meta(http-equiv='content-type', content='text/html; charset=utf-8')
meta(content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0', name='viewport')
meta(content='yes', name='apple-mobile-web-app-capable')
meta(content='black-translucent', name='apple-mobile-web-app-status-bar-style')
meta(content='telephone=no', name='format-detection')
meta(name='description', content=config.description)
block title
link(rel='stylesheet', type='text/css', href='//cdn.bootcss.com/normalize/5.0.0/normalize.min.css')
link(rel='stylesheet', type='text/css', href='//cdn.bootcss.com/pure/0.6.2/pure-min.css')
link(rel='stylesheet', type='text/css', href='//cdn.bootcss.com/pure/0.6.2/grids-responsive-min.css')
link(rel='stylesheet', type='text/css', href=url_for(theme.css) + '/style.css' + '?v=' + theme.version)
link(rel='stylesheet', href='//cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css')
script(type='text/javascript', src='//cdn.bootcss.com/jquery/3.1.1/jquery.min.js')
link(rel='Shortcut Icon', type='image/x-icon', href=url_for('favicon.ico'))
link(rel='apple-touch-icon', href=url_for('apple-touch-icon.png'))
link(rel='apple-touch-icon-precomposed', href=url_for('apple-touch-icon.png'))
if config.feed
link(rel='alternate', type=feed_type, href=url_for(config.feed.path))

include _partial/head

body: .body_container
#header
Expand Down

0 comments on commit 8973cd2

Please sign in to comment.