Merge pull request #31 from gigaSproule/master

Allow gravatar to be used for the images, about section to exist under the profile and able to hide the logo on the header
pull/33/head
ppoffice 2015-07-19 11:08:55 +08:00
commit 8b78173fa3
6 changed files with 68 additions and 25 deletions

19
.editorconfig Normal file
View File

@ -0,0 +1,19 @@
# EditorConfig is awesome: http://EditorConfig.org
# top-most EditorConfig file
root = true
# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true
# Matches multiple files with brace expansion notation
# Set default charset
[*.{js,py}]
charset = utf-8
# 4 space indentation
[{*.json,*.yml,*.styl,*.ejs}]
indent_style = space
indent_size = 2

2
.gitignore vendored
View File

@ -1 +1,3 @@
_config.yml _config.yml
*.iml
.idea

View File

@ -12,6 +12,8 @@ fancybox: true
# Profile # Profile
profile: true # whether to show profile bar profile: true # whether to show profile bar
gravatar: false # whether to use gravatar with the email
showlogo: false # whether to show the logo in the header
# Sidebar # Sidebar
sidebar: right # set to false if you don't want a sidebar sidebar: right # set to false if you don't want a sidebar

View File

@ -1,7 +1,7 @@
<header id="header"> <header id="header">
<div id="header-main" class="header-inner"> <div id="header-main" class="header-inner">
<div class="outer"> <div class="outer">
<a href="<%- url_for('.') %>" id="logo"><i class="logo"></i><span class="site-title"><%= config.title %></span></a> <a href="<%- url_for() %>" id="logo"><%=(theme.showlogo? '<i class="logo"></i>':'')%><span class="site-title"><%= config.title %></span></a>
<nav id="main-nav"> <nav id="main-nav">
<% for (var i in theme.menu){ %> <% for (var i in theme.menu){ %>
<a class="main-nav-link" href="<%- url_for(theme.menu[i]) %>"><%= i %></a> <a class="main-nav-link" href="<%- url_for(theme.menu[i]) %>"><%= i %></a>
@ -10,7 +10,7 @@
<% if(theme.profile) { %> <% if(theme.profile) { %>
<nav id="sub-nav"> <nav id="sub-nav">
<div class="profile" id="profile-nav"> <div class="profile" id="profile-nav">
<a id="profile-anchor" href="javascript:;"><img class="avatar" src="<%- url_for(config.avatar) %>"><i class="fa fa-caret-down"></i></a> <a id="profile-anchor" href="javascript:;"><img class="avatar" src="<%= ( theme.gravatar ? gravatar(theme.email) : url_for(config.avatar)) %>"><i class="fa fa-caret-down"></i></a>
</div> </div>
</nav> </nav>
<% } %> <% } %>

View File

@ -1,7 +1,7 @@
<aside id="profile"> <aside id="profile">
<div class="inner profile-inner"> <div class="inner profile-inner">
<div class="base-info profile-block"> <div class="base-info profile-block">
<img id="avatar" src="<%- url_for(config.avatar) %>"> <img id="avatar" src="<%= ( theme.gravatar ? gravatar(theme.email) : url_for(config.avatar)) %>">
<h2 id="name"><%= config.author %></h2> <h2 id="name"><%= config.author %></h2>
<h3 id="title"><%= config.author_title %></h3> <h3 id="title"><%= config.author_title %></h3>
<span id="location"><i class="fa fa-map-marker"></i><%= config.location %></span> <span id="location"><i class="fa fa-map-marker"></i><%= config.location %></span>
@ -28,5 +28,11 @@
</table> </table>
</div> </div>
<% } %> <% } %>
<% if(theme.about) { %>
<div class="article-info profile-block bio">
<h2>About</h2>
<p><%- theme.about %></p>
</div>
<% } %>
</div> </div>
</aside> </aside>

View File

@ -1,3 +1,17 @@
.bio
text-align: center
#profile .inner .bio h2
font-size: 1.3em
font-weight: bold
margin-top: 15px
#profile .inner .bio p
margin: 5px 20px 10px 20px
text-align: justify
max-width: 300px
line-height: 1.5em
.profile-block .profile-block
padding: 15px 20px padding: 15px 20px
border-bottom: 1px solid color-border border-bottom: 1px solid color-border