Skip to content

S
solo-1
Commit 7ee15874 authored by Van's avatar Van
Browse files
Options

♻ default-admin.css 重构 #12658

parent bc4b1016
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 543 additions and 352 deletions
gulpfile.js
View file @ 7ee15874
...@@ -34,7 +34,10 @@ const del = require('del') ...@@ -34,7 +34,10 @@ const del = require('del')
function sassSkinProcess () { function sassSkinProcess () {
return gulp.src('./src/main/webapp/skins/*/css/*.scss'). return gulp.src('./src/main/webapp/skins/*/css/*.scss').
pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError)). pipe(sass({
outputStyle: 'compressed',
includePaths: ['node_modules']
}).on('error', sass.logError)).
pipe(gulp.dest('./src/main/webapp/skins/')) pipe(gulp.dest('./src/main/webapp/skins/'))
} }
...@@ -45,7 +48,10 @@ function sassWatch () { ...@@ -45,7 +48,10 @@ function sassWatch () {
function sassCommonProcess () { function sassCommonProcess () {
return gulp.src('./src/main/webapp/scss/*.scss'). return gulp.src('./src/main/webapp/scss/*.scss').
pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError)). pipe(sass({
outputStyle: 'compressed',
includePaths: ['node_modules']
}).on('error', sass.logError)).
pipe(gulp.dest('./src/main/webapp/scss/')) pipe(gulp.dest('./src/main/webapp/scss/'))
} }
......
package-lock.json
View file @ 7ee15874
This diff is collapsed.
package.json
View file @ 7ee15874
...@@ -35,5 +35,7 @@ ...@@ -35,5 +35,7 @@
"gulp-sass": "^4.0.1", "gulp-sass": "^4.0.1",
"gulp-uglify": "^3.0.1" "gulp-uglify": "^3.0.1"
}, },
"dependencies": {} "dependencies": {
"vditor": "^0.2.5"
}
} }
src/main/webapp/admin/admin-about.ftl
View file @ 7ee15874
...@@ -27,16 +27,16 @@ ...@@ -27,16 +27,16 @@
<img width="128" src="${staticServePath}/images/logo.png" alt="Solo" title="Solo" /> <img width="128" src="${staticServePath}/images/logo.png" alt="Solo" title="Solo" />
</a> </a>
</div> </div>
<div class="left content-reset about__panel" style="margin-left: 20px;"> <div class="fn__left content-reset about__panel" style="margin-left: 20px;">
<div id="aboutLatest" class="about-margin left"> <div id="aboutLatest" class="about-margin fn__left">
${checkingVersionLabel} ${checkingVersionLabel}
</div> </div>
<iframe src="https://ghbtns.com/github-btn.html?user=b3log&repo=solo&type=star&count=true&size=large" <iframe src="https://ghbtns.com/github-btn.html?user=b3log&repo=solo&type=star&count=true&size=large"
frameborder="0" scrolling="0" width="160px" height="30px" class="about__iframe" frameborder="0" scrolling="0" width="160px" height="30px" class="about__iframe"
style="margin: 21px 0 0 20px;border: 0" style="margin: 21px 0 0 20px;border: 0"
class="left"></iframe> class="fn__left"></iframe>
<div class="clear"></div> <div class="fn__clear"></div>
${aboutContentLabel} ${aboutContentLabel}
<ul class="about-list"> <ul class="about-list">
...@@ -44,9 +44,9 @@ ...@@ -44,9 +44,9 @@
<li><a target="_blank" href="https://hacpai.com/article/1537690756242">Solo 从设计到实现</a></li> <li><a target="_blank" href="https://hacpai.com/article/1537690756242">Solo 从设计到实现</a></li>
<li><a target="_blank" href="https://hacpai.com/article/1493814851007">皮肤开发指南</a></li> <li><a target="_blank" href="https://hacpai.com/article/1493814851007">皮肤开发指南</a></li>
</ul> </ul>
<button class="right" onclick="window.open('https://b3log.org/donate.html')">${sponsorLabel}</button> <button class="fn__right" onclick="window.open('https://b3log.org/donate.html')">${sponsorLabel}</button>
</div> </div>
<span class="clear" /> <br/> <span class="fn__clear" /> <br/>
</div> </div>
</div> </div>
${plugins} ${plugins}
src/main/webapp/admin/admin-article-list.ftl
View file @ 7ee15874
...@@ -17,15 +17,15 @@ ...@@ -17,15 +17,15 @@
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="form margin12"> <div class="form fn__margin12">
<input type="text" id="articleListInput"> <input type="text" id="articleListInput">
<button class="search-btn" id="articleListBtn">${searchLabel}</button> <button class="search-btn" id="articleListBtn">${searchLabel}</button>
</div> </div>
<div id="articleTable"> <div id="articleTable">
</div> </div>
<div id="articlePagination" class="right margin12"> <div id="articlePagination" class="fn__right fn__margin12">
</div> </div>
<div id="articleComments" class="none"> <div id="articleComments" class="fn__none">
</div> </div>
<div class="clear"></div> <div class="fn__clear"></div>
${plugins} ${plugins}
src/main/webapp/admin/admin-article.ftl
View file @ 7ee15874
...@@ -24,14 +24,14 @@ ...@@ -24,14 +24,14 @@
</div> </div>
<div> <div>
<label>${content1Label}</label> <label>${content1Label}</label>
<div class="right"> <div class="fn__right">
<label for="articleThumbnail" style="margin-bottom: 0"> <label for="articleThumbnail" style="margin-bottom: 0">
${useTumbnailLabel} ${useTumbnailLabel}
<input type="checkbox" style="vertical-align: middle;" <input type="checkbox" style="vertical-align: middle;"
id="articleThumbnail" onclick="$('.article__thumbnail').slideToggle()" /> id="articleThumbnail" onclick="$('.article__thumbnail').slideToggle()" />
</label> </label>
</div> </div>
<div class="clear"></div> <div class="fn__clear"></div>
<div class="article__thumbnail"> <div class="article__thumbnail">
<div class="thumbnail__img"></div> <div class="thumbnail__img"></div>
<button id="articleThumbnailBtn">${chageLabel}</button> <button id="articleThumbnailBtn">${chageLabel}</button>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<label for="permalink" class="permalink__label" style="margin-bottom: 0">${permalink1Label}</label> <label for="permalink" class="permalink__label" style="margin-bottom: 0">${permalink1Label}</label>
<input id="permalink" class="fn__flex1" type="text" style="margin: 0 12px 0 6px;" /> <input id="permalink" class="fn__flex1" type="text" style="margin: 0 12px 0 6px;" />
</div> </div>
<div class="right viewpwd__panel"> <div class="fn__right viewpwd__panel">
<label for="viewPwd">${articleViewPwd1Label}</label> <label for="viewPwd">${articleViewPwd1Label}</label>
<input id="viewPwd" type="text" style="width: 156px" /> <input id="viewPwd" type="text" style="width: 156px" />
</div> </div>
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<button id="articleSign3">${signLabel}3</button> <button id="articleSign3">${signLabel}3</button>
<button id="articleSign0">${noSignLabel}</button> <button id="articleSign0">${noSignLabel}</button>
</span> </span>
<div class="right article-commentable__panel"> <div class="fn__right article-commentable__panel">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" id="articleCommentable" checked /> <input type="checkbox" id="articleCommentable" checked />
${allowCommentLabel} ${allowCommentLabel}
...@@ -84,13 +84,13 @@ ...@@ -84,13 +84,13 @@
</label> </label>
</span> </span>
</div> </div>
<div class="clear"></div> <div class="fn__clear"></div>
</div> </div>
<div class="right"> <div class="fn__right">
<button id="unSubmitArticle" class="none marginRight12" onclick="admin.article.unPublish();">${unPublishLabel}</button> <button id="unSubmitArticle" class="fn__none marginRight12" onclick="admin.article.unPublish();">${unPublishLabel}</button>
<button class="marginRight12" id="saveArticle">${saveLabel}${draftListLabel}</button> <button class="marginRight12" id="saveArticle">${saveLabel}${draftListLabel}</button>
<button id="submitArticle">${publishLabel}</button> <button id="submitArticle">${publishLabel}</button>
</div> </div>
<div class="clear"></div> <div class="fn__clear"></div>
</div> </div>
${plugins} ${plugins}
\ No newline at end of file
src/main/webapp/admin/admin-category-list.ftl
View file @ 7ee15874
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
--> -->
<div> <div>
<div id="categoryTable"></div> <div id="categoryTable"></div>
<div id="categoryPagination" class="margin12 right"></div> <div id="categoryPagination" class="fn__margin12 fn__right"></div>
</div> </div>
<div class="clear"></div> <div class="fn__clear"></div>
<div class="form form__no-table"> <div class="form form__no-table">
${addCategoryLabel} ${addCategoryLabel}
<label for="categoryName">${linkTitle1Label}</label> <label for="categoryName">${linkTitle1Label}</label>
...@@ -34,10 +34,10 @@ ${addCategoryLabel} ...@@ -34,10 +34,10 @@ ${addCategoryLabel}
<span class="tag__select"> <span class="tag__select">
<input id="categoryTags" type="text"/> <input id="categoryTags" type="text"/>
</span><br> </span><br>
<button onclick="admin.categoryList.add();" class="right">${saveLabel}</button> <button onclick="admin.categoryList.add();" class="fn__right">${saveLabel}</button>
<div class="clear"></div> <div class="fn__clear"></div>
</div> </div>
<div id="categoryUpdate" class="none form__no-table form" data-title="${updateCategoryLabel}"> <div id="categoryUpdate" class="fn__none form__no-table form" data-title="${updateCategoryLabel}">
<label for="categoryNameUpdate">${linkTitle1Label}</label> <label for="categoryNameUpdate">${linkTitle1Label}</label>
<input id="categoryNameUpdate" type="text"/> <input id="categoryNameUpdate" type="text"/>
<label for="categoryURIUpdate">URI：</label> <label for="categoryURIUpdate">URI：</label>
...@@ -46,7 +46,7 @@ ${addCategoryLabel} ...@@ -46,7 +46,7 @@ ${addCategoryLabel}
<input id="categoryDescUpdate" type="text"/> <input id="categoryDescUpdate" type="text"/>
<label for="categoryTagsUpdate">${tags1Label}</label> <label for="categoryTagsUpdate">${tags1Label}</label>
<input id="categoryTagsUpdate" type="text"/> <br><br> <input id="categoryTagsUpdate" type="text"/> <br><br>
<button onclick="admin.categoryList.update();" class="right">${updateLabel}</button> <button onclick="admin.categoryList.update();" class="fn__right">${updateLabel}</button>
<div class="clear"></div> <div class="fn__clear"></div>
</div> </div>
${plugins} ${plugins}
src/main/webapp/admin/admin-comment-list.ftl
View file @ 7ee15874
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
--> -->
<div id="commentTable"> <div id="commentTable">
</div> </div>
<div id="commentPagination" class="right margin12"> <div id="commentPagination" class="fn__right fn__margin12">
</div> </div>
<div class="clear"></div> <div class="fn__clear"></div>
${plugins} ${plugins}
\ No newline at end of file
src/main/webapp/admin/admin-draft-list.ftl
View file @ 7ee15874
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
--> -->
<div id="draftTable"> <div id="draftTable">
</div> </div>
<div id="draftPagination" class="right margin12"> <div id="draftPagination" class="fn__right fn__margin12">
</div> </div>
<div class="clear"></div> <div class="fn__clear"></div>
<div id="draftComments" class="none"> <div id="draftComments" class="fn__none">
</div> </div>
${plugins} ${plugins}
\ No newline at end of file
src/main/webapp/admin/admin-index.ftl
View file @ 7ee15874
...@@ -27,11 +27,9 @@ ...@@ -27,11 +27,9 @@
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta http-equiv="Window-target" content="_top"> <meta http-equiv="Window-target" content="_top">
<meta name="robots" content="none" /> <meta name="robots" content="fn__none" />
<title>${adminConsoleLabel} - ${blogTitle}</title> <title>${adminConsoleLabel} - ${blogTitle}</title>
<link type="text/css" rel="stylesheet" href="${staticServePath}/scss/base.css?${staticResourceVersion}" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/scss/admin.css?${staticResourceVersion}" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/scss/admin.css?${staticResourceVersion}" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/js/lib/vditor-0.2.5/index.classic.css" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/js/lib/highlight-9.13.1/styles/github.css?${staticResourceVersion}" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/js/lib/highlight-9.13.1/styles/github.css?${staticResourceVersion}" />
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" /> <link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
<link rel="manifest" href="${servePath}/manifest.json"> <link rel="manifest" href="${servePath}/manifest.json">
...@@ -44,9 +42,9 @@ ...@@ -44,9 +42,9 @@
<a href="${servePath}" target="_blank" class="hover"> <a href="${servePath}" target="_blank" class="hover">
Solo Solo
</a> </a>
<span class="icon-unordered-list top__menu none" <span class="icon-unordered-list top__menu fn__none"
onclick="admin.toggleMenu()"></span> onclick="admin.toggleMenu()"></span>
<span class="right"> <span class="fn__right">
<a href="${servePath}" title='${indexLabel}'> <a href="${servePath}" title='${indexLabel}'>
<div class="avatar" style="background-image: url(${gravatar})"></div> <div class="avatar" style="background-image: url(${gravatar})"></div>
${userName} ${userName}
...@@ -67,7 +65,7 @@ ...@@ -67,7 +65,7 @@
<div id="tabArticleTitle" class="tab-current" onclick="admin.collapseNav(this)"> <div id="tabArticleTitle" class="tab-current" onclick="admin.collapseNav(this)">
<span class="icon-article"></span> <span class="icon-article"></span>
${articleLabel} ${articleLabel}
<span class="icon-chevron-up right"></span> <span class="icon-chevron-up fn__right"></span>
</div> </div>
<ul id="tabArticleMgt"> <ul id="tabArticleMgt">
<li> <li>
...@@ -98,9 +96,9 @@ ...@@ -98,9 +96,9 @@
<div id="tabToolsTitle" onclick="admin.collapseNav(this)"> <div id="tabToolsTitle" onclick="admin.collapseNav(this)">
<span class="icon-setting"></span> <span class="icon-setting"></span>
${ToolLabel} ${ToolLabel}
<span class="icon-chevron-down right"></span> <span class="icon-chevron-down fn__right"></span>
</div> </div>
<ul class="none" id="tabTools"> <ul class="fn__none" id="tabTools">
<li> <li>
<div id="tabs_preference"> <div id="tabs_preference">
<a href="#tools/preference">${preferenceLabel}</a> <a href="#tools/preference">${preferenceLabel}</a>
...@@ -149,21 +147,21 @@ ...@@ -149,21 +147,21 @@
</div> </div>
<div class="tabs__bg" onclick="admin.toggleMenu()"></div> <div class="tabs__bg" onclick="admin.toggleMenu()"></div>
<div id="tabsPanel"> <div id="tabsPanel">
<div id="tabsPanel_main" class="none"></div> <div id="tabsPanel_main" class="fn__none"></div>
<div id="tabsPanel_article" class="none"></div> <div id="tabsPanel_article" class="fn__none"></div>
<div id="tabsPanel_article-list" class="none"></div> <div id="tabsPanel_article-list" class="fn__none"></div>
<div id="tabsPanel_draft-list" class="none"></div> <div id="tabsPanel_draft-list" class="fn__none"></div>
<div id="tabsPanel_link-list" class="none"></div> <div id="tabsPanel_link-list" class="fn__none"></div>
<div id="tabsPanel_preference" class="none"></div> <div id="tabsPanel_preference" class="fn__none"></div>
<div id="tabsPanel_category-list" class="none"></div> <div id="tabsPanel_category-list" class="fn__none"></div>
<div id="tabsPanel_page-list" class="none"></div> <div id="tabsPanel_page-list" class="fn__none"></div>
<div id="tabsPanel_others" class="none"></div> <div id="tabsPanel_others" class="fn__none"></div>
<div id="tabsPanel_user-list" class="none"></div> <div id="tabsPanel_user-list" class="fn__none"></div>
<div id="tabsPanel_comment-list" class="none"></div> <div id="tabsPanel_comment-list" class="fn__none"></div>
<div id="tabsPanel_plugin-list" class="none"></div> <div id="tabsPanel_plugin-list" class="fn__none"></div>
<div id="tabsPanel_about" class="none"></div> <div id="tabsPanel_about" class="fn__none"></div>
</div> </div>
<div class="clear"></div> <div class="fn__clear"></div>
<div class="footer"> <div class="footer">
Powered by <a href="https://b3log.org" target="_blank">B3log 开源</a> • <a href="https://solo.b3log.org" target="_blank">Solo</a> ${version} Powered by <a href="https://b3log.org" target="_blank">B3log 开源</a> • <a href="https://solo.b3log.org" target="_blank">Solo</a> ${version}
</div> </div>
......
src/main/webapp/admin/admin-link-list.ftl
View file @ 7ee15874
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
--> -->
<div> <div>
<div id="linkTable"></div> <div id="linkTable"></div>
<div id="linkPagination" class="margin12 right"></div> <div id="linkPagination" class="fn__margin12 fn__right"></div>
</div> </div>
<div class="clear"></div> <div class="fn__clear"></div>
<div class="form form__no-table"> <div class="form form__no-table">
${addLinkLabel} ${addLinkLabel}
<label>${linkTitle1Label}</label> <label>${linkTitle1Label}</label>
...@@ -30,17 +30,17 @@ ${addLinkLabel} ...@@ -30,17 +30,17 @@ ${addLinkLabel}
<input id="linkAddress" type="text"/> <input id="linkAddress" type="text"/>
<label>${linkDescription1Label}</label> <label>${linkDescription1Label}</label>
<input id="linkDescription" type="text"/> <br><br> <input id="linkDescription" type="text"/> <br><br>
<button onclick="admin.linkList.add();" class="right">${saveLabel}</button> <button onclick="admin.linkList.add();" class="fn__right">${saveLabel}</button>
<div class="clear"></div> <div class="fn__clear"></div>
</div> </div>
<div id="updateLink" class="none form form__no-table" data-title="${updateLinkLabel}"> <div id="updateLink" class="fn__none form form__no-table" data-title="${updateLinkLabel}">
<label>${linkTitle1Label}</label> <label>${linkTitle1Label}</label>
<input id="linkTitleUpdate" type="text"/> <input id="linkTitleUpdate" type="text"/>
<label>${url1Label}</label> <label>${url1Label}</label>
<input id="linkAddressUpdate" type="text"/> <input id="linkAddressUpdate" type="text"/>
<label>${linkDescription1Label}</label> <label>${linkDescription1Label}</label>
<input id="linkDescriptionUpdate" type="text"/><br><br> <input id="linkDescriptionUpdate" type="text"/><br><br>
<button onclick="admin.linkList.update();" class="right">${updateLabel}</button> <button onclick="admin.linkList.update();" class="fn__right">${updateLabel}</button>
<div class="clear"></div> <div class="fn__clear"></div>
</div> </div>
${plugins} ${plugins}
\ No newline at end of file
src/main/webapp/admin/admin-others.ftl
View file @ 7ee15874
...@@ -42,21 +42,21 @@ ...@@ -42,21 +42,21 @@
<input id="replayEmailTemplateTitle" type="text"/> <input id="replayEmailTemplateTitle" type="text"/>
<label for="replayEmailTemplateBody">${emailContent1Label}</label> <label for="replayEmailTemplateBody">${emailContent1Label}</label>
<textarea rows="9" id="replayEmailTemplateBody"></textarea><br><br> <textarea rows="9" id="replayEmailTemplateBody"></textarea><br><br>
<button onclick="admin.others.update()" class="right">${updateLabel}</button> <button onclick="admin.others.update()" class="fn__right">${updateLabel}</button>
<div class="clear"></div> <div class="fn__clear"></div>
<div class="content-reset"> <div class="content-reset">
${replayEmailExplanationLabel} ${replayEmailExplanationLabel}
</div> </div>
</div> </div>
<div id="tabOthersPanel_tag" class="none"> <div id="tabOthersPanel_tag" class="fn__none">
<button class="margin12" onclick="admin.others.removeUnusedTags();">${removeUnusedTagsLabel}</button> <button class="fn__margin12" onclick="admin.others.removeUnusedTags();">${removeUnusedTagsLabel}</button>
</div> </div>
<div id="tabOthersPanel_data" class="none"> <div id="tabOthersPanel_data" class="fn__none">
<#if supportExport> <#if supportExport>
<button class="margin12" onclick="admin.others.exportSQL();">${exportSQLLabel}</button> <button class="fn__margin12" onclick="admin.others.exportSQL();">${exportSQLLabel}</button>
</#if> </#if>
<button class="margin12" onclick="admin.others.exportJSON();">${exportJSONLabel}</button> <button class="fn__margin12" onclick="admin.others.exportJSON();">${exportJSONLabel}</button>
<button class="margin12" onclick="admin.others.exportHexo();">${exportHexoLabel}</button> <button class="fn__margin12" onclick="admin.others.exportHexo();">${exportHexoLabel}</button>
</div> </div>
</div> </div>
${plugins} ${plugins}
src/main/webapp/admin/admin-page-list.ftl
View file @ 7ee15874
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
<div> <div>
<div id="pageTable"> <div id="pageTable">
</div> </div>
<div id="pagePagination" class="margin12 right"> <div id="pagePagination" class="fn__margin12 fn__right">
</div> </div>
<div class="clear"></div> <div class="fn__clear"></div>
</div> </div>
<div class="form"> <div class="form">
<div> <div>
...@@ -49,16 +49,16 @@ ...@@ -49,16 +49,16 @@
<button data-type="link" class="selected fn-type">${pageLinkLabel}</button> <button data-type="link" class="selected fn-type">${pageLinkLabel}</button>
<button data-type="page" class="fn-type">${pageLabel}</button> <button data-type="page" class="fn-type">${pageLabel}</button>
</div> </div>
<div id="pagePagePanel" class="none"> <div id="pagePagePanel" class="fn__none">
<div id="pageContent" style="height: 430px;width: 100%;" name="pageContent"></div> <div id="pageContent" style="height: 430px;width: 100%;" name="pageContent"></div>
<label>${allowComment1Label}</label> <label>${allowComment1Label}</label>
<input type="checkbox" id="pageCommentable" checked="checked" /> <input type="checkbox" id="pageCommentable" checked="checked" />
</div> </div>
<div class="right"> <div class="fn__right">
<button onclick="admin.pageList.submit();">${saveLabel}</button> <button onclick="admin.pageList.submit();">${saveLabel}</button>
</div> </div>
<div class="clear"></div> <div class="fn__clear"></div>
</div> </div>
<div id="pageComments" class="none"></div> <div id="pageComments" class="fn__none"></div>
<div class="clear"></div> <div class="fn__clear"></div>
${plugins} ${plugins}
src/main/webapp/admin/admin-plugin-list.ftl
View file @ 7ee15874
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
--> -->
<div id="pluginTable"> <div id="pluginTable">
</div> </div>
<div id="pluginPagination" class="margin12 right"> <div id="pluginPagination" class="fn__margin12 fn__right">
</div> </div>
<div id="pluginSetting" class="none"> <div id="pluginSetting" class="fn__none">
</div> </div>
<div class="clear"></div> <div class="fn__clear"></div>
${plugins} ${plugins}
src/main/webapp/admin/admin-preference.ftl
View file @ 7ee15874
...@@ -17,7 +17,7 @@ ...@@ -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 id="tabPreference" class="sub-tabs fn-clear"> <div id="tabPreference" class="sub-tabs fn__clear">
<ul> <ul>
<li> <li>
<div id="tabPreference_config"> <div id="tabPreference_config">
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
</div> </div>
<div id="tabPreferencePanel" class="sub-tabs-main"> <div id="tabPreferencePanel" class="sub-tabs-main">
<div id="tabPreferencePanel_config" class="form"> <div id="tabPreferencePanel_config" class="form">
<button onclick="admin.preference.update()" class="right">${updateLabel}</button> <button onclick="admin.preference.update()" class="fn__right">${updateLabel}</button>
<div class="clear"></div> <div class="fn__clear"></div>
<label for="blogTitle">${blogTitle1Label}</label> <label for="blogTitle">${blogTitle1Label}</label>
<input id="blogTitle" type="text"/> <input id="blogTitle" type="text"/>
<label for="blogSubtitle">${blogSubtitle1Label}</label> <label for="blogSubtitle">${blogSubtitle1Label}</label>
...@@ -61,12 +61,12 @@ ...@@ -61,12 +61,12 @@
<textarea rows="6" id="noticeBoard"></textarea> <textarea rows="6" id="noticeBoard"></textarea>
<label for="footerContent">${footerContent1Label}</label> <label for="footerContent">${footerContent1Label}</label>
<textarea rows="2" id="footerContent"></textarea><br><br> <textarea rows="2" id="footerContent"></textarea><br><br>
<button onclick="admin.preference.update()" class="right">${updateLabel}</button> <button onclick="admin.preference.update()" class="fn__right">${updateLabel}</button>
<div class="clear"></div> <div class="fn__clear"></div>
</div> </div>
<div id="tabPreferencePanel_setting" class="none form"> <div id="tabPreferencePanel_setting" class="fn__none form">
<button class="right" onclick="admin.preference.update()">${updateLabel}</button> <button class="fn__right" onclick="admin.preference.update()">${updateLabel}</button>
<div class="clear"></div> <div class="fn__clear"></div>
<label for="localeString">${localeString1Label}</label> <label for="localeString">${localeString1Label}</label>
<select id="localeString"> <select id="localeString">
<option value="zh_CN">简体中文</option> <option value="zh_CN">简体中文</option>
...@@ -117,17 +117,17 @@ ...@@ -117,17 +117,17 @@
<input id="feedOutputCnt" class="normalInput" type="text"/> <input id="feedOutputCnt" class="normalInput" type="text"/>
<label for="customVars">${customVars1Label}</label> <label for="customVars">${customVars1Label}</label>
<input id="customVars" class="normalInput" type="text"/><br/><br/> <input id="customVars" class="normalInput" type="text"/><br/><br/>
<button class="right" onclick="admin.preference.update()">${updateLabel}</button> <button class="fn__right" onclick="admin.preference.update()">${updateLabel}</button>
<div class="clear"></div> <div class="fn__clear"></div>
</div> </div>
<div id="tabPreferencePanel_skins" class="none form"> <div id="tabPreferencePanel_skins" class="fn__none form">
<table class="form" width="100%" cellpadding="0" cellspacing="0"> <table class="form" width="100%" cellpadding="0" cellspacing="0">
<tbody> <tbody>
<tr> <tr>
<td> <td>
<a href="https://github.com/b3log/solo/issues/12449" target="_blank">新皮肤推荐</a> • <a href="https://github.com/b3log/solo/issues/12449" target="_blank">新皮肤推荐</a> •
<a href="https://hacpai.com/article/1493814851007" target="_blank">皮肤开发指南</a> <a href="https://hacpai.com/article/1493814851007" target="_blank">皮肤开发指南</a>
<button style="float: right" onclick="admin.preference.update()">${updateLabel}</button> <button class="fn__right" onclick="admin.preference.update()">${updateLabel}</button>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -139,23 +139,23 @@ ...@@ -139,23 +139,23 @@
<td> <td>
<a href="https://github.com/b3log/solo/issues/12449" target="_blank">新皮肤推荐</a> • <a href="https://github.com/b3log/solo/issues/12449" target="_blank">新皮肤推荐</a> •
<a href="https://hacpai.com/article/1493814851007" target="_blank">皮肤开发指南</a> <a href="https://hacpai.com/article/1493814851007" target="_blank">皮肤开发指南</a>
<button style="float: right" onclick="admin.preference.update()">${updateLabel}</button> <button class="fn__right" onclick="admin.preference.update()">${updateLabel}</button>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<div id="tabPreferencePanel_signs" class="none form"> <div id="tabPreferencePanel_signs" class="fn__none form">
<button onclick="admin.preference.update()" class="right">${updateLabel}</button> <button onclick="admin.preference.update()" class="fn__right">${updateLabel}</button>
<div class="clear"></div> <div class="fn__clear"></div>
<button id="preferenceSignButton1">${signLabel}1</button> <button id="preferenceSignButton1">${signLabel}1</button>
<textarea rows="8" id="preferenceSign1"></textarea> <textarea rows="8" id="preferenceSign1"></textarea>
<button id="preferenceSignButton2">${signLabel}2</button> <button id="preferenceSignButton2">${signLabel}2</button>
<textarea rows="8" id="preferenceSign2"></textarea> <textarea rows="8" id="preferenceSign2"></textarea>
<button id="preferenceSignButton3">${signLabel}3</button> <button id="preferenceSignButton3">${signLabel}3</button>
<textarea rows="8" id="preferenceSign3"></textarea><br><br> <textarea rows="8" id="preferenceSign3"></textarea><br><br>
<button onclick="admin.preference.update()" class="right">${updateLabel}</button> <button onclick="admin.preference.update()" class="fn__right">${updateLabel}</button>
<div class="clear"></div> <div class="fn__clear"></div>
</div> </div>
</div> </div>
${plugins} ${plugins}
src/main/webapp/admin/admin-user-list.ftl
View file @ 7ee15874
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
--> -->
<div> <div>
<div id="userTable"></div> <div id="userTable"></div>
<div id="userPagination" class="margin12 right"></div> <div id="userPagination" class="fn__margin12 fn__right"></div>
</div> </div>
<div class="clear"></div> <div class="fn__clear"></div>
<div class="form form__no-table"> <div class="form form__no-table">
<div id="userUpdate" class="none form form__no-table"> <div id="userUpdate" class="fn__none form form__no-table">
<label for="userNameUpdate">${userName1Label}</label> <label for="userNameUpdate">${userName1Label}</label>
<input id="userNameUpdate" type="text"/> <input id="userNameUpdate" type="text"/>
<label for="userEmailUpdate">${commentEmailLabel}</label> <label for="userEmailUpdate">${commentEmailLabel}</label>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<label for="userB3KeyUpdate">B3 Key</label> <label for="userB3KeyUpdate">B3 Key</label>
<input id="userB3KeyUpdate" type="text"/> <input id="userB3KeyUpdate" type="text"/>
<br><br> <br><br>
<button onclick="admin.userList.update();" class="right">${updateLabel}</button> <button onclick="admin.userList.update();" class="fn__right">${updateLabel}</button>
<div class="clear"></div> <div class="fn__clear"></div>
</div> </div>
${plugins} ${plugins}
src/main/webapp/admin/article-pwd.ftl
View file @ 7ee15874
...@@ -28,7 +28,7 @@ ${articleTitle} ...@@ -28,7 +28,7 @@ ${articleTitle}
<label for="pwdTyped">访问密码</label> <label for="pwdTyped">访问密码</label>
<input type="password" id="pwdTyped" name="pwdTyped" /> <input type="password" id="pwdTyped" name="pwdTyped" />
<input type="hidden" name="articleId" value="${articleId}" /> <input type="hidden" name="articleId" value="${articleId}" />
<div style="text-align: right"> <div style="text-align: fn__right">
<#if msg??> <#if msg??>
<span class="error">${msg}</span> <span class="error">${msg}</span>
</#if> </#if>
......
src/main/webapp/js/admin/admin.js
View file @ 7ee15874
...@@ -240,10 +240,10 @@ $.extend(Admin.prototype, { ...@@ -240,10 +240,10 @@ $.extend(Admin.prototype, {
var subNav = $(it).next(); var subNav = $(it).next();
subNav.slideToggle("normal", function () { subNav.slideToggle("normal", function () {
if (this.style.display !== "none") { if (this.style.display !== "none") {
$(it).find(".icon-chevron-down")[0].className = "icon-chevron-up right"; $(it).find(".icon-chevron-down")[0].className = "icon-chevron-up fn__right";
$(it).addClass('tab-current'); $(it).addClass('tab-current');
} else { } else {
$(it).find(".icon-chevron-up")[0].className = "icon-chevron-down right"; $(it).find(".icon-chevron-up")[0].className = "icon-chevron-down fn__right";
$(it).removeClass('tab-current'); $(it).removeClass('tab-current');
} }
......
src/main/webapp/js/admin/admin.min.js
View file @ 7ee15874
This diff is collapsed.
src/main/webapp/js/admin/article.js
View file @ 7ee15874
...@@ -317,7 +317,7 @@ admin.article = { ...@@ -317,7 +317,7 @@ admin.article = {
for (var i = 0; i < result.tags.length; i++) { for (var i = 0; i < result.tags.length; i++) {
spans += '<span>' + result.tags[i].tagTitle + '</span>' spans += '<span>' + result.tags[i].tagTitle + '</span>'
} }
$('#tagCheckboxPanel').html(spans + '<div class="clear"></div>') $('#tagCheckboxPanel').html(spans + '<div class="fn__clear"></div>')
$('#loadMsg').text('') $('#loadMsg').text('')
}, },
......
src/main/webapp/js/admin/comment.js
View file @ 7ee15874
...@@ -72,17 +72,17 @@ admin.comment = { ...@@ -72,17 +72,17 @@ admin.comment = {
hrefHTML = "<a target='_blank'>"; hrefHTML = "<a target='_blank'>";
} }
commentsHTML += "<div class='comment-title'><span class='left'>" commentsHTML += "<div class='comment-title'><span class='fn__left'>"
+ hrefHTML + comments[i].commentName + "</a>"; + hrefHTML + comments[i].commentName + "</a>";
if (comments[i].commentOriginalCommentName) { if (comments[i].commentOriginalCommentName) {
commentsHTML += "@" + comments[i].commentOriginalCommentName; commentsHTML += "@" + comments[i].commentOriginalCommentName;
} }
commentsHTML += "</span><span title='" + Label.removeLabel + "' class='right deleteIcon' onclick=\"admin.comment.del('" commentsHTML += "</span><span title='" + Label.removeLabel + "' class='fn__right deleteIcon' onclick=\"admin.comment.del('"
+ comments[i].oId + "', '" + fromId + "', '" + onId + "')\"></span><span class='right'><a href='mailto:" + comments[i].oId + "', '" + fromId + "', '" + onId + "')\"></span><span class='fn__right'><a href='mailto:"
+ comments[i].commentEmail + "'>" + comments[i].commentEmail + "</a>&nbsp;&nbsp;" + comments[i].commentEmail + "'>" + comments[i].commentEmail + "</a>&nbsp;&nbsp;"
+ $.bowknot.getDate(comments[i].commentTime) + $.bowknot.getDate(comments[i].commentTime)
+ "&nbsp;</span><div class='clear'></div></div><div class='margin12'>" + "&nbsp;</span><div class='fn__clear'></div></div><div class='fn__margin12'>"
+ contentHTML + "</div>"; + contentHTML + "</div>";
} }
if ("" === commentsHTML) { if ("" === commentsHTML) {
......
src/main/webapp/js/admin/preference.js
View file @ 7ee15874
...@@ -83,11 +83,11 @@ admin.preference = { ...@@ -83,11 +83,11 @@ admin.preference = {
selectedClass += " selected"; selectedClass += " selected";
} }
skinsHTML += "<div title='" + skins[i].skinDirName skinsHTML += "<div title='" + skins[i].skinDirName
+ "' class='left skinItem" + selectedClass + "'><img class='skinPreview' src='" + "' class='fn__left skinItem" + selectedClass + "'><img class='skinPreview' src='"
+ latkeConfig.staticServePath + "/skins/" + skins[i].skinDirName + latkeConfig.staticServePath + "/skins/" + skins[i].skinDirName
+ "/preview.png'/><div>" + skins[i].skinName + "</div></div>"; + "/preview.png'/><div>" + skins[i].skinName + "</div></div>";
} }
$("#skinMain").append(skinsHTML + "<div class='clear'></div>"); $("#skinMain").append(skinsHTML + "<div class='fn__clear'></div>");
$(".skinItem").click(function () { $(".skinItem").click(function () {
$(".skinItem").removeClass("selected"); $(".skinItem").removeClass("selected");
......
src/main/webapp/scss/admin.scss
View file @ 7ee15874
...@@ -20,178 +20,35 @@ ...@@ -20,178 +20,35 @@
* *
* @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.6.0.4, Feb 19, 2019 * @version 3.0.0.0, Feb 21, 2019
*/ */
@import "../scss/reset"; @import "reset";
@import "../scss/reset-content"; @import "reset-content";
@import "tooltipped";
@import "function";
@import "vditor/src/assets/scss/classic";
.tooltipped { body {
position: relative; color: #767676;
cursor: pointer; background: #f1f2f7;
} font-size: 13px;
.tooltipped::after {
position: absolute;
z-index: 1000000;
display: none;
padding: 5px 8px;
font-size: 11px;
font-weight: normal;
-webkit-font-smoothing: subpixel-antialiased;
color: #fff;
text-align: center;
text-decoration: none;
text-shadow: none;
text-transform: none;
letter-spacing: normal;
word-wrap: break-word;
white-space: pre;
pointer-events: none;
content: attr(aria-label);
background: rgba(0, 0, 0, 0.8);
border-radius: 3px;
line-height: 16px;
opacity: 0
}
.tooltipped::before {
position: absolute;
z-index: 1000001;
display: none;
width: 0;
height: 0;
color: rgba(0, 0, 0, 0.8);
pointer-events: none;
content: "";
border: 5px solid transparent;
opacity: 0
}
@-webkit-keyframes tooltip-appear {
from {
opacity: 0
}
to {
opacity: 1
}
}
@keyframes tooltip-appear {
from {
opacity: 0
}
to {
opacity: 1
}
}
.tooltipped-hover::before,
.tooltipped-hover::after,
.tooltipped:hover::before,
.tooltipped:hover::after,
.tooltipped:active::before,
.tooltipped:active::after,
.tooltipped:focus::before,
.tooltipped:focus::after {
display: inline-block;
text-decoration: none;
-webkit-animation-name: tooltip-appear;
animation-name: tooltip-appear;
-webkit-animation-duration: 0.1s;
animation-duration: 0.1s;
-webkit-animation-fill-mode: forwards;
animation-fill-mode: forwards;
-webkit-animation-timing-function: ease-in;
animation-timing-function: ease-in;
-webkit-animation-delay: 0.4s;
animation-delay: 0.4s
}
.tooltipped-s::after, .tooltipped-se::after, .tooltipped-sw::after {
top: 100%;
right: 50%;
margin-top: 5px
}
.tooltipped-s::before, .tooltipped-se::before, .tooltipped-sw::before {
top: auto;
right: 50%;
bottom: -5px;
margin-right: -5px;
border-bottom-color: rgba(0, 0, 0, 0.8)
}
.tooltipped-se::after {
right: auto;
left: 50%;
margin-left: -15px
}
.tooltipped-sw::after {
margin-right: -15px
}
.tooltipped-n::after, .tooltipped-ne::after, .tooltipped-nw::after {
right: 50%;
bottom: 100%;
margin-bottom: 5px
}
.tooltipped-n::before, .tooltipped-ne::before, .tooltipped-nw::before {
top: -5px;
right: 50%;
bottom: auto;
margin-right: -5px;
border-top-color: rgba(0, 0, 0, 0.8)
}
.tooltipped-ne::after {
right: auto;
left: 50%;
margin-left: -15px
}
.tooltipped-nw::after {
margin-right: -15px
}
.tooltipped-s::after, .tooltipped-n::after {
-webkit-transform: translateX(50%);
transform: translateX(50%)
} }
.tooltipped-w::after { a {
right: 100%; color: #4183c4;
bottom: 50%; text-decoration: none
margin-right: 5px;
-webkit-transform: translateY(50%);
transform: translateY(50%);
} }
.tooltipped-w::before { a:visited {
top: 50%; color: #7ba9d6
bottom: 50%;
left: -5px;
margin-top: -5px;
border-left-color: rgba(0, 0, 0, 0.8);
} }
.tooltipped-e::after { a:active {
bottom: 50%; color: #2c5d8d
left: 100%;
margin-left: 5px;
-webkit-transform: translateY(50%);
transform: translateY(50%)
} }
.tooltipped-e::before { a:hover {
top: 50%; text-decoration: underline
right: -5px;
bottom: 50%;
margin-top: -5px;
border-right-color: rgba(0, 0, 0, 0.8)
} }
button, button,
...@@ -220,7 +77,9 @@ button:hover { ...@@ -220,7 +77,9 @@ button:hover {
border-color: #1ca59e; border-color: #1ca59e;
} }
/* end reset */ .fn__margin12 {
margin: 12px;
}
/* start ico */ /* start ico */
@font-face { @font-face {
...@@ -391,7 +250,7 @@ a[class*=" icon-"]:hover { ...@@ -391,7 +250,7 @@ a[class*=" icon-"]:hover {
line-height: 50px; line-height: 50px;
} }
#top > .right a { #top > .fn__right a {
color: #555; color: #555;
line-height: 32px; line-height: 32px;
margin: 8px 10px; margin: 8px 10px;
...@@ -403,7 +262,7 @@ a[class*=" icon-"]:hover { ...@@ -403,7 +262,7 @@ a[class*=" icon-"]:hover {
display: inline-block; display: inline-block;
} }
#top > .right a:hover { #top > .fn__right a:hover {
color: #333; color: #333;
} }
......
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