This commit is contained in:
Van 2019-08-02 11:14:23 +08:00
parent 62950911ef
commit a63f182b7e
No known key found for this signature in database
GPG Key ID: 7059B8783A78F16C
3 changed files with 19 additions and 23 deletions

File diff suppressed because one or more lines are too long

View File

@ -21,10 +21,11 @@
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 2.4.0.0, Jul 17, 2019 * @version 2.5.0.0, Aug 2, 2019
*/ */
@import "../../../scss/toc"; @import "../../../scss/toc";
@import "../../../scss/usite"; @import "../../../scss/usite";
@import "../../../scss/function";
@import "vditor/src/assets/scss/classic"; @import "vditor/src/assets/scss/classic";
.vditor-reset::-webkit-scrollbar { .vditor-reset::-webkit-scrollbar {
@ -385,6 +386,11 @@ pre code, pre tt {
background-color: #FFF; background-color: #FFF;
height: 100%; height: 100%;
width: 300px; width: 300px;
overflow: auto;
&::-webkit-scrollbar {
display: none;
}
.vditor-reset, .vditor-reset,
.vditor-reset a { .vditor-reset a {
@ -462,12 +468,7 @@ pre code, pre tt {
} }
.side footer { .side footer {
position: absolute;
bottom: 15px;
width: 228px;
text-align: center; text-align: center;
left: 50%;
margin-left: -114px;
} }
.side footer > div { .side footer > div {
@ -978,9 +979,16 @@ footer.footer .icon-goup:hover {
position: relative; position: relative;
height: auto; height: auto;
width: 100%; width: 100%;
min-height: auto;
.user__sites {
position: relative;
top: 16px;
}
} }
.side .avatar { .side .avatar {
position: relative; display: none;
} }
.side .content { .side .content {
@ -989,20 +997,10 @@ footer.footer .icon-goup:hover {
} }
.side .overlay { .side .overlay {
height: 100px; height: 104px;
z-index: 0; z-index: 0;
} }
.side nav {
display: none;
}
.side footer {
position: initial;
margin: 10px auto;
padding-bottom: 16px;
}
main { main {
position: initial; position: initial;
} }

View File

@ -17,7 +17,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
--> -->
<div class="side"> <div class="side fn__flex-column">
<div class="overlay"> <div class="overlay">
<a onclick="$('.side .toc').show()" href="javascript:void(0)" class="toc-btn">${tocLabel}</a> <a onclick="$('.side .toc').show()" href="javascript:void(0)" class="toc-btn">${tocLabel}</a>
</div> </div>
@ -25,7 +25,7 @@
<div class="user__sites"> <div class="user__sites">
<@userSite dir=""/> <@userSite dir=""/>
</div> </div>
<header class="content"> <header class="content fn__flex-1">
<a href="${servePath}"> <a href="${servePath}">
<img class="avatar" src="${adminUser.userAvatar}" title="${userName}"/> <img class="avatar" src="${adminUser.userAvatar}" title="${userName}"/>
</a> </a>
@ -34,11 +34,9 @@
<a href="${servePath}">${blogTitle}</a> <a href="${servePath}">${blogTitle}</a>
</h1> </h1>
</hgroup> </hgroup>
<#if "" != noticeBoard>
<p class="subtitle"> <p class="subtitle">
${blogSubtitle} ${blogSubtitle}
</p> </p>
</#if>
<nav> <nav>
<ul> <ul>
<#list pageNavigations as page> <#list pageNavigations as page>