From b40b5925f7cbe42efec42d0a0866bdfbe3bbb860 Mon Sep 17 00:00:00 2001 From: charlie Date: Mon, 21 Dec 2020 09:26:51 +0800 Subject: [PATCH] refactor: build styles --- gulpfile.js | 11 +++++++---- resources/css/common.css | 2 +- resources/css/style.css | 2 +- src/main/frontend/components/block.css | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 2d9d4e225..55cf78a29 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -13,8 +13,10 @@ const resourcesPath = path.join(__dirname, 'resources') const sourcePath = path.join(__dirname, 'src/main/frontend') const resourceFilePath = path.join(resourcesPath, '**') +const tailwindCoreEntry = path.join(__dirname, 'tailwind.css') +const tailwindBuildEntry = path.join(sourcePath, '**/*.css') const tailwind = { - paths: [path.join(__dirname, 'tailwind.css'), path.join(sourcePath, '**/*.css')], + paths: [tailwindCoreEntry, tailwindBuildEntry], outputDir: path.join(outputPath, 'css'), outputName: 'tailwind.build.css', } @@ -36,7 +38,10 @@ const css = { }, buildCSS (...params) { - return gulp.series(css._buildTailwind.bind(null, void 0, void 0), css._optimizeCSSForRelease)(...params) + return gulp.series( + css._buildTailwind.bind(null, tailwindCoreEntry, 'tailwind.core.css'), + css._buildTailwind.bind(null, tailwindBuildEntry, 'tailwind.build.css'), + css._optimizeCSSForRelease)(...params) }, _buildTailwind (entry, output) { @@ -49,8 +54,6 @@ const css = { }, _optimizeCSSForRelease () { - // tailwind.core.css placeholder - fs.writeFileSync(path.join(outputPath, 'css', 'tailwind.core.css'), '') return gulp.src(path.join(outputPath, 'css', 'style.css')) .pipe(cleanCSS()) .pipe(gulp.dest(path.join(outputPath, 'css'))) diff --git a/resources/css/common.css b/resources/css/common.css index 5f7b8ca32..1c6a3592b 100644 --- a/resources/css/common.css +++ b/resources/css/common.css @@ -244,7 +244,7 @@ blockquote { background-color: var(--ls-page-blockquote-bg-color, #f7f7f7); margin: 1rem 0; color: var(--ls-page-blockquote-color, #24292e); - font-size: 1.25rem; + font-size: 1rem; } input { diff --git a/resources/css/style.css b/resources/css/style.css index 22b869d0b..3b206f947 100644 --- a/resources/css/style.css +++ b/resources/css/style.css @@ -10,5 +10,5 @@ @import "./datepicker.css"; @import "./highlight.css"; @import "../../static/css/tailwind.core.css"; /* Build by gulp. Check `_buildTailwind` for more detail */ -@import "../../static/css/tailwind.build.css"; /* Build by gulp. Check `_buildTailwind` for more detail */ @import "./common.css"; +@import "../../static/css/tailwind.build.css"; /* Build by gulp. Check `_buildTailwind` for more detail */ diff --git a/src/main/frontend/components/block.css b/src/main/frontend/components/block.css index fca35240a..9f98348f3 100644 --- a/src/main/frontend/components/block.css +++ b/src/main/frontend/components/block.css @@ -6,6 +6,7 @@ max-width: 100%; overflow: initial; cursor: text; + word-break: break-word; img { max-width: 100%;