Van
2019-02-21 21:46:33 +08:00
parent 3a5132b6ba
commit fbba7dd293
194 changed files with 2365 additions and 7692 deletions

View File

@@ -59,7 +59,7 @@
</a>
</div>
<div class="clear"></div>
<div class="article-body">
<div class="content-reset">
<div id="abstract${article.oId}">
${article.articleAbstract}
</div>

View File

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

View File

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

File diff suppressed because one or more lines are too long

18
NeoEase/css/base.css Normal file

File diff suppressed because one or more lines are too long

View File

@@ -19,8 +19,10 @@
* skin neoease style
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 1.2.1.0, Jan 4, 2019
*/
* @version 2.0.0.0, Feb 21, 2019
*/
@import "../../../scss/reset-content";
/* start base */
html, body, div, ul, li, h1, h2, h3, h4, h5, h6 {
margin: 0;
@@ -107,58 +109,6 @@ textarea, input {
font-size: 11px;
}
.em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09,
.em10, .em11, .em12, .em13, .em14 {
background-image: url("../../../images/emotions/emotions.png");
background-size: 120px;
float: left;
height: 24px;
margin-right: 5px;
width: 24px;
}
.em01 {
background-position: -24px 0;
}
.em02 {
background-position: -48px 0;
}
.em03 {
background-position: -72px 0;
}
.em04 {
background-position: -96px 0;
}
.em05 {
background-position: 0 -24px;
}
.em06 {
background-position: -24px -24px;
}
.em07 {
background-position: -48px -24px;
}
.em08 {
background-position: -72px -24px;
}
.em09 {
background-position: -96px -24px;
}
.em10 {
background-position: 0 -48px;
}
.em11 {
background-position: -24px -48px ;
}
.em12 {
background-position: -48px -48px;
}
.em13 {
background-position: -72px -48px;
}
.em14 {
background-position: -96px -48px;
}
.em-span {
line-height: 24px;
float: left;
@@ -560,201 +510,6 @@ textarea, input {
background-position: 0 -70px;
}
/* start article-body */
.article-body {
word-break: break-word;
line-height: 145%;
overflow: hidden;
word-wrap: break-word;
}
.article-body a {
border-bottom: 1px solid #DFDFDF;
}
.article-body a:hover {
color: #D54E21;
border-bottom: 1px solid #D54E21;
}
.article-body p {
line-height: 18px;
}
.article-body ul,
.article-body ol {
margin-top: 0;
margin-bottom: 16px;
margin-left: 40px;
}
.article-body li {
margin-top: 0.25em;
}
.article-body img {
cursor: zoom-in;
}
.article-body img.emoji {
cursor: auto;
max-width: 18px;
}
.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 {
font-size: 2em;
margin: .67em 0;
}
.article-body h2 {
font-size: 1.5em;
margin: .75em 0;
}
.article-body h3 {
font-size: 1.17em;
margin: .83em 0;
}
.article-body h4 {
margin: 1.12em 0;
}
.article-body h4 {
font-size: .83em;
margin: 1.5em 0;
}
.article-body h6 {
font-size: .75em;
margin: 1.67em 0;
}
.article-body hr {
height: 0.15em;
padding: 0;
margin: 24px 0;
background-color: #e7e7e7;
border: 0;
}
.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 ins > iframe {
border: 0;
}
.article-body iframe {
border: 1px solid rgba(0, 0, 0, 0.38);
}
.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;
word-break: break-word;
}
.article-body pre {
position: relative;
}
.article-body pre textarea {
position: absolute;
top: -100000px;
}
.article-body pre > code {
padding: 0.5em;
background-color: rgba(0, 0, 0, 0.04);
background-size: 20px 20px;
border-radius: 5px;
display: block;
}
.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 rgba(0, 0, 0, 0.38);
border-bottom-color: #bbb;
border-radius: 3px;
box-shadow: inset 0 -1px 0 #bbb;
}
.article-body__task,
.article-body .task-list-item {
list-style: none;
margin-left: -1em;
}
/* end article-body */
.pagination {
margin-top: 30px;
line-height: 21px;
@@ -870,7 +625,7 @@ textarea, input {
line-height: 16px;
}
.comment-panel .article-body {
.comment-panel .content-reset {
margin-top: 5px;
}

View File

@@ -40,22 +40,7 @@
"markedAvailable": ${markedAvailable?c},
"adminLabel": "${adminLabel}",
"logoutLabel": "${logoutLabel}",
"skinDirName": "${skinDirName}",
"em00Label": "${em00Label}",
"em01Label": "${em01Label}",
"em02Label": "${em02Label}",
"em03Label": "${em03Label}",
"em04Label": "${em04Label}",
"em05Label": "${em05Label}",
"em06Label": "${em06Label}",
"em07Label": "${em07Label}",
"em08Label": "${em08Label}",
"em09Label": "${em09Label}",
"em10Label": "${em10Label}",
"em11Label": "${em11Label}",
"em12Label": "${em12Label}",
"em13Label": "${em13Label}",
"em14Label": "${em14Label}"
"skinDirName": "${skinDirName}"
};
</script>
<script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script>

View File

@@ -76,4 +76,3 @@ randomArticlesLabel=\u968F\u673A\u9605\u8BFB
externalRelevantArticlesLabel=\u7AD9\u5916\u76F8\u5173\u9605\u8BFB
captchaErrorLabel=\u9A8C\u8BC1\u7801\u9519\u8BEF
b3logLabel=<span style="color: orange;">B</span><span style="color: blue;"><sup>3</sup></span><span style="color: green;">L</span><span style="color: red;">O</span><span style="color: blue;">G</span>
killBrowserLabel=<h2>\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01</h2><p>\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002</p>\u60A8\u53EF\u4EE5\u4E0B\u8F7D<ul><li><a href="http://www.mozilla.com/" target="_blank">\u706B\u72D0</a></li><li><a href="http://www.google.com/chrome" target="_blank">\u8C37\u6B4C\u6D4F\u89C8\u5668</a></li><li><a href="http://windows.microsoft.com/en-US/internet-explorer/downloads/ie" target="_blank">IE8 / IE9</a></li><li><a href="http://www.maxthon.com/" target="_blank">\u9068\u6E38</a>\u6216\u8005<a href="http://www.google.com" target="_blank">\u5176\u5B83\u6D4F\u89C8\u5668</a>.</li></ul>

View File

@@ -27,7 +27,7 @@
<meta name="revised" content="${blogTitle?html}, ${year}" />
<meta name="copyright" content="B3log" />
<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 type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/base.css?${staticResourceVersion}" charset="utf-8" />
<link href="${servePath}/rss.xml" title="RSS" type="application/rss+xml" rel="alternate" />
<link rel="icon" type="image/png" href="${servePath}/favicon.png" />
<link rel="manifest" href="${servePath}/manifest.json">

View File

@@ -34,7 +34,7 @@
<div class="body">
<div class="wrapper">
<div class="main">
<div class="page article-body" style="border-bottom: 0px;">
<div class="page content-reset" style="border-bottom: 0px;">
${page.pageContent}
</div>
<@comments commentList=pageComments article=page></@comments>