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
Show 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')
const uglify = require('gulp-uglify')
const sass = require('gulp-sass')
const rename = require('gulp-rename')
const minifycss = require('gulp-minify-css')
const del = require('del')
function sassProcess () {
function sassSkinProcess () {
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/'))
}
function sassProcessWatch () {
gulp.watch('./src/main/webapp/skins/*/css/*.scss', sassProcess)
function sassWatch () {
gulp.watch(['./src/main/webapp/skins/*/css/*.scss'], sassSkinProcess)
gulp.watch(['./src/main/webapp/scss/*.scss'], sassCommonProcess)
}
gulp.task('watch', gulp.series(sassProcessWatch))
function minCSS () {
// minify css
return gulp.src('./src/main/webapp/css/*.css').
pipe(rename({suffix: '.min'})).
pipe(minifycss()).
pipe(gulp.dest('./src/main/webapp/css/'))
function sassCommonProcess () {
return gulp.src('./src/main/webapp/scss/*.scss').
pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError)).
pipe(gulp.dest('./src/main/webapp/scss/'))
}
gulp.task('watch', gulp.series(sassWatch))
function minJS () {
// minify js
return gulp.src('./src/main/webapp/js/*.js').
......@@ -123,22 +121,12 @@ function minSkinJS () {
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 () {
return del([
'./src/main/webapp/css/*.min.css',
'./src/main/webapp/js/*.min.js',
'./src/main/webapp/skins/*/css/*.min.css',
'./src/main/webapp/skins/*/js/*.min.js'])
}
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)))
\ No newline at end of file
package-lock.json
View file @ a90c821e
......@@ -173,12 +173,6 @@
"integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
"dev": true
},
"array-differ": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
"integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
"dev": true
},
"array-each": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
......@@ -446,12 +440,6 @@
"tweetnacl": "^0.14.3"
}
},
"beeper": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
"integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
"dev": true
},
"binary-extensions": {
"version": "1.12.0",
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz",
......@@ -518,15 +506,6 @@
"integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
"dev": true
},
"bufferstreams": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.0.1.tgz",
"integrity": "sha1-z7GtlWjTujz+k1upq92VLeiKqyo=",
"dev": true,
"requires": {
"readable-stream": "^1.0.33"
}
},
"builtin-modules": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
......@@ -648,24 +627,12 @@
"wrap-ansi": "^2.0.0"
}
},
"clone": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
"integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
"dev": true
},
"clone-buffer": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
"integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
"dev": true
},
"clone-stats": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
"integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
"dev": true
},
"cloneable-readable": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.2.tgz",
......@@ -772,15 +739,6 @@
"delayed-stream": "~1.0.0"
}
},
"commander": {
"version": "2.8.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
"integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
"dev": true,
"requires": {
"graceful-readlink": ">= 1.0.0"
}
},
"component-emitter": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
......@@ -940,12 +898,6 @@
"assert-plus": "^1.0.0"
}
},
"dateformat": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
"integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
"dev": true
},
"debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
......@@ -1080,15 +1032,6 @@
"integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
"dev": true
},
"duplexer2": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
"integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
"dev": true,
"requires": {
"readable-stream": "~1.1.9"
}
},
"duplexify": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz",
......@@ -1592,7 +1535,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
......@@ -1613,12 +1557,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -1633,17 +1579,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -1760,7 +1709,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
......@@ -1772,6 +1722,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
......@@ -1786,6 +1737,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......@@ -1793,12 +1745,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
......@@ -1817,6 +1771,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
......@@ -1897,7 +1852,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
......@@ -1909,6 +1865,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -1994,7 +1951,8 @@
"safe-buffer": {
"version": "5.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
......@@ -2030,6 +1988,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
......@@ -2049,6 +2008,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
......@@ -2092,12 +2052,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"yallist": {
"version": "3.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
}
}
},
......@@ -2335,12 +2297,6 @@
"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
"dev": true
},
"graceful-readlink": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
"integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
"dev": true
},
"gulp": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.0.tgz",
......@@ -2426,77 +2382,6 @@
}
}
},
"gulp-minify-css": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/gulp-minify-css/-/gulp-minify-css-1.2.4.tgz",
"integrity": "sha1-thZJV2Auon+eWtiCJ2ld0gV3jAY=",
"dev": true,
"requires": {
"clean-css": "^3.3.3",
"gulp-util": "^3.0.5",
"object-assign": "^4.0.1",
"readable-stream": "^2.0.0",
"vinyl-bufferstream": "^1.0.1",
"vinyl-sourcemaps-apply": "^0.2.0"
},
"dependencies": {
"clean-css": {
"version": "3.4.28",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz",
"integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=",
"dev": true,
"requires": {
"commander": "2.8.x",
"source-map": "0.4.x"
}
},
"isarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
"dev": true
},
"object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
"dev": true
},
"readable-stream": {
"version": "2.3.6",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
"isarray": "~1.0.0",
"process-nextick-args": "~2.0.0",
"safe-buffer": "~5.1.1",
"string_decoder": "~1.1.1",
"util-deprecate": "~1.0.1"
}
},
"source-map": {
"version": "0.4.4",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
"dev": true,
"requires": {
"amdefine": ">=0.0.4"
}
},
"string_decoder": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"dev": true,
"requires": {
"safe-buffer": "~5.1.0"
}
}
}
},
"gulp-rename": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.4.0.tgz",
......@@ -2595,32 +2480,6 @@
}
}
},
"gulp-util": {
"version": "3.0.8",
"resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
"integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
"dev": true,
"requires": {
"array-differ": "^1.0.0",
"array-uniq": "^1.0.2",
"beeper": "^1.0.0",
"chalk": "^1.0.0",
"dateformat": "^2.0.0",
"fancy-log": "^1.1.0",
"gulplog": "^1.0.0",
"has-gulplog": "^0.1.0",
"lodash._reescape": "^3.0.0",
"lodash._reevaluate": "^3.0.0",
"lodash._reinterpolate": "^3.0.0",
"lodash.template": "^3.0.0",
"minimist": "^1.1.0",
"multipipe": "^0.1.2",
"object-assign": "^3.0.0",
"replace-ext": "0.0.1",
"through2": "^2.0.0",
"vinyl": "^0.5.0"
}
},
"gulplog": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
......@@ -3028,12 +2887,6 @@
"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
"dev": true
},
"isarray": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
"dev": true
},
"isexe": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
......@@ -3237,60 +3090,6 @@
}
}
},
"lodash._basecopy": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
"integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
"dev": true
},
"lodash._basetostring": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
"integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
"dev": true
},
"lodash._basevalues": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
"integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
"dev": true
},
"lodash._getnative": {
"version": "3.9.1",
"resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
"integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
"dev": true
},
"lodash._isiterateecall": {
"version": "3.0.9",
"resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
"integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
"dev": true
},
"lodash._reescape": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
"integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
"dev": true
},
"lodash._reevaluate": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
"integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
"dev": true
},
"lodash._reinterpolate": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
"integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
"dev": true
},
"lodash._root": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
"integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
"dev": true
},
"lodash.assign": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
......@@ -3309,77 +3108,12 @@
"integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
"dev": true
},
"lodash.escape": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
"integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
"dev": true,
"requires": {
"lodash._root": "^3.0.0"
}
},
"lodash.isarguments": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
"integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
"dev": true
},
"lodash.isarray": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
"integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
"dev": true
},
"lodash.keys": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
"integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
"dev": true,
"requires": {
"lodash._getnative": "^3.0.0",
"lodash.isarguments": "^3.0.0",
"lodash.isarray": "^3.0.0"
}
},
"lodash.mergewith": {
"version": "4.6.1",
"resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
"integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
"dev": true
},
"lodash.restparam": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
"integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
"dev": true
},
"lodash.template": {
"version": "3.6.2",
"resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
"integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
"dev": true,
"requires": {
"lodash._basecopy": "^3.0.0",
"lodash._basetostring": "^3.0.0",
"lodash._basevalues": "^3.0.0",
"lodash._isiterateecall": "^3.0.0",
"lodash._reinterpolate": "^3.0.0",
"lodash.escape": "^3.0.0",
"lodash.keys": "^3.0.0",
"lodash.restparam": "^3.0.0",
"lodash.templatesettings": "^3.0.0"
}
},
"lodash.templatesettings": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
"integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
"dev": true,
"requires": {
"lodash._reinterpolate": "^3.0.0",
"lodash.escape": "^3.0.0"
}
},
"loud-rejection": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
......@@ -3568,15 +3302,6 @@
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
"dev": true
},
"multipipe": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
"integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
"dev": true,
"requires": {
"duplexer2": "0.0.2"
}
},
"mute-stdout": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
......@@ -3812,12 +3537,6 @@
"integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
"dev": true
},
"object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
"integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
"dev": true
},
"object-copy": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
......@@ -4220,18 +3939,6 @@
"read-pkg": "^1.0.0"
}
},
"readable-stream": {
"version": "1.1.14",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.1",
"isarray": "0.0.1",
"string_decoder": "~0.10.x"
}
},
"readdirp": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
......@@ -4352,12 +4059,6 @@
"is-finite": "^1.0.0"
}
},
"replace-ext": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
"integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
"dev": true
},
"replace-homedir": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
......@@ -4943,12 +4644,6 @@
"strip-ansi": "^3.0.0"
}
},
"string_decoder": {
"version": "0.10.31",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
"dev": true
},
"strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
......@@ -5394,26 +5089,6 @@
"extsprintf": "^1.2.0"
}
},
"vinyl": {
"version": "0.5.3",
"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
"integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
"dev": true,
"requires": {
"clone": "^1.0.0",
"clone-stats": "^0.0.1",
"replace-ext": "0.0.1"
}
},
"vinyl-bufferstream": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/vinyl-bufferstream/-/vinyl-bufferstream-1.0.1.tgz",
"integrity": "sha1-BTeGn1gO/6TKRay0dXnkuf5jCBo=",
"dev": true,
"requires": {
"bufferstreams": "1.0.1"
}
},
"vinyl-fs": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
......
src/main/resources/lang_en_US.properties
View file @ a90c821e
......@@ -18,7 +18,7 @@
#
# 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: Liyuan Li
# Author: Dongxu Wang
......@@ -302,7 +302,7 @@ goTopLabel=Top
permalink1Label=Permalink:
permalinkLabel=Permalink
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
closeForeverLabel=Close Forever
readmoreLabel=Read more\u00BB
......
src/main/resources/lang_zh_CN.properties
View file @ a90c821e
......@@ -18,7 +18,7 @@
#
# 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: Liyuan Li
# Author: Dongxu Wang
......@@ -302,7 +302,7 @@ goTopLabel=\u9876\u90E8
permalink1Label=\u94FE\u63A5\uFF1A
permalinkLabel=\u94FE\u63A5
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
closeForeverLabel=\u6C38\u4E45\u5173\u95ED
readmoreLabel=\u9605\u8BFB\u66F4\u591A\u00BB
......
src/main/webapp/WEB-INF/static-resources.xml
View file @ a90c821e
......@@ -73,12 +73,12 @@
<include path="/skins/**/*.woff"/>
<include path="/skins/**/*.cur"/>
<include path="/css/**.css"/>
<include path="/css/**/*.css"/>
<include path="/css/fonts/*.eot"/>
<include path="/css/fonts/*.svg"/>
<include path="/css/fonts/*.ttf"/>
<include path="/css/fonts/*.woff"/>
<include path="/scss/**.css"/>
<include path="/scss/**/*.css"/>
<include path="/scss/fonts/*.eot"/>
<include path="/scss/fonts/*.svg"/>
<include path="/scss/fonts/*.ttf"/>
<include path="/scss/fonts/*.woff"/>
<include path="/images/**.png"/>
<include path="/images/**/*.png"/>
......
src/main/webapp/admin/admin-index.ftl
View file @ a90c821e
......@@ -29,8 +29,8 @@
<meta http-equiv="Window-target" content="_top">
<meta name="robots" content="none" />
<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}/css/default-admin${miniPostfix}.css?${staticResourceVersion}" />
<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}/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 rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
......
src/main/webapp/css/default-admin.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/>.
*/
.content-reset h1,.content-reset h2{padding-bottom:.3em;border-bottom:1px solid #eee}#tabs ul,.sub-tabs ul{list-style:none}body,input,textarea{font-family:"Helvetica Neue","Luxi Sans","DejaVu Sans",Tahoma,"Hiragino Sans GB","Microsoft Yahei",sans-serif}body,html{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 ol,.content-reset ul{padding-left:2em;margin-top:0;margin-bottom:16px}.content-reset li{margin-top:.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{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)}#top>a,.article__thumbnail,.footer,.skinItem,.tip,.tooltipped::after{text-align:center}.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}.tooltipped{position:relative;cursor:pointer}.tooltipped::after,.tooltipped::before{position:absolute;display:none;pointer-events:none}.tooltipped::after{z-index:1000000;padding:5px 8px;font-size:11px;font-weight:400;-webkit-font-smoothing:subpixel-antialiased;color:#fff;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-wrap:break-word;white-space:pre;content:attr(aria-label);background:rgba(0,0,0,.8);border-radius:3px;line-height:16px;opacity:0}.tooltipped::before{z-index:1000001;width:0;height:0;color:rgba(0,0,0,.8);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::after,.tooltipped-hover::before,.tooltipped:active::after,.tooltipped:active::before,.tooltipped:focus::after,.tooltipped:focus::before,.tooltipped:hover::after,.tooltipped:hover::before{display:inline-block;text-decoration:none;-webkit-animation-name:tooltip-appear;animation-name:tooltip-appear;-webkit-animation-duration:.1s;animation-duration:.1s;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards;-webkit-animation-timing-function:ease-in;animation-timing-function:ease-in;-webkit-animation-delay:.4s;animation-delay:.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,.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,.8)}.tooltipped-ne::after{right:auto;left:50%;margin-left:-15px}.tooltipped-nw::after{margin-right:-15px}.tooltipped-n::after,.tooltipped-s::after{-webkit-transform:translateX(50%);transform:translateX(50%)}.tooltipped-w::after{right:100%;bottom:50%;margin-right:5px;-webkit-transform:translateY(50%);transform:translateY(50%)}.tooltipped-w::before{top:50%;bottom:50%;left:-5px;margin-top:-5px;border-left-color:rgba(0,0,0,.8)}.tooltipped-e::after{bottom:50%;left:100%;margin-left:5px;-webkit-transform:translateY(50%);transform:translateY(50%)}.tooltipped-e::before{top:50%;right:-5px;bottom:50%;margin-top:-5px;border-right-color:rgba(0,0,0,.8)}.completed-ck span,button{padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;text-align:center;white-space:nowrap;vertical-align:baseline;cursor:pointer;user-select:none;background-image:none;border:1px solid #1fb5ad;border-radius:4px;background-color:#1fb5ad;color:#fff;height:auto;outline:0;line-height:18px}button:hover{background-color:#1ca59e;border-color:#1ca59e}@font-face{font-family:icomoon;src:url(fonts/icomoon.eot?pmeuih);src:url(fonts/icomoon.eot?pmeuih#iefix) format('embedded-opentype'),url(fonts/icomoon.ttf?pmeuih) format('truetype'),url(fonts/icomoon.woff?pmeuih) format('woff'),url(fonts/icomoon.svg?pmeuih#icomoon) format('svg');font-weight:400;font-style:normal}[class*=" icon-"],[class^=icon-]{font-family:icomoon!important;speak:none;font-style:normal;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-close:before{content:"\e909"}.icon-move-down:before{content:"\e90a"}.icon-move-up:before{content:"\e90b"}.icon-unordered-list:before{content:"\e004"}.icon-info:before{content:"\e00d"}.icon-article:before{content:"\e61d"}.icon-setting:before{content:"\e604"}.icon-cmts:before{content:"\e60a"}.icon-refresh:before{content:"\e60b"}.icon-chevron-down:before{content:"\e618"}.icon-chevron-up:before{content:"\e619"}a[class*=" icon-"],a[class^=icon-]{color:#333}a[class*=" icon-"]:hover,a[class^=icon-]:hover{text-decoration:none;color:#4183c4}.aboutIcon{background-position:-16px -48px}.icon-move-down,.icon-move-up{cursor:pointer}#allPanel{height:auto;min-height:100%;position:relative}#top,#top>a{height:50px}#tabsPanel{margin:50px 0 0 240px;padding:15px;min-height:100px}#tabsPanel>div{padding-bottom:36px}#tabsPanel_article-list,#tabsPanel_category-list>div:first-child,#tabsPanel_comment-list,#tabsPanel_draft-list,#tabsPanel_link-list>div:first-child,#tabsPanel_page-list>div:first-child,#tabsPanel_plugin-list,#tabsPanel_user-list>div:first-child{background-color:#FFF;border-radius:4px;margin-bottom:40px;overflow:hidden}.tip{font-weight:700;margin:0 auto;overflow:hidden;padding:2px 0;position:fixed;top:3px;left:255px;z-index:1001}#loadMsg,#tipMsg{color:#31708f;background-color:#d9edf7;border-radius:4px;line-height:40px;display:inline-block}.footer{bottom:12px;position:absolute;width:100%;padding-left:240px;box-sizing:border-box}#top{position:fixed;box-shadow:1px 0 3px rgba(0,0,0,.15);width:100%;top:0;background-color:#fff;z-index:80}#top>a{background:#1fb5ad;float:left;width:240px;position:relative;color:#F7F7F7;text-decoration:none;font-size:20px;line-height:50px}#top>.right a{color:#555;line-height:32px;margin:8px 10px;border:1px solid #f6f6f6;background-color:#f6f6f6;border-radius:100px;padding:0 10px;text-decoration:none;display:inline-block}#top>.right a:hover{color:#333}#top .avatar{height:25px;width:25px;border-radius:20px;background-size:cover;background-repeat:no-repeat;background-position:center center;float:left;margin:3px 6px 0 0}#tabs{height:100%;min-height:468px;width:240px;margin-top:50px;position:fixed;top:0;background-color:#32323a;overflow:auto}#tabs li{margin-left:0;border-bottom:1px solid rgba(255,255,255,.05)}#tabs #tabArticleTitle,#tabs #tabToolsTitle,#tabs li>div>a{color:#aeb2b7;display:block;text-decoration:none;letter-spacing:1px;padding:18px 0 18px 25px;line-height:18px;height:18px;transition:all .3s ease;cursor:pointer}#tabs #tabArticleTitle.tab-current,#tabs #tabArticleTitle:hover,#tabs #tabToolsTitle.tab-current,#tabs #tabToolsTitle:hover,#tabs a.tab-current,#tabs a:hover{background-color:#28282e;color:#1fb5ad}#tabs li li{border-bottom:0}#tabs li li>div>a{padding:13px 0 13px 46px;line-height:15px;height:15px;background-color:#28282e}#tabs li li>div>a.tab-current,#tabs li li>div>a:hover{background-color:#202025}#tabs .aboutIcon,#tabs .commentIcon,#tabs .postIcon,#tabs .preferenceIcon,#tabs .usersIcon{display:none}#tabs .icon-chevron-down,#tabs .icon-chevron-up{margin-right:10px}.sub-tabs{background-color:#e0e1e7;border-radius:4px 4px 0 0;overflow:hidden}.sub-tabs ul{float:left;margin-right:24px}.sub-tabs li{float:left;margin:0}.sub-tabs li a{border-right:1px solid #e0e1e7;color:#898989;display:block;line-height:18px;padding:20px 15px;text-decoration:none}.sub-tabs .tab-current,.sub-tabs .tab-current:hover,.sub-tabs a:hover{background-color:#FFF;color:#1fb5ad}.sub-tabs-main{background-color:#FFF;padding:15px;border-radius:0 0 4px 4px}.form>div{margin:15px 0}.form label{margin-bottom:10px;display:inline-block}.form label.checkbox{display:inline-flex;align-items:center;margin:11px 0}.form label.checkbox input{height:auto}.form input[type=text],.form input[type=password],.form select,.form textarea{font-size:14px;outline:0;width:100%;padding:6px 12px;height:34px;box-sizing:border-box;border:1px solid #e2e2e4;color:#333;border-radius:4px;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;background-color:#fff}.form textarea{height:auto}.form input[type=text]:focus,.form input[type=password]:focus,.form input[type=radio]:focus,.form textarea:focus{box-shadow:none;border-color:#1fb5ad}table.form label{margin:10px 0 0}table.form th{vertical-align:initial}.module-panel{border-radius:4px;background-color:#fff;margin-bottom:20px;min-height:160px}.module-header{background:#fafafa;padding:15px;border-bottom:1px solid #eff2f7;border-top-left-radius:3px;border-top-right-radius:3px}.module-header h2{font-size:13px;font-weight:400}.module-header a{color:#767676;text-decoration:none}.module-header a:hover{color:#1fb5ad}.module-panel .module-body{padding:15px}.module-panel .module-body li{padding:10px;line-height:18px;border-bottom:1px solid #ddd}.module-panel .module-body li:hover{background-color:#fafafa}.module-panel .module-body li a:hover{text-decoration:none}.comment-title{background-color:#ECECEC;border-bottom:1px solid #DFDFDF;border-top:1px solid #F9F9F9;padding:3px 6px 3px 12px}#comments{height:462px;overflow:auto}.article__thumbnail{margin:10px auto 20px;display:none}.article__thumbnail .thumbnail__img{background-color:rgba(0,0,0,.02);background-size:cover;background-repeat:no-repeat;background-position:50%;height:432px;width:768px;margin:0 auto}.article__thumbnail button{margin-top:10px}button#submitArticle{background-color:#fa8564;border-color:#fa8564}button#submitArticle:hover{background-color:#ec6459;border-color:#ec6459}#pagePagePanel{margin-top:0}#skinsPanel{min-width:328px;width:99%}.skinPreview{cursor:pointer;height:160px;margin:6px;width:280px}.skinItem{background-color:#FAFAFA;border-radius:3px;box-shadow:1px 1px 3px #333;line-height:16px;margin:10px}#skinMain .skinItem.selected{background-color:#1fb5ad}.skinItem:hover{background-color:#EEE}.error-msg,.f-blue{color:#36C}.small-head{float:left;height:35px;margin:3px 9px 0 3px;width:35px}#commentTable .table-main td{vertical-align:top}.about-logo{float:left;margin:20px 0 0 20px}.about-margin{font-size:20px;margin:20px 0}.content-reset .about-list li{border:0}.content-reset .about-list li:hover{background-color:#fff;text-decoration:underline}.tag__select{position:relative;display:block}.tag__select button{position:absolute;right:0;top:1px;border-radius:0 4px 4px 0}.completed-panel{background-color:#fff;border:1px solid #ddd;color:#00C;display:none;overflow:auto;padding:2px;position:absolute;z-index:10;width:50%;border-top:0}.completed-panel a{display:block;text-decoration:none;line-height:26px;padding:0 5px}.completed-panel a.selected{background-color:#fafafa;color:#fa8564}.completed-ck{margin-top:9px}.completed-ck span,.signs button{margin:5px 10px 5px 0;display:inline-block;background-color:#c7cbd6;border-color:#c7cbd6}.completed-ck span:hover,.signs button:hover{background-color:#b0b5b9;border-color:#b0b5b9}.completed-ck span.selected,.signs button.selected{background-color:#1ca59e;border-color:#1ca59e;color:#fff}.dialog-background{background-color:#000;display:none;filter:alpha(opacity=30);height:100%;left:0;opacity:.3;position:fixed;top:0;width:100%;z-index:90}.dialog-panel{display:none;position:absolute;z-index:100}.dialog-title{color:#FFF;float:left;font-size:12px;margin-left:12px}.dialog-header-bg{background:#32323a;border-radius:6px 6px 0 0;cursor:move;height:34px;line-height:34px}.dialog-header-bg .icon-close{cursor:pointer;float:right;height:18px;margin-top:6px;padding:3px;width:22px;color:#1fb5ad}.dialog-header-bg .icon-close:hover{color:#1ca59e}.dialog-main{background-color:#FFF;border:1px solid #666;border-color:silver #D9D9D9 #D9D9D9;border-top-width:0;padding:12px}.paginate-pageCount,.paginate-paginate a,.paginate-paginate div.button.paginate-page,.pagination-pages{border:1px solid #EFF2F7;padding:6px 12px;cursor:pointer;float:left;line-height:18px;background:#eee;height:18px;margin-left:1px;border-radius:0;text-decoration:none;color:#333}.paginate-pageCount,.pagination-current-page{cursor:auto}.paginate-pageCount{margin-left:10px}.paginate-paginate a:hover,.paginate-paginate div.button.paginate-page:hover,.pagination-current-page,.pagination-pages:hover{border-color:#2eb4ad;background-color:#2eb4ad;color:#FFF}.paginate-paginate div.button{padding:0;float:left;border:0;background:0 0}.table-header,.table-main td{border-bottom:1px solid #ddd}.paginate-inputPage{height:26px;width:24px;margin:0 5px}.table-main{margin:0;padding:0;position:relative}.table-main table{word-break:break-all;word-wrap:break-word}.table-header{background-color:#fafafa;padding:15px 0}.table-header th{line-height:18px;text-align:left;text-indent:6px;font-weight:400}.table-main td{color:#767676;padding:10px 0}.table-lineHover .table-hasExpend td{border-bottom:0}.table-heiglight td,.table-lineHover td{background-color:#fafafa;border-right-color:#fafafa}.table-expendRow td{padding:0 0 5px 36px}.table-expendRow td span{margin-left:60px}.table-expendRow td a{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px;text-decoration:none;color:#FFF;background-color:#c7cbd6;border-color:#c7cbd6}.table-expendRow td a:hover{background-color:#b0b5b9;border-color:#b0b5b9}.table-center{margin:0 auto}.table-tag{color:#D54121;font-size:12px;font-style:italic;margin-left:10px}.navigation-icon{height:18px;width:18px;float:left;margin:-1px 10px 0 0}#preferenceSignButton1,#preferenceSignButton2,#preferenceSignButton3{margin:10px 0}#tabPreferencePanel label,#tabPreferencePanel_setting label,.form__no-table label{width:100%;margin-top:10px;font-weight:700}.page-list__label{width:100%}.search-btn{position:absolute;top:28px;right:27px;border-radius:0 4px 4px 0}.vditor-toolbar label{margin-bottom:0}.vditor .vditor-textarea{border:0;resize:none;padding:10px;box-sizing:border-box;background-color:#fafbfc;outline:0;font-size:16px;line-height:22px;color:#24292e;border-radius:0 0 3px 3px}@media (max-width:768px){#top>a{display:none}.about-logo,.fn__flex,.top__menu{display:block}#tabsPanel{margin-left:0}.footer{padding-left:0}.skinPreview{width:100%;height:auto;margin:0}.tip{left:12px}#tabs{transition:all .15s ease-in-out;left:-240px;z-index:100}.top__menu{font-size:22px;margin:12px;float:left}#permalink{margin:0!important}.permalink__label{margin-bottom:10px!important}.article-commentable__panel,.viewpwd__panel{float:none}#viewPwd{width:100%!important}.viewpwd__panel label{margin-top:20px}.signs label{width:100%}.table-expendRow td{padding-left:10px}.about-margin{margin-bottom:10px}.about__iframe{margin:0 0 20px!important}.about-logo{margin:0 auto;float:none;width:128px}.about__panel{margin-left:0!important}.dialog-panel{left:0!important;top:0!important;padding:10px!important;box-sizing:border-box!important;width:100%!important}.tabs__bg{display:none;width:100vw;height:100vh;background-color:rgba(0,0,0,.4);position:fixed;top:0;z-index:78}}
\ No newline at end of file
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 = {
* 按需加载 MathJax 及 flow
* @returns {undefined}
*/
parseMarkdown: function (className) {
parseMarkdown: function () {
var hasMathJax = false;
var hasFlow = false;
var className = className || 'article-body';
var className = 'content-reset';
$('.' + className).each(function () {
$(this).find('p').each(function () {
if ($(this).text().split('$').length > 2 ||
......
src/main/webapp/js/page.js
View file @ a90c821e
......@@ -45,7 +45,7 @@ $.extend(Page.prototype, {
*/
parseLanguage: function (obj) {
var isHljs = false
$('.article-body pre, .content-reset pre, .code-highlight pre').
$('..content-reset pre, .code-highlight pre').
each(function () {
isHljs = true
})
......
src/main/webapp/kill-browser.ftl
View file @ a90c821e
......@@ -19,24 +19,24 @@
-->
<#include "macro-common-page.ftl">
<@commonPage "403 Forbidden!">
${killBrowserLabel}
<br/>
<div style="text-align: right">
<@commonPage "Kill IE!">
<div class="kill">
${killBrowserLabel}
<div class="kill__btns">
<button onclick="closeIframe();">${closeLabel}</button> &nbsp;
<button onclick="closeIframeForever();">${closeForeverLabel}</button>
</div>
<img src='${staticServePath}/images/kill-browser.png' title='Kill IE6' class="kill__img" alt='Kill IE6'/>
</div>
<img src='${staticServePath}/images/kill-browser.png' title='Kill IE6' style="float: right;
margin: -171px 0 0 0;" alt='Kill IE6'/>
<script>
var closeIframe = function () {
window.parent.$("iframe").prev().remove();
window.parent.$("iframe").remove();
};
window.parent.$('iframe').prev().remove()
window.parent.$('iframe').remove()
}
var closeIframeForever = function () {
window.parent.Cookie.createCookie("showKill", true, 365);
closeIframe();
};
window.parent.Cookie.createCookie('showKill', true, 365)
closeIframe()
}
</script>
</@commonPage>
\ No newline at end of file
src/main/webapp/macro-common-page.ftl
View file @ a90c821e
......@@ -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" media="(device-height: 568px)">
<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"
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="apple-touch-icon" href="${staticServePath}/favicon.png">
</head>
......
src/main/webapp/css/default-admin.css → src/main/webapp/scss/admin.scss
View file @ a90c821e
......@@ -22,213 +22,8 @@
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 2.6.0.4, Feb 19, 2019
*/
/* start resset */
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;
}
@import "../scss/reset";
@import "../scss/reset-content";
.tooltipped {
position: relative;
......
src/main/webapp/css/default-base.css → src/main/webapp/scss/base.scss
View file @ a90c821e
......@@ -19,45 +19,14 @@
* base style
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 1.2.1.0, Jan 4, 2019
* @version 2.0.0.0, Feb 21, 2019
*/
html, body, div, ul, li, h1, h2, h3, h4, h5, h6, p, dd, dl, ol {
margin: 0;
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%;
}
@import "../scss/reset";
@import "../scss/reset-content";
textarea {
overflow: auto;
overflow: hidden;
}
button, .button {
......@@ -362,187 +331,6 @@ button:hover,.button:hover {
}
/* 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 */
.em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09,
.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 @@
* 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://88250.b3log.org">Liang Ding</a>
* @version 1.3.0.1, Feb 19, 2019
* @version 2.0.0.0, Feb 21, 2019
*/
/* reset */
html, body {
margin: 0;
padding: 0;
min-height: 100vh;
}
body {
background-color: #fff;
color: #3b3e43;
font-family: \5fae\8f6f\96c5\9ed1;
font-size: small;
}
@import "reset";
@import "reset-content";
/* reset */
button {
background-size: 110% 110%;
border: 1px solid rgba(27, 31, 35, .2);
......@@ -167,24 +157,18 @@ input[type=text]:focus {
/* end 403/404/500 */
/* start kill */
.kill img {
position: absolute;
right: 40px;
top: 200px;
}
.kill ul {
margin-bottom: 50px;
}
.kill p {
margin: 12px 20px;
}
.kill span {
margin-left: 20px;
.kill {
&__btns {
text-align: right;
}
&__img {
float: right;
margin: -280px 0 0 0;
}
.content-reset {
margin: 10px;
}
}
/* end kill */
/* start */
......@@ -268,187 +252,6 @@ input[type=text]:focus {
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 */
.search {
border-top: 5px solid #e6e5d9;
......@@ -474,6 +277,7 @@ input[type=text]:focus {
.search__input {
flex: 1;
display: flex;
}
.search__input input {
......@@ -490,6 +294,26 @@ input[type=text]:focus {
.search__articles {
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 {
......@@ -505,6 +329,7 @@ input[type=text]:focus {
.search__articles .meta {
font-size: 14px;
color: #999;
margin: 5px 0;
}
.search__articles footer {
......@@ -554,12 +379,7 @@ input[type=text]:focus {
border: 0;
float: none;
width: auto;
}
input {
width: 100%;
box-sizing: border-box;
display: block;
padding: 10px;
}
.a-500,
......@@ -575,31 +395,22 @@ input[type=text]:focus {
left: 0;
}
.search__input {
float: none;
}
.search__input input {
margin: 0;
}
.search__input button {
position: absolute;
right: 20px;
height: 32px;
line-height: 16px;
}
.search {
padding: 20px;
width: 100%;
min-height: auto;
box-sizing: border-box;
&__input input {
width: auto;
flex: 1;
margin-left: 0;
}
.search__articles {
&__articles {
width: auto;
}
}
}
/* end responsive */
\ No newline at end of file
src/main/webapp/search.ftl
View file @ a90c821e
......@@ -25,7 +25,7 @@
<meta name="viewport" content="initial-scale=1.0,user-scalable=no,maximum-scale=1" media="(device-height: 568px)">
<title>${searchLabel} - ${blogTitle}${searchLabel}</title>
<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="apple-touch-icon" href="${staticServePath}/favicon.png">
</head>
......@@ -73,7 +73,6 @@
<footer>
<#list article.articleTags?split(",") as articleTag>
<a class="tag" rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">${articleTag}</a>
<#if articleTag_has_next> · ‎</#if>
</#list>
</footer>
</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