yexuejc/solo-skins
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #7 from b3log/0.6.0

Browse Source 
0.6.0
This commit is contained in:
Liang Ding 2013-04-26 10:22:27 -07:00
commit 00a8f79373
29 changed files with 1608 additions and 1445 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
andrea/macro-head.ftl
View File

@ -2,10 +2,11 @@
<meta charset="utf-8" />
<title>${title}</title>
<#nested>
<meta name="author" content="B3log Team" />
<meta name="generator" content="B3log" />
<meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log Solo" />
<meta name="owner" content="B3log Team" />
<meta name="revised" content="${blogTitle?html}, ${year}" />
<meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" />
<meta http-equiv="Window-target" content="_top" />
<link href='http://fonts.googleapis.com/css?family=Neucha' rel='stylesheet' type='text/css' charset="utf-8" />
<link href='http://fonts.googleapis.com/css?family=Reenie+Beanie' rel='stylesheet' type='text/css' charset="utf-8" />

2
andrea/skin.properties
View File

@ -22,5 +22,5 @@
name=Andrea
version=2.0.5
forSolo=0.5.6
forSolo=0.6.0
memo=Refers to http://www.madeincima.eu

7
classic/macro-head.ftl
View File

@ -2,10 +2,11 @@
<meta charset="utf-8" />
<title>${title}</title>
<#nested>
<meta name="author" content="B3log Team" />
<meta name="generator" content="B3log" />
<meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log Solo" />
<meta name="owner" content="B3log Team" />
<meta name="revised" content="${blogTitle?html}, ${year}" />
<meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" />
<meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />

2
classic/skin.properties
View File

@ -23,5 +23,5 @@
name=\u7ecf\u5178\u6de1\u84dd
version=2.0.5
forSolo=0.5.6
forSolo=0.6.0
memo=\u8fd9\u4e2a\u76ae\u80a4\u5f88\u4e11\u4e48\uff1f\u6211\u52d2\u4e2a\u53bb\u3002

7
community/macro-head.ftl
View File

@ -2,10 +2,11 @@
<meta charset="utf-8" />
<title>${title}</title>
<#nested>
<meta name="author" content="B3log Team" />
<meta name="generator" content="B3log" />
<meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log Solo" />
<meta name="owner" content="B3log Team" />
<meta name="revised" content="${blogTitle?html}, ${year}" />
<meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" />
<meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />

2
community/skin.properties
View File

@ -22,5 +22,5 @@
name=Community
version=2.0.5
forSolo=0.5.6
forSolo=0.6.0
memo=Refers to http://demo.woothemes.com/skeptical/

7
ease/macro-head.ftl
View File

@ -2,10 +2,11 @@
<meta charset="utf-8" />
<title>${title}</title>
<#nested>
<meta name="author" content="B3log Team" />
<meta name="generator" content="B3log" />
<meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log Solo" />
<meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" />
<meta name="owner" content="B3log Team" />
<meta name="revised" content="${blogTitle?html}, ${year}" />
<meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" />

4
ease/skin.properties
View File

@ -16,12 +16,12 @@
#
# Description: ease skin.
# Version: 1.0.0.4, Feb 4, 2013
# Version: 1.0.0.5, Apr 26, 2013
# Author: Liyuan Li
# Author: Liang Ding
#
name=ease
version=1.0.4
forSolo=0.5.6
forSolo=0.6.0
memo=\u56de\u5f52\u606c\u9759

7
favourite/macro-head.ftl
View File

@ -2,10 +2,11 @@
<meta charset="utf-8" />
<title>${title}</title>
<#nested>
<meta name="author" content="B3log Team" />
<meta name="generator" content="B3log" />
<meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log Solo" />
<meta name="owner" content="B3log Team" />
<meta name="revised" content="${blogTitle?html}, ${year}" />
<meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" />
<meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />

2
favourite/skin.properties
View File

@ -23,5 +23,5 @@
name=favourite
version=2.0.5
forSolo=0.5.6
forSolo=0.6.0
memo=Refers to http://www.iprimidieci.com/

7
i-nove/macro-head.ftl
View File

@ -2,10 +2,11 @@
<meta charset="utf-8" />
<title>${title}</title>
<#nested>
<meta name="author" content="B3log Team" />
<meta name="generator" content="B3log" />
<meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log Solo" />
<meta name="owner" content="B3log Team" />
<meta name="revised" content="${blogTitle?html}, ${year}" />
<meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" />
<meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />

2
i-nove/skin.properties
View File

@ -22,5 +22,5 @@
name=i-nove
version=2.0.5
forSolo=0.5.6
forSolo=0.6.0
memo=Refers to http://demo.neoease.com

7
mobile/macro-head.ftl
View File

@ -2,10 +2,11 @@
<meta charset="utf-8" />
<title>${title}</title>
<#nested>
<meta name="author" content="B3log Team" />
<meta name="generator" content="B3log" />
<meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log Solo" />
<meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" />
<meta name="owner" content="B3log Team" />
<meta name="revised" content="${blogTitle?html}, ${year}" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/themes/default/style.css?${staticResourceVersion}" charset="utf-8" />

4
mobile/skin.properties
View File

@ -16,11 +16,11 @@
#
# Description: Mobile skin.
# Version: 1.0.0.6, Feb 4, 2013
# Version: 1.0.0.7, Apr 26, 2013
# Author: Liang Ding
#
name=Mobile
version=0.1.5
forSolo=0.5.6
forSolo=0.6.0
memo=\u8bf7\u4e0d\u8981\u4ece\u90e8\u7f72\u76ee\u5f55\u4e2d\u5220\u9664\u8be5\u76ae\u80a4\uff0c\u5426\u5219\u79fb\u52a8\u8bbe\u5907\u8bbf\u95ee\u65f6\u535a\u5ba2\u5c06\u4e0d\u53ef\u7528\u3002

7
neoease/macro-head.ftl
View File

@ -2,10 +2,11 @@
<meta charset="utf-8" />
<title>${title}</title>
<#nested>
<meta name="author" content="B3log Team" />
<meta name="generator" content="B3log" />
<meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log Solo" />
<meta name="owner" content="B3log Team" />
<meta name="revised" content="${blogTitle?html}, ${year}" />
<meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" />
<meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" />

2
neoease/skin.properties
View File

@ -22,5 +22,5 @@
name=NeoEase
version=1.0.5
forSolo=0.5.6
forSolo=0.6.0
memo=http://www.neoease.com/

7
owmx-3.0/macro-head.ftl
View File

@ -2,10 +2,11 @@
<meta charset="utf-8" />
<title>${title}</title>
<#nested>
<meta name="author" content="B3log Team" />
<meta name="generator" content="B3log" />
<meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log Solo" />
<meta name="owner" content="B3log Team" />
<meta name="revised" content="${blogTitle?html}, ${year}" />
<meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" />
<meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />

7
owmx-3.0/skin.properties
View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
#
# Copyright (C) 2011, B3log Team
#
@ -21,6 +22,6 @@
#
name=owmx-3.0
version=2.0.6
forSolo=0.5.6
memo=Refers to http://dx.b3log.org
version=2.0.5
forSolo=0.6.0
memo=Refers to http://lightdian.b3log.org

2
timeline/article.ftl
View File

@ -81,7 +81,7 @@
<#if previousArticlePermalink??>
<div class="right">
<a href="${servePath}${previousArticlePermalink}">
${previousArticleTitle}
<span class="left">${previousArticleTitle}</span>
<span class="ico-next">»</span>
</a>
</div>

18
timeline/css/timeline.css
View File

@ -17,7 +17,7 @@
* timeline skin style.
*
* @author <a href="mailto:LLY219@gmail.com">Liyuan Li</a>
* @version 1.0.1.0, Jan 30, 2013
* @version 1.0.1.1, Feb 20, 2013
*/
/* start reset */
html, body {
@ -414,6 +414,13 @@ a:hover > .ico-pre {
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.7);
}
.header .sub-title {
float: left;
max-width: 574px;
white-space: normal;
word-wrap: break-word;
}
.header li a {
color: #444;
padding: 17px;
@ -514,6 +521,15 @@ a:hover > .ico-pre {
right: inherit
}
.articles pre {
background-color: #F5F5F5;
border: 1px solid #ddd;
border-radius: 4px 4px 4px 4px;
padding: 9.5px;
white-space: pre-wrap;
word-wrap: break-word;
}
time.article-time {
top: -8px;
left: 50%;

2
timeline/css/timeline.min.css vendored
View File

@ -63,6 +63,7 @@ a:hover>.ico-next,a:hover>.ico-pre{background-color:#000;}
.footer a:hover{text-decoration:underline;}
.header .title{font-size:150%;margin:3px 0 0;}
.header .title a{color:#414141;text-shadow:0 1px 0 rgba(255, 255, 255, 0.7);}
.header .sub-title{float:left;max-width:574px;white-space:normal;word-wrap:break-word;}
.header li a{color:#444;padding:17px;line-height:20px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.7);white-space:nowrap;}
.header li a.current{border-bottom:2px solid #D26911;}
.header a:hover{color:#000;}
@ -79,6 +80,7 @@ a:hover>.ico-next,a:hover>.ico-pre{background-color:#000;}
.articles .r .dot{left:-37px;right:inherit;}
.articles .arrow{height:15px;position:absolute;right:-9px;top:21px;width:9px;}
.articles .r .arrow{background-position:0 -22px;left:-9px;right:inherit;}
.articles pre{background-color:#F5F5F5;border:1px solid #ddd;border-radius:4px 4px 4px 4px;padding:9.5px;white-space:pre-wrap;word-wrap:break-word;}
time.article-time{top:-8px;left:50%;position:absolute;}
time.article-time>span{background-color:#FFFFFF;border:1px solid #A8A9A9;border-radius:20em 20em 20em 20em;font-size:80%;margin-left:-56px;padding:5px 10px;}
article .article-title{margin:10px 0 0 0;}

2
timeline/footer.ftl
View File

@ -7,7 +7,7 @@
${b3logLabel}&nbsp;
<b style="color: orangered;">Solo</b></a>,
ver ${version}&nbsp;&nbsp;
Theme by <a rel="friend" rel="friend" href="http://vanessa.b3log.org" target="_blank">Vanessa</a>.
Theme by <a rel="friend" target="_blank" href="http://themify.me/demo/themes/postline/">Postline</a> & <a rel="friend" href="http://vanessa.b3log.org" target="_blank">Vanessa</a>.
</div>
<div class="right fn-clear">
<span class="left">

2
timeline/header.ftl
View File

@ -16,7 +16,7 @@
${blogTitle}
</a>
</h1>
<span>${blogSubtitle}</span>
<span class="sub-title">${blogSubtitle}</span>
</div>
<ul class="left">
<#list pageNavigations as page>

153
timeline/js/timeline.js
View File

@ -18,7 +18,7 @@
* @fileoverview timeline js.
*
* @author <a href="mailto:LLY219@gmail.com">Liyuan Li</a>
* @version 1.0.1.0, Jan 30, 2013
* @version 1.0.1.1, Feb 20, 2013
*/
var timeline = {
_COLHA: 0,
@ -35,7 +35,7 @@ var timeline = {
var $it = $(this),
isLeft = colH[1] > colH[0],
top = isLeft ? colH[0] : colH[1];
if (!$it.hasClass("r") && !$it.hasClass("l")) {
if (parseInt($it.css("top")) !== top) {
$it.css({
"top": top + "px",
"position": "absolute"
@ -53,9 +53,10 @@ var timeline = {
$articles.height(colH[0] > colH[1] ? colH[0] : colH[1]);
});
setTimeout(function () {
$(window).resize();
}, 500);
$(".module img").imagesLoaded(function () {
$(window).resize();
});
},
@ -96,7 +97,7 @@ var timeline = {
isLeft = colH[1] > colH[0],
top = isLeft ? colH[0] : colH[1];
if (!$it.hasClass("r") && !$it.hasClass("l")) {
if (parseInt($it.css("top")) !== top) {
$it.css({
"top": top + "px",
"position": "absolute"
@ -115,9 +116,10 @@ var timeline = {
});
});
setTimeout(function () {
$(window).resize();
}, 500);
$(".module img").imagesLoaded(function () {
$(window).resize();
});
},
_setNavCurrent: function () {
@ -250,9 +252,10 @@ var timeline = {
$more.css("background", "none #60829F").text(Label.moreLabel);
}
setTimeout(function () {
$(window).resize();
}, 500);
$(".module img").imagesLoaded(function () {
$(window).resize();
});
}
});
},
@ -282,9 +285,139 @@ var timeline = {
}
};
/*!
* jQuery imagesLoaded plugin v2.1.1
* http://github.com/desandro/imagesloaded
*
* MIT License. by Paul Irish et al.
*/
/*jshint curly: true, eqeqeq: true, noempty: true, strict: true, undef: true, browser: true */
/*global jQuery: false */
;
(function($, undefined) {
'use strict';
// blank image data-uri bypasses webkit log warning (thx doug jones)
var BLANK = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==';
$.fn.imagesLoaded = function( callback ) {
var $this = this,
deferred = $.isFunction($.Deferred) ? $.Deferred() : 0,
hasNotify = $.isFunction(deferred.notify),
$images = $this.find('img').add( $this.filter('img') ),
loaded = [],
proper = [],
broken = [];
// Register deferred callbacks
if ($.isPlainObject(callback)) {
$.each(callback, function (key, value) {
if (key === 'callback') {
callback = value;
} else if (deferred) {
deferred[key](value);
}
});
}
function doneLoading() {
var $proper = $(proper),
$broken = $(broken);
if ( deferred ) {
if ( broken.length ) {
deferred.reject( $images, $proper, $broken );
} else {
deferred.resolve( $images );
}
}
if ( $.isFunction( callback ) ) {
callback.call( $this, $images, $proper, $broken );
}
}
function imgLoadedHandler( event ) {
imgLoaded( event.target, event.type === 'error' );
}
function imgLoaded( img, isBroken ) {
// don't proceed if BLANK image, or image is already loaded
if ( img.src === BLANK || $.inArray( img, loaded ) !== -1 ) {
return;
}
// store element in loaded images array
loaded.push( img );
// keep track of broken and properly loaded images
if ( isBroken ) {
broken.push( img );
} else {
proper.push( img );
}
// cache image and its state for future calls
$.data( img, 'imagesLoaded', {
isBroken: isBroken,
src: img.src
} );
// trigger deferred progress method if present
if ( hasNotify ) {
deferred.notifyWith( $(img), [ isBroken, $images, $(proper), $(broken) ] );
}
// call doneLoading and clean listeners if all images are loaded
if ( $images.length === loaded.length ) {
setTimeout( doneLoading );
$images.unbind( '.imagesLoaded', imgLoadedHandler );
}
}
// if no images, trigger immediately
if ( !$images.length ) {
doneLoading();
} else {
$images.bind( 'load.imagesLoaded error.imagesLoaded', imgLoadedHandler )
.each( function( i, el ) {
var src = el.src;
// find out if this image has been already checked for status
// if it was, and src has not changed, call imgLoaded on it
var cached = $.data( el, 'imagesLoaded' );
if ( cached && cached.src === src ) {
imgLoaded( el, cached.isBroken );
return;
}
// if complete is true and browser supports natural sizes, try
// to check for image status manually
if ( el.complete && el.naturalWidth !== undefined ) {
imgLoaded( el, el.naturalWidth === 0 || el.naturalHeight === 0 );
return;
}
// cached images don't fire load sometimes, so we reset src, but only when
// dealing with IE, or image is complete (loaded) and failed manual check
// webkit hack from http://groups.google.com/group/jquery-dev/browse_thread/thread/eee6ab7b2da50e1f
if ( el.readyState || el.complete ) {
el.src = BLANK;
el.src = src;
}
});
}
return deferred ? deferred.promise( $this ) : $this;
};
})(jQuery);
(function () {
Util.init();
Util.replaceSideEm($(".recent-comments-content"));
Util.replaceSideEm($(".comments .article-body"));
Util.buildTags("tagsSide");
timeline.init();

4
timeline/js/timeline.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
timeline/macro-head.ftl
View File

@ -2,10 +2,11 @@
<meta charset="utf-8" />
<title>${title}</title>
<#nested>
<meta name="author" content="B3log Team" />
<meta name="generator" content="B3log" />
<meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log Solo" />
<meta name="owner" content="B3log Team" />
<meta name="revised" content="${blogTitle?html}, ${year}" />
<meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" />
<meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" />

2
timeline/skin.properties
View File

@ -22,6 +22,6 @@
name=timeline
version=1.0.1
forSolo=0.5.6
forSolo=0.6.0
memo=\u65f6\u5149\u6d41\u901d
note=\u6b64\u76ae\u80a4\u5ffd\u7565\u66f4\u65b0\u3001\u7f6e\u9876\u6392\u5e8f

7
tree-house/macro-head.ftl
View File

@ -2,10 +2,11 @@
<meta charset="utf-8" />
<title>${title}</title>
<#nested>
<meta name="author" content="B3log Team" />
<meta name="generator" content="B3log" />
<meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log Solo" />
<meta name="owner" content="B3log Team" />
<meta name="revised" content="${blogTitle?html}, ${year}" />
<meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" />
<meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />

2
tree-house/skin.properties
View File

@ -22,5 +22,5 @@
name=Tree House
version=2.0.5
forSolo=0.5.6
forSolo=0.6.0
memo=Refers to http://www.thepixel.com/blog