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

Merge remote-tracking branch 'origin/master' into 0.6.1

Browse Source 
Conflicts:
	neoease/js/neoease.js
	neoease/js/neoease.min.js
	timeline/css/timeline.min.css
	timeline/js/timeline.min.js
This commit is contained in:
Liang Ding
2013-08-24 14:18:26 +08:00
parent e705c23e7f 02dd34d716
commit f9b7011838
93 changed files with 7294 additions and 1020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
timeline/css/timeline.css
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2010, 2011, 2012, B3log Team
/**
* Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
*/
/*
* timeline skin style.
*
@@ -980,4 +980,4 @@ article .article-title a {
bottom: 114px;
}
}
/* end responsive */
/* end responsive */