Merge pull request #14 from atika/master

Some additionals options
pull/19/merge
ppoffice 2015-05-27 21:55:44 +08:00
commit 34252daf17
8 changed files with 45 additions and 9 deletions

View File

@ -18,6 +18,9 @@ widgets:
- archive - archive
thumbnail: true thumbnail: true
# Additional Stylesheet
customstylesheet: 'custom'
# Contacts # Contacts
contacts: contacts:
github: http://github.com/ppoffice github: http://github.com/ppoffice

View File

@ -1,5 +1,8 @@
<article id="<%= post.layout %>-<%= post.slug %>" class="article article-type-<%= post.layout %>" itemscope itemprop="blogPost"> <article id="<%= post.layout %>-<%= post.slug %>" class="article article-type-<%= post.layout %>" itemscope itemprop="blogPost">
<div class="article-inner"> <div class="article-inner">
<% if (post.banner){ %>
<%- partial('post/banner') %>
<% } %>
<%- partial('post/gallery') %> <%- partial('post/gallery') %>
<% if (post.link || post.title){ %> <% if (post.link || post.title){ %>
<header class="article-header"> <header class="article-header">

View File

@ -33,4 +33,7 @@
<%- css('css/style') %> <%- css('css/style') %>
<%- css('font-awesome/css/font-awesome.min') %> <%- css('font-awesome/css/font-awesome.min') %>
<%- partial('google-analytics') %> <%- partial('google-analytics') %>
<% if( theme.customstylesheet ){ %>
<%- css('css/'+theme.customstylesheet) %>
<% } %>
</head> </head>

View File

@ -0,0 +1,10 @@
<% if (post.link){ %>
<a href="<%- url_for(post.link) %>" target="_blank" itemprop="url"><img src="<%- post.banner %>" class="article-banner"></a>
<% } else if (post.title){ %>
<% if (index){ %>
<a href="<%- url_for(post.path) %>" itemprop="url"><img src="<%- post.banner %>" class="article-banner"></a>
<% } else { %>
<img src="<%- post.banner %>" class="article-banner">
<% } %>
<% } %>

View File

@ -1,12 +1,19 @@
<a href="<%- url_for((post.link?post.link:post.path)) %>" class="thumbnail"> <a href="<%- url_for((post.link?post.link:post.path)) %>" class="thumbnail">
<% <%
var img=/\<img\s.*?\s?src\s*=\s*['|"]?([^\s'"]+).*?\>/ig;
var result = post.content.match(img);
var s = ""; var s = "";
result = img.exec(post.content);
if(result != null) { if (post.thumbnail){
for(var i = result.length -1; i; --i){ s = post.thumbnail;
s += result[i]+"\n"; }else if (post.banner){
s = post.banner;
}else{
var img=/\<img\s.*?\s?src\s*=\s*['|"]?([^\s'"]+).*?\>/ig;
var result = post.content.match(img);
result = img.exec(post.content);
if(result != null) {
for(var i = result.length -1; i; --i){
s += result[i]+"\n";
}
} }
} }
if(s.length > 0){ if(s.length > 0){

View File

@ -1,6 +1,6 @@
<% if (site.posts.length){ %> <% if (site.posts.length){ %>
<div class="widget-wrap widget-list"> <div class="widget-wrap widget-list">
<h3 class="widget-title"><%= __('sidebar.links') %></h3> <h3 class="widget-title"><%= __('widget.links') %></h3>
<div class="widget"> <div class="widget">
<ul> <ul>
<% for (var i in theme.links){ %> <% for (var i in theme.links){ %>

View File

@ -5,15 +5,19 @@
@extend $block @extend $block
overflow: hidden overflow: hidden
.article-banner
width:100%
height:auto
.article-meta .article-meta
clearfix() clearfix()
& > div & > div
margin-bottom: 5px margin-bottom: 5px
.article-date, .article-category .article-date, .article-category
margin-right: 10px margin-right: 10px
color: color-default color: color-default + #444
a a
color: color-default color: color-default + #444
&:hover &:hover
color: color-link color: color-link

View File

@ -80,11 +80,17 @@ $line-numbers
.gist-data .gist-data
background: none background: none
border: none border: none
table
background: none
.pl-vo
color:#FFF
.line-numbers .line-numbers
@extend $line-numbers @extend $line-numbers
background: none background: none
border: none border: none
padding: 0 20px 0 0 padding: 0 20px 0 0
height: font-size * line-height
vertical-align: top
.line-data .line-data
padding: 0 !important padding: 0 !important
.highlight .highlight