diff --git a/README.md b/README.md index d138b00..cff2c04 100644 --- a/README.md +++ b/README.md @@ -18,17 +18,16 @@ bower install * index page : 90% * post page : 80% * archive page: 50% -While all pages can be rendered, there are still lots of details that can be cover. + While all pages can be rendered, there are still lots of details that can be cover. ***Main todos***: - [ ] SEO for post page - [ ] Beautify post page - [ ] Analysis plugins -- [-] Share plugins +- [x] Share plugins - [ ] Comment plugins - [ ] Customization -- [ ] docs - +- [ ] Docs ## Config ### theme variables Setting those variables in `pteris/_config.yml` diff --git a/README.zh.md b/README.zh.md index 73fa183..745206b 100644 --- a/README.zh.md +++ b/README.zh.md @@ -8,7 +8,7 @@ **亮点** - 简洁漂亮的材料设计 - 刚刚好的布局尺寸及排版 -- 2017年度色 草绿色 配色 +- 2017年度色 草木绿 配色 - 导航栏适时隐藏,不遮盖内容 - 流畅的过渡动画 diff --git a/_config.yml b/_config.yml index 9ec76ea..a8eb2a2 100644 --- a/_config.yml +++ b/_config.yml @@ -4,7 +4,6 @@ language: en # main menu navigation menu: Home: / - About: /about Archives: /archives diff --git a/gulpfile.js b/gulpfile.js new file mode 100644 index 0000000..876c84d --- /dev/null +++ b/gulpfile.js @@ -0,0 +1,15 @@ +// Sass configuration +var gulp = require('gulp'); +var sass = require('gulp-sass'); + +gulp.task('sass', function () { + gulp.src('*.scss') + .pipe(sass()) + .pipe(gulp.dest(function (f) { + return f.base; + })) +}); + +gulp.task('default', ['sass'], function () { + gulp.watch('*.scss', ['sass']); +}) \ No newline at end of file diff --git a/layout/partial/parallax.njk b/layout/partial/parallax.njk index 9e330b2..910c6e8 100644 --- a/layout/partial/parallax.njk +++ b/layout/partial/parallax.njk @@ -23,7 +23,7 @@ {% if theme.headerImageUrl %} {% else %} -
+
{% endif %} \ No newline at end of file diff --git a/source/css/pteris.css b/source/css/pteris.css index ddfa25e..5c33e88 100644 --- a/source/css/pteris.css +++ b/source/css/pteris.css @@ -9,16 +9,16 @@ main { flex: 1 0 auto; } #logo-container { - -webkit-text-fill-color: #009688; } + -webkit-text-fill-color: #93b658; } #logo-container .brand-logo { - color: #608b70; } + color: #00ab6b; } nav ul a { - color: #608b70; } + color: #00ab6b; } a { - color: #009688; } + color: #93b658; } .header-fixed { position: fixed; @@ -44,10 +44,10 @@ a { width: 100%; } .pagination li.active { - background-color: #608b70; } + background-color: #00ab6b; } footer.page-footer { - background-color: #009688; } + background-color: #93b658; } footer a { color: whitesmoke; } @@ -76,7 +76,7 @@ footer a { margin-bottom: 2rem; } .pagination .page-number.current { color: #fff; - background: #608b70; + background: #93b658; border-top-color: #ccc; } .pagination .prev, .pagination .next, .pagination .page-number { transition-property: border-color; diff --git a/source/css/pteris.sass b/source/css/pteris.sass index 061bfa9..689c0d4 100644 --- a/source/css/pteris.sass +++ b/source/css/pteris.sass @@ -1,5 +1,5 @@ -$color-primary: #009688 -$color-secondary: #608b70 +$color-primary: #93b658 +$color-secondary: #00ab6b $color-accent: #53c34a body @@ -83,7 +83,7 @@ footer a margin-bottom: 2rem .page-number.current color: #fff - background: $color-secondary + background: $color-primary border-top-color: #ccc .prev, .next, .page-number