Skip to content

Commit

Permalink
Update Theme
Browse files Browse the repository at this point in the history
  • Loading branch information
stunstunstun committed May 19, 2017
1 parent 817a667 commit 745ed2c
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 52 deletions.
2 changes: 0 additions & 2 deletions _config.yml
Expand Up @@ -10,8 +10,6 @@ logo: /logo.png

# Comment
disqus: holaxapps
duoshuo:
cloudTie:

# Analytics
# google-analytics:
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
Expand Up @@ -10,6 +10,6 @@ gulp.task('sass', function() {
});

gulp.task('default', ['sass'], function() {
gulp.watch('./source/scss/_partial/*.scss', ['sass']);
gulp.watch('./source/scss/*.scss', ['sass']);
gulp.watch('./source/scss/_partial/*.scss', ['sass']);
});
4 changes: 2 additions & 2 deletions layout/archive.pug
@@ -1,13 +1,13 @@
extends base.pug

block site_title
config.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")
meta(name="og:image", content=config.logo)

block container
include mixins/post.pug
Expand Down
6 changes: 3 additions & 3 deletions layout/index.pug
@@ -1,13 +1,13 @@
extends base.pug

block site_title
config.title
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")
meta(name="og:image", content=config.logo)

block container
include mixins/post.pug
Expand Down
3 changes: 2 additions & 1 deletion layout/mixins/post.pug
@@ -1,7 +1,8 @@
mixin postInfo(item)
.post-info
!= full_date(item.date, 'll')

//- span categories
//- Index Page
mixin posts
ul.home.post-list
Expand Down
28 changes: 0 additions & 28 deletions layout/partial/comment.pug
@@ -1,17 +1,3 @@
if theme.duoshuo
.ds-thread(data-thread-key=page.path, data-title=page.title, data-url=page.permalink, data-author-key='1')
script.
var duoshuoQuery = {short_name:"#{theme.duoshuo}"};
(function() {
var ds = document.createElement('script');
ds.type = 'text/javascript';ds.async = true;
ds.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') + '//static.duoshuo.com/embed.js';
ds.charset = 'UTF-8';
(document.getElementsByTagName('head')[0]
|| document.getElementsByTagName('body')[0]).appendChild(ds);
})();


if theme.disqus
#disqus_thread
script.
Expand All @@ -25,17 +11,3 @@ if theme.disqus
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})();
script(id='dsq-count-scr' src='//#{theme.disqus}.disqus.com/count.js' async)


if theme.cloudTie
#cloud-tie-wrapper.cloud-tie-wrapper
script(src='https://img1.cache.netease.com/f2e/tie/yun/sdk/loader.js')
script.
var cloudTieConfig = {
url: document.location.href,
sourceId: "#{page.path}",
productKey: "#{theme.cloudTie}",
target: "cloud-tie-wrapper"
};
var yunManualLoad = true;
Tie.loader("aHR0cHM6Ly9hcGkuZ2VudGllLjE2My5jb20vcGMvbGl2ZXNjcmlwdC5odG1s", true);
2 changes: 1 addition & 1 deletion layout/post.pug
Expand Up @@ -5,7 +5,7 @@ block site_title

block description
- var desc = page.desc || config.description;
- var image = page.image || config.url + '/logo.png';
- var image = page.image || config.url + config.logo;
meta(name="description", content=desc)
meta(name="og:title", content=page.title)
meta(name="og:description", content=desc)
Expand Down
3 changes: 2 additions & 1 deletion package.json
Expand Up @@ -24,6 +24,7 @@
"devDependencies": {
"gulp": "^3.9.1",
"gulp-autoprefixer": "^3.1.1",
"gulp-sass": "^2.3.2"
"gulp-sass": "^2.3.2",
"gulp-pug": "^3.3.0"
}
}
2 changes: 1 addition & 1 deletion source/css/apollo.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion source/scss/_partial/base.scss
Expand Up @@ -50,7 +50,7 @@ hr {
code {
margin: 0 2px;
padding: 3px 5px;
color: #e96900;
color: rgba(0, 0, 0, 0.8);
border-radius: 2px;
white-space: inherit;
}
Expand Down
19 changes: 8 additions & 11 deletions source/scss/_partial/post.scss
Expand Up @@ -7,17 +7,14 @@

.post-info {
color: #7f8c8d;
margin-bottom: 2em;
margin-bottom: 1em;
span {
margin-left: 0.5rem;
}
a.post-from {
margin-left: 0.5rem;
padding: 3px 6px;
border-radius: 5px;
font-size: 12px;
color: white;
background-color: #E36B6B;
margin-left: 5px;
padding: 3px 5px;
background-color: rgba(0, 0, 0, 0.05);
color: rgba(0, 0, 0, 0.6);
border-radius: 4px;
white-space: inherit;
}
}
}
Expand All @@ -28,7 +25,7 @@
margin: 35px 0 0 0;
a:before {
content: "#";
color: #ce1458;
color: rgba(0, 0, 0, 0.8);
position: absolute;
left: -0.8em;
top: -0.15em;
Expand Down

0 comments on commit 745ed2c

Please sign in to comment.