Skip to content

S
solo
Commit 5eb82728 authored by D's avatar D Committed by GitHub
Browse files
Options

Merge branch 'master' into master

parents 8ef3aa92 523b7a62
Expand all Show whitespace changes
Inline Side-by-side
Showing with 267 additions and 101 deletions
nb-configuration.xml deleted 100644 → 0
View file @ 8ef3aa92
<?xml version="1.0" encoding="UTF-8"?>
<project-shared-configuration>
<!--
This file contains additional configuration written by modules in the NetBeans IDE.
The configuration is intended to be shared among all the users of project and
therefore it is assumed to be part of version control checkout.
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-->
<spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1">
<word>admin</word>
<word>Favicon</word>
<word>servlet</word>
</spellchecker-wordlist>
</project-shared-configuration>
src/main/webapp/WEB-INF/static-resources.xml
View file @ 5eb82728
......@@ -19,83 +19,88 @@
<!--
Description: Static resources definition.
Version: 2.7.5.6, Aug 26, 2016
Version: 2.7.6.6, Dec 10, 2016
Author: Liang Ding
-->
<static-files>
<!-- Uses the STANDARD Ant Path Pattern to configure these paths! -->
<include path="/favicon.ico" />
<include path="/favicon.png" />
<include path="/robots.txt" />
<include path="/favicon.ico"/>
<include path="/favicon.png"/>
<include path="/robots.txt"/>
<include path="/js/**.js" />
<include path="/js/**/*.js" />
<include path="/js/**.css" />
<include path="/js/**/*.css" />
<include path="/js/**.htm" />
<include path="/js/**/*.htm" />
<include path="/js/**.html" />
<include path="/js/**/*.html" />
<include path="/js/**.gif" />
<include path="/js/**/*.gif" />
<include path="/js/**.png" />
<include path="/js/**/*.png" />
<include path="/js/**.jpg" />
<include path="/js/**/*.jpg" />
<include path="/js/**.js"/>
<include path="/js/**/*.js"/>
<include path="/js/**.css"/>
<include path="/js/**/*.css"/>
<include path="/js/**.htm"/>
<include path="/js/**/*.htm"/>
<include path="/js/**.html"/>
<include path="/js/**/*.html"/>
<include path="/js/**.gif"/>
<include path="/js/**/*.gif"/>
<include path="/js/**.png"/>
<include path="/js/**/*.png"/>
<include path="/js/**.jpg"/>
<include path="/js/**/*.jpg"/>
<include path="/js/**/*.swf"/>
<include path="/js/**/*.eot"/>
<include path="/js/**/*.svg"/>
<include path="/js/**/*.ttf"/>
<include path="/js/**/*.woff"/>
<include path="/skins/**.css" />
<include path="/skins/**.css.map" />
<include path="/skins/**/*.css" />
<include path="/skins/**/*.css.map" />
<include path="/skins/**.js" />
<include path="/skins/**/*.js" />
<include path="/skins/**.png" />
<include path="/skins/**/*.png" />
<include path="/skins/**.jpg" />
<include path="/skins/**/*.jpg" />
<include path="/skins/**.swf" />
<include path="/skins/**/*.swf" />
<include path="/skins/**.gif" />
<include path="/skins/**/*.gif" />
<include path="/skins/**/*.eot" />
<include path="/skins/**/*.svg" />
<include path="/skins/**/*.ttf" />
<include path="/skins/**/*.woff" />
<include path="/skins/**.css"/>
<include path="/skins/**.css.map"/>
<include path="/skins/**/*.css"/>
<include path="/skins/**/*.css.map"/>
<include path="/skins/**.js"/>
<include path="/skins/**/*.js"/>
<include path="/skins/**.png"/>
<include path="/skins/**/*.png"/>
<include path="/skins/**.jpg"/>
<include path="/skins/**/*.jpg"/>
<include path="/skins/**.swf"/>
<include path="/skins/**/*.swf"/>
<include path="/skins/**.gif"/>
<include path="/skins/**/*.gif"/>
<include path="/skins/**/*.eot"/>
<include path="/skins/**/*.svg"/>
<include path="/skins/**/*.ttf"/>
<include path="/skins/**/*.woff"/>
<include path="/css/**.css" />
<include path="/css/**/*.css" />
<include path="/css/fonts/*.eot" />
<include path="/css/fonts/*.svg" />
<include path="/css/fonts/*.ttf" />
<include path="/css/fonts/*.woff" />
<include path="/css/**.css"/>
<include path="/css/**/*.css"/>
<include path="/css/fonts/*.eot"/>
<include path="/css/fonts/*.svg"/>
<include path="/css/fonts/*.ttf"/>
<include path="/css/fonts/*.woff"/>
<include path="/images/**.png" />
<include path="/images/**/*.png" />
<include path="/images/**.jpg" />
<include path="/images/**/*.jpg" />
<include path="/images/**.gif" />
<include path="/images/**/*.gif" />
<include path="/images/**.png"/>
<include path="/images/**/*.png"/>
<include path="/images/**.jpg"/>
<include path="/images/**/*.jpg"/>
<include path="/images/**.gif"/>
<include path="/images/**/*.gif"/>
<include path="/plugins/**.css" />
<include path="/plugins/**/*.css" />
<include path="/plugins/**.js" />
<include path="/plugins/**/*.js" />
<include path="/plugins/**.png" />
<include path="/plugins/**/*.png" />
<include path="/plugins/**.jpg" />
<include path="/plugins/**/*.jpg" />
<include path="/plugins/**.swf" />
<include path="/plugins/**/*.swf" />
<include path="/plugins/**.gif" />
<include path="/plugins/**/*.gif" />
<include path="/plugins/**.html" />
<include path="/plugins/**/*.html" />
<include path="/plugins/**.htm" />
<include path="/plugins/**/*.htm" />
<include path="/plugins/**.css"/>
<include path="/plugins/**/*.css"/>
<include path="/plugins/**.js"/>
<include path="/plugins/**/*.js"/>
<include path="/plugins/**.png"/>
<include path="/plugins/**/*.png"/>
<include path="/plugins/**.jpg"/>
<include path="/plugins/**/*.jpg"/>
<include path="/plugins/**.swf"/>
<include path="/plugins/**/*.swf"/>
<include path="/plugins/**.gif"/>
<include path="/plugins/**/*.gif"/>
<include path="/plugins/**.html"/>
<include path="/plugins/**/*.html"/>
<include path="/plugins/**.htm"/>
<include path="/plugins/**/*.htm"/>
<include path="/CHANGE_LOGS.html" />
<include path="/README.txt" />
<include path="/LICENSE.txt" />
<include path="/CHANGE_LOGS.html"/>
<include path="/README.txt"/>
<include path="/LICENSE.txt"/>
</static-files>
src/main/webapp/css/default-init.css
View file @ 5eb82728
......@@ -18,7 +18,7 @@
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.1.7, Apr 15, 2016
* @version 1.0.2.7, Dec 14, 2016
*/
html {
height: 100%;
......@@ -146,7 +146,8 @@ button:active {
.logo {
float: left;
padding: 162px 12px 0;
width: 153px;
width: 217px;
text-align: center;
}
.wrapper {
......@@ -168,7 +169,7 @@ button:active {
margin: 0 auto;
padding: 0 0 28px 0;
position: relative;
width: 700px;
width: 760px;
top: 60px;
}
......@@ -225,7 +226,7 @@ button:active {
padding: 5px;
}
.a-403, .a-500 {
.a-403, .a-500, .a-404 {
margin: 20px 50px 0 0 ;
text-align: right;
}
......@@ -241,6 +242,10 @@ button:active {
.a-500 {
margin: 25px 35px 0 0 ;
}
.a-404 {
margin: 42px 35px 0 0;
}
/* end 403/404/500 */
/* start kill */
......
src/main/webapp/error/404.ftl
View file @ 5eb82728
......@@ -10,8 +10,24 @@
<body>
<div class="wrapper">
<div class="wrap">
<div class="content" style="height: 380px;width: 760px">
<script type="text/javascript" src="http://www.qq.com/404/search_children.js?edition=small" charset="utf-8"></script>
<div class="content">
<div class="logo">
<a href="http://b3log.org" target="_blank">
<img border="0" width="153" height="56" alt="B3log" title="B3log" src="${staticServePath}/images/logo.jpg"/>
</a>
</div>
<div class="main">
<h2>404 Not Found!</h2>
<img class="img-t0t" width="488" src="${staticServePath}/images/404.gif" title="404" alt="500: not found!" />
<div class="a-404">
欢迎访问
<a href="https://hacpai.com">黑客与画家</a>
</div>
<a href="http://b3log.org" target="_blank">
<img border="0" class="icon" alt="B3log" title="B3log" src="${staticServePath}/favicon.png"/>
</a>
</div>
<span class="clear"></span>
</div>
</div>
</div>
......
src/main/webapp/js/admin/article.js
View file @ 5eb82728
......@@ -444,7 +444,7 @@ admin.article = {
var filename = "";
$('#articleUpload').fileupload({
multipart: true,
url: "http://upload.qiniu.com/",
url: "https://up.qbox.me",
add: function (e, data) {
filename = data.files[0].name;
......@@ -469,6 +469,7 @@ admin.article = {
return;
}
$('#articleUpload').after('<div>![' + data.files[0].name + '](http://'
+ qiniu.qiniuDomain + qiniuKey + ')</div>');
},
......
src/main/webapp/js/admin/latkeAdmin.js
View file @ 5eb82728
......@@ -1356,7 +1356,7 @@ admin.article = {
var filename = "";
$('#articleUpload').fileupload({
multipart: true,
url: "http://upload.qiniu.com/",
url: "https://up.qbox.me",
add: function (e, data) {
filename = data.files[0].name;
......
src/main/webapp/js/admin/latkeAdmin.min.js
View file @ 5eb82728
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/js/page.js
View file @ 5eb82728
......@@ -499,7 +499,7 @@ $.extend(Page.prototype, {
var tips = this.tips;
try {
$.ajax({
url: "http://rhythm.b3log.org:80/get-articles-by-tags.do?tags=" + tags
url: "https://rhythm.b3log.org/get-articles-by-tags.do?tags=" + tags
+ "&blogHost=" + tips.blogHost + "&paginationPageSize=" + tips.externalRelevantArticlesDisplayCount,
type: "GET",
cache: true,
......
src/main/webapp/js/page.min.js
View file @ 5eb82728
This diff is collapsed.
src/main/webapp/skins/next/css/next.css
View file @ 5eb82728
......@@ -18,7 +18,7 @@
* skin next style
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 0.2.2.1, Sep 6, 2016
* @version 0.3.2.1, Dec 17, 2016
*/
/* start reset */
html {
......@@ -693,6 +693,144 @@ img {
/* end list*/
/* start article */
.article-body {
font-family: "Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif;
word-wrap: break-word;
overflow: hidden;
line-height: 1.5
}
.article-body ul,.article-body ol {
padding-left: 2em;
margin-top: 0;
margin-bottom: 16px
}
.article-body li {
margin-top: 0.25em;
}
.article-body h1,.article-body h2,.article-body h3,.article-body h4,.article-body h5,.article-body h6 {
margin-top: 24px;
margin-bottom: 16px;
font-weight: 600;
line-height: 1.25
}
.article-body h1 {
padding-bottom: 0.3em;
font-size: 2em
}
.article-body h2 {
padding-bottom: 0.3em;
font-size: 1.5em
}
.article-body h3 {
font-size: 1.25em
}
.article-body h4 {
font-size: 1em
}
.article-body h5 {
font-size: 0.875em
}
.article-body h6 {
font-size: 0.85em
}
.article-body p {
margin-top: 0;
margin-bottom: 16px
}
.article-body blockquote {
padding: 0 1em;
color: #777;
border-left: 0.25em solid #ddd;
margin-bottom: 16px
}
.article-body blockquote p {
margin: 0
}
.article-body iframe {
border: 1px solid #ccc
}
.article-body table {
width: 100%;
border: 1px solid #dedede;
margin: 15px auto;
border-collapse: collapse;
empty-cells: show
}
.article-body thead {
text-align: center
}
.article-body td,.article-body th {
height: 35px;
border: 1px solid #dedede;
padding: 0 10px
}
.article-body th {
font-weight: bold;
text-align: center !important;
background: rgba(158,188,226,0.2)
}
.article-body tbody tr:nth-child(2n) {
background: rgba(158,188,226,0.12)
}
.article-body tr:hover {
background: #efefef
}
.article-body code {
padding: 0.2em 0.4em;
margin: 0;
font-size: 85%;
background-color: rgba(252,41,41,0.12);
border-radius: 3px;
color: #d23f31;
font-family: mononoki,Consolas,"Liberation Mono",Menlo,Courier,monospace
}
.article-body pre>code {
padding: 0.5em;
border-radius: 0;
color: #333;
background-color: rgba(0,0,0,0.04);
background-image: url(../images/code-bg.png);
background-size: 20px 20px;
border-radius: 5px
}
.article-body kbd {
display: inline-block;
padding: 3px 5px;
font: 11px Consolas, "Liberation Mono", Menlo, Courier, monospace;
line-height: 10px;
color: #555;
vertical-align: middle;
background-color: #fcfcfc;
border: solid 1px #ccc;
border-bottom-color: #bbb;
border-radius: 3px;
box-shadow: inset 0 -1px 0 #bbb
}
.post-header {
text-align: center;
}
......
src/main/webapp/skins/next/css/next.min.css
View file @ 5eb82728
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment