Skip to content

Commit 83df8ee

Browse files
author
BruceZhao
committed
Merge pull request Huxpro#1 from Huxpro/master
update form fork
2 parents c2c04f5 + 3d5ecad commit 83df8ee

File tree

10 files changed

+290
-7
lines changed

10 files changed

+290
-7
lines changed

README.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@
55
![](http://huangxuan.me/img/blog-desktop.jpg)
66

77

8+
### "Page Build Warning" email
9+
10+
These days, some of you must receive a "Page Build Warning" email from github after you commit happily. **Don't Worried!** It just that github changes its build environment.
11+
12+
In this mail, github told us:
13+
14+
> You are attempting to use the 'pygments' highlighter, which is currently unsupported on GitHub Pages. Your site will use 'rouge' for highlighting instead. To suppress this warning, change the 'highlighter' value to 'rouge' in your '_config.yml'.
15+
16+
So, just edit `_config.yml`, find `highlighter: pygments`, change it to `highlighter: rouge` and the warning will be gone.
17+
818

919
## Boilerplate (beta)
1020

@@ -25,8 +35,8 @@ $ git clone [email protected]:Huxpro/huxblog-boilerplate.git
2535

2636
##### New Feature (V1.5.2)
2737

28-
- Annoyed to delete my blog post after clone or pull? **Boilerplate** comes to help you get started quickly and easily merge update.
29-
- `-apple-system` is added in font rule, which display beautiful new font **San Francisco** in iOS 9 by default.
38+
- Annoyed to delete my blog post after clone or pull? **Boilerplate** comes to help you get started quickly and easily merge update.
39+
- `-apple-system` is added in font rule, which display beautiful new font **San Francisco** in iOS 9 by default.
3040
- Fixed [issue#15](https://github.com/Huxpro/huxpro.github.io/issues/15) about code wrap.
3141

3242
##### New Feature (V1.5.1)

_config.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,21 @@ facebook_username: huxpro
2121

2222

2323
# Build settings
24-
highlighter: pygments
24+
# from 2016, 'pygments' is unsupported on GitHub Pages. Use 'rouge' for highlighting instead.
25+
highlighter: rouge
2526
permalink: pretty
2627
paginate: 10
2728
exclude: ["less","node_modules","Gruntfile.js","package.json","README.md"]
2829
anchorjs: true # if you want to customize anchor. check out line:181 of `post.html`
2930

3031

3132

33+
# Gems
34+
# from PR#40, to support local preview for Jekyll 3.0
35+
gems: [jekyll-paginate]
36+
37+
38+
3239
# Markdown settings
3340
# replace redcarpet to kramdown,
3441
# although redcarpet can auto highlight code, the lack of header-id make the catalog impossible, so I switch to kramdown

_layouts/post.html

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,21 @@
99
<!-- Post Header -->
1010
<style type="text/css">
1111
header.intro-header{
12+
position: relative;
1213
background-image: url('{{ site.baseurl }}/{% if page.header-img %}{{ page.header-img }}{% else %}{{ site.header-img }}{% endif %}')
1314
}
15+
16+
{% if page.header-mask %}
17+
header.intro-header .header-mask{
18+
width: 100%;
19+
height: 100%;
20+
position: absolute;
21+
background: rgba(0,0,0, {{ page.header-mask }});
22+
}
23+
{% endif %}
1424
</style>
1525
<header class="intro-header" >
26+
<div class="header-mask"></div>
1627
<div class="container">
1728
<div class="row">
1829
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">

_posts/2015-10-28-how-designer-learn-fe.markdown

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ tags:
1111
- UX Design
1212
---
1313

14-
> 这篇文章转载自[我在知乎上的回答](https://www.zhihu.com/question/21921588/answer/69680480)
15-
> 这篇文章也被刊登于[优秀网页设计](http://www.uisdc.com/head-first-front-end)等多个网站上
14+
> 这篇文章转载自[我在知乎上的回答](https://www.zhihu.com/question/21921588/answer/69680480),也被刊登于[优秀网页设计](http://www.uisdc.com/head-first-front-end)等多个网站上 ;)
1615
1716

1817
<div>

_posts/2016-02-01-React-vs-Angular2.markdown

Lines changed: 241 additions & 0 deletions
Large diffs are not rendered by default.

about.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</select>
1313

1414
<!-- Chinese Version -->
15-
<div class="zh">
15+
<div class="zh post-container">
1616

1717
<!--copied from markdown -->
1818
<blockquote><p>写写代码,做做设计,看看产品。<br>
@@ -41,7 +41,7 @@ <h5>Resumes</h5>
4141
</div>
4242

4343
<!-- English Version -->
44-
<div class="en">
44+
<div class="en post-container">
4545
<blockquote><p>Yet another Frontend Engineer. <br>
4646
Yet another Lifelong Designer.</p></blockquote>
4747

css/hux-blog.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*!
2+
* Hux Blog v1.0.0 (http://huxpro.github.io)
3+
* Copyright 2016 Hux <[email protected]>
4+
*/
5+
16
@media (min-width: 1200px) {
27
.post-container,
38
.sidebar-container {

css/hux-blog.min.css

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

img/post-bg-re-vs-ng2.jpg

346 KB
Loading

js/hux-blog.min.js

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)