Skip to content

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

🎨 401, 403, 404, 500, article-pwd, start, search, kill-browser page and style #12658

parent f8f1d6d8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 1128 deletions
gulpfile.js
View file @ a90c821e
...@@ -30,29 +30,27 @@ const concat = require('gulp-concat') ...@@ -30,29 +30,27 @@ const concat = require('gulp-concat')
const uglify = require('gulp-uglify') const uglify = require('gulp-uglify')
const sass = require('gulp-sass') const sass = require('gulp-sass')
const rename = require('gulp-rename') const rename = require('gulp-rename')
const minifycss = require('gulp-minify-css')
const del = require('del') const del = require('del')
function sassProcess () { function sassSkinProcess () {
return gulp.src('./src/main/webapp/skins/*/css/*.scss'). return gulp.src('./src/main/webapp/skins/*/css/*.scss').
pipe(sass().on('error', sass.logError)). pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError)).
pipe(gulp.dest('./src/main/webapp/skins/')) pipe(gulp.dest('./src/main/webapp/skins/'))
} }
function sassProcessWatch () { function sassWatch () {
gulp.watch('./src/main/webapp/skins/*/css/*.scss', sassProcess) gulp.watch(['./src/main/webapp/skins/*/css/*.scss'], sassSkinProcess)
gulp.watch(['./src/main/webapp/scss/*.scss'], sassCommonProcess)
} }
gulp.task('watch', gulp.series(sassProcessWatch)) function sassCommonProcess () {
return gulp.src('./src/main/webapp/scss/*.scss').
function minCSS () { pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError)).
// minify css pipe(gulp.dest('./src/main/webapp/scss/'))
return gulp.src('./src/main/webapp/css/*.css').
pipe(rename({suffix: '.min'})).
pipe(minifycss()).
pipe(gulp.dest('./src/main/webapp/css/'))
} }
gulp.task('watch', gulp.series(sassWatch))
function minJS () { function minJS () {
// minify js // minify js
return gulp.src('./src/main/webapp/js/*.js'). return gulp.src('./src/main/webapp/js/*.js').
...@@ -123,22 +121,12 @@ function minSkinJS () { ...@@ -123,22 +121,12 @@ function minSkinJS () {
pipe(gulp.dest('./src/main/webapp/skins/')) pipe(gulp.dest('./src/main/webapp/skins/'))
} }
function minSkinCSS () {
// minify skin css
return gulp.src('./src/main/webapp/skins/*/css/*.css').
pipe(rename({suffix: '.min'})).
pipe(minifycss()).
pipe(gulp.dest('./src/main/webapp/skins/'))
}
function cleanProcess () { function cleanProcess () {
return del([ return del([
'./src/main/webapp/css/*.min.css',
'./src/main/webapp/js/*.min.js', './src/main/webapp/js/*.min.js',
'./src/main/webapp/skins/*/css/*.min.css',
'./src/main/webapp/skins/*/js/*.min.js']) './src/main/webapp/skins/*/js/*.min.js'])
} }
gulp.task('default', gulp.task('default',
gulp.series(cleanProcess, sassProcess, gulp.parallel(minSkinJS, minJS, minSkinCSS, minCSS), gulp.series(cleanProcess, sassSkinProcess, sassCommonProcess, gulp.parallel(minSkinJS, minJS),
gulp.parallel(miniPjax, miniAdmin, miniAdminLibs))) gulp.parallel(miniPjax, miniAdmin, miniAdminLibs)))
\ No newline at end of file
package-lock.json
View file @ a90c821e
This diff is collapsed.
package.json
View file @ a90c821e
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
"del": "^3.0.0", "del": "^3.0.0",
"gulp": "^4.0.0", "gulp": "^4.0.0",
"gulp-concat": "^2.6.1", "gulp-concat": "^2.6.1",
"gulp-minify-css": "^1.2.4",
"gulp-rename": "^1.4.0", "gulp-rename": "^1.4.0",
"gulp-sass": "^4.0.1", "gulp-sass": "^4.0.1",
"gulp-uglify": "^3.0.1" "gulp-uglify": "^3.0.1"
......
src/main/resources/lang_en_US.properties
View file @ a90c821e
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
# #
# Description: Solo language configurations(en_US). # Description: Solo language configurations(en_US).
# Version: 2.31.0.0, Feb 10, 2019 # Version: 2.31.0.1, Feb 21, 2019
# Author: Liang Ding # Author: Liang Ding
# Author: Liyuan Li # Author: Liyuan Li
# Author: Dongxu Wang # Author: Dongxu Wang
...@@ -302,7 +302,7 @@ goTopLabel=Top ...@@ -302,7 +302,7 @@ goTopLabel=Top
permalink1Label=Permalink: permalink1Label=Permalink:
permalinkLabel=Permalink permalinkLabel=Permalink
welcomeToSoloLabel=Welcome to welcomeToSoloLabel=Welcome to
killBrowserLabel=<h2>Let's kill outdated and insecure browser!</h2><p>Let's kill outdated and insecure browser for browser evolution, human progress and better experience.</p><p>You can download</p><ul><li><a href="http://www.mozilla.com/" target="_blank">Firefox</a></li><li><a href="http://www.google.com/chrome" target="_blank">Chrome</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">Maxthon</a> and <a href="http://www.google.com" target="_blank">so on</a>.</li></ul><span style="font-size: 10px">Tip: Remove "Util.killIE();" in /js/common.js can support all browser.</span> killBrowserLabel=<h2>Let's kill outdated and insecure browser!</h2><div class="content-reset"><p>Let's kill outdated and insecure browser for browser evolution, human progress and better experience.</p><p>You can download</p><ul><li><a href="http://www.mozilla.com/" target="_blank">Firefox</a></li><li><a href="http://www.google.com/chrome" target="_blank">Chrome</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">Maxthon</a> and <a href="http://www.google.com" target="_blank">so on</a>.</li></ul><span style="font-size: 10px">Tip: Remove "Util.killIE();" in /js/common.js can support all browser.</span></div>
closeLabel=Close closeLabel=Close
closeForeverLabel=Close Forever closeForeverLabel=Close Forever
readmoreLabel=Read more\u00BB readmoreLabel=Read more\u00BB
......
src/main/resources/lang_zh_CN.properties
View file @ a90c821e
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
# #
# Description: Solo default language configurations(zh_CN). # Description: Solo default language configurations(zh_CN).
# Version: 2.31.0.0, Feb 10, 2019 # Version: 2.31.0.1, Feb 21, 2019
# Author: Liang Ding # Author: Liang Ding
# Author: Liyuan Li # Author: Liyuan Li
# Author: Dongxu Wang # Author: Dongxu Wang
...@@ -302,7 +302,7 @@ goTopLabel=\u9876\u90E8 ...@@ -302,7 +302,7 @@ goTopLabel=\u9876\u90E8
permalink1Label=\u94FE\u63A5\uFF1A permalink1Label=\u94FE\u63A5\uFF1A
permalinkLabel=\u94FE\u63A5 permalinkLabel=\u94FE\u63A5
welcomeToSoloLabel=\u6B22\u8FCE\u4F7F\u7528 welcomeToSoloLabel=\u6B22\u8FCE\u4F7F\u7528
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><span style="font-size: 10px">\u6CE8\uFF1A\u5220\u9664 /js/common.js \u4E2D\u7684 Util.killIE(); \u53EF\u5BF9\u6240\u6709\u6D4F\u89C8\u5668\u8FDB\u884C\u652F\u6301\u3002</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><div class="content-reset"><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><span style="font-size: 10px">\u6CE8\uFF1A\u5220\u9664 /js/common.js \u4E2D\u7684 Util.killIE(); \u53EF\u5BF9\u6240\u6709\u6D4F\u89C8\u5668\u8FDB\u884C\u652F\u6301\u3002</span></div>
closeLabel=\u5173\u95ED closeLabel=\u5173\u95ED
closeForeverLabel=\u6C38\u4E45\u5173\u95ED closeForeverLabel=\u6C38\u4E45\u5173\u95ED
readmoreLabel=\u9605\u8BFB\u66F4\u591A\u00BB readmoreLabel=\u9605\u8BFB\u66F4\u591A\u00BB
......
src/main/webapp/WEB-INF/static-resources.xml
View file @ a90c821e
...@@ -73,12 +73,12 @@ ...@@ -73,12 +73,12 @@
<include path="/skins/**/*.woff"/> <include path="/skins/**/*.woff"/>
<include path="/skins/**/*.cur"/> <include path="/skins/**/*.cur"/>
<include path="/css/**.css"/> <include path="/scss/**.css"/>
<include path="/css/**/*.css"/> <include path="/scss/**/*.css"/>
<include path="/css/fonts/*.eot"/> <include path="/scss/fonts/*.eot"/>
<include path="/css/fonts/*.svg"/> <include path="/scss/fonts/*.svg"/>
<include path="/css/fonts/*.ttf"/> <include path="/scss/fonts/*.ttf"/>
<include path="/css/fonts/*.woff"/> <include path="/scss/fonts/*.woff"/>
<include path="/images/**.png"/> <include path="/images/**.png"/>
<include path="/images/**/*.png"/> <include path="/images/**/*.png"/>
......
src/main/webapp/admin/admin-index.ftl
View file @ a90c821e
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
<meta http-equiv="Window-target" content="_top"> <meta http-equiv="Window-target" content="_top">
<meta name="robots" content="none" /> <meta name="robots" content="none" />
<title>${adminConsoleLabel} - ${blogTitle}</title> <title>${adminConsoleLabel} - ${blogTitle}</title>
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/scss/base.css?${staticResourceVersion}" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-admin${miniPostfix}.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/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" />
......
src/main/webapp/css/default-admin.min.css deleted 100644 → 0
View file @ f8f1d6d8
This diff is collapsed.
src/main/webapp/css/default-base.min.css deleted 100644 → 0
View file @ f8f1d6d8
/**
* 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/>.
*/
body,dd,div,dl,h1,h2,h3,h4,h5,h6,html,img,li,ol,p,ul{padding:0;margin:0}.clear,.fn-clear:after{clear:both}.form th,.nowrap{white-space:nowrap}.goBottomIcon,.goTopIcon{position:fixed;right:20px}#tags,#tags li{list-style:none}body{background-color:#FFF;color:#000;font-family:elvetica,Arial,sans-serif,'\5fae\8f6f\96c5\9ed1';font-size:small}img{border:none;vertical-align:middle}h1{font-size:160%}h2{font-size:140%}h3{font-size:120%}h4{font-size:110%}textarea{overflow:auto}.button,button{background:url(../images/icon.png) center bottom;border:1px solid;border-color:#CCC #BBB #A0A0A0;border-radius:4px;height:28px;margin:0;padding:0 6px;vertical-align:top}.button:hover,button:hover{border-color:#BBB}.padding12{padding:12px}.paddingBottom12{padding-bottom:12px!important}.paddingTop12{padding-top:12px!important}.margin12{margin:12px}.marginTop12{margin-top:12px!important}.marginBottom12{margin-bottom:12px!important}.marginLeft12{margin-left:12px!important}.marginLeft6{margin-left:6px!important}.marginRight12{margin-right:12px!important}.f-bold{font-weight:700!important}.left{float:left}.right{float:right}.clear{background-color:transparent;border:0;display:block;font-size:0;height:0;line-height:0;overflow:hidden}.fn-clear:after,.fn-clear:before{display:table;content:""}.fn__flex{display:flex}.fn__flex1{flex:1;min-width:1px}.fn__flex-inline{display:inline-flex!important;align-items:center}.none{display:none}.pointer{cursor:pointer}.no-underline{text-decoration:none!important}#tags a,.logo{text-decoration:none}.red{color:red}.contentBody{margin-bottom:12px;padding:3px 12px}.form th{text-align:right}.form input[type=text],.form input[type=password],.form textarea{border-color:silver #D9D9D9 #D9D9D9;border-right:1px solid #D9D9D9;border-style:solid;border-width:1px;font-family:Helvetica,Arial,sans-serif;font-size:12px;outline:0;width:99%;padding:0 3px}.form input{height:24px}.form input[type=checkbox]{border:0;vertical-align:sub;height:20px}.form input.normalInput{width:auto}.form input[type=checkbox]:focus{border:0;box-shadow:0 0 0}.form input:focus,.form textarea:focus{box-shadow:0 1px 2px rgba(0,0,0,.3) inset}.form textarea{padding:3px;overflow:auto;resize:vertical}.logo{padding:0 5px;text-shadow:0 0 1px #EEE}.article-body h1,.article-body h2{padding-bottom:.3em;border-bottom:1px solid #eee}.aboutIcon,.adminIcon,.articlesIcon,.browserIcon,.cacheIcon,.calendarIcon,.commentIcon,.deleteIcon,.draftsIcon,.falseIcon,.fileIcon,.goBottomIcon,.goTopIcon,.homeIcon,.linkIcon,.loginIcon,.logoutIcon,.notPutTopIcon,.othersIcon,.pageIcon,.postIcon,.preferenceIcon,.putTopIcon,.trueIcon,.updateIcon,.usersIcon{background-image:url(../images/icon.png);cursor:pointer;height:16px;width:16px}.adminIcon,.homeIcon,.loginIcon,.logoutIcon{margin-top:3px}.pageIcon{background-position:-144px 0}.postIcon{background-position:-16px 0}.linkIcon{background-position:-32px 0}.preferenceIcon{background-position:-48px 0}.articlesIcon{background-position:-64px 0}.trueIcon{background-position:-80px 0;cursor:auto}.falseIcon{background-position:-96px 0;cursor:auto}.fileIcon{background-position:-112px 0}.deleteIcon{background-position:0 -16px}.updateIcon{background-position:-16px -16px}.commentIcon{background-position:-32px -16px}.homeIcon{background-position:-64px -16px}.adminIcon{background-position:-80px -16px}.logoutIcon{background-position:-96px -16px}.loginIcon{background-position:-112px -16px}.browserIcon{background-position:-128px -16px}.calendarIcon{background-position:-144px -16px}.putTopIcon{background-position:-16px -32px;float:left}.notPutTopIcon{background-position:-32px -32px;float:left}.othersIcon{background-position:-48px -32px}.cacheIcon,.draftsIcon{background-position:-96px -32px}.usersIcon{background-position:-112px -32px}.goTopIcon{background-position:-64px -32px;top:45%}.goBottomIcon{background-position:-80px -32px;bottom:40%}.article-body{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.article-body ol,.article-body ul{padding-left:2em;margin-top:0;margin-bottom:16px}.article-body li{margin-top:.25em}.article-body img{cursor:zoom-in}.article-body img.emoji{cursor:auto;max-width:18px}#captcha,#captchaReply,#emotions span{cursor:pointer}.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:1.7em}.article-body h2{font-size:1.5em}.article-body h3{font-size:1.25em}.article-body h4{font-size:1em}.article-body h5{font-size:.875em}.article-body h6{font-size:.85em}.article-body hr{height:.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:.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,.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:700;text-align:center!important;background:rgba(158,188,226,.2)}.article-body tbody tr:nth-child(2n){background:rgba(158,188,226,.12)}.article-body tr:hover{background:#efefef}.article-body code{padding:.2em .4em;margin:0;font-size:85%;background-color:rgba(252,41,41,.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:.5em;background-color:rgba(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:1px solid rgba(0,0,0,.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.article-body .task-list-item,.article-body__task{list-style:none;margin-left:-1em}.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}#tags li{float:left;height:38px}#tags a:hover{text-shadow:0 0 2px #555}#tags a{border-radius:3px;box-shadow:1px 1px 3px #555;float:left;margin:3px 6px;padding:3px 12px}#tags .tags1{font-size:12px;font-weight:400}#tags .tags2{font-size:14px;font-weight:400}#tags .tags3{font-size:16px;font-weight:400}#tags .tags4{font-size:18px;font-weight:700}#tags .tags5{font-size:20px;font-weight:700}
\ No newline at end of file
src/main/webapp/css/default-init.min.css deleted 100644 → 0
View file @ f8f1d6d8
/**
* 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/>.
*/
.error,button{font-weight:700}.wrap,body,html{min-height:100vh}.content,.logo{align-self:center}.content-reset img,.img-error{max-width:100%}body,html{margin:0;padding:0}body{background-color:#fff;color:#3b3e43;font-family:\5fae\8f6f\96c5\9ed1;font-size:small}button{background-size:110% 110%;border:1px solid rgba(27,31,35,.2);font-size:13px;text-shadow:0 1px 0 rgba(255,255,255,.9);white-space:nowrap;background-color:#eff3f6;background-image:linear-gradient(-180deg,#fafbfc,#eff3f6 90%);color:#24292e;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,.075);outline:0;padding:7px 15px;margin-top:10px;cursor:pointer}button:hover{background-color:#e6ebf1;background-image:linear-gradient(-180deg,#f0f3f6,#e6ebf1 90%);background-position:-.5em;border-color:rgba(27,31,35,.35)}a{color:#4285f4;text-decoration:none}h2{background-color:#F3F1E5;border-radius:4px 4px 0 0;font-size:16px;margin:0;padding:10px 20px}input[type=password],input[type=text]{border:1px solid #d1d5da;background-color:#FAFAFA;border-radius:3px;box-shadow:inset 0 1px 2px rgba(27,31,35,.075);padding:7px 8px;width:100%;line-height:17px;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;outline:0;margin-top:10px}input[type=password]:focus,input[type=text]:focus{background-color:#FFF;box-shadow:inset 0 1px 2px rgba(27,31,35,.075),0 0 0 .2em #dbedff;border:1px solid #4285f4}.error{color:#d23f31}.wrap{border-top:5px solid #E6E5D9;background-color:#F3F1E5;display:flex;flex-direction:column;box-sizing:border-box}.content-wrap{flex:1;display:flex}.content{background-color:#fff;margin:0 auto;width:760px;display:flex}.main{border-left:1px solid #E6E5D9;font-size:15px;padding:20px;flex:1}.logo{width:217px;text-align:center}.logo img{height:128px;width:128px}.footerWrapper{background-color:#FFF;border-top:1px solid #E6E5D9;padding:12px 0;text-align:center}.a-error{text-align:right}.img-error{margin:20px auto;padding:0;display:block}.content-reset h1,.content-reset h2{padding-bottom:.3em;border-bottom:1px solid #eee}.kill img{position:absolute;right:40px;top:200px}.kill ul{margin-bottom:50px}.kill p{margin:12px 20px}.kill span{margin-left:20px}#github{position:relative;text-align:center}#github.github--loading:after{content:"Loading...";position:absolute;height:100%;width:100%;top:0;left:0;z-index:7;background-color:rgba(255,255,255,.6);font-size:22px;text-align:center;padding-top:135px;color:#000;text-shadow:0 1px 2px rgba(0,0,0,.2);box-sizing:border-box}#github .github__icon{height:200px;width:266px;background-image:url(../images/github.png);margin:0 auto;background-size:contain;cursor:pointer}#github .github__icon:hover{background-image:url(../images/github.gif)}#github img{display:none}.github__text{cursor:pointer;font-size:12px;color:#666}.github__text ul{display:none;text-align:left;margin:5px auto 0;width:280px;padding-left:24px;box-sizing:border-box}.github__link{font-size:12px;text-decoration:underline;margin-top:10px;display:block}.github__check{font-size:12px;display:flex;width:80%;margin:10px auto 0;align-items:center;line-height:20px;color:#999}.github__check a{color:#999;text-decoration:underline}.github__check input{width:auto}.content-reset{word-wrap:break-word;overflow:auto;line-height:1.65;font-size:16px;word-break:break-word}.content-reset ol,.content-reset ul{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:.25em}.content-reset img.emoji{max-width:20px}.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{font-size:1.7em}.content-reset h2{font-size:1.5em}.content-reset h3{font-size:1.25em}.content-reset h4{font-size:1em}.content-reset h5{font-size:.875em}.content-reset h6{font-size:.85em}.content-reset hr{height:.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:.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,.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:700;text-align:center!important;background:rgba(158,188,226,.2)}.content-reset tbody tr:nth-child(2n){background:rgba(158,188,226,.12)}.content-reset tr:hover{background:#efefef}.content-reset code{padding:.2em .4em;margin:0;font-size:85%;background-color:rgba(252,41,41,.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:.5em;background-color:rgba(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:1px solid rgba(0,0,0,.38);border-bottom-color:#bbb;border-radius:3px;box-shadow:inset 0 -1px 0 #bbb}.content-reset .task-list-item,.content-reset__task{list-style:none;margin-left:-1em}.search{border-top:5px solid #e6e5d9;background-color:#f3f1e5;padding:20px 0 20px 84px;min-height:480px;flex:1}.search__body{display:flex;flex-direction:column}.search__header{margin:20px;display:flex}.search__header a{line-height:44px}.search__input{flex:1}.search__input input{margin:0 10px 0 20px;width:523px;height:44px;line-height:44px}.search__input button{height:44px;margin:0}.search__articles{width:600px}.search__articles header h1{margin:0}.search__articles header h1>a{font-size:18px;text-decoration:none;font-weight:400}.search__articles .meta{font-size:14px;color:#999}.search__articles footer{margin-bottom:30px}.search__articles footer a{text-decoration:none;font-size:13px}.search__articles footer a:hover,.search__articles header h1>a:hover,.search__pagination a:hover{text-decoration:underline}.search__pagination a{color:#4285f4;text-decoration:none}.search__pagination a,.search__pagination span{margin-right:5px}@media (max-width:780px){.content,.main{width:auto}.main,.search__input{float:none}.wrap{padding:40px 0 0}.logo,.search__header img,.search__header>.fn-right{display:none}.main{border:0}#init,.search,input{width:100%;box-sizing:border-box}input{display:block}.a-403,.a-404,.a-500{margin:0 20px 0 0}#init{padding:0 20px;left:0}.search__input input{margin:0}.search__input button{position:absolute;right:20px;height:32px;line-height:16px}.search{padding:20px;min-height:auto}.search__articles{width:auto}}
\ No newline at end of file
src/main/webapp/js/common.js
View file @ a90c821e
...@@ -102,10 +102,10 @@ var Util = { ...@@ -102,10 +102,10 @@ var Util = {
* 按需加载 MathJax 及 flow * 按需加载 MathJax 及 flow
* @returns {undefined} * @returns {undefined}
*/ */
parseMarkdown: function (className) { parseMarkdown: function () {
var hasMathJax = false; var hasMathJax = false;
var hasFlow = false; var hasFlow = false;
var className = className || 'article-body'; var className = 'content-reset';
$('.' + className).each(function () { $('.' + className).each(function () {
$(this).find('p').each(function () { $(this).find('p').each(function () {
if ($(this).text().split('$').length > 2 || if ($(this).text().split('$').length > 2 ||
......
src/main/webapp/js/page.js
View file @ a90c821e
...@@ -45,7 +45,7 @@ $.extend(Page.prototype, { ...@@ -45,7 +45,7 @@ $.extend(Page.prototype, {
*/ */
parseLanguage: function (obj) { parseLanguage: function (obj) {
var isHljs = false var isHljs = false
$('.article-body pre, .content-reset pre, .code-highlight pre'). $('..content-reset pre, .code-highlight pre').
each(function () { each(function () {
isHljs = true isHljs = true
}) })
......
src/main/webapp/kill-browser.ftl
View file @ a90c821e
...@@ -19,24 +19,24 @@ ...@@ -19,24 +19,24 @@
--> -->
<#include "macro-common-page.ftl"> <#include "macro-common-page.ftl">
<@commonPage "403 Forbidden!"> <@commonPage "Kill IE!">
${killBrowserLabel} <div class="kill">
<br/> ${killBrowserLabel}
<div style="text-align: right"> <div class="kill__btns">
<button onclick="closeIframe();">${closeLabel}</button> &nbsp; <button onclick="closeIframe();">${closeLabel}</button> &nbsp;
<button onclick="closeIframeForever();">${closeForeverLabel}</button> <button onclick="closeIframeForever();">${closeForeverLabel}</button>
</div>
<img src='${staticServePath}/images/kill-browser.png' title='Kill IE6' class="kill__img" alt='Kill IE6'/>
</div> </div>
<img src='${staticServePath}/images/kill-browser.png' title='Kill IE6' style="float: right;
margin: -171px 0 0 0;" alt='Kill IE6'/>
<script> <script>
var closeIframe = function () { var closeIframe = function () {
window.parent.$("iframe").prev().remove(); window.parent.$('iframe').prev().remove()
window.parent.$("iframe").remove(); window.parent.$('iframe').remove()
}; }
var closeIframeForever = function () { var closeIframeForever = function () {
window.parent.Cookie.createCookie("showKill", true, 365); window.parent.Cookie.createCookie('showKill', true, 365)
closeIframe(); closeIframe()
}; }
</script> </script>
</@commonPage> </@commonPage>
\ No newline at end of file
src/main/webapp/macro-common-page.ftl
View file @ a90c821e
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
<meta name="viewport" content="initial-scale=1.0,user-scalable=no,maximum-scale=1,width=device-width"> <meta name="viewport" content="initial-scale=1.0,user-scalable=no,maximum-scale=1,width=device-width">
<meta name="viewport" content="initial-scale=1.0,user-scalable=no,maximum-scale=1" media="(device-height: 568px)"> <meta name="viewport" content="initial-scale=1.0,user-scalable=no,maximum-scale=1" media="(device-height: 568px)">
<meta name="robots" content="none"/> <meta name="robots" content="none"/>
<title><#if blogTitle??>${blogTitle} - </#if>${title}</title> <title>${title}<#if blogTitle??> - ${blogTitle}</#if></title>
<link type="text/css" rel="stylesheet" <link type="text/css" rel="stylesheet"
href="${staticServePath}/css/default-init${miniPostfix}.css?${staticResourceVersion}" charset="utf-8"/> href="${staticServePath}/scss/start.css?${staticResourceVersion}" charset="utf-8"/>
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png"/> <link rel="icon" type="image/png" href="${staticServePath}/favicon.png"/>
<link rel="apple-touch-icon" href="${staticServePath}/favicon.png"> <link rel="apple-touch-icon" href="${staticServePath}/favicon.png">
</head> </head>
......
src/main/webapp/css/default-admin.css → src/main/webapp/scss/admin.scss
View file @ a90c821e
...@@ -22,213 +22,8 @@ ...@@ -22,213 +22,8 @@
* @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 2.6.0.4, Feb 19, 2019
*/ */
@import "../scss/reset";
/* start resset */ @import "../scss/reset-content";
body, input, textarea {
font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif;;
}
html, body {
color: #767676;
background: #f1f2f7;
font-size: 13px;
}
a {
color: #4183c4;
text-decoration: none;
}
a:visited {
color: #7ba9d6;
}
a:active {
color: #2c5d8d;
}
a:hover {
text-decoration: underline;
}
.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: 20px;
}
.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;
}
.tooltipped { .tooltipped {
position: relative; position: relative;
......
src/main/webapp/css/default-base.css → src/main/webapp/scss/base.scss
View file @ a90c821e
...@@ -19,45 +19,14 @@ ...@@ -19,45 +19,14 @@
* base style * base style
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @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
*/ */
html, body, div, ul, li, h1, h2, h3, h4, h5, h6, p, dd, dl, ol { @import "../scss/reset";
margin: 0; @import "../scss/reset-content";
padding: 0;
}
body {
background-color: #FFF;
color: #000;
font-family: elvetica,Arial,'sans-serif','\5fae\8f6f\96c5\9ed1';
font-size: small;
}
img {
border: medium none;
margin: 0;
padding: 0;
vertical-align: middle;
}
h1 {
font-size: 160%;
}
h2 {
font-size: 140%;
}
h3 {
font-size: 120%;
}
h4 {
font-size: 110%;
}
textarea { textarea {
overflow: auto; overflow: hidden;
} }
button, .button { button, .button {
...@@ -362,187 +331,6 @@ button:hover,.button:hover { ...@@ -362,187 +331,6 @@ button:hover,.button:hover {
} }
/* end icon */ /* end icon */
/* start article-body */
.article-body {
word-wrap: break-word;
overflow: auto;
line-height: 1.65;
font-size: 16px;
word-break: break-word;
}
.article-body ul,
.article-body ol {
padding-left: 2em;
margin-top: 0;
margin-bottom: 16px;
}
.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 {
padding-bottom: 0.3em;
font-size: 1.7em;
border-bottom: 1px solid #eee;
}
.article-body h2 {
padding-bottom: 0.3em;
font-size: 1.5em;
border-bottom: 1px solid #eee;
}
.article-body h3 {
font-size: 1.25em;
}
.article-body h4 {
font-size: 1em;
}
.article-body h5 {
font-size: 0.875em;
}
.article-body h6 {
font-size: 0.85em;
}
.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 */
/* start emotions */ /* start emotions */
.em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09, .em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09,
.em10, .em11, .em12, .em13, .em14 { .em10, .em11, .em12, .em13, .em14 {
......
src/main/webapp/css/default-init.css → src/main/webapp/scss/start.scss
View file @ a90c821e
...@@ -16,27 +16,17 @@ ...@@ -16,27 +16,17 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
/** /**
* 403, 404, 500, article-pwd, init, login and kill-browser page style. * 401, 403, 404, 500, article-pwd, start, search and kill-browser page style.
* *
* @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 1.3.0.1, Feb 19, 2019 * @version 2.0.0.0, Feb 21, 2019
*/ */
/* reset */ @import "reset";
html, body { @import "reset-content";
margin: 0;
padding: 0;
min-height: 100vh;
}
body {
background-color: #fff;
color: #3b3e43;
font-family: \5fae\8f6f\96c5\9ed1;
font-size: small;
}
/* reset */
button { button {
background-size: 110% 110%; background-size: 110% 110%;
border: 1px solid rgba(27, 31, 35, .2); border: 1px solid rgba(27, 31, 35, .2);
...@@ -167,24 +157,18 @@ input[type=text]:focus { ...@@ -167,24 +157,18 @@ input[type=text]:focus {
/* end 403/404/500 */ /* end 403/404/500 */
/* start kill */ /* start kill */
.kill img { .kill {
position: absolute; &__btns {
right: 40px; text-align: right;
top: 200px; }
} &__img {
float: right;
.kill ul { margin: -280px 0 0 0;
margin-bottom: 50px; }
} .content-reset {
margin: 10px;
.kill p { }
margin: 12px 20px;
}
.kill span {
margin-left: 20px;
} }
/* end kill */ /* end kill */
/* start */ /* start */
...@@ -268,187 +252,6 @@ input[type=text]:focus { ...@@ -268,187 +252,6 @@ input[type=text]:focus {
width: auto; width: auto;
} }
/* start content-reset */
.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 {
max-width: 100%;
}
.content-reset img.emoji {
max-width: 20px;
}
.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;
}
/* end content-reset */
/* start search */ /* start search */
.search { .search {
border-top: 5px solid #e6e5d9; border-top: 5px solid #e6e5d9;
...@@ -474,6 +277,7 @@ input[type=text]:focus { ...@@ -474,6 +277,7 @@ input[type=text]:focus {
.search__input { .search__input {
flex: 1; flex: 1;
display: flex;
} }
.search__input input { .search__input input {
...@@ -490,6 +294,26 @@ input[type=text]:focus { ...@@ -490,6 +294,26 @@ input[type=text]:focus {
.search__articles { .search__articles {
width: 600px; width: 600px;
.tag {
color: #616161;
padding: 2px 5px;
border: 1px solid transparent;
position: relative;
height: 20px;
white-space: nowrap;
word-wrap: normal;
background-color: #f7f7f7;
border-radius: 3px 3px 3px 3px;
line-height: 21px;
font-size: 12px;
display: inline-block;
margin-right: 5px;
&:hover {
color: #000;
box-shadow: 0 1px 2px rgba(0,0,0,.2);
text-decoration: none;
}
}
} }
.search__articles header h1 { .search__articles header h1 {
...@@ -505,6 +329,7 @@ input[type=text]:focus { ...@@ -505,6 +329,7 @@ input[type=text]:focus {
.search__articles .meta { .search__articles .meta {
font-size: 14px; font-size: 14px;
color: #999; color: #999;
margin: 5px 0;
} }
.search__articles footer { .search__articles footer {
...@@ -554,12 +379,7 @@ input[type=text]:focus { ...@@ -554,12 +379,7 @@ input[type=text]:focus {
border: 0; border: 0;
float: none; float: none;
width: auto; width: auto;
} padding: 10px;
input {
width: 100%;
box-sizing: border-box;
display: block;
} }
.a-500, .a-500,
...@@ -575,30 +395,21 @@ input[type=text]:focus { ...@@ -575,30 +395,21 @@ input[type=text]:focus {
left: 0; left: 0;
} }
.search__input {
float: none;
}
.search__input input {
margin: 0;
}
.search__input button {
position: absolute;
right: 20px;
height: 32px;
line-height: 16px;
}
.search { .search {
padding: 20px; padding: 20px;
width: 100%; width: 100%;
min-height: auto; min-height: auto;
box-sizing: border-box; box-sizing: border-box;
}
.search__articles { &__input input {
width: auto; width: auto;
flex: 1;
margin-left: 0;
}
&__articles {
width: auto;
}
} }
} }
......
src/main/webapp/search.ftl
View file @ a90c821e
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<meta name="viewport" content="initial-scale=1.0,user-scalable=no,maximum-scale=1" media="(device-height: 568px)"> <meta name="viewport" content="initial-scale=1.0,user-scalable=no,maximum-scale=1" media="(device-height: 568px)">
<title>${searchLabel} - ${blogTitle}${searchLabel}</title> <title>${searchLabel} - ${blogTitle}${searchLabel}</title>
<link type="text/css" rel="stylesheet" <link type="text/css" rel="stylesheet"
href="${staticServePath}/css/default-init${miniPostfix}.css?${staticResourceVersion}" charset="utf-8"/> href="${staticServePath}/scss/start.css?${staticResourceVersion}" charset="utf-8"/>
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png"/> <link rel="icon" type="image/png" href="${staticServePath}/favicon.png"/>
<link rel="apple-touch-icon" href="${staticServePath}/favicon.png"> <link rel="apple-touch-icon" href="${staticServePath}/favicon.png">
</head> </head>
...@@ -73,7 +73,6 @@ ...@@ -73,7 +73,6 @@
<footer> <footer>
<#list article.articleTags?split(",") as articleTag> <#list article.articleTags?split(",") as articleTag>
<a class="tag" rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">${articleTag}</a> <a class="tag" rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">${articleTag}</a>
<#if articleTag_has_next> · ‎</#if>
</#list> </#list>
</footer> </footer>
</article> </article>
......
skins @ 3a5132b6
Subproject commit a0daa3f9e2bd932cb6addefe573e2de5dfcf032a Subproject commit 3a5132b6ba245f04deab73e914c4de78df1cce07
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