Skip to content

Commit

Permalink
🔨 Redesign
Browse files Browse the repository at this point in the history
  • Loading branch information
invom committed Mar 15, 2019
1 parent 25a8988 commit 49c1a6c
Show file tree
Hide file tree
Showing 35 changed files with 560 additions and 24,981 deletions.
11 changes: 11 additions & 0 deletions Changelog.md
@@ -1,5 +1,16 @@
### 2019/3/15

- 重新设计基本完成,特别感谢 @zhugaoqi 同学的设计指导;
- 将所有第三方库、图片替换为 CDN 引用,极大精简仓库大小;
- 重新设计 archive 渲染逻辑;
- 统一文章页布局,新增文章版权声明;
- 精简页面,配置项;
- 老版本逐渐放弃维护,代码归档在 `v0.9` 分支;

### 2019/1/28

更新内容:

1. _config.yml结构大改,图片路径统一为相对于根目录
2. 可自定义index、archive、post、about页面的顶部图像高度(0 - 100)
3. 文章页顶部图像可统一设置,也可文章内单独设置。优先级:文章内banner_img属性 > 主题配置
Expand Down
30 changes: 16 additions & 14 deletions README.md
@@ -1,24 +1,24 @@
<h1 align="center">Material-T</h1>

<p align="center">一款 Material Design 风格的主题,灵感来源于 <a href="https://github.com/creativetimofficial/material-kit">Material-Kit</a></p>
<p align="center">一款 Material Design 风格的主题</p>

<p align="center">
<a href="https://join.slack.com/t/material-t/shared_invite/enQtNTQ2NjA3OTAzOTQwLWIyNGZlYWE2N2U2ZWEzMzBlNDZlYjQxNmI3NGM2Njk4ODUzYTY2MTdmNzRhYjgyYTY5NGZlOTc2YTk1YTMzNDg"><img src="https://img.shields.io/badge/chat-on%20slack-blueviolet.svg"></a>
<img alt="GitHub repo size in bytes" src="https://img.shields.io/github/repo-size/invom/Material-T.svg">
<a href="https://github.com/invom/Material-T/issues?q=is%3Aopen+is%3Aissue+label%3Anotification"><img alt="notification" src="https://img.shields.io/github/issues-raw/invom/Material-T/notification.svg?label=notification&style=flat"></a>
<img alt="contributors" src="https://img.shields.io/github/contributors/invom/Material-T.svg?style=flat">
<img alt="license" src="https://img.shields.io/github/license/invom/Material-T.svg?style=flat">
</p>

![screenshot-index](https://github.com/invom/Material-T/raw/master/screenshot-index.png)
![ScreenShot](https://i.imgur.com/mMHoZJE.png)


## 在线预览 Live Preview
## Demo

[invom's blog](https://invom.cc)
[invom's blog](https://invom.github.io)

## [文档 Document](http://invom.github.io/Material-T-docs)
## [文档 Docs](http://invom.github.io/Material-T-docs)

## 安装 Installation
## 快速开始 Quick Start

**1.** 获取最新版本

Expand Down Expand Up @@ -56,18 +56,20 @@ hexo new page about

**4.** 在 Hexo 的 `_config.yml` 中启用 `Material-T`

## 更新
## 更新 Update

`git pull`


## [TODO](https://github.com/invom/Material-T/projects)
> `v0.9` 向上升级时,建议先备份,然后直接用新版本替换,以免 `git pull` 时出现过多冲突。
```bash
cd /themes/Material-T
git pull
```

## 贡献 Contributing
## Contributors

项目会持续更新,期待您的 Pull Request
@zhugaoqi, @ChungZH

## [TODO](https://github.com/invom/Material-T/projects)

## License

Expand Down
70 changes: 25 additions & 45 deletions _config.yml
Expand Up @@ -17,16 +17,14 @@ apple_touch_icon: /apple-touch-icon.png
# Index Page
#---------------------------
index:
banner_img: /img/index-banner.jpg
# available: 0 - 100
banner_img_height: 100
banner_img: https://i.imgur.com/OLJxbaR.jpg
banner_img_height: 100 # available: 0 - 100
subtitle:
enable: true
auto_excerpt:
enable: true
length: 175
# available: _blank | _self
post_url_target: _self
length: 300
post_url_target: _self # available: _blank | _self
post_info:
enable: true

Expand All @@ -37,40 +35,33 @@ index:
#---------------------------
navbar:
menu:
enable: true
list:
archives: /archives/
about: /about/
icons:
enable: true
tips: 'See me here'
list:
github: https://github.com/
twitter: https://twitter.com/

Home: /
Archives: /archives/
About: /about/


#---------------------------
# 文章页
# Post Page
#---------------------------
post:
banner_img: /img/post-banner.jpg
# available: 0 - 100
banner_img_height: 70
# available: 1 | 2
layout: 2
banner_img: https://i.imgur.com/oADD1Ip.jpg
banner_img_height: 70 # available: 0 - 100
toc:
enable: true
# Code Highlight Theme available: github | tomorrow | tomorrow-night | tomorrow-night-eighties
highlight:
enable: true
theme: tomorrow-night-eighties
comments:
theme: tomorrow-night-eighties # available: github | tomorrow | tomorrow-night | tomorrow-night-eighties
copyright:
enable: true
type: disqus
content: 本博客所有文章除特别声明外,均采用 <a href="https://zh.wikipedia.org/wiki/Wikipedia:CC_BY-SA_3.0%E5%8D%8F%E8%AE%AE%E6%96%87%E6%9C%AC">CC BY-SA 3.0协议</a> 。转载请注明出处!
comments:
enable: false
type: disqus # available: disqus | valine

# Disqus
disqus:
shortname:
shortname: # your shortname

# Valine
# You can get your appid and appkey from https://leancloud.cn
Expand All @@ -92,30 +83,19 @@ valine:
# Archive Page
#---------------------------
archive:
banner_img: /img/archive-banner.jpg
# available: 0 - 100
banner_img_height: 70
banner_img: https://i.imgur.com/FNwWK1Y.jpg
banner_img_height: 80 # available: 0 - 100

#---------------------------
# 关于页
# About Page
#---------------------------
about:
banner_img: /img/about-banner.jpg
# available: 0 - 100
banner_img_height: 60
avatar: /img/avatar.jpg
banner_img: https://i.imgur.com/rVtDsho.png
banner_img_height: 80 # available: 0 - 100
avatar: https://i.imgur.com/ME3xK6V.jpg
name: myname
job: myjob
introduce: my info
extension:
introduce: info / info / info
icons:
github: https://github.com
twitter: https://twitter.com


#---------------------------
# 底部信息
# Footer
#---------------------------
footer: <b>多喝热水</b>
twitter: https://twitter.com
Empty file removed lanaguages/.gitkeep
Empty file.
60 changes: 28 additions & 32 deletions layout/_partial/footer.ejs
@@ -1,33 +1,29 @@
<footer class="footer footer-default">
<div class="container">
<div class="float-left" style="padding: 15px 0;">
<%- theme.footer %>
</div>
<div class="copyright float-right">
&copy;
<script>
document.write(new Date().getFullYear())
</script>&nbsp;<a href="https://hexo.io/zh-cn/" target="_blank">HEXO</a>&nbsp;<i class="material-icons">favorite_border</i>
<a href="https://github.com/invom/Material-T" target="_blank">Material-T</a>
</div>
</div>
<footer class="mt-5">
<div class="text-center py-3">
<a href="https://hexo.io" target="_blank"><b>HEXO</b></a>
<i class="iconfont icon-love"></i>
<a href="https://github.com/invom/Material-T" target="_blank"> <b>Material-T</b></a>
</div>
</footer>
<!-- Core JS Files -->
<%- js("/js/core/jquery.min.js?v=3.2.1") %>
<%- js("/js/main.js") %>
<%- js("/js/core/popper.min.js") %>
<%- js("/js/core/bootstrap-material-design.min.js") %>
<%- js("/js/plugins/moment.min.js") %>
<!-- Control Center for Material Kit: parallax effects, scripts for the example pages etc -->
<%- js("/js/material-kit.min.js?v=2.0.5") %>
<% if(is_post()){ %>
<script src="https://cdnjs.cloudflare.com/ajax/libs/tocbot/4.4.2/tocbot.min.js"></script>
<%- js("/js/post.js") %>
<%- js('/js/plugins/prettify.js') %>
<script>
$(document).ready(function(){
$('pre').addClass('prettyprint linenums');
prettyPrint();
})
</script>
<% } %>

<!-- SCRIPTS -->
<%- js("https://cdn.jsdelivr.net/npm/mdbootstrap@4.7.4/js/jquery-3.3.1.min.js") %>
<%- js("https://cdn.jsdelivr.net/npm/mdbootstrap@4.7.4/js/popper.min.js") %>
<%- js("https://cdn.jsdelivr.net/npm/mdbootstrap@4.7.4/js/bootstrap.min.js") %>
<%- js("https://cdn.jsdelivr.net/npm/mdbootstrap@4.7.4/js/mdb.min.js") %>
<%- js("js/main.js") %>
<% if(is_post()){ %>
<% if(theme.post.toc.enable){ %>
<%- js("https://cdnjs.cloudflare.com/ajax/libs/tocbot/4.4.2/tocbot.min.js") %>
<% } %>
<%- js("/js/post.js") %>
<% if(theme.post.highlight.enable){ %>
<%- js("js/plugins/prettify.js") %>
<script>
$(document).ready(function(){
$('pre').addClass('prettyprint linenums');
prettyPrint();
})
</script>
<% } %>
<% } %>
19 changes: 9 additions & 10 deletions layout/_partial/head.ejs
Expand Up @@ -10,19 +10,18 @@
<meta charset="utf-8" />
<link rel="apple-touch-icon" sizes="76x76" href="<%- url_for(theme.apple_touch_icon) %>">
<link rel="icon" type="image/png" href="<%- url_for(theme.favicon) %>">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no" name="viewport" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="description" content="<%= config.description %>">
<meta name="author" content="<%= config.author %>">
<meta name="keywords" content="<%= config.keywords %>">
<title><%= title %></title>
<%- css('css/Material_Icons.css') %>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css">
<%- css('css/main.css') %>
<% if(is_post()){ %>
<%- css('css/post.css') %>
<% if(theme.post.highlight.enable){ %>
<%- css('css/Prettify/'+theme.post.highlight.theme+'.min.css') %>
<% } %>
<%- css("https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.7.2/css/all.css") %>
<%- css('https://cdn.jsdelivr.net/npm/mdbootstrap@4.7.4/css/bootstrap.min.css') %>
<%- css('https://cdn.jsdelivr.net/npm/mdbootstrap@4.7.4/css/mdb.min.css') %>
<%- css('css/style.css') %>
<%- css("https://at.alicdn.com/t/font_1067060_vr10bjtg3us.css") %>
<% if(is_post() && theme.post.highlight.enable){ %>
<%- css('css/Prettify/'+theme.post.highlight.theme+'.min.css') %>
<% } %>
</head>
58 changes: 22 additions & 36 deletions layout/_partial/nav.ejs
@@ -1,37 +1,23 @@
<nav class="navbar navbar-transparent navbar-color-on-scroll fixed-top navbar-expand-lg" color-on-scroll="100" id="sectionsNav">
<div class="container">
<div class="navbar-translate">
<a class="navbar-brand" href="<%- url_for() %>">
<%= config.title %></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="sr-only">Toggle navigation</span>
<span class="navbar-toggler-icon"></span>
<span class="navbar-toggler-icon"></span>
<span class="navbar-toggler-icon"></span>
</button>
</div>
<div class="collapse navbar-collapse">
<ul class="navbar-nav ml-auto">
<% if(theme.navbar.menu.enable) { %>
<% for(var i in theme.navbar.menu.list) { %>
<li class="nav-item">
<a class="nav-link" href="<%- url_for(theme.navbar.menu.list[i]) %>">
<%= i %>
</a>
</li>
<% } %>
<% } %>
<% if(theme.navbar.icons.enable) { %>
<% for(var j in theme.navbar.icons.list) { %>
<li class="nav-item">
<a class="nav-link" rel="tooltip" title="" data-placement="bottom" href="<%- theme.navbar.icons.list[j] %>" target="_blank" data-original-title="<%= theme.navbar.icons.tips %>">
<i class="fa fa-<%= j %>"></i>
</a>
</li>
<% } %>
<% } %>
</ul>
</div>
<nav id="navbar" class="navbar fixed-top navbar-expand-lg navbar-dark scrolling-navbar">
<div class="container">
<a class="navbar-brand" href="<%- url_for() %>"><strong><%= config.title %></strong></a>

<button id="navbar-toggler-btn" class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<div class="animated-icon"><span></span><span></span><span></span></div>
</button>

<!-- Collapsible content -->
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ml-auto text-center">
<% for(var i in theme.navbar.menu) { %>
<li class="nav-item">
<a class="nav-link" href="<%- url_for(theme.navbar.menu[i]) %>"><%= i %></a>
</li>
<% } %>
</ul>
</div>
</nav>

</div>


</nav>
28 changes: 15 additions & 13 deletions layout/_partial/paginator.ejs
@@ -1,14 +1,16 @@
<% if (page.total > 1){ %>
<div class="text-center">
<% if(page.prev != 0) { %>
<a class="btn btn-primary btn-just-icon btn-round" href="<%- url_for(page.prev_link) %>">
<i class="material-icons">navigate_before</i>
</a>
<% } %>
<% if(page.next != 0) { %>
<a class="btn btn-primary btn-just-icon btn-round" href="<%- url_for(page.next_link) %>">
<i class="material-icons">navigate_next</i>
</a>
<% } %>
</div>
<% } %>
<nav aria-label="index posts navigation">
<ul class="pagination pg-blue justify-content-center mt-5">
<% if(page.prev != 0) { %>
<li class="page-item">
<a class="page-link" href="<%- url_for(page.prev_link) %>">Previous</a>
</li>
<% } %>
<% if(page.next != 0) { %>
<li class="page-item">
<a class="page-link" href="<%- url_for(page.next_link) %>">Next</a>
</li>
<% } %>
</ul>
</nav>
<% } %>

0 comments on commit 49c1a6c

Please sign in to comment.