Van
2019-02-21 18:16:59 +08:00
parent d7e9db917c
commit 755eb33471
134 changed files with 1846 additions and 1598 deletions

View File

@@ -70,7 +70,7 @@
<a class="shareCount"></a>
</span>
</div>
<div class="article-body breakline">
<div class="content-reset breakline">
${article.articleContent}
<#if "" != article.articleSign.signHTML?trim>
<div class="marginTop12">

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -16,6 +16,8 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
@charset "utf-8";
@import "../../../scss/reset-content";
body {
margin:0;
padding:0;
@@ -297,12 +299,13 @@ a:hover {
background-position:-7px -125px;
padding:0 0 0 13px;
}
.article-body {
.content-reset {
margin:8px 0;
padding:0px;
line-height:22px;
white-space:normal;
overflow:hidden;
font-size: 12px;
}
.navigation {
margin:5px 15px 5px 15px;

View File

@@ -1 +1,18 @@
/**
* Solo - A small and beautiful blogging system written in Java.
* Copyright (c) 2010-2019, b3log.org & hacpai.com
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#maincontent,#sidebar{padding:0;display:inline}#wrap{margin:0 auto;padding:0;width:900px;border-left:3px solid #424242;border-right:3px solid #424242;background:url(../images/side-bg.gif) right repeat-y}#maincontent{float:left;margin:0 0 0 -271px;width:100%}#maincontent .forFlow{margin:0 0 0 271px}#sidebar{float:right;margin:10px;width:250px}

View File

@@ -1 +1,18 @@
/**
* Solo - A small and beautiful blogging system written in Java.
* Copyright (c) 2010-2019, b3log.org & hacpai.com
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#maincontent,#sidebar{padding:0;display:inline}#wrap{margin:0 auto;padding:0;width:900px;border-left:3px solid #424242;border-right:3px solid #424242;background:url(../images/side-bg.gif) left repeat-y}#maincontent{float:right;margin:0 0 0 -271px;width:100%}#maincontent .forFlow{margin:0 0 0 271px;float:none;width:auto}#sidebar{float:left;margin:10px;width:250px}

View File

@@ -1 +1,18 @@
/**
* Solo - A small and beautiful blogging system written in Java.
* Copyright (c) 2010-2019, b3log.org & hacpai.com
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#wrap{margin:0 auto;padding:0;width:900px;border-left:3px solid #424242;border-right:3px solid #424242}#maincontent{float:right;margin:0;padding:0;display:inline;width:100%}#maincontent .forFlow{margin:0;float:none;width:auto}#sidebar{display:none}

View File

@@ -1 +1,18 @@
/**
* Solo - A small and beautiful blogging system written in Java.
* Copyright (c) 2010-2019, b3log.org & hacpai.com
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#maincontent,#sidebar{padding:0;display:inline}#wrap{margin:0 auto;padding:0;width:100%;background:url(../images/side-bg.gif) right repeat-y}#maincontent{float:left;margin:0 0 0 -271px;width:100%}#maincontent .forFlow{margin:0 0 0 271px}#sidebar{float:right;margin:10px;width:250px}

View File

@@ -1 +1,18 @@
/**
* Solo - A small and beautiful blogging system written in Java.
* Copyright (c) 2010-2019, b3log.org & hacpai.com
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#maincontent,#sidebar{padding:0;display:inline}#wrap{margin:0 auto;padding:0;width:100%;background:url(../images/side-bg.gif) left repeat-y}#maincontent{float:right;margin:0 0 0 -271px;width:100%}#maincontent .forFlow{margin:0 0 0 271px;float:none;width:auto}#sidebar{float:left;margin:10px;width:250px}

View File

@@ -1 +1,18 @@
/*
* Solo - A small and beautiful blogging system written in Java.
* Copyright (c) 2010-2019, b3log.org & hacpai.com
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
function writeCookie(e,t){exp=new Date,exp.setTime(exp.getTime()+2592e6),document.cookie=e+"="+escape(t)+"; expires="+exp.toGMTString()+"; path=/",document.cookie.replace("stylesheet=css0","stylesheet="+t)}function readCookie(e){var t;return t=e+"=",offset=document.cookie.indexOf(t),-1!=offset?(offset+=t.length,end=document.cookie.indexOf(";",offset),-1==end&&(end=document.cookie.length),unescape(document.cookie.substring(offset,end))):""}function setStyleSheet(e){for(var t=document.getElementsByTagName("link"),o=0,n=0;n<t.length;n++)-1<t[n].type.indexOf("css")&&t[n].title&&(t[n].disabled=!0,t[n].title==e&&(o=n));t[o].disabled=!1,writeCookie("stylesheet",t[o].title)}

View File

@@ -48,7 +48,7 @@
</#if>
</div>
<div class="clear"></div>
<div class="comment-content">
<div class="comment-content content-reset">
${comment.commentContent}
</div>
</div>

View File

@@ -31,7 +31,7 @@
<link title="css2" href="${staticServePath}/skins/${skinDirName}/css/layout3.css?${staticResourceVersion}" rel="stylesheet" disabled="false" type="text/css" charset="utf-8" />
<link title="css3" href="${staticServePath}/skins/${skinDirName}/css/layout4.css?${staticResourceVersion}" rel="stylesheet" disabled="false" type="text/css" charset="utf-8" />
<link title="css4" href="${staticServePath}/skins/${skinDirName}/css/layout5.css?${staticResourceVersion}" rel="stylesheet" disabled="false" type="text/css" charset="utf-8" />
<link href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}.css?${staticResourceVersion}" type="text/css" rel="stylesheet" charset="utf-8" />
<link href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" type="text/css" rel="stylesheet" charset="utf-8" />
<script type="text/javascript" src="${staticServePath}/skins/${skinDirName}/js/${skinDirName}.js?${staticResourceVersion}" charset="utf-8"></script>
<script type="text/javascript">setStyleSheet(readCookie("stylesheet"));</script>
<link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" />

View File

@@ -43,7 +43,7 @@
<h2 class="post-tltle breakline">
${page.pageTitle}
</h2>
<div class="article-body breakline">
<div class="content-reset breakline">
${page.pageContent}
</div>
</div>