This commit is contained in:
@@ -79,7 +79,7 @@
|
||||
</div>
|
||||
|
||||
<div class="row article-content code-highlight">
|
||||
<div class="col-sm-12" id="abstract${article.oId}">
|
||||
<div class="col-sm-12 content-reset" id="abstract${article.oId}">
|
||||
${article.articleContent}
|
||||
<#if "" != article.articleSign.signHTML?trim>
|
||||
<p>
|
||||
|
@@ -38,6 +38,6 @@
|
||||
</#if></span>
|
||||
|
||||
</div>
|
||||
<div class="row code-highlight article-content">${comment.commentContent}</div>
|
||||
<div class="row code-highlight article-content content-reset">${comment.commentContent}</div>
|
||||
</div>
|
||||
</div>
|
18
Bruce/css/Bruce.min.css
vendored
18
Bruce/css/Bruce.min.css
vendored
@@ -1,18 +0,0 @@
|
||||
/**
|
||||
* 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/>.
|
||||
*/
|
||||
@charset "utf-8";.article-date,.article-tags,.article-title,.footer{text-align:center}.footer,.header{background-color:#f9f9f9}body,button,input,select,textarea{font:400 1em/1.8 Avenir,Microsoft Yahei,Hiragino Sans GB,Microsoft Sans Serif,WenQuanYi Micro Hei,sans-serif;letter-spacing:.01rem}.site{padding:0 2em;margin:0 auto;font-size:16px}h4,h5,h6{font-weight:700}.article{margin-bottom:90px}.article-tags{font-size:14px}.article-date{font-size:12px;margin-top:6px;margin-bottom:12px}.article-content{font-size:1.1em}.article-content .task-list-item{list-style:none;margin-left:-1em}.article-content img{max-width:100%}.header{border-bottom:1px solid #ddd;margin-bottom:20px}.nav-item{position:relative;display:inline-block;padding:10px;font-weight:500}.nav-item .page-icon{float:left;height:14px;width:14px;margin:2px 3px 0 0}.comment{margin-bottom:32px}.comment p{margin-bottom:0}#captcha,#captchaReply,#emotions span,#emotionsReply span,.form-control{margin-top:15px}.cmtFromSym{font-size:12px;color:#ccc;margin-bottom:1em}.cmtForm{margin-top:24px}.gray{color:#ccc}.em00,.em01,.em02,.em03,.em04,.em05,.em06,.em07,.em08,.em09,.em10,.em11,.em12,.em13,.em14{cursor:pointer;background-image:url(../../../images/emotions/emotions.png);background-size:120px;float:left;height:24px;margin-right:5px;width:24px;transition:all .2s ease-out;-webkit-transition:all .2s ease-out;-moz-transition:all .2s ease-out}#emotions span:hover{transform:scale(1.2) rotate(360deg);-webkit-transform:scale(1.2) rotate(360deg);-moz-transform:scale(1.2) rotate(360deg)}.em01{background-position:-24px 0}.em02{background-position:-48px 0}.em03{background-position:-72px 0}.em04{background-position:-96px 1px}.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}.footer{padding:40px 0;margin-top:20px;color:#999;border-top:1px solid #e5e5e5}.right{float:right}
|
18
Bruce/css/base.css
Normal file
18
Bruce/css/base.css
Normal file
@@ -0,0 +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/>.
|
||||
*/
|
||||
.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ul,.content-reset ol{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:0.25em}.content-reset img{cursor:zoom-in}.content-reset img.emoji{cursor:auto;max-width:18px}.content-reset h1,.content-reset h2,.content-reset h3,.content-reset h4,.content-reset h5,.content-reset h6{margin-top:24px;margin-bottom:16px;font-weight:600;line-height:1.25}.content-reset h1{padding-bottom:0.3em;font-size:1.7em;border-bottom:1px solid #eee}.content-reset h2{padding-bottom:0.3em;font-size:1.5em;border-bottom:1px solid #eee}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:0.875em}.content-reset h6{font-size:0.85em}.content-reset hr{height:0.15em;padding:0;margin:24px 0;background-color:#e7e7e7;border:0}.content-reset p{margin-top:0;margin-bottom:16px}.content-reset blockquote{padding:0 1em;color:#777;border-left:0.25em solid #ddd;margin-bottom:16px}.content-reset blockquote p{margin:0}.content-reset ins>iframe{border:0}.content-reset iframe{border:1px solid rgba(0,0,0,0.38)}.content-reset table{width:100%;border:1px solid #dedede;margin:15px auto;border-collapse:collapse;empty-cells:show}.content-reset thead{text-align:center}.content-reset td,.content-reset th{height:35px;border:1px solid #dedede;padding:0 10px}.content-reset th{font-weight:bold;text-align:center !important;background:rgba(158,188,226,0.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,0.12)}.content-reset tr:hover{background:#efefef}.content-reset 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}.content-reset pre{position:relative}.content-reset pre textarea{position:absolute;top:-100000px}.content-reset pre>code{padding:0.5em;background-color:rgba(0,0,0,0.04);background-size:20px 20px;border-radius:5px;display:block}.content-reset 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}.content-reset__task,.content-reset .task-list-item{list-style:none;margin-left:-1em}.img-preview{width:100%;height:100%;top:0;z-index:211;overflow:auto;cursor:zoom-out;transition:background-color .2s ease-in-out}.img-preview img{max-width:inherit;transition:transform .3s ease-in-out}body,button,input,select,textarea{font:400 1em/1.8 Avenir,Microsoft Yahei,Hiragino Sans GB,Microsoft Sans Serif,WenQuanYi Micro Hei,sans-serif;letter-spacing:0.01rem}.site{padding:0 2em 0;margin:0 auto;font-size:16px}h4,h5,h6{font-weight:bold}.article{margin-bottom:90px}.article-title{text-align:center}.article-tags{text-align:center;font-size:14px}.article-date{text-align:center;font-size:12px;margin-top:6px;margin-bottom:12px}.article-content{font-size:1.1em}.article-content .task-list-item{list-style:none;margin-left:-1em}.article-content img{max-width:100%}.header{border-bottom:1px solid #ddd;background-color:#f9f9f9;margin-bottom:20px}.nav-item{position:relative;display:inline-block;padding:10px;font-weight:500}.nav-item .page-icon{float:left;height:14px;width:14px;margin:2px 3px 0 0}.comment{margin-bottom:32px}.comment p{margin-bottom:0em}.form-control{margin-top:15px}.cmtFromSym{font-size:12px;color:#ccc;margin-bottom:1em}.cmtForm{margin-top:24px}.gray{color:#ccc}.footer{padding:40px 0;margin-top:20px;color:#999;text-align:center;background-color:#f9f9f9;border-top:1px solid #e5e5e5}.right{float:right}
|
@@ -21,9 +21,10 @@
|
||||
*
|
||||
* @author <a href="http://88250.b3log.org">Liang Ding</a>
|
||||
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
|
||||
* @version 1.1.0.1, Jan 2, 2019
|
||||
* @version 2.0.0.0, Feb 21, 2019
|
||||
*/
|
||||
|
||||
@import "../../../scss/reset-content";
|
||||
body, button, input, select, textarea {
|
||||
font: 400 1em/1.8 Avenir,Microsoft Yahei,Hiragino Sans GB,Microsoft Sans Serif,WenQuanYi Micro Hei,sans-serif;
|
||||
letter-spacing: 0.01rem;
|
||||
@@ -100,11 +101,7 @@ h4, h5, h6 {
|
||||
margin-bottom: 0em;
|
||||
}
|
||||
|
||||
.form-control,
|
||||
#captcha,
|
||||
#captchaReply,
|
||||
#emotions span,
|
||||
#emotionsReply span {
|
||||
.form-control {
|
||||
margin-top: 15px;
|
||||
}
|
||||
|
||||
@@ -122,72 +119,6 @@ h4, h5, h6 {
|
||||
color: #ccc;
|
||||
}
|
||||
|
||||
.comment-panel {
|
||||
}
|
||||
|
||||
.em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09,
|
||||
.em10, .em11, .em12, .em13, .em14 {
|
||||
cursor: pointer;
|
||||
background-image: url("../../../images/emotions/emotions.png");
|
||||
background-size: 120px;
|
||||
float: left;
|
||||
height: 24px;
|
||||
margin-right: 5px;
|
||||
width: 24px;
|
||||
transition: all .2s ease-out;
|
||||
-webkit-transition: all .2s ease-out;
|
||||
-moz-transition: all .2s ease-out;
|
||||
}
|
||||
|
||||
#emotions span:hover {
|
||||
transform: scale(1.2) rotate(360deg);
|
||||
-webkit-transform: scale(1.2) rotate(360deg);
|
||||
-moz-transform: scale(1.2) rotate(360deg);
|
||||
}
|
||||
|
||||
.em01 {
|
||||
background-position: -24px 0;
|
||||
}
|
||||
.em02 {
|
||||
background-position: -48px 0;
|
||||
}
|
||||
.em03 {
|
||||
background-position: -72px 0;
|
||||
}
|
||||
.em04 {
|
||||
background-position: -96px 1px;
|
||||
}
|
||||
.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;
|
||||
}
|
||||
|
||||
.footer {
|
||||
padding: 40px 0;
|
||||
margin-top: 20px;
|
18
Bruce/css/bootstrap-theme.min.css
vendored
18
Bruce/css/bootstrap-theme.min.css
vendored
File diff suppressed because one or more lines are too long
18
Bruce/css/bootstrap.min.css
vendored
18
Bruce/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@@ -45,31 +45,13 @@
|
||||
"abstractLabel": "${abstractLabel}",
|
||||
"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>
|
||||
<script type="text/javascript" src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="${staticServePath}/skins/${skinDirName}/js/bootstrap${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
|
||||
<script>
|
||||
Util.initSW();
|
||||
Util.setTopBar();
|
||||
Util.parseMarkdown('article-content');
|
||||
Util.killIE(8)
|
||||
Util.init()
|
||||
</script>
|
||||
${plugins}
|
||||
|
@@ -29,7 +29,7 @@
|
||||
<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}/css/bootstrap${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
|
||||
<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">
|
||||
|
@@ -36,7 +36,7 @@
|
||||
<div class="col-sm-2"></div>
|
||||
|
||||
<div class="col-sm-8 site">
|
||||
<div class="article">
|
||||
<div class="article content-reset">
|
||||
${page.pageContent}
|
||||
</div>
|
||||
|
||||
|
Reference in New Issue
Block a user